commit 30fdb672739f620376ace70dd27da18ae0b4a8d9
Author: seg_yinzy <yzy123456>
Date:   Fri May 13 23:42:45 2022 +0800

    修改了微信sdk包的引用方式

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..095aa77
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,45 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+/logs/
diff --git a/.run/test#1.run.xml b/.run/test#1.run.xml
new file mode 100644
index 0000000..67e0c24
--- /dev/null
+++ b/.run/test#1.run.xml
@@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test#1" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" path="$PROJECT_DIR$/ruoyi-segchk-web/src/main/resources/test.http" runType="Run single request">
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8564f29
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 RuoYi
+
+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
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f1ec311
--- /dev/null
+++ b/README.md
@@ -0,0 +1,85 @@
+## 平台简介
+
+若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+
+* 前端采用Vue、Element UI。
+* 后端采用Spring Boot、Spring Security、Redis & Jwt。
+* 权限认证使用Jwt，支持多终端认证系统。
+* 支持加载动态权限菜单，多方式轻松权限控制。
+* 高效率开发，使用代码生成器可以一键生成前后端代码。
+* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
+* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
+* 特别鸣谢：[element](https://github.com/ElemeFE/element)，[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://github.com/elunez/eladmin-web)。
+* 阿里云折扣场：[点我进入](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://vue.ruoyi.vip  
+文档地址：http://doc.ruoyi.vip
+
+## 演示图
+
+<table>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
+    </tr>
+	<tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
+    </tr>	 
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
+    </tr>
+	<tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
+    </tr>
+	<tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
+    </tr>
+</table>
+
+
+## 若依前后端分离交流群
+
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) 点击按钮入群。
\ No newline at end of file
diff --git a/bin/clean.bat b/bin/clean.bat
new file mode 100644
index 0000000..24c0974
--- /dev/null
+++ b/bin/clean.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ��������target����·����
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
+pause
\ No newline at end of file
diff --git a/bin/package.bat b/bin/package.bat
new file mode 100644
index 0000000..c693ec0
--- /dev/null
+++ b/bin/package.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ���Web���̣�����war/jar���ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
+pause
\ No newline at end of file
diff --git a/bin/run.bat b/bin/run.bat
new file mode 100644
index 0000000..41efbd0
--- /dev/null
+++ b/bin/run.bat
@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [��Ϣ] ʹ��Jar��������Web���̡�
+echo.
+
+cd %~dp0
+cd ../ruoyi-admin/target
+
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -jar %JAVA_OPTS% ruoyi-admin.jar
+
+cd bin
+pause
\ No newline at end of file
diff --git a/doc/若依环境使用手册.docx b/doc/若依环境使用手册.docx
new file mode 100644
index 0000000..9e4daef
Binary files /dev/null and b/doc/若依环境使用手册.docx differ
diff --git a/java_sdk_v3.0.9/README.md b/java_sdk_v3.0.9/README.md
new file mode 100644
index 0000000..38d4c0f
--- /dev/null
+++ b/java_sdk_v3.0.9/README.md
@@ -0,0 +1,298 @@
+微信支付 Java SDK
+------
+
+对[微信支付开发者文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)中给出的API进行了封装。
+
+com.github.wxpay.sdk.WXPay类下提供了对应的方法：
+
+|方法名 | 说明 |
+|--------|--------|
+|microPay| 刷卡支付 |
+|unifiedOrder | 统一下单|
+|orderQuery | 查询订单 |
+|reverse | 撤销订单 |
+|closeOrder|关闭订单|
+|refund|申请退款|
+|refundQuery|查询退款|
+|downloadBill|下载对账单|
+|report|交易保障|
+|shortUrl|转换短链接|
+|authCodeToOpenid|授权码查询openid|
+
+* 注意:
+* 证书文件不能放在web服务器虚拟目录，应放在有访问权限控制的目录中，防止被他人下载
+* 建议将证书文件名改为复杂且不容易猜测的文件名
+* 商户服务器要做好病毒和木马防护工作，不被非法侵入者窃取证书文件
+* 请妥善保管商户支付密钥、公众帐号SECRET，避免密钥泄露
+* 参数为`Map<String, String>`对象，返回类型也是`Map<String, String>`
+* 方法内部会将参数会转换成含有`appid`、`mch_id`、`nonce_str`、`sign\_type`和`sign`的XML
+* 可选HMAC-SHA256算法和MD5算法签名
+* 通过HTTPS请求得到返回数据后会对其做必要的处理（例如验证签名，签名错误则抛出异常）
+* 对于downloadBill，无论是否成功都返回Map，且都含有`return_code`和`return_msg`，若成功，其中`return_code`为`SUCCESS`，另外`data`对应对账单数据
+
+
+## 示例
+配置类MyConfig:
+```java
+import com.github.wxpay.sdk.WXPayConfig;
+import java.io.*;
+
+public class MyConfig implements WXPayConfig{
+
+    private byte[] certData;
+
+    public MyConfig() throws Exception {
+        String certPath = "/path/to/apiclient_cert.p12";
+        File file = new File(certPath);
+        InputStream certStream = new FileInputStream(file);
+        this.certData = new byte[(int) file.length()];
+        certStream.read(this.certData);
+        certStream.close();
+    }
+
+    public String getAppID() {
+        return "wx8888888888888888";
+    }
+
+    public String getMchID() {
+        return "12888888";
+    }
+
+    public String getKey() {
+        return "88888888888888888888888888888888";
+    }
+
+    public InputStream getCertStream() {
+        ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData);
+        return certBis;
+    }
+
+    public int getHttpConnectTimeoutMs() {
+        return 8000;
+    }
+
+    public int getHttpReadTimeoutMs() {
+        return 10000;
+    }
+}
+```
+
+统一下单：
+
+```java
+import com.github.wxpay.sdk.WXPay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("body", "腾讯充值中心-QQ会员充值");
+        data.put("out_trade_no", "2016090910595900000012");
+        data.put("device_info", "");
+        data.put("fee_type", "CNY");
+        data.put("total_fee", "1");
+        data.put("spbill_create_ip", "123.12.12.123");
+        data.put("notify_url", "http://www.example.com/wxpay/notify");
+        data.put("trade_type", "NATIVE");  // 此处指定为扫码支付
+        data.put("product_id", "12");
+
+        try {
+            Map<String, String> resp = wxpay.unifiedOrder(data);
+            System.out.println(resp);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
+```
+
+订单查询：
+```java
+import com.github.wxpay.sdk.WXPay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", "2016090910595900000012");
+
+        try {
+            Map<String, String> resp = wxpay.orderQuery(data);
+            System.out.println(resp);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
+```
+
+退款查询：
+
+```java
+import com.github.wxpay.sdk.WXPay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", "2016090910595900000012");
+
+        try {
+            Map<String, String> resp = wxpay.refundQuery(data);
+            System.out.println(resp);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
+```
+
+下载对账单：
+
+```java
+import com.github.wxpay.sdk.WXPay;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("bill_date", "20140603");
+        data.put("bill_type", "ALL");
+
+        try {
+            Map<String, String> resp = wxpay.downloadBill(data);
+            System.out.println(resp);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
+```
+
+其他API的使用和上面类似。
+
+暂时不支持下载压缩格式的对账单，但可以使用该SDK生成请求用的XML数据：
+```java
+import com.github.wxpay.sdk.WXPay;
+import com.github.wxpay.sdk.WXPayUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("bill_date", "20140603");
+        data.put("bill_type", "ALL");
+        data.put("tar_type", "GZIP");
+
+        try {
+            data = wxpay.fillRequestData(data);
+            System.out.println(WXPayUtil.mapToXml(data));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
+```
+
+收到支付结果通知时，需要验证签名，可以这样做：
+```java
+
+import com.github.wxpay.sdk.WXPay;
+import com.github.wxpay.sdk.WXPayUtil;
+
+import java.util.Map;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+
+        String notifyData = "...."; // 支付结果通知的xml格式数据
+
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config);
+
+        Map<String, String> notifyMap = WXPayUtil.xmlToMap(notifyData);  // 转换成map
+
+        if (wxpay.isPayResultNotifySignatureValid(notifyMap)) {
+            // 签名正确
+            // 进行处理。
+            // 注意特殊情况：订单已经退款，但收到了支付结果成功的通知，不应把商户侧订单状态从退款改成支付成功
+        }
+        else {
+            // 签名错误，如果数据里没有sign字段，也认为是签名错误
+        }
+    }
+
+}
+```
+
+HTTPS请求可选HMAC-SHA256算法和MD5算法签名：
+```
+import com.github.wxpay.sdk.WXPay;
+import com.github.wxpay.sdk.WXPayConstants;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config, WXPayConstants.SignType.HMACSHA256);
+        // ......
+    }
+}
+```
+
+若需要使用sandbox环境：
+```
+import com.github.wxpay.sdk.WXPay;
+import com.github.wxpay.sdk.WXPayConstants;
+
+public class WXPayExample {
+
+    public static void main(String[] args) throws Exception {
+        MyConfig config = new MyConfig();
+        WXPay wxpay = new WXPay(config, WXPayConstants.SignType.MD5, true);
+        // ......
+    }
+
+}
+```
\ No newline at end of file
diff --git a/java_sdk_v3.0.9/pom.xml b/java_sdk_v3.0.9/pom.xml
new file mode 100644
index 0000000..0c1c352
--- /dev/null
+++ b/java_sdk_v3.0.9/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.wxpay</groupId>
+    <artifactId>wxpay-sdk</artifactId>
+    <version>3.0.9</version>
+    <name>wxpay-sdk</name>
+    <description>wxpay sdk</description>
+<!--    <url>https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=11_1</url>-->
+
+    <properties>
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+    </dependencies>
+
+    <!--<licenses>
+        <license>
+            <name>The BSD 3-Clause License</name>
+            <url>https://opensource.org/licenses/BSD-3-Clause</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <scm>
+        <url></url>
+        <connection></connection>
+        <developerConnection></developerConnection>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>wxpay</name>
+            <email></email>
+            <url>https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=11_1</url>
+        </developer>
+    </developers>-->
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>oss</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+                </snapshotRepository>
+                <repository>
+                    <id>oss</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+            <build>
+                <plugins>
+                    <!-- Source -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Javadoc -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Gpg Signature -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/IWXPayDomain.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/IWXPayDomain.java
new file mode 100644
index 0000000..b693aad
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/IWXPayDomain.java
@@ -0,0 +1,42 @@
+package com.github.wxpay.sdk;
+
+/**
+ * 域名管理，实现主备域名自动切换
+ */
+public abstract interface IWXPayDomain {
+    /**
+     * 上报域名网络状况
+     * @param domain 域名。 比如：api.mch.weixin.qq.com
+     * @param elapsedTimeMillis 耗时
+     * @param ex 网络请求中出现的异常。
+     *           null表示没有异常
+     *           ConnectTimeoutException，表示建立网络连接异常
+     *           UnknownHostException， 表示dns解析异常
+     */
+    abstract void report(final String domain, long elapsedTimeMillis, final Exception ex);
+
+    /**
+     * 获取域名
+     * @param config 配置
+     * @return 域名
+     */
+    abstract DomainInfo getDomain(final WXPayConfig config);
+
+    static class DomainInfo{
+        public String domain;       //域名
+        public boolean primaryDomain;     //该域名是否为主域名。例如:api.mch.weixin.qq.com为主域名
+        public DomainInfo(String domain, boolean primaryDomain) {
+            this.domain = domain;
+            this.primaryDomain = primaryDomain;
+        }
+
+        @Override
+        public String toString() {
+            return "DomainInfo{" +
+                    "domain='" + domain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    '}';
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPay.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPay.java
new file mode 100644
index 0000000..5c9e3fa
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPay.java
@@ -0,0 +1,689 @@
+package com.github.wxpay.sdk;
+
+import com.github.wxpay.sdk.WXPayConstants.SignType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPay {
+
+    private WXPayConfig config;
+    private SignType signType;
+    private boolean autoReport;
+    private boolean useSandbox;
+    private String notifyUrl;
+    private WXPayRequest wxPayRequest;
+
+    public WXPay(final WXPayConfig config) throws Exception {
+        this(config, null, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final boolean autoReport) throws Exception {
+        this(config, null, autoReport, false);
+    }
+
+
+    public WXPay(final WXPayConfig config, final boolean autoReport, final boolean useSandbox) throws Exception{
+        this(config, null, autoReport, useSandbox);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl) throws Exception {
+        this(config, notifyUrl, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport) throws Exception {
+        this(config, notifyUrl, autoReport, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport, final boolean useSandbox) throws Exception {
+        this.config = config;
+        this.notifyUrl = notifyUrl;
+        this.autoReport = autoReport;
+        this.useSandbox = useSandbox;
+        if (useSandbox) {
+            this.signType = SignType.MD5; // 沙箱环境
+        }
+        else {
+            this.signType = SignType.HMACSHA256;
+        }
+        this.wxPayRequest = new WXPayRequest(config);
+    }
+
+    private void checkWXPayConfig() throws Exception {
+        if (this.config == null) {
+            throw new Exception("config is null");
+        }
+        if (this.config.getAppID() == null || this.config.getAppID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getMchID() == null || this.config.getMchID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getCertStream() == null) {
+            throw new Exception("cert stream in config is empty");
+        }
+        if (this.config.getWXPayDomain() == null){
+            throw new Exception("config.getWXPayDomain() is null");
+        }
+
+        if (this.config.getHttpConnectTimeoutMs() < 10) {
+            throw new Exception("http connect timeout is too small");
+        }
+        if (this.config.getHttpReadTimeoutMs() < 10) {
+            throw new Exception("http read timeout is too small");
+        }
+
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign_type、sign <br>
+     * 该函数适用于商户适用于统一下单等接口，不适用于红包、代金券接口
+     *
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        if (SignType.MD5.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.MD5);
+        }
+        else if (SignType.HMACSHA256.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.HMACSHA256);
+        }
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 判断xml数据的sign是否有效，必须包含sign字段，否则返回false。
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isResponseSignatureValid(Map<String, String> reqData) throws Exception {
+        // 返回数据的签名方式和请求中给定的签名方式是一致的
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), this.signType);
+    }
+
+    /**
+     * 判断支付结果通知中的sign是否有效
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isPayResultNotifySignatureValid(Map<String, String> reqData) throws Exception {
+        String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
+        SignType signType;
+        if (signTypeInData == null) {
+            signType = SignType.MD5;
+        }
+        else {
+            signTypeInData = signTypeInData.trim();
+            if (signTypeInData.length() == 0) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.MD5.equals(signTypeInData)) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.HMACSHA256.equals(signTypeInData)) {
+                signType = SignType.HMACSHA256;
+            }
+            else {
+                throw new Exception(String.format("Unsupported sign_type: %s", signTypeInData));
+            }
+        }
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), signType);
+    }
+
+
+    /**
+     * 不需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithoutCert(String urlSuffix, Map<String, String> reqData,
+                                     int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithoutCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, autoReport);
+        return resp;
+    }
+
+
+    /**
+     * 需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据  Map
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithCert(String urlSuffix, Map<String, String> reqData,
+                                  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID= reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, this.autoReport);
+        return resp;
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception
+     */
+    public Map<String, String> processResponseXml(String xmlStr) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        }
+        else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (return_code.equals(WXPayConstants.FAIL)) {
+            return respData;
+        }
+        else if (return_code.equals(WXPayConstants.SUCCESS)) {
+           if (this.isResponseSignatureValid(respData)) {
+               return respData;
+           }
+           else {
+               throw new Exception(String.format("Invalid sign value in XML: %s", xmlStr));
+           }
+        }
+        else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData) throws Exception {
+        return this.microPay(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_MICROPAY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.MICROPAY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData) throws Exception {
+        return this.microPayWithPos(reqData, this.config.getHttpConnectTimeoutMs());
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @param connectTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData, int connectTimeoutMs) throws Exception {
+        int remainingTimeMs = 60*1000;
+        long startTimestampMs = 0;
+        Map<String, String> lastResult = null;
+        Exception lastException = null;
+
+        while (true) {
+            startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+            int readTimeoutMs = remainingTimeMs - connectTimeoutMs;
+            if (readTimeoutMs > 1000) {
+                try {
+                    lastResult = this.microPay(reqData, connectTimeoutMs, readTimeoutMs);
+                    String returnCode = lastResult.get("return_code");
+                    if (returnCode.equals("SUCCESS")) {
+                        String resultCode = lastResult.get("result_code");
+                        String errCode = lastResult.get("err_code");
+                        if (resultCode.equals("SUCCESS")) {
+                            break;
+                        }
+                        else {
+                            // 看错误码，若支付结果未知，则重试提交刷卡支付
+                            if (errCode.equals("SYSTEMERROR") || errCode.equals("BANKERROR") || errCode.equals("USERPAYING")) {
+                                remainingTimeMs = remainingTimeMs - (int)(WXPayUtil.getCurrentTimestampMs() - startTimestampMs);
+                                if (remainingTimeMs <= 100) {
+                                    break;
+                                }
+                                else {
+                                    WXPayUtil.getLogger().info("microPayWithPos: try micropay again");
+                                    if (remainingTimeMs > 5*1000) {
+                                        Thread.sleep(5*1000);
+                                    }
+                                    else {
+                                        Thread.sleep(1*1000);
+                                    }
+                                    continue;
+                                }
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+                catch (Exception ex) {
+                    lastResult = null;
+                    lastException = ex;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        if (lastResult == null) {
+            throw lastException;
+        }
+        else {
+            return lastResult;
+        }
+    }
+
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData) throws Exception {
+        return this.unifiedOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_UNIFIEDORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.UNIFIEDORDER_URL_SUFFIX;
+        }
+        if(this.notifyUrl != null) {
+            reqData.put("notify_url", this.notifyUrl);
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData) throws Exception {
+        return this.orderQuery(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据 int
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_ORDERQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.ORDERQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData) throws Exception {
+        return this.reverse(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REVERSE_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REVERSE_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData) throws Exception {
+        return this.closeOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_CLOSEORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.CLOSEORDER_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData) throws Exception {
+        return this.refund(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUND_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUND_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData) throws Exception {
+        return this.refundQuery(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUNDQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUNDQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：对账单下载（成功时返回对账单数据，失败时返回XML格式数据）<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData) throws Exception {
+        return this.downloadBill(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     *      其中return_code为`SUCCESS`，data为对账单数据。
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return 经过封装的API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_DOWNLOADBILL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.DOWNLOADBILL_URL_SUFFIX;
+        }
+        String respStr = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs).trim();
+        Map<String, String> ret;
+        // 出现错误，返回XML数据
+        if (respStr.indexOf("<") == 0) {
+            ret = WXPayUtil.xmlToMap(respStr);
+        }
+        else {
+            // 正常返回csv数据
+            ret = new HashMap<String, String>();
+            ret.put("return_code", WXPayConstants.SUCCESS);
+            ret.put("return_msg", "ok");
+            ret.put("data", respStr);
+        }
+        return ret;
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData) throws Exception {
+        return this.report(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REPORT_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REPORT_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return WXPayUtil.xmlToMap(respXml);
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData) throws Exception {
+        return this.shortUrl(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SHORTURL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.SHORTURL_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData) throws Exception {
+        return this.authCodeToOpenid(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+} // end class
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConfig.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConfig.java
new file mode 100644
index 0000000..ed1acf2
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConfig.java
@@ -0,0 +1,103 @@
+package com.github.wxpay.sdk;
+
+import java.io.InputStream;
+
+public abstract class WXPayConfig {
+
+
+
+    /**
+     * 获取 App ID
+     *
+     * @return App ID
+     */
+    abstract String getAppID();
+
+
+    /**
+     * 获取 Mch ID
+     *
+     * @return Mch ID
+     */
+    abstract String getMchID();
+
+
+    /**
+     * 获取 API 密钥
+     *
+     * @return API密钥
+     */
+    abstract String getKey();
+
+
+    /**
+     * 获取商户证书内容
+     *
+     * @return 商户证书内容
+     */
+    abstract InputStream getCertStream();
+
+    /**
+     * HTTP(S) 连接超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpConnectTimeoutMs() {
+        return 6*1000;
+    }
+
+    /**
+     * HTTP(S) 读数据超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpReadTimeoutMs() {
+        return 8*1000;
+    }
+
+    /**
+     * 获取WXPayDomain, 用于多域名容灾自动切换
+     * @return
+     */
+    abstract IWXPayDomain getWXPayDomain();
+
+    /**
+     * 是否自动上报。
+     * 若要关闭自动上报，子类中实现该函数返回 false 即可。
+     *
+     * @return
+     */
+    public boolean shouldAutoReport() {
+        return true;
+    }
+
+    /**
+     * 进行健康上报的线程的数量
+     *
+     * @return
+     */
+    public int getReportWorkerNum() {
+        return 6;
+    }
+
+
+    /**
+     * 健康上报缓存消息的最大数量。会有线程去独立上报
+     * 粗略计算：加入一条消息200B，10000消息占用空间 2000 KB，约为2MB，可以接受
+     *
+     * @return
+     */
+    public int getReportQueueMaxSize() {
+        return 10000;
+    }
+
+    /**
+     * 批量上报，一次最多上报多个数据
+     *
+     * @return
+     */
+    public int getReportBatchSize() {
+        return 10;
+    }
+
+}
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConstants.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConstants.java
new file mode 100644
index 0000000..8419859
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayConstants.java
@@ -0,0 +1,59 @@
+package com.github.wxpay.sdk;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 常量
+ */
+public class WXPayConstants {
+
+    public enum SignType {
+        MD5, HMACSHA256
+    }
+
+    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+
+    public static final String FAIL     = "FAIL";
+    public static final String SUCCESS  = "SUCCESS";
+    public static final String HMACSHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+
+    public static final String FIELD_SIGN = "sign";
+    public static final String FIELD_SIGN_TYPE = "sign_type";
+
+    public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+    public static final String USER_AGENT = WXPAYSDK_VERSION +
+            " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+            ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
+    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
+    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
+    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
+    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
+    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
+    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
+    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
+    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+    // sandbox
+    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
+    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
+    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
+    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
+    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/secapi/pay/refund";
+    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
+    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
+    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
+    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+
+}
+
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayReport.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayReport.java
new file mode 100644
index 0000000..a6a2e22
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayReport.java
@@ -0,0 +1,265 @@
+package com.github.wxpay.sdk;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * 交易保障
+ */
+public class WXPayReport {
+
+    public static class ReportInfo {
+
+        /**
+         * 布尔变量使用int。0为false， 1为true。
+         */
+
+        // 基本信息
+        private String version = "v1";
+        private String sdk = WXPayConstants.WXPAYSDK_VERSION;
+        private String uuid;  // 交易的标识
+        private long timestamp;   // 上报时的时间戳，单位秒
+        private long elapsedTimeMillis; // 耗时，单位 毫秒
+
+        // 针对主域名
+        private String firstDomain;  // 第1次请求的域名
+        private boolean primaryDomain; //是否主域名
+        private int firstConnectTimeoutMillis;  // 第1次请求设置的连接超时时间，单位 毫秒
+        private int firstReadTimeoutMillis;  // 第1次请求设置的读写超时时间，单位 毫秒
+        private int firstHasDnsError;  // 第1次请求是否出现dns问题
+        private int firstHasConnectTimeout; // 第1次请求是否出现连接超时
+        private int firstHasReadTimeout; // 第1次请求是否出现连接超时
+
+        public ReportInfo(String uuid, long timestamp, long elapsedTimeMillis, String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis, boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+            this.uuid = uuid;
+            this.timestamp = timestamp;
+            this.elapsedTimeMillis = elapsedTimeMillis;
+            this.firstDomain = firstDomain;
+            this.primaryDomain = primaryDomain;
+            this.firstConnectTimeoutMillis = firstConnectTimeoutMillis;
+            this.firstReadTimeoutMillis = firstReadTimeoutMillis;
+            this.firstHasDnsError = firstHasDnsError?1:0;
+            this.firstHasConnectTimeout = firstHasConnectTimeout?1:0;
+            this.firstHasReadTimeout = firstHasReadTimeout?1:0;
+         }
+
+        @Override
+        public String toString() {
+            return "ReportInfo{" +
+                    "version='" + version + '\'' +
+                    ", sdk='" + sdk + '\'' +
+                    ", uuid='" + uuid + '\'' +
+                    ", timestamp=" + timestamp +
+                    ", elapsedTimeMillis=" + elapsedTimeMillis +
+                    ", firstDomain='" + firstDomain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    ", firstConnectTimeoutMillis=" + firstConnectTimeoutMillis +
+                    ", firstReadTimeoutMillis=" + firstReadTimeoutMillis +
+                    ", firstHasDnsError=" + firstHasDnsError +
+                    ", firstHasConnectTimeout=" + firstHasConnectTimeout +
+                    ", firstHasReadTimeout=" + firstHasReadTimeout +
+                    '}';
+        }
+
+        /**
+         * 转换成 csv 格式
+         *
+         * @return
+         */
+        public String toLineString(String key) {
+            String separator = ",";
+            Object[] objects = new Object[] {
+                version, sdk, uuid, timestamp, elapsedTimeMillis,
+                    firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                    firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout
+            };
+            StringBuffer sb = new StringBuffer();
+            for(Object obj: objects) {
+                sb.append(obj).append(separator);
+            }
+            try {
+                String sign = WXPayUtil.HMACSHA256(sb.toString(), key);
+                sb.append(sign);
+                return sb.toString();
+            }
+            catch (Exception ex) {
+                return null;
+            }
+
+        }
+
+    }
+
+    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
+    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
+
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6*1000;
+    private static final int DEFAULT_READ_TIMEOUT_MS = 8*1000;
+
+    private LinkedBlockingQueue<String> reportMsgQueue = null;
+    private WXPayConfig config;
+    private ExecutorService executorService;
+
+    private volatile static WXPayReport INSTANCE;
+
+    private WXPayReport(final WXPayConfig config) {
+        this.config = config;
+        reportMsgQueue = new LinkedBlockingQueue<String>(config.getReportQueueMaxSize());
+
+        // 添加处理线程
+        executorService = Executors.newFixedThreadPool(config.getReportWorkerNum(), new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setDaemon(true);
+                return t;
+            }
+        });
+
+        if (config.shouldAutoReport()) {
+            WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
+            for (int i = 0; i < config.getReportWorkerNum(); ++i) {
+                executorService.execute(new Runnable() {
+                    public void run() {
+                        while (true) {
+                            // 先用 take 获取数据
+                            try {
+                                StringBuffer sb = new StringBuffer();
+                                String firstMsg = reportMsgQueue.take();
+                                WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
+                                String msg = null;
+                                sb.append(firstMsg); //会阻塞至有消息
+                                int remainNum = config.getReportBatchSize() - 1;
+                                for (int j=0; j<remainNum; ++j) {
+                                    WXPayUtil.getLogger().info("try get remain report msg");
+                                    // msg = reportMsgQueue.poll();  // 不阻塞了
+                                    msg = reportMsgQueue.take();
+                                    WXPayUtil.getLogger().info("get remain report msg: {}", msg);
+                                    if (msg == null) {
+                                        break;
+                                    }
+                                    else {
+                                        sb.append("\n");
+                                        sb.append(msg);
+                                    }
+                                }
+                                // 上报
+                                WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                            }
+                            catch (Exception ex) {
+                                WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+    }
+
+    /**
+     * 单例，双重校验，请在 JDK 1.5及更高版本中使用
+     *
+     * @param config
+     * @return
+     */
+    public static WXPayReport getInstance(WXPayConfig config) {
+        if (INSTANCE == null) {
+            synchronized (WXPayReport.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayReport(config);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public void report(String uuid, long elapsedTimeMillis,
+                       String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis,
+                       boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+        long currentTimestamp = WXPayUtil.getCurrentTimestamp();
+        ReportInfo reportInfo = new ReportInfo(uuid, currentTimestamp, elapsedTimeMillis,
+                firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
+        String data = reportInfo.toLineString(config.getKey());
+        WXPayUtil.getLogger().info("report {}", data);
+        if (data != null) {
+            reportMsgQueue.offer(data);
+        }
+    }
+
+
+    @Deprecated
+    private void reportSync(final String data) throws Exception {
+        httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+    }
+
+    @Deprecated
+    private void reportAsync(final String data) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                }
+                catch (Exception ex) {
+                    WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * http 请求
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    private static String httpRequest(String data, int connectTimeoutMs, int readTimeoutMs) throws Exception{
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(REPORT_URL);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT);
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+    }
+
+}
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayRequest.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayRequest.java
new file mode 100644
index 0000000..83dd05a
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayRequest.java
@@ -0,0 +1,258 @@
+package com.github.wxpay.sdk;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+
+import static com.github.wxpay.sdk.WXPayConstants.USER_AGENT;
+
+public class WXPayRequest {
+    private WXPayConfig config;
+    public WXPayRequest(WXPayConfig config) throws Exception{
+
+        this.config = config;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     * @param domain
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @param useCert 是否使用证书，针对退款、撤销等操作
+     * @return
+     * @throws Exception
+     */
+    private String requestOnce(final String domain, String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        if (useCert) {
+            // 证书
+            char[] password = config.getMchID().toCharArray();
+            InputStream certStream = config.getCertStream();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(certStream, password);
+
+            // 实例化密钥库 & 初始化密钥工厂
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, password);
+
+            // 创建 SSLContext
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(kmf.getKeyManagers(), null, new SecureRandom());
+
+            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext,
+                    new String[]{"TLSv1"},
+                    null,
+                    new DefaultHostnameVerifier());
+
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", sslConnectionSocketFactory)
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+        else {
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        String url = "https://" + domain + urlSuffix;
+        HttpPost httpPost = new HttpPost(url);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", USER_AGENT + " " + config.getMchID());
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+
+    }
+
+
+    private String request(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert, boolean autoReport) throws Exception {
+        Exception exception = null;
+        long elapsedTimeMillis = 0;
+        long startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+        boolean firstHasDnsErr = false;
+        boolean firstHasConnectTimeout = false;
+        boolean firstHasReadTimeout = false;
+        IWXPayDomain.DomainInfo domainInfo = config.getWXPayDomain().getDomain(config);
+        if(domainInfo == null){
+            throw new Exception("WXPayConfig.getWXPayDomain().getDomain() is empty or null");
+        }
+        try {
+            String result = requestOnce(domainInfo.domain, urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, useCert);
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, null);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+            return result;
+        }
+        catch (UnknownHostException ex) {  // dns 解析错误，或域名不存在
+            exception = ex;
+            firstHasDnsErr = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (ConnectTimeoutException ex) {
+            exception = ex;
+            firstHasConnectTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (SocketTimeoutException ex) {
+            exception = ex;
+            firstHasReadTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        catch (Exception ex) {
+            exception = ex;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, exception);
+        throw exception;
+    }
+
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), false, autoReport);
+    }
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs,  boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, false, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), true, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, true, autoReport);
+    }
+}
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayUtil.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayUtil.java
new file mode 100644
index 0000000..8f6948a
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayUtil.java
@@ -0,0 +1,295 @@
+package com.github.wxpay.sdk;
+
+import com.github.wxpay.sdk.WXPayConstants.SignType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.*;
+
+
+public class WXPayUtil {
+
+    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    private static final Random RANDOM = new SecureRandom();
+
+    /**
+     * XML格式字符串转换为Map
+     *
+     * @param strXML XML字符串
+     * @return XML数据转换后的Map
+     * @throws Exception
+     */
+    public static Map<String, String> xmlToMap(String strXML) throws Exception {
+        try {
+            Map<String, String> data = new HashMap<String, String>();
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            org.w3c.dom.Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                // do nothing
+            }
+            return data;
+        } catch (Exception ex) {
+            WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+        return generateSignedXml(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名类型
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+        String sign = generateSignature(data, key, signType);
+        data.put(WXPayConstants.FIELD_SIGN, sign);
+        return mapToXml(data);
+    }
+
+
+    /**
+     * 判断签名是否正确
+     *
+     * @param xmlStr XML格式数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+        Map<String, String> data = xmlToMap(xmlStr);
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key).equals(sign);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+        return isSignatureValid(data, key, SignType.MD5);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key, signType).equals(sign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+        return generateSignature(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals(WXPayConstants.FIELD_SIGN)) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        if (SignType.MD5.equals(signType)) {
+            return MD5(sb.toString()).toUpperCase();
+        }
+        else if (SignType.HMACSHA256.equals(signType)) {
+            return HMACSHA256(sb.toString(), key);
+        }
+        else {
+            throw new Exception(String.format("Invalid sign_type: %s", signType));
+        }
+    }
+
+
+    /**
+     * 获取随机字符串 Nonce Str
+     *
+     * @return String 随机字符串
+     */
+    public static String generateNonceStr() {
+        char[] nonceChars = new char[32];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+
+
+    /**
+     * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String MD5(String data) throws Exception {
+        java.security.MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] array = md.digest(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception
+     */
+    public static String HMACSHA256(String data, String key) throws Exception {
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+        sha256_HMAC.init(secret_key);
+        byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 日志
+     * @return
+     */
+    public static Logger getLogger() {
+        Logger logger = LoggerFactory.getLogger("wxpay java sdk");
+        return logger;
+    }
+
+    /**
+     * 获取当前时间戳，单位秒
+     * @return
+     */
+    public static long getCurrentTimestamp() {
+        return System.currentTimeMillis()/1000;
+    }
+
+    /**
+     * 获取当前时间戳，单位毫秒
+     * @return
+     */
+    public static long getCurrentTimestampMs() {
+        return System.currentTimeMillis();
+    }
+
+}
diff --git a/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayXmlUtil.java b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayXmlUtil.java
new file mode 100644
index 0000000..5988840
--- /dev/null
+++ b/java_sdk_v3.0.9/src/main/java/com/github/wxpay/sdk/WXPayXmlUtil.java
@@ -0,0 +1,30 @@
+package com.github.wxpay.sdk;
+
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * 2018/7/3
+ */
+public final class WXPayXmlUtil {
+    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+}
diff --git a/libs/wxpay-sdk-0.0.1.jar b/libs/wxpay-sdk-0.0.1.jar
new file mode 100644
index 0000000..a153876
Binary files /dev/null and b/libs/wxpay-sdk-0.0.1.jar differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..e98f899
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <packaging>pom</packaging>
+    <version>3.6.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依管理系统</description>
+    
+    <properties>
+        <ruoyi.version>3.6.0</ruoyi.version>
+        <wxsdk.version>3.0.9</wxsdk.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+        <druid.version>1.2.6</druid.version>
+        <bitwalker.version>1.21</bitwalker.version>
+        <swagger.version>3.0.0</swagger.version>
+		<kaptcha.version>2.3.2</kaptcha.version>
+		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+        <fastjson.version>1.2.76</fastjson.version>
+        <oshi.version>5.8.0</oshi.version>
+        <jna.version>5.8.0</jna.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <poi.version>4.1.2</poi.version>
+        <velocity.version>1.7</velocity.version>
+        <jwt.version>0.9.1</jwt.version>
+        <alipay.version>4.8.10.ALL</alipay.version>
+    </properties>
+	
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+            <!-- 生成二维码的jar -->
+            <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
+            <dependency>
+                <groupId>com.google.zxing</groupId>
+                <artifactId>core</artifactId>
+                <version>3.4.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alipay.sdk</groupId>
+                <artifactId>alipay-sdk-java</artifactId>
+                <version>${alipay.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>fastjson</artifactId>
+                        <groupId>com.alibaba</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk16</artifactId>
+                <version>1.46</version>
+            </dependency>
+            <!--dom4j -->
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+
+            <!--腾讯云短信-->
+            <dependency>
+                <groupId>com.github.qcloudsms</groupId>
+                <artifactId>qcloudsms</artifactId>
+                <version>1.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-core</artifactId>
+                <version>4.0.6</version> <!-- 注：如提示报错，先升级基础包版，无法解决可联系技术支持 -->
+            </dependency>
+
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+                <version>1.1.0</version>
+            </dependency>
+            <!--腾讯云OSS-->
+            <dependency>
+                <groupId>com.qcloud</groupId>
+                <artifactId>cos_api</artifactId>
+                <version>5.6.8</version>
+            </dependency>
+            <!-- 阿里云OSS -->
+            <dependency>
+                <groupId>com.aliyun.oss</groupId>
+                <artifactId>aliyun-sdk-oss</artifactId>
+                <version>2.5.0</version>
+            </dependency>
+            <!--lombok-->
+<!--            <dependency>-->
+<!--                <groupId>org.projectlombok</groupId>-->
+<!--                <artifactId>lombok</artifactId>-->
+<!--                <version>1.18.12</version>-->
+<!--            </dependency>-->
+
+            <!-- SpringBoot的依赖配置-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.2.13.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- 阿里数据库连接池 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <!-- 解析客户端操作系统、浏览器等 -->
+            <dependency>
+                <groupId>eu.bitwalker</groupId>
+                <artifactId>UserAgentUtils</artifactId>
+                <version>${bitwalker.version}</version>
+            </dependency>
+
+            <!-- SpringBoot集成mybatis框架 -->
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- 获取系统信息 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <!-- Swagger3依赖 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-boot-starter</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!-- 文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- velocity代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- collections工具类 -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+
+            <!-- 阿里JSON解析器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!-- Token生成与解析-->
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jwt.version}</version>
+            </dependency>
+
+            <!-- 验证码 -->
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <!-- 定时任务-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-quartz</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 代码生成-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-generator</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 核心模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-framework</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 通用工具-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- segchk服务层-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-segchk</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- segchk接口层-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-segchk-web</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.wxpay</groupId>
+                <artifactId>wxpay-sdk</artifactId>
+                <version>${wxsdk.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>ruoyi-segchk</module>
+        <module>ruoyi-segchk-web</module>
+        <module>ruoyi-admin</module>
+        <module>ruoyi-framework</module>
+        <module>ruoyi-system</module>
+        <module>ruoyi-quartz</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
+
+<!--        加入微信sdk-->
+        <module>wxpay-sdk</module>
+    </modules>
+
+
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <meminitial>512m</meminitial>
+                    <maxmem>1048m</maxmem>
+                </configuration>
+
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+
+</project>
\ No newline at end of file
diff --git a/pom.xmlbak b/pom.xmlbak
new file mode 100644
index 0000000..56ac15a
--- /dev/null
+++ b/pom.xmlbak
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.6.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依管理系统</description>
+    
+    <properties>
+        <ruoyi.version>3.6.0</ruoyi.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+        <druid.version>1.2.6</druid.version>
+        <bitwalker.version>1.21</bitwalker.version>
+        <swagger.version>3.0.0</swagger.version>
+		<kaptcha.version>2.3.2</kaptcha.version>
+		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+        <fastjson.version>1.2.76</fastjson.version>
+        <oshi.version>5.8.0</oshi.version>
+        <jna.version>5.8.0</jna.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <poi.version>4.1.2</poi.version>
+        <velocity.version>1.7</velocity.version>
+        <jwt.version>0.9.1</jwt.version>
+    </properties>
+	
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- SpringBoot的依赖配置-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.2.13.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- 阿里数据库连接池 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <!-- 解析客户端操作系统、浏览器等 -->
+            <dependency>
+                <groupId>eu.bitwalker</groupId>
+                <artifactId>UserAgentUtils</artifactId>
+                <version>${bitwalker.version}</version>
+            </dependency>
+
+            <!-- SpringBoot集成mybatis框架 -->
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- 获取系统信息 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+
+            <!-- Swagger3依赖 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-boot-starter</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!-- 文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- velocity代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- collections工具类 -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+
+            <!-- 阿里JSON解析器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!-- Token生成与解析-->
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jwt.version}</version>
+            </dependency>
+
+            <!-- 验证码 -->
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <!-- 定时任务-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-quartz</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 代码生成-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-generator</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 核心模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-framework</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 通用工具-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- segchk服务层-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-segchk</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- segchk接口层-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-segchk-web</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>ruoyi-segchk</module>
+        <module>ruoyi-segchk-web</module>
+        <module>ruoyi-admin</module>
+        <module>ruoyi-framework</module>
+        <module>ruoyi-system</module>
+        <module>ruoyi-quartz</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
+    </modules>
+    <packaging>pom</packaging>
+
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>
\ No newline at end of file
diff --git a/pom1.xml b/pom1.xml
new file mode 100644
index 0000000..f5bc269
--- /dev/null
+++ b/pom1.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.0.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>魔金商城平台管理</description>
+
+    <properties>
+        <ruoyi.version>3.0.0</ruoyi.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <mybatis.boot.version>1.3.2</mybatis.boot.version>
+        <druid.version>1.1.14</druid.version>
+        <bitwalker.version>1.19</bitwalker.version>
+        <swagger.version>2.9.2</swagger.version>
+        <pagehelper.boot.version>1.2.5</pagehelper.boot.version>
+        <fastjson.version>1.2.70</fastjson.version>
+        <oshi.version>3.9.1</oshi.version>
+        <commons.io.version>2.5</commons.io.version>
+        <commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <poi.version>3.17</poi.version>
+        <velocity.version>1.7</velocity.version>
+        <jwt.version>0.9.0</jwt.version>
+        <alipay.version>4.8.10.ALL</alipay.version>
+    </properties>
+
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+            <!-- 生成二维码的jar -->
+            <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
+            <dependency>
+                <groupId>com.google.zxing</groupId>
+                <artifactId>core</artifactId>
+                <version>3.4.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alipay.sdk</groupId>
+                <artifactId>alipay-sdk-java</artifactId>
+                <version>${alipay.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>fastjson</artifactId>
+                        <groupId>com.alibaba</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk16</artifactId>
+                <version>1.46</version>
+            </dependency>
+            <!--dom4j -->
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+            <!--腾讯云短信-->
+            <dependency>
+                <groupId>com.github.qcloudsms</groupId>
+                <artifactId>qcloudsms</artifactId>
+                <version>1.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-core</artifactId>
+                <version>4.0.6</version> <!-- 注：如提示报错，先升级基础包版，无法解决可联系技术支持 -->
+            </dependency>
+
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+                <version>1.1.0</version>
+            </dependency>
+            <!--腾讯云OSS-->
+            <dependency>
+                <groupId>com.qcloud</groupId>
+                <artifactId>cos_api</artifactId>
+                <version>5.6.8</version>
+            </dependency>
+            <!-- 阿里云OSS -->
+            <dependency>
+                <groupId>com.aliyun.oss</groupId>
+                <artifactId>aliyun-sdk-oss</artifactId>
+                <version>2.5.0</version>
+            </dependency>
+            <!--lombok-->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.12</version>
+            </dependency>
+            <!--swagger2 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>2.9.2</version>
+            </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>2.9.2</version>
+            </dependency>
+            <!-- SpringBoot的依赖配置-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!--阿里数据库连接池 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <!-- 解析客户端操作系统、浏览器等 -->
+            <dependency>
+                <groupId>eu.bitwalker</groupId>
+                <artifactId>UserAgentUtils</artifactId>
+                <version>${bitwalker.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- 获取系统信息 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.version}</version>
+            </dependency>
+
+            <!-- swagger2-->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-annotations</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- swagger2-UI-->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+
+            <!--io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!--文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!--velocity代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>${velocity.version}</version>
+            </dependency>
+
+            <!-- 阿里JSON解析器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!--Token生成与解析-->
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jwt.version}</version>
+            </dependency>
+
+            <!-- 定时任务-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-quartz</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 代码生成-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-generator</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 核心模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-framework</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!-- 系统模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-mall</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+            <!-- 通用工具-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>ruoyi-store</module>
+<!--        <module>ruoyi-web</module>-->
+        <module>ruoyi-web</module>
+        <module>ruoyi-admin</module>
+        <module>ruoyi-framework</module>
+
+        <module>ruoyi-system</module>
+        <module>ruoyi-mall</module>
+        <module>ruoyi-quartz</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
+    </modules>
+    <packaging>pom</packaging>
+
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
new file mode 100644
index 0000000..93af423
--- /dev/null
+++ b/ruoyi-admin/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-admin</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+         <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-generator</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.1.0</version>   
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>   
+           </plugin>   
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </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
new file mode 100644
index 0000000..390b435
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -0,0 +1,32 @@
+package com.ruoyi;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author ruoyi
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class RuoYiApplication
+{
+    public static void main(String[] args)
+    {
+        // 第一个参数为账户名 第二个参数为密码 第三个参数为盐对应用户表salt（如果没有可以不用填）
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(RuoYiApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
new file mode 100644
index 0000000..6de67dc
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
@@ -0,0 +1,18 @@
+package com.ruoyi;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ * 
+ * @author ruoyi
+ */
+public class RuoYiServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(RuoYiApplication.class);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/SecurityConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/security/SecurityConfig.java
new file mode 100644
index 0000000..f6592ef
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/SecurityConfig.java
@@ -0,0 +1,131 @@
+package com.ruoyi.security;
+
+import com.ruoyi.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.security.handle.AuthenticationEntryPointImpl;
+import com.ruoyi.security.handle.LogoutSuccessHandlerImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+/**
+ * spring security配置
+ *
+ * @author ruoyi
+ */
+@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    /**
+     * 自定义用户认证逻辑
+     */
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    /**
+     * 认证失败处理类
+     */
+    @Autowired
+    private AuthenticationEntryPointImpl unauthorizedHandler;
+
+    /**
+     * 退出处理类
+     */
+    @Autowired
+    private LogoutSuccessHandlerImpl logoutSuccessHandler;
+
+    /**
+     * token认证过滤器
+     */
+    @Autowired
+    private JwtAuthenticationTokenFilter authenticationTokenFilter;
+
+    /**
+     * 解决 无法直接注入 AuthenticationManager
+     *
+     * @return
+     * @throws Exception
+     */
+    @Bean
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
+
+    /**
+     * anyRequest          |   匹配所有请求路径
+     * access              |   SpringEl表达式结果为true时可以访问
+     * anonymous           |   匿名可以访问
+     * denyAll             |   用户不能访问
+     * fullyAuthenticated  |   用户完全认证可以访问（非remember-me下自动登录）
+     * hasAnyAuthority     |   如果有参数，参数表示权限，则其中任何一个权限可以访问
+     * hasAnyRole          |   如果有参数，参数表示角色，则其中任何一个角色可以访问
+     *
+     * @ss.hasPermi |   如果有参数，参数表示权限，则其权限可以访问
+     * hasIpAddress        |   如果有参数，参数表示IP地址，如果用户IP和参数匹配，则可以访问
+     * hasRole             |   如果有参数，参数表示角色，则其角色可以访问
+     * permitAll           |   用户可以任意访问
+     * rememberMe          |   允许通过remember-me登录的用户访问
+     * authenticated       |   用户登录后可访问
+     */
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity
+                // CRSF禁用，因为不使用session
+                .csrf().disable()
+                // 认证失败处理类
+                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
+                // 基于token，所以不需要session
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
+                // 过滤请求
+                .authorizeRequests()
+                // 对于登录login 验证码captchaImage 允许匿名访问
+                .antMatchers("/login", "/captchaImage").anonymous()
+                .antMatchers(
+                        HttpMethod.GET,
+                        "/*.html",
+                        "/**/*.html",
+                        "/**/*.css",
+                        "/**/*.js"
+                ).permitAll()
+                .antMatchers("/profile/**").anonymous()
+                .antMatchers("/common/download**").anonymous()
+                .antMatchers("/common/download/resource**").anonymous()
+                .antMatchers("/swagger-ui.html").anonymous()
+                .antMatchers("/swagger-resources/**").anonymous()
+                .antMatchers("/webjars/**").anonymous()
+                .antMatchers("/*/api-docs").anonymous()
+                .antMatchers("/druid/**").anonymous()
+                // 除上面外的所有请求全部需要鉴权认证
+                .anyRequest().authenticated()
+                .and()
+                .headers().frameOptions().disable();
+        httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
+        // 添加JWT filter
+        httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
+    }
+
+
+    /**
+     * 强散列哈希加密实现
+     */
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    /**
+     * 身份认证接口
+     */
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi-admin/src/main/java/com/ruoyi/security/filter/JwtAuthenticationTokenFilter.java
new file mode 100644
index 0000000..6254c51
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/filter/JwtAuthenticationTokenFilter.java
@@ -0,0 +1,43 @@
+package com.ruoyi.security.filter;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * token过滤器 验证token有效性
+ *
+ * @author ruoyi
+ */
+@Component
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+            throws ServletException, IOException {
+        logger.debug(request.getRequestURI());
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
+            tokenService.verifyToken(loginUser);
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
+            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+        }
+        chain.doFilter(request, response);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/security/handle/AuthenticationEntryPointImpl.java
new file mode 100644
index 0000000..7112571
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/handle/AuthenticationEntryPointImpl.java
@@ -0,0 +1,33 @@
+package com.ruoyi.security.handle;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * 认证失败处理类 返回未授权
+ *
+ * @author ruoyi
+ */
+@Component
+public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable {
+    private static final long serialVersionUID = -8970718410437077606L;
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
+            throws IOException {
+        int code = HttpStatus.UNAUTHORIZED;
+        String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
+        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/security/handle/LogoutSuccessHandlerImpl.java
new file mode 100644
index 0000000..95c16dd
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/handle/LogoutSuccessHandlerImpl.java
@@ -0,0 +1,51 @@
+package com.ruoyi.security.handle;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 自定义退出处理类 返回成功
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 退出处理
+     *
+     * @return
+     */
+    @Override
+    public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser)) {
+            String userName = loginUser.getUsername();
+            // 删除用户缓存记录
+            tokenService.delLoginUser(loginUser.getToken());
+            // 记录用户退出日志
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
+        }
+        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功")));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/Server.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/Server.java
new file mode 100644
index 0000000..db3c8ab
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/Server.java
@@ -0,0 +1,211 @@
+package com.ruoyi.security.web.domain;
+
+import com.ruoyi.common.utils.Arith;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.security.web.domain.server.*;
+import oshi.SystemInfo;
+import oshi.hardware.CentralProcessor;
+import oshi.hardware.CentralProcessor.TickType;
+import oshi.hardware.GlobalMemory;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.software.os.FileSystem;
+import oshi.software.os.OSFileStore;
+import oshi.software.os.OperatingSystem;
+import oshi.util.Util;
+
+import java.net.UnknownHostException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * 服务器相关信息
+ *
+ * @author ruoyi
+ */
+public class Server {
+    private static final int OSHI_WAIT_SECOND = 1000;
+
+    /**
+     * CPU相关信息
+     */
+    private Cpu cpu = new Cpu();
+
+    /**
+     * 內存相关信息
+     */
+    private Mem mem = new Mem();
+
+    /**
+     * JVM相关信息
+     */
+    private Jvm jvm = new Jvm();
+
+    /**
+     * 服务器相关信息
+     */
+    private Sys sys = new Sys();
+
+    /**
+     * 磁盘相关信息
+     */
+    private List<SysFile> sysFiles = new LinkedList<SysFile>();
+
+    public Cpu getCpu() {
+        return cpu;
+    }
+
+    public void setCpu(Cpu cpu) {
+        this.cpu = cpu;
+    }
+
+    public Mem getMem() {
+        return mem;
+    }
+
+    public void setMem(Mem mem) {
+        this.mem = mem;
+    }
+
+    public Jvm getJvm() {
+        return jvm;
+    }
+
+    public void setJvm(Jvm jvm) {
+        this.jvm = jvm;
+    }
+
+    public Sys getSys() {
+        return sys;
+    }
+
+    public void setSys(Sys sys) {
+        this.sys = sys;
+    }
+
+    public List<SysFile> getSysFiles() {
+        return sysFiles;
+    }
+
+    public void setSysFiles(List<SysFile> sysFiles) {
+        this.sysFiles = sysFiles;
+    }
+
+    /**
+     * 设置磁盘信息
+     */
+    private void setSysFiles(OperatingSystem os) {
+        FileSystem fileSystem = os.getFileSystem();
+        OSFileStore[] fsArray = fileSystem.getFileStores().toArray(new OSFileStore[0]);
+        for (OSFileStore fs : fsArray) {
+            long free = fs.getUsableSpace();
+            long total = fs.getTotalSpace();
+            long used = total - free;
+            SysFile sysFile = new SysFile();
+            sysFile.setDirName(fs.getMount());
+            sysFile.setSysTypeName(fs.getType());
+            sysFile.setTypeName(fs.getName());
+            sysFile.setTotal(convertFileSize(total));
+            sysFile.setFree(convertFileSize(free));
+            sysFile.setUsed(convertFileSize(used));
+            sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100));
+            sysFiles.add(sysFile);
+        }
+    }
+
+    public void copyTo() throws Exception {
+        SystemInfo si = new SystemInfo();
+        HardwareAbstractionLayer hal = si.getHardware();
+
+        setCpuInfo(hal.getProcessor());
+
+        setMemInfo(hal.getMemory());
+
+        setSysInfo();
+
+        setJvmInfo();
+
+        setSysFiles(si.getOperatingSystem());
+    }
+
+    /**
+     * 设置CPU信息
+     */
+    private void setCpuInfo(CentralProcessor processor) {
+        // CPU信息
+        long[] prevTicks = processor.getSystemCpuLoadTicks();
+        Util.sleep(OSHI_WAIT_SECOND);
+        long[] ticks = processor.getSystemCpuLoadTicks();
+        long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()];
+        long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()];
+        long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
+        long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
+        long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
+        long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
+        long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
+        long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
+        long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal;
+        cpu.setCpuNum(processor.getLogicalProcessorCount());
+        cpu.setTotal(totalCpu);
+        cpu.setSys(cSys);
+        cpu.setUsed(user);
+        cpu.setWait(iowait);
+        cpu.setFree(idle);
+    }
+
+    /**
+     * 设置内存信息
+     */
+    private void setMemInfo(GlobalMemory memory) {
+        mem.setTotal(memory.getTotal());
+        mem.setUsed(memory.getTotal() - memory.getAvailable());
+        mem.setFree(memory.getAvailable());
+    }
+
+    /**
+     * 设置服务器信息
+     */
+    private void setSysInfo() {
+        Properties props = System.getProperties();
+        sys.setComputerName(IpUtils.getHostName());
+        sys.setComputerIp(IpUtils.getHostIp());
+        sys.setOsName(props.getProperty("os.name"));
+        sys.setOsArch(props.getProperty("os.arch"));
+        sys.setUserDir(props.getProperty("user.dir"));
+    }
+
+    /**
+     * 设置Java虚拟机
+     */
+    private void setJvmInfo() throws UnknownHostException {
+        Properties props = System.getProperties();
+        jvm.setTotal(Runtime.getRuntime().totalMemory());
+        jvm.setMax(Runtime.getRuntime().maxMemory());
+        jvm.setFree(Runtime.getRuntime().freeMemory());
+        jvm.setVersion(props.getProperty("java.version"));
+        jvm.setHome(props.getProperty("java.home"));
+    }
+
+    /**
+     * 字节转换
+     *
+     * @param size 字节大小
+     * @return 转换后值
+     */
+    public String convertFileSize(long size) {
+        long kb = 1024;
+        long mb = kb * 1024;
+        long gb = mb * 1024;
+        if (size >= gb) {
+            return String.format("%.1f GB", (float) size / gb);
+        } else if (size >= mb) {
+            float f = (float) size / mb;
+            return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
+        } else if (size >= kb) {
+            float f = (float) size / kb;
+            return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
+        } else {
+            return String.format("%d B", size);
+        }
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Cpu.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Cpu.java
new file mode 100644
index 0000000..37dcf3c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Cpu.java
@@ -0,0 +1,88 @@
+package com.ruoyi.security.web.domain.server;
+
+import com.ruoyi.common.utils.Arith;
+
+/**
+ * CPU相关信息
+ *
+ * @author ruoyi
+ */
+public class Cpu {
+    /**
+     * 核心数
+     */
+    private int cpuNum;
+
+    /**
+     * CPU总的使用率
+     */
+    private double total;
+
+    /**
+     * CPU系统使用率
+     */
+    private double sys;
+
+    /**
+     * CPU用户使用率
+     */
+    private double used;
+
+    /**
+     * CPU当前等待率
+     */
+    private double wait;
+
+    /**
+     * CPU当前空闲率
+     */
+    private double free;
+
+    public int getCpuNum() {
+        return cpuNum;
+    }
+
+    public void setCpuNum(int cpuNum) {
+        this.cpuNum = cpuNum;
+    }
+
+    public double getTotal() {
+        return Arith.round(Arith.mul(total, 100), 2);
+    }
+
+    public void setTotal(double total) {
+        this.total = total;
+    }
+
+    public double getSys() {
+        return Arith.round(Arith.mul(sys / total, 100), 2);
+    }
+
+    public void setSys(double sys) {
+        this.sys = sys;
+    }
+
+    public double getUsed() {
+        return Arith.round(Arith.mul(used / total, 100), 2);
+    }
+
+    public void setUsed(double used) {
+        this.used = used;
+    }
+
+    public double getWait() {
+        return Arith.round(Arith.mul(wait / total, 100), 2);
+    }
+
+    public void setWait(double wait) {
+        this.wait = wait;
+    }
+
+    public double getFree() {
+        return Arith.round(Arith.mul(free / total, 100), 2);
+    }
+
+    public void setFree(double free) {
+        this.free = free;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Jvm.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Jvm.java
new file mode 100644
index 0000000..c44f437
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Jvm.java
@@ -0,0 +1,107 @@
+package com.ruoyi.security.web.domain.server;
+
+import com.ruoyi.common.utils.Arith;
+import com.ruoyi.common.utils.DateUtils;
+
+import java.lang.management.ManagementFactory;
+
+/**
+ * JVM相关信息
+ *
+ * @author ruoyi
+ */
+public class Jvm {
+    /**
+     * 当前JVM占用的内存总数(M)
+     */
+    private double total;
+
+    /**
+     * JVM最大可用内存总数(M)
+     */
+    private double max;
+
+    /**
+     * JVM空闲内存(M)
+     */
+    private double free;
+
+    /**
+     * JDK版本
+     */
+    private String version;
+
+    /**
+     * JDK路径
+     */
+    private String home;
+
+    public double getTotal() {
+        return Arith.div(total, (1024 * 1024), 2);
+    }
+
+    public void setTotal(double total) {
+        this.total = total;
+    }
+
+    public double getMax() {
+        return Arith.div(max, (1024 * 1024), 2);
+    }
+
+    public void setMax(double max) {
+        this.max = max;
+    }
+
+    public double getFree() {
+        return Arith.div(free, (1024 * 1024), 2);
+    }
+
+    public void setFree(double free) {
+        this.free = free;
+    }
+
+    public double getUsed() {
+        return Arith.div(total - free, (1024 * 1024), 2);
+    }
+
+    public double getUsage() {
+        return Arith.mul(Arith.div(total - free, total, 4), 100);
+    }
+
+    /**
+     * 获取JDK名称
+     */
+    public String getName() {
+        return ManagementFactory.getRuntimeMXBean().getVmName();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getHome() {
+        return home;
+    }
+
+    public void setHome(String home) {
+        this.home = home;
+    }
+
+    /**
+     * JDK启动时间
+     */
+    public String getStartTime() {
+        return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate());
+    }
+
+    /**
+     * JDK运行时间
+     */
+    public String getRunTime() {
+        return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate());
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Mem.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Mem.java
new file mode 100644
index 0000000..d98a29e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Mem.java
@@ -0,0 +1,53 @@
+package com.ruoyi.security.web.domain.server;
+
+import com.ruoyi.common.utils.Arith;
+
+/**
+ * 內存相关信息
+ *
+ * @author ruoyi
+ */
+public class Mem {
+    /**
+     * 内存总量
+     */
+    private double total;
+
+    /**
+     * 已用内存
+     */
+    private double used;
+
+    /**
+     * 剩余内存
+     */
+    private double free;
+
+    public double getTotal() {
+        return Arith.div(total, (1024 * 1024 * 1024), 2);
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public double getUsed() {
+        return Arith.div(used, (1024 * 1024 * 1024), 2);
+    }
+
+    public void setUsed(long used) {
+        this.used = used;
+    }
+
+    public double getFree() {
+        return Arith.div(free, (1024 * 1024 * 1024), 2);
+    }
+
+    public void setFree(long free) {
+        this.free = free;
+    }
+
+    public double getUsage() {
+        return Arith.mul(Arith.div(used, total, 4), 100);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Sys.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Sys.java
new file mode 100644
index 0000000..014a138
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/Sys.java
@@ -0,0 +1,73 @@
+package com.ruoyi.security.web.domain.server;
+
+/**
+ * 系统相关信息
+ *
+ * @author ruoyi
+ */
+public class Sys {
+    /**
+     * 服务器名称
+     */
+    private String computerName;
+
+    /**
+     * 服务器Ip
+     */
+    private String computerIp;
+
+    /**
+     * 项目路径
+     */
+    private String userDir;
+
+    /**
+     * 操作系统
+     */
+    private String osName;
+
+    /**
+     * 系统架构
+     */
+    private String osArch;
+
+    public String getComputerName() {
+        return computerName;
+    }
+
+    public void setComputerName(String computerName) {
+        this.computerName = computerName;
+    }
+
+    public String getComputerIp() {
+        return computerIp;
+    }
+
+    public void setComputerIp(String computerIp) {
+        this.computerIp = computerIp;
+    }
+
+    public String getUserDir() {
+        return userDir;
+    }
+
+    public void setUserDir(String userDir) {
+        this.userDir = userDir;
+    }
+
+    public String getOsName() {
+        return osName;
+    }
+
+    public void setOsName(String osName) {
+        this.osName = osName;
+    }
+
+    public String getOsArch() {
+        return osArch;
+    }
+
+    public void setOsArch(String osArch) {
+        this.osArch = osArch;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/SysFile.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/SysFile.java
new file mode 100644
index 0000000..9f7ddb1
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/domain/server/SysFile.java
@@ -0,0 +1,99 @@
+package com.ruoyi.security.web.domain.server;
+
+/**
+ * 系统文件相关信息
+ *
+ * @author ruoyi
+ */
+public class SysFile {
+    /**
+     * 盘符路径
+     */
+    private String dirName;
+
+    /**
+     * 盘符类型
+     */
+    private String sysTypeName;
+
+    /**
+     * 文件类型
+     */
+    private String typeName;
+
+    /**
+     * 总大小
+     */
+    private String total;
+
+    /**
+     * 剩余大小
+     */
+    private String free;
+
+    /**
+     * 已经使用量
+     */
+    private String used;
+
+    /**
+     * 资源的使用率
+     */
+    private double usage;
+
+    public String getDirName() {
+        return dirName;
+    }
+
+    public void setDirName(String dirName) {
+        this.dirName = dirName;
+    }
+
+    public String getSysTypeName() {
+        return sysTypeName;
+    }
+
+    public void setSysTypeName(String sysTypeName) {
+        this.sysTypeName = sysTypeName;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getFree() {
+        return free;
+    }
+
+    public void setFree(String free) {
+        this.free = free;
+    }
+
+    public String getUsed() {
+        return used;
+    }
+
+    public void setUsed(String used) {
+        this.used = used;
+    }
+
+    public double getUsage() {
+        return usage;
+    }
+
+    public void setUsage(double usage) {
+        this.usage = usage;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/exception/GlobalExceptionHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/exception/GlobalExceptionHandler.java
new file mode 100644
index 0000000..554ab27
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/exception/GlobalExceptionHandler.java
@@ -0,0 +1,105 @@
+package com.ruoyi.security.web.exception;
+
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.DemoModeException;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AccountExpiredException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+/**
+ * 全局异常处理器
+ *
+ * @author ruoyi
+ */
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /**
+     * 基础异常
+     */
+    @ExceptionHandler(BaseException.class)
+    public AjaxResult baseException(BaseException e) {
+        return AjaxResult.error(e.getMessage());
+    }
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(CustomException.class)
+    public AjaxResult businessException(CustomException e) {
+        if (StringUtils.isNull(e.getCode())) {
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.error(e.getCode(), e.getMessage());
+    }
+
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public AjaxResult handlerNoFoundException(Exception e) {
+        log.error(e.getMessage(), e);
+        return AjaxResult.error(HttpStatus.NOT_FOUND, "路径不存在，请检查路径是否正确");
+    }
+
+    @ExceptionHandler(AccessDeniedException.class)
+    public AjaxResult handleAuthorizationException(AccessDeniedException e) {
+        log.error(e.getMessage());
+        return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+    }
+
+    @ExceptionHandler(AccountExpiredException.class)
+    public AjaxResult handleAccountExpiredException(AccountExpiredException e) {
+        log.error(e.getMessage(), e);
+        return AjaxResult.error(e.getMessage());
+    }
+
+    @ExceptionHandler(UsernameNotFoundException.class)
+    public AjaxResult handleUsernameNotFoundException(UsernameNotFoundException e) {
+        log.error(e.getMessage(), e);
+        return AjaxResult.error(e.getMessage());
+    }
+
+    @ExceptionHandler(Exception.class)
+    public AjaxResult handleException(Exception e) {
+        log.error(e.getMessage(), e);
+        return AjaxResult.error(e.getMessage());
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(BindException.class)
+    public AjaxResult validatedBindException(BindException e) {
+        log.error(e.getMessage(), e);
+        String message = e.getAllErrors().get(0).getDefaultMessage();
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Object validExceptionHandler(MethodArgumentNotValidException e) {
+        log.error(e.getMessage(), e);
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 演示模式异常
+     */
+    @ExceptionHandler(DemoModeException.class)
+    public AjaxResult demoModeException(DemoModeException e) {
+        return AjaxResult.error("演示模式，不允许操作");
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/PermissionService.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/PermissionService.java
new file mode 100644
index 0000000..6e1127b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/PermissionService.java
@@ -0,0 +1,153 @@
+package com.ruoyi.security.web.service;
+
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Set;
+
+/**
+ * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
+ *
+ * @author ruoyi
+ */
+@Service("ss")
+public class PermissionService {
+    /**
+     * 所有权限标识
+     */
+    private static final String ALL_PERMISSION = "*:*:*";
+
+    /**
+     * 管理员角色权限标识
+     */
+    private static final String SUPER_ADMIN = "admin";
+
+    private static final String ROLE_DELIMETER = ",";
+
+    private static final String PERMISSION_DELIMETER = ",";
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 验证用户是否具备某权限
+     *
+     * @param permission 权限字符串
+     * @return 用户是否具备某权限
+     */
+    public boolean hasPermi(String permission) {
+        if (StringUtils.isEmpty(permission)) {
+            return false;
+        }
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
+            return false;
+        }
+        return hasPermissions(loginUser.getPermissions(), permission);
+    }
+
+    /**
+     * 验证用户是否不具备某权限，与 hasPermi逻辑相反
+     *
+     * @param permission 权限字符串
+     * @return 用户是否不具备某权限
+     */
+    public boolean lacksPermi(String permission) {
+        return hasPermi(permission) != true;
+    }
+
+    /**
+     * 验证用户是否具有以下任意一个权限
+     *
+     * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表
+     * @return 用户是否具有以下任意一个权限
+     */
+    public boolean hasAnyPermi(String permissions) {
+        if (StringUtils.isEmpty(permissions)) {
+            return false;
+        }
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
+            return false;
+        }
+        Set<String> authorities = loginUser.getPermissions();
+        for (String permission : permissions.split(PERMISSION_DELIMETER)) {
+            if (permission != null && hasPermissions(authorities, permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断用户是否拥有某个角色
+     *
+     * @param role 角色字符串
+     * @return 用户是否具备某角色
+     */
+    public boolean hasRole(String role) {
+        if (StringUtils.isEmpty(role)) {
+            return false;
+        }
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
+            return false;
+        }
+        for (SysRole sysRole : loginUser.getUser().getRoles()) {
+            String roleKey = sysRole.getRoleKey();
+            if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(StringUtils.trim(role))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 验证用户是否不具备某角色，与 isRole逻辑相反。
+     *
+     * @param role 角色名称
+     * @return 用户是否不具备某角色
+     */
+    public boolean lacksRole(String role) {
+        return hasRole(role) != true;
+    }
+
+    /**
+     * 验证用户是否具有以下任意一个角色
+     *
+     * @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表
+     * @return 用户是否具有以下任意一个角色
+     */
+    public boolean hasAnyRoles(String roles) {
+        if (StringUtils.isEmpty(roles)) {
+            return false;
+        }
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
+            return false;
+        }
+        for (String role : roles.split(ROLE_DELIMETER)) {
+            if (hasRole(role)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否包含权限
+     *
+     * @param permissions 权限列表
+     * @param permission  权限字符串
+     * @return 用户是否具备某权限
+     */
+    private boolean hasPermissions(Set<String> permissions, String permission) {
+        return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysLoginService.java
new file mode 100644
index 0000000..bf586d0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysLoginService.java
@@ -0,0 +1,80 @@
+package com.ruoyi.security.web.service;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.user.CaptchaException;
+import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 登录校验方法
+ *
+ * @author ruoyi
+ */
+@Component
+public class SysLoginService {
+    @Autowired
+    private TokenService tokenService;
+
+    @Resource
+    private AuthenticationManager authenticationManager;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 登录验证
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @param code     验证码
+     * @param uuid     唯一标识
+     * @return 结果
+     */
+    public String login(String username, String password, String code, String uuid) {
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        String captcha = redisCache.getCacheObject(verifyKey);
+        redisCache.deleteObject(verifyKey);
+        if (captcha == null) {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+            throw new CaptchaException();
+        }
+        // 用户验证
+        Authentication authentication = null;
+        try {
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager
+                    .authenticate(new UsernamePasswordAuthenticationToken(username, password));
+        } catch (Exception e) {
+            if (e instanceof BadCredentialsException) {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            } else {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new CustomException(e.getMessage());
+            }
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        // 生成token
+        return tokenService.createToken(loginUser);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysPermissionService.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysPermissionService.java
new file mode 100644
index 0000000..443afb7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/SysPermissionService.java
@@ -0,0 +1,58 @@
+package com.ruoyi.security.web.service;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.segchk.service.ISegchkProviderMgtService;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 用户权限处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class SysPermissionService {
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysMenuService menuService;
+    /**
+     * 获取角色数据权限
+     *
+     * @param user 用户信息
+     * @return 角色权限信息
+     */
+    public Set<String> getRolePermission(SysUser user) {
+        Set<String> roles = new HashSet<String>();
+        // 管理员拥有所有权限
+        if (user.isAdmin()) {
+            roles.add("admin");
+        } else {
+            roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
+        }
+        return roles;
+    }
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param user 用户信息
+     * @return 菜单权限信息
+     */
+    public Set<String> getMenuPermission(SysUser user) {
+        Set<String> perms = new HashSet<String>();
+        // 管理员拥有所有权限
+        if (user.isAdmin()) {
+            perms.add("*:*:*");
+        } else {
+            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+        }
+        return perms;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/UserDetailsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/UserDetailsServiceImpl.java
new file mode 100644
index 0000000..db42920
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/security/web/service/UserDetailsServiceImpl.java
@@ -0,0 +1,52 @@
+package com.ruoyi.security.web.service;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.UserStatus;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户验证处理
+ *
+ * @author ruoyi
+ */
+@Service
+public class UserDetailsServiceImpl implements UserDetailsService {
+    private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        SysUser user = userService.selectUserByUserName(username);
+        if (StringUtils.isNull(user)) {
+            log.info("登录用户：{} 不存在.", username);
+            throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
+        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
+            log.info("登录用户：{} 已被删除.", username);
+            throw new BaseException("对不起，您的账号：" + username + " 已被删除");
+        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", username);
+            throw new BaseException("对不起，您的账号：" + username + " 已停用");
+        }
+
+        return createLoginUser(user);
+    }
+
+    public UserDetails createLoginUser(SysUser user) {
+        return new LoginUser(user, permissionService.getMenuPermission(user));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
new file mode 100644
index 0000000..0aad226
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.common;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.service.ISysConfigService;
+
+/**
+ * 验证码操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+    
+    // 验证码类型
+    @Value("${ruoyi.captchaType}")
+    private String captchaType;
+    
+    @Autowired
+    private ISysConfigService configService;
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    {
+        AjaxResult ajax = AjaxResult.success();
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        ajax.put("captchaOnOff", captchaOnOff);
+        if (!captchaOnOff)
+        {
+            return ajax;
+        }
+
+        // 保存验证码信息
+        String uuid = IdUtils.simpleUUID();
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+
+        String capStr = null, code = null;
+        BufferedImage image = null;
+
+        // 生成验证码
+        if ("math".equals(captchaType))
+        {
+            String capText = captchaProducerMath.createText();
+            capStr = capText.substring(0, capText.lastIndexOf("@"));
+            code = capText.substring(capText.lastIndexOf("@") + 1);
+            image = captchaProducerMath.createImage(capStr);
+        }
+        else if ("char".equals(captchaType))
+        {
+            capStr = code = captchaProducer.createText();
+            image = captchaProducer.createImage(capStr);
+        }
+
+        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 转换流信息写出
+        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        try
+        {
+            ImageIO.write(image, "jpg", os);
+        }
+        catch (IOException e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+
+        ajax.put("uuid", uuid);
+        ajax.put("img", Base64.encode(os.toByteArray()));
+        return ajax;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
new file mode 100644
index 0000000..bf5b910
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -0,0 +1,334 @@
+package com.ruoyi.web.controller.common;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+
+/**
+ * 通用请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求
+     */
+    @PostMapping("/common/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/upload with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传商家执照
+     */
+    @PostMapping("/common/store_cert")
+    public AjaxResult storeCert(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_cert";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_cert with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传商家小图标
+     */
+    @PostMapping("/common/store_smallicon")
+    public AjaxResult storeSmallicon(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_smallicon";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_smallicon with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传商家大图标
+     */
+    @PostMapping("/common/store_bigicon")
+    public AjaxResult storeBigicon(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_bigicon";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_bigicon with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 上传商家轮播图
+     */
+    @PostMapping("/common/store_banner")
+    public AjaxResult storeBanner(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_banner";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_banner with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传商家环境
+     */
+    @PostMapping("/common/store_env")
+    public AjaxResult storeEnv(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_env";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_env with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 上传商家详情
+     */
+    @PostMapping("/common/store_details")
+    public AjaxResult storeDetails(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/store_details";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/store_details with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传行业标签
+     */
+    @PostMapping("/common/keyword")
+    public AjaxResult keyword(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/keyword";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/keyword with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传优惠券
+     */
+    @PostMapping("/common/preference")
+    public AjaxResult preference(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/preference";
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+
+            String url = serverConfig.getUrl() + fileName;
+            log.debug("/common/preference with url: {{}}, filename: {{}}", url, fileName );
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/common/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
new file mode 100644
index 0000000..7b97de2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -0,0 +1,53 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 缓存监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController
+{
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+        Map<String, Object> result = new HashMap<>(3);
+        result.put("info", info);
+        result.put("dbSize", dbSize);
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        commandStats.stringPropertyNames().forEach(key -> {
+            Map<String, String> data = new HashMap<>(2);
+            String property = commandStats.getProperty(key);
+            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+            pieList.add(data);
+        });
+        result.put("commandStats", pieList);
+        return AjaxResult.success(result);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
new file mode 100644
index 0000000..7c3c812
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@@ -0,0 +1,27 @@
+package com.ruoyi.web.controller.monitor;
+
+import com.ruoyi.security.web.domain.Server;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.AjaxResult;
+
+/**
+ * 服务器监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
new file mode 100644
index 0000000..339f242
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -0,0 +1,67 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.service.ISysLogininforService;
+
+/**
+ * 系统访问记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysLogininfor logininfor)
+    {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        return util.exportExcel(list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds)
+    {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
new file mode 100644
index 0000000..1d7eb02
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -0,0 +1,67 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.service.ISysOperLogService;
+
+/**
+ * 操作日志记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        return util.exportExcel(list, "操作日志");
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable Long[] operIds)
+    {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
new file mode 100644
index 0000000..9b157ea
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -0,0 +1,92 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController
+{
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName)
+    {
+        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        for (String key : keys)
+        {
+            LoginUser user = redisCache.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                }
+            }
+            else if (StringUtils.isNotEmpty(ipaddr))
+            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+                }
+            }
+            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+            {
+                if (StringUtils.equals(userName, user.getUsername()))
+                {
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                }
+            }
+            else
+            {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId)
+    {
+        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCarouseMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCarouseMgtController.java
new file mode 100644
index 0000000..c766f54
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCarouseMgtController.java
@@ -0,0 +1,183 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkCarouseMgt;
+import com.ruoyi.segchk.service.ISegchkCarouseMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg首页轮播图管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_carouse_mgt")
+public class SegchkCarouseMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkCarouseMgtService segchkCarouseMgtService;
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkCarouseMgt segchkCarouseMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCarouseMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkCarouseMgt> list = segchkCarouseMgtService.selectSegchkCarouseMgtList(segchkCarouseMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg首页轮播图管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:export')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkCarouseMgt segchkCarouseMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCarouseMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkCarouseMgt> list = segchkCarouseMgtService.selectSegchkCarouseMgtList(segchkCarouseMgt);
+        ExcelUtil<SegchkCarouseMgt> util = new ExcelUtil<SegchkCarouseMgt>(SegchkCarouseMgt.class);
+        return util.exportExcel(list, "seg首页轮播图管理数据");
+    }
+
+    /**
+     * 获取seg首页轮播图管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:query')")
+    @GetMapping(value = "/{carouseId}")
+    public AjaxResult getInfo(@PathVariable("carouseId") Long carouseId)
+    {
+        return AjaxResult.success(segchkCarouseMgtService.selectSegchkCarouseMgtByCarouseId(carouseId));
+    }
+
+    /**
+     * 新增seg首页轮播图管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:add')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkCarouseMgt segchkCarouseMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCarouseMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkCarouseMgtService.insertSegchkCarouseMgt(segchkCarouseMgt));
+    }
+
+    /**
+     * 修改seg首页轮播图管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:edit')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.UPDATE)
+    @PutMapping("edit_info")
+    public AjaxResult edit(@RequestBody SegchkCarouseMgt segchkCarouseMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCarouseMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkCarouseMgtService.updateSegchkCarouseMgt(segchkCarouseMgt));
+    }
+
+    /**
+     * 修改seg首页轮播图管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:edit')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/mgt_state")
+    public AjaxResult mgt_state(@RequestBody SegchkCarouseMgt segchkCarouseMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCarouseMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkCarouseMgtService.updateSegchkCarouseMgt(segchkCarouseMgt));
+    }
+
+
+    /**
+     * 修改seg首页轮播图管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:edit')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/sort_update")
+    public AjaxResult sort_update(@RequestBody String[] sortInfos)
+    {
+        logger.debug("sort_update with {}", sortInfos);
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            ;
+        }
+        return toAjax(segchkCarouseMgtService.updateSegchkCarouseMgtSort(sortInfos));
+    }
+
+    /**
+     * 删除seg首页轮播图管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:remove')")
+    @Log(title = "seg首页轮播图管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{carouseIds}")
+    public AjaxResult remove(@PathVariable Long[] carouseIds)
+    {
+        return toAjax(segchkCarouseMgtService.deleteSegchkCarouseMgtByCarouseIds(carouseIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkChargeCardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkChargeCardController.java
new file mode 100644
index 0000000..6bc002e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkChargeCardController.java
@@ -0,0 +1,154 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkChargeCard;
+import com.ruoyi.segchk.service.ISegchkChargeCardService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg充值卡管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_charge_card")
+public class SegchkChargeCardController extends BaseController
+{
+    @Autowired
+    private ISegchkChargeCardService segchkChargeCardService;
+
+    /**
+     * 查询seg充值卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkChargeCard segchkChargeCard)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkChargeCard.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkChargeCard> list = segchkChargeCardService.selectSegchkChargeCardList(segchkChargeCard);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg充值卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:export')")
+    @Log(title = "seg充值卡管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkChargeCard segchkChargeCard)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkChargeCard.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkChargeCard> list = segchkChargeCardService.selectSegchkChargeCardList(segchkChargeCard);
+        ExcelUtil<SegchkChargeCard> util = new ExcelUtil<SegchkChargeCard>(SegchkChargeCard.class);
+        return util.exportExcel(list, "seg充值卡管理数据");
+    }
+
+    /**
+     * 获取seg充值卡管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:query')")
+    @GetMapping(value = "/{cardTypeId}")
+    public AjaxResult getInfo(@PathVariable("cardTypeId") Long cardTypeId)
+    {
+        SegchkChargeCard segchkChargeCard = new SegchkChargeCard();
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkChargeCard.setProviderId(sysUser.getProviderId());
+        }
+        return AjaxResult.success(segchkChargeCardService.selectSegchkChargeCardByCardTypeId(cardTypeId));
+    }
+
+    /**
+     * 新增seg充值卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:add')")
+    @Log(title = "seg充值卡管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkChargeCard segchkChargeCard)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            if(ObjectUtils.isEmpty(segchkChargeCard.getProviderId())){
+                return AjaxResult.error("500", "请输入运营商id");
+            }
+        }
+        else{
+            segchkChargeCard.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkChargeCardService.insertSegchkChargeCard(segchkChargeCard));
+    }
+
+    /**
+     * 修改seg充值卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:edit')")
+    @Log(title = "seg充值卡管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkChargeCard segchkChargeCard)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkChargeCard.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkChargeCardService.updateSegchkChargeCard(segchkChargeCard));
+    }
+
+    /**
+     * 删除seg充值卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_charge_card:remove')")
+    @Log(title = "seg充值卡管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{cardTypeIds}")
+    public AjaxResult remove(@PathVariable String[] cardTypeIds)
+    {
+        return toAjax(segchkChargeCardService.deleteSegchkChargeCardByCardTypeIds(cardTypeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCommentAccController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCommentAccController.java
new file mode 100644
index 0000000..a0705ca
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkCommentAccController.java
@@ -0,0 +1,145 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkCommentAcc;
+import com.ruoyi.segchk.service.ISegchkCommentAccService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家累积评价Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_comment_acc")
+public class SegchkCommentAccController extends BaseController
+{
+    @Autowired
+    private ISegchkCommentAccService segchkCommentAccService;
+
+    /**
+     * 查询seg商家累积评价列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkCommentAcc segchkCommentAcc)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCommentAcc.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkCommentAcc> list = segchkCommentAccService.selectSegchkCommentAccList(segchkCommentAcc);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家累积评价列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:export')")
+    @Log(title = "seg商家累积评价", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkCommentAcc segchkCommentAcc)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCommentAcc.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkCommentAcc> list = segchkCommentAccService.selectSegchkCommentAccList(segchkCommentAcc);
+        ExcelUtil<SegchkCommentAcc> util = new ExcelUtil<SegchkCommentAcc>(SegchkCommentAcc.class);
+        return util.exportExcel(list, "seg商家累积评价数据");
+    }
+
+    /**
+     * 获取seg商家累积评价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:query')")
+    @GetMapping(value = "/{updateId}")
+    public AjaxResult getInfo(@PathVariable("updateId") Long updateId)
+    {
+        return AjaxResult.success(segchkCommentAccService.selectSegchkCommentAccByUpdateId(updateId));
+    }
+
+    /**
+     * 新增seg商家累积评价
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:add')")
+    @Log(title = "seg商家累积评价", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkCommentAcc segchkCommentAcc)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCommentAcc.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkCommentAccService.insertSegchkCommentAcc(segchkCommentAcc));
+    }
+
+    /**
+     * 修改seg商家累积评价
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:edit')")
+    @Log(title = "seg商家累积评价", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkCommentAcc segchkCommentAcc)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkCommentAcc.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkCommentAccService.updateSegchkCommentAcc(segchkCommentAcc));
+    }
+
+    /**
+     * 删除seg商家累积评价
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_comment_acc:remove')")
+    @Log(title = "seg商家累积评价", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{updateIds}")
+    public AjaxResult remove(@PathVariable Long[] updateIds)
+    {
+        return toAjax(segchkCommentAccService.deleteSegchkCommentAccByUpdateIds(updateIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkDistrictInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkDistrictInfoController.java
new file mode 100644
index 0000000..20d1b84
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkDistrictInfoController.java
@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkDistrictInfo;
+import com.ruoyi.segchk.service.ISegchkDistrictInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg行政区域代码Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_district_info")
+public class SegchkDistrictInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkDistrictInfoService segchkDistrictInfoService;
+
+    /**
+     * 查询seg行政区域代码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkDistrictInfo segchkDistrictInfo)
+    {
+        startPage();
+        List<SegchkDistrictInfo> list = segchkDistrictInfoService.selectSegchkDistrictInfoList(segchkDistrictInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg行政区域代码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:export')")
+    @Log(title = "seg行政区域代码", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkDistrictInfo segchkDistrictInfo)
+    {
+        List<SegchkDistrictInfo> list = segchkDistrictInfoService.selectSegchkDistrictInfoList(segchkDistrictInfo);
+        ExcelUtil<SegchkDistrictInfo> util = new ExcelUtil<SegchkDistrictInfo>(SegchkDistrictInfo.class);
+        return util.exportExcel(list, "seg行政区域代码数据");
+    }
+
+    /**
+     * 获取seg行政区域代码详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:query')")
+    @GetMapping(value = "/{districtId}")
+    public AjaxResult getInfo(@PathVariable("districtId") Integer districtId)
+    {
+        return AjaxResult.success(segchkDistrictInfoService.selectSegchkDistrictInfoByDistrictId(districtId));
+    }
+
+    /**
+     * 新增seg行政区域代码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:add')")
+    @Log(title = "seg行政区域代码", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkDistrictInfo segchkDistrictInfo)
+    {
+        return toAjax(segchkDistrictInfoService.insertSegchkDistrictInfo(segchkDistrictInfo));
+    }
+
+    /**
+     * 修改seg行政区域代码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:edit')")
+    @Log(title = "seg行政区域代码", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkDistrictInfo segchkDistrictInfo)
+    {
+        return toAjax(segchkDistrictInfoService.updateSegchkDistrictInfo(segchkDistrictInfo));
+    }
+
+    /**
+     * 删除seg行政区域代码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_district_info:remove')")
+    @Log(title = "seg行政区域代码", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{districtIds}")
+    public AjaxResult remove(@PathVariable Integer[] districtIds)
+    {
+        return toAjax(segchkDistrictInfoService.deleteSegchkDistrictInfoByDistrictIds(districtIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkKeywordLableController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkKeywordLableController.java
new file mode 100644
index 0000000..60cba6b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkKeywordLableController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkKeywordLable;
+import com.ruoyi.segchk.service.ISegchkKeywordLableService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg关键字管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_keyword_lable")
+public class SegchkKeywordLableController extends BaseController
+{
+    @Autowired
+    private ISegchkKeywordLableService segchkKeywordLableService;
+
+    /**
+     * 查询seg关键字管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkKeywordLable segchkKeywordLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkKeywordLable.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkKeywordLable> list = segchkKeywordLableService.selectSegchkKeywordLableList(segchkKeywordLable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg关键字管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:export')")
+    @Log(title = "seg关键字管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkKeywordLable segchkKeywordLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkKeywordLable.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkKeywordLable> list = segchkKeywordLableService.selectSegchkKeywordLableList(segchkKeywordLable);
+        ExcelUtil<SegchkKeywordLable> util = new ExcelUtil<SegchkKeywordLable>(SegchkKeywordLable.class);
+        return util.exportExcel(list, "seg关键字管理数据");
+    }
+
+    /**
+     * 获取seg关键字管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:query')")
+    @GetMapping(value = "/{keywordId}")
+    public AjaxResult getInfo(@PathVariable("keywordId") Long keywordId)
+    {
+        return AjaxResult.success(segchkKeywordLableService.selectSegchkKeywordLableByKeywordId(keywordId));
+    }
+
+    /**
+     * 新增seg关键字管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:add')")
+    @Log(title = "seg关键字管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkKeywordLable segchkKeywordLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkKeywordLable.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkKeywordLableService.insertSegchkKeywordLable(segchkKeywordLable));
+    }
+
+    /**
+     * 修改seg关键字管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:edit')")
+    @Log(title = "seg关键字管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkKeywordLable segchkKeywordLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkKeywordLable.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkKeywordLableService.updateSegchkKeywordLable(segchkKeywordLable));
+    }
+
+    /**
+     * 删除seg关键字管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_keyword_lable:remove')")
+    @Log(title = "seg关键字管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{keywordIds}")
+    public AjaxResult remove(@PathVariable Long[] keywordIds)
+    {
+        return toAjax(segchkKeywordLableService.deleteSegchkKeywordLableByKeywordIds(keywordIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLableMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLableMgtController.java
new file mode 100644
index 0000000..fb2ccbf
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLableMgtController.java
@@ -0,0 +1,165 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+import com.ruoyi.segchk.service.ISegchkLableMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg首页标签管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_lable_mgt")
+public class SegchkLableMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkLableMgtService segchkLableMgtService;
+
+    /**
+     * 查询seg首页标签管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkLableMgt segchkLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        logger.debug("segchk:segchk_lable_mgt:list get with---user: {}",sysUser.toString());
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkLableMgt> list = segchkLableMgtService.selectSegchkLableMgtList(segchkLableMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg首页标签管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:export')")
+    @Log(title = "seg首页标签管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkLableMgt segchkLableMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkLableMgt> list = segchkLableMgtService.selectSegchkLableMgtList(segchkLableMgt);
+        ExcelUtil<SegchkLableMgt> util = new ExcelUtil<SegchkLableMgt>(SegchkLableMgt.class);
+        return util.exportExcel(list, "seg首页标签管理数据");
+    }
+
+    /**
+     * 获取seg首页标签管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:query')")
+    @GetMapping(value = "/{mgtId}")
+    public AjaxResult getInfo(@PathVariable("mgtId") Long mgtId)
+    {
+        return AjaxResult.success(segchkLableMgtService.selectSegchkLableMgtByMgtId(mgtId));
+    }
+
+    /**
+     * 新增seg首页标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:add')")
+    @Log(title = "seg首页标签管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkLableMgt segchkLableMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkLableMgtService.insertSegchkLableMgt(segchkLableMgt));
+    }
+
+    /**
+     * 修改seg首页标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:edit')")
+    @Log(title = "seg首页标签管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit_info")
+    public AjaxResult edit(@RequestBody SegchkLableMgt segchkLableMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkLableMgtService.updateSegchkLableMgt(segchkLableMgt));
+    }
+
+
+    /**
+     * 修改seg首页标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:edit')")
+    @Log(title = "seg首页标签管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/mgt_state")
+    public AjaxResult mgt_state(@RequestBody SegchkLableMgt segchkLableMgt)
+    {
+        logger.debug("mgt_state with --- {}", segchkLableMgt.toString());
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkLableMgtService.updateSegchkLableMgt(segchkLableMgt));
+    }
+
+    /**
+     * 删除seg首页标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_lable_mgt:remove')")
+    @Log(title = "seg首页标签管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{mgtIds}")
+    public AjaxResult remove(@PathVariable Long[] mgtIds)
+    {
+        return toAjax(segchkLableMgtService.deleteSegchkLableMgtByProviderIds(mgtIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLogionDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLogionDetailController.java
new file mode 100644
index 0000000..5eb65e1
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkLogionDetailController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkLogionDetail;
+import com.ruoyi.segchk.service.ISegchkLogionDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg登录记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_logion_detail")
+public class SegchkLogionDetailController extends BaseController
+{
+    @Autowired
+    private ISegchkLogionDetailService segchkLogionDetailService;
+
+    /**
+     * 查询seg登录记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkLogionDetail segchkLogionDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLogionDetail.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkLogionDetail> list = segchkLogionDetailService.selectSegchkLogionDetailList(segchkLogionDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg登录记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:export')")
+    @Log(title = "seg登录记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkLogionDetail segchkLogionDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLogionDetail.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkLogionDetail> list = segchkLogionDetailService.selectSegchkLogionDetailList(segchkLogionDetail);
+        ExcelUtil<SegchkLogionDetail> util = new ExcelUtil<SegchkLogionDetail>(SegchkLogionDetail.class);
+        return util.exportExcel(list, "seg登录记录数据");
+    }
+
+    /**
+     * 获取seg登录记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:query')")
+    @GetMapping(value = "/{loginId}")
+    public AjaxResult getInfo(@PathVariable("loginId") Long loginId)
+    {
+        return AjaxResult.success(segchkLogionDetailService.selectSegchkLogionDetailByLoginId(loginId));
+    }
+
+    /**
+     * 新增seg登录记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:add')")
+    @Log(title = "seg登录记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkLogionDetail segchkLogionDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLogionDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkLogionDetailService.insertSegchkLogionDetail(segchkLogionDetail));
+    }
+
+    /**
+     * 修改seg登录记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:edit')")
+    @Log(title = "seg登录记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkLogionDetail segchkLogionDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkLogionDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkLogionDetailService.updateSegchkLogionDetail(segchkLogionDetail));
+    }
+
+    /**
+     * 删除seg登录记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_logion_detail:remove')")
+    @Log(title = "seg登录记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{loginIds}")
+    public AjaxResult remove(@PathVariable Long[] loginIds)
+    {
+        return toAjax(segchkLogionDetailService.deleteSegchkLogionDetailByLoginIds(loginIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkMsgDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkMsgDetailController.java
new file mode 100644
index 0000000..40eb032
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkMsgDetailController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkMsgDetail;
+import com.ruoyi.segchk.service.ISegchkMsgDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg消息记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_msg_detail")
+public class SegchkMsgDetailController extends BaseController
+{
+    @Autowired
+    private ISegchkMsgDetailService segchkMsgDetailService;
+
+    /**
+     * 查询seg消息记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkMsgDetail segchkMsgDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkMsgDetail.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkMsgDetail> list = segchkMsgDetailService.selectSegchkMsgDetailList(segchkMsgDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg消息记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:export')")
+    @Log(title = "seg消息记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkMsgDetail segchkMsgDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkMsgDetail.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkMsgDetail> list = segchkMsgDetailService.selectSegchkMsgDetailList(segchkMsgDetail);
+        ExcelUtil<SegchkMsgDetail> util = new ExcelUtil<SegchkMsgDetail>(SegchkMsgDetail.class);
+        return util.exportExcel(list, "seg消息记录数据");
+    }
+
+    /**
+     * 获取seg消息记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:query')")
+    @GetMapping(value = "/{msgId}")
+    public AjaxResult getInfo(@PathVariable("msgId") Long msgId)
+    {
+        return AjaxResult.success(segchkMsgDetailService.selectSegchkMsgDetailByMsgId(msgId));
+    }
+
+    /**
+     * 新增seg消息记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:add')")
+    @Log(title = "seg消息记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkMsgDetail segchkMsgDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkMsgDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkMsgDetailService.insertSegchkMsgDetail(segchkMsgDetail));
+    }
+
+    /**
+     * 修改seg消息记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:edit')")
+    @Log(title = "seg消息记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkMsgDetail segchkMsgDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkMsgDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkMsgDetailService.updateSegchkMsgDetail(segchkMsgDetail));
+    }
+
+    /**
+     * 删除seg消息记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_msg_detail:remove')")
+    @Log(title = "seg消息记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{msgIds}")
+    public AjaxResult remove(@PathVariable Long[] msgIds)
+    {
+        return toAjax(segchkMsgDetailService.deleteSegchkMsgDetailByMsgIds(msgIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkPreferenceLableController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkPreferenceLableController.java
new file mode 100644
index 0000000..2e84908
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkPreferenceLableController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkPreferenceLable;
+import com.ruoyi.segchk.service.ISegchkPreferenceLableService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg优惠管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_preference_lable")
+public class SegchkPreferenceLableController extends BaseController
+{
+    @Autowired
+    private ISegchkPreferenceLableService segchkPreferenceLableService;
+
+    /**
+     * 查询seg优惠管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkPreferenceLable segchkPreferenceLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkPreferenceLable.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkPreferenceLable> list = segchkPreferenceLableService.selectSegchkPreferenceLableList(segchkPreferenceLable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg优惠管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:export')")
+    @Log(title = "seg优惠管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkPreferenceLable segchkPreferenceLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkPreferenceLable.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkPreferenceLable> list = segchkPreferenceLableService.selectSegchkPreferenceLableList(segchkPreferenceLable);
+        ExcelUtil<SegchkPreferenceLable> util = new ExcelUtil<SegchkPreferenceLable>(SegchkPreferenceLable.class);
+        return util.exportExcel(list, "seg优惠管理数据");
+    }
+
+    /**
+     * 获取seg优惠管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:query')")
+    @GetMapping(value = "/{preferenceId}")
+    public AjaxResult getInfo(@PathVariable("preferenceId") Long preferenceId)
+    {
+        return AjaxResult.success(segchkPreferenceLableService.selectSegchkPreferenceLableByPreferenceId(preferenceId));
+    }
+
+    /**
+     * 新增seg优惠管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:add')")
+    @Log(title = "seg优惠管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkPreferenceLable segchkPreferenceLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkPreferenceLable.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkPreferenceLableService.insertSegchkPreferenceLable(segchkPreferenceLable));
+    }
+
+    /**
+     * 修改seg优惠管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:edit')")
+    @Log(title = "seg优惠管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkPreferenceLable segchkPreferenceLable)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkPreferenceLable.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkPreferenceLableService.updateSegchkPreferenceLable(segchkPreferenceLable));
+    }
+
+    /**
+     * 删除seg优惠管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_preference_lable:remove')")
+    @Log(title = "seg优惠管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{preferenceIds}")
+    public AjaxResult remove(@PathVariable Long[] preferenceIds)
+    {
+        return toAjax(segchkPreferenceLableService.deleteSegchkPreferenceLableByPreferenceIds(preferenceIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkProviderMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkProviderMgtController.java
new file mode 100644
index 0000000..dba1e4a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkProviderMgtController.java
@@ -0,0 +1,161 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkProviderMgt;
+import com.ruoyi.segchk.service.ISegchkProviderMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg运营商管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_provider_mgt")
+public class SegchkProviderMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkProviderMgtService segchkProviderMgtService;
+
+    /**
+     * 查询seg运营商管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkProviderMgt segchkProviderMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkProviderMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkProviderMgt> list = segchkProviderMgtService.selectSegchkProviderMgtList(segchkProviderMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg运营商管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:export')")
+    @Log(title = "seg运营商管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkProviderMgt segchkProviderMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkProviderMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkProviderMgt> list = segchkProviderMgtService.selectSegchkProviderMgtList(segchkProviderMgt);
+        ExcelUtil<SegchkProviderMgt> util = new ExcelUtil<SegchkProviderMgt>(SegchkProviderMgt.class);
+        return util.exportExcel(list, "seg运营商管理数据");
+    }
+
+    /**
+     * 获取seg运营商管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:query')")
+    @GetMapping(value = "/{providerId}")
+    public AjaxResult getInfo(@PathVariable("providerId") Long providerId)
+    {
+        return AjaxResult.success(segchkProviderMgtService.selectSegchkProviderMgtByProviderId(providerId));
+    }
+
+    /**
+     * 新增seg运营商管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:add')")
+    @Log(title = "seg运营商管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkProviderMgt segchkProviderMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkProviderMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkProviderMgtService.insertSegchkProviderMgt(segchkProviderMgt));
+    }
+
+    /**
+     * 修改seg运营商管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:edit')")
+    @Log(title = "seg运营商管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SegchkProviderMgt segchkProviderMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkProviderMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkProviderMgtService.updateSegchkProviderMgt(segchkProviderMgt));
+    }
+
+    /**
+     * 修改seg运营商管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:edit')")
+    @Log(title = "seg运营商管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/status")
+    public AjaxResult status(@RequestBody SegchkProviderMgt segchkProviderMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkProviderMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkProviderMgtService.updateSegchkProviderMgt(segchkProviderMgt));
+    }
+
+    /**
+     * 删除seg运营商管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_provider_mgt:remove')")
+    @Log(title = "seg运营商管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{providerIds}")
+    public AjaxResult remove(@PathVariable Long[] providerIds)
+    {
+        return toAjax(segchkProviderMgtService.deleteSegchkProviderMgtByProviderIds(providerIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkRecommenderStoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkRecommenderStoreController.java
new file mode 100644
index 0000000..cfb3d2a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkRecommenderStoreController.java
@@ -0,0 +1,161 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+import com.ruoyi.segchk.service.ISegchkRecommenderStoreService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg首页推荐商户Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_recommender_store")
+public class SegchkRecommenderStoreController extends BaseController
+{
+    @Autowired
+    private ISegchkRecommenderStoreService segchkRecommenderStoreService;
+
+    /**
+     * 查询seg首页推荐商户列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkRecommenderStore segchkRecommenderStore)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkRecommenderStore.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkRecommenderStore> list = segchkRecommenderStoreService.selectSegchkRecommenderStoreList(segchkRecommenderStore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg首页推荐商户列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:export')")
+    @Log(title = "seg首页推荐商户", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkRecommenderStore segchkRecommenderStore)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkRecommenderStore.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkRecommenderStore> list = segchkRecommenderStoreService.selectSegchkRecommenderStoreList(segchkRecommenderStore);
+        ExcelUtil<SegchkRecommenderStore> util = new ExcelUtil<SegchkRecommenderStore>(SegchkRecommenderStore.class);
+        return util.exportExcel(list, "seg首页推荐商户数据");
+    }
+
+    /**
+     * 获取seg首页推荐商户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:query')")
+    @GetMapping(value = "/{recommenderId}")
+    public AjaxResult getInfo(@PathVariable("recommenderId") Long recommenderId)
+    {
+        return AjaxResult.success(segchkRecommenderStoreService.selectSegchkRecommenderStoreByRecommenderId(recommenderId));
+    }
+
+    /**
+     * 新增seg首页推荐商户
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:add')")
+    @Log(title = "seg首页推荐商户", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkRecommenderStore segchkRecommenderStore)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkRecommenderStore.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkRecommenderStoreService.insertSegchkRecommenderStore(segchkRecommenderStore));
+    }
+
+    /**
+     * 修改seg首页推荐商户
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:edit')")
+    @Log(title = "seg首页推荐商户", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit_info")
+    public AjaxResult edit(@RequestBody SegchkRecommenderStore segchkRecommenderStore)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkRecommenderStore.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkRecommenderStoreService.updateSegchkRecommenderStore(segchkRecommenderStore));
+    }
+
+    /**
+     * 修改seg首页推荐商户
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:edit')")
+    @Log(title = "seg首页推荐商户", businessType = BusinessType.UPDATE)
+    @PutMapping("/mgt_state")
+    public AjaxResult mgt_state(@RequestBody SegchkRecommenderStore segchkRecommenderStore)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkRecommenderStore.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkRecommenderStoreService.updateSegchkRecommenderStore(segchkRecommenderStore));
+    }
+
+    /**
+     * 删除seg首页推荐商户
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_recommender_store:remove')")
+    @Log(title = "seg首页推荐商户", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{recommenderIds}")
+    public AjaxResult remove(@PathVariable Long[] recommenderIds)
+    {
+        return toAjax(segchkRecommenderStoreService.deleteSegchkRecommenderStoreByRecommenderIds(recommenderIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSalerInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSalerInfoController.java
new file mode 100644
index 0000000..b8a51ff
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSalerInfoController.java
@@ -0,0 +1,161 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkSalerInfo;
+import com.ruoyi.segchk.service.ISegchkSalerInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg销售人员信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_saler_info")
+public class SegchkSalerInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkSalerInfoService segchkSalerInfoService;
+
+    /**
+     * 查询seg销售人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkSalerInfo segchkSalerInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSalerInfo.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkSalerInfo> list = segchkSalerInfoService.selectSegchkSalerInfoList(segchkSalerInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg销售人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:export')")
+    @Log(title = "seg销售人员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkSalerInfo segchkSalerInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSalerInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkSalerInfo> list = segchkSalerInfoService.selectSegchkSalerInfoList(segchkSalerInfo);
+        ExcelUtil<SegchkSalerInfo> util = new ExcelUtil<SegchkSalerInfo>(SegchkSalerInfo.class);
+        return util.exportExcel(list, "seg销售人员信息数据");
+    }
+
+    /**
+     * 获取seg销售人员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:query')")
+    @GetMapping(value = "/{salerId}")
+    public AjaxResult getInfo(@PathVariable("salerId") Integer salerId)
+    {
+        return AjaxResult.success(segchkSalerInfoService.selectSegchkSalerInfoBySalerId(salerId));
+    }
+
+    /**
+     * 新增seg销售人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:add')")
+    @Log(title = "seg销售人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkSalerInfo segchkSalerInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSalerInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSalerInfoService.insertSegchkSalerInfo(segchkSalerInfo));
+    }
+
+    /**
+     * 修改seg销售人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:edit')")
+    @Log(title = "seg销售人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SegchkSalerInfo segchkSalerInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSalerInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSalerInfoService.updateSegchkSalerInfo(segchkSalerInfo));
+    }
+
+    /**
+     * 修改seg销售人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:edit')")
+    @Log(title = "seg销售人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/update_status")
+    public AjaxResult update_status(@RequestBody SegchkSalerInfo segchkSalerInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSalerInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSalerInfoService.updateSegchkSalerInfo(segchkSalerInfo));
+    }
+
+    /**
+     * 删除seg销售人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_saler_info:remove')")
+    @Log(title = "seg销售人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{salerIds}")
+    public AjaxResult remove(@PathVariable Integer[] salerIds)
+    {
+        return toAjax(segchkSalerInfoService.deleteSegchkSalerInfoBySalerIds(salerIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSelfServiceChkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSelfServiceChkController.java
new file mode 100644
index 0000000..777d5c0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSelfServiceChkController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkSelfServiceChk;
+import com.ruoyi.segchk.service.ISegchkSelfServiceChkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg自定义卡核消记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_self_service_chk")
+public class SegchkSelfServiceChkController extends BaseController
+{
+    @Autowired
+    private ISegchkSelfServiceChkService segchkSelfServiceChkService;
+
+    /**
+     * 查询seg自定义卡核消记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSelfServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkSelfServiceChk> list = segchkSelfServiceChkService.selectSegchkSelfServiceChkList(segchkSelfServiceChk);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg自定义卡核消记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:export')")
+    @Log(title = "seg自定义卡核消记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSelfServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkSelfServiceChk> list = segchkSelfServiceChkService.selectSegchkSelfServiceChkList(segchkSelfServiceChk);
+        ExcelUtil<SegchkSelfServiceChk> util = new ExcelUtil<SegchkSelfServiceChk>(SegchkSelfServiceChk.class);
+        return util.exportExcel(list, "seg自定义卡核消记录数据");
+    }
+
+    /**
+     * 获取seg自定义卡核消记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:query')")
+    @GetMapping(value = "/{chkServiceId}")
+    public AjaxResult getInfo(@PathVariable("chkServiceId") Long chkServiceId)
+    {
+        return AjaxResult.success(segchkSelfServiceChkService.selectSegchkSelfServiceChkByChkServiceId(chkServiceId));
+    }
+
+    /**
+     * 新增seg自定义卡核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:add')")
+    @Log(title = "seg自定义卡核消记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSelfServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSelfServiceChkService.insertSegchkSelfServiceChk(segchkSelfServiceChk));
+    }
+
+    /**
+     * 修改seg自定义卡核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:edit')")
+    @Log(title = "seg自定义卡核消记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSelfServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSelfServiceChkService.updateSegchkSelfServiceChk(segchkSelfServiceChk));
+    }
+
+    /**
+     * 删除seg自定义卡核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk: segchk_self_service_chk:remove')")
+    @Log(title = "seg自定义卡核消记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chkServiceIds}")
+    public AjaxResult remove(@PathVariable Long[] chkServiceIds)
+    {
+        return toAjax(segchkSelfServiceChkService.deleteSegchkSelfServiceChkByChkServiceIds(chkServiceIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceChkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceChkController.java
new file mode 100644
index 0000000..ee57936
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceChkController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkServiceChk;
+import com.ruoyi.segchk.service.ISegchkServiceChkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg核消记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_service_chk")
+public class SegchkServiceChkController extends BaseController
+{
+    @Autowired
+    private ISegchkServiceChkService segchkServiceChkService;
+
+    /**
+     * 查询seg核消记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkServiceChk segchkServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkServiceChk> list = segchkServiceChkService.selectSegchkServiceChkList(segchkServiceChk);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg核消记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:export')")
+    @Log(title = "seg核消记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkServiceChk segchkServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkServiceChk> list = segchkServiceChkService.selectSegchkServiceChkList(segchkServiceChk);
+        ExcelUtil<SegchkServiceChk> util = new ExcelUtil<SegchkServiceChk>(SegchkServiceChk.class);
+        return util.exportExcel(list, "seg核消记录数据");
+    }
+
+    /**
+     * 获取seg核消记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:query')")
+    @GetMapping(value = "/{chkServiceId}")
+    public AjaxResult getInfo(@PathVariable("chkServiceId") Long chkServiceId)
+    {
+        return AjaxResult.success(segchkServiceChkService.selectSegchkServiceChkByChkServiceId(chkServiceId));
+    }
+
+    /**
+     * 新增seg核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:add')")
+    @Log(title = "seg核消记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkServiceChk segchkServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkServiceChkService.insertSegchkServiceChk(segchkServiceChk));
+    }
+
+    /**
+     * 修改seg核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:edit')")
+    @Log(title = "seg核消记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkServiceChk segchkServiceChk)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceChk.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkServiceChkService.updateSegchkServiceChk(segchkServiceChk));
+    }
+
+    /**
+     * 删除seg核消记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_chk:remove')")
+    @Log(title = "seg核消记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chkServiceIds}")
+    public AjaxResult remove(@PathVariable Long[] chkServiceIds)
+    {
+        return toAjax(segchkServiceChkService.deleteSegchkServiceChkByChkServiceIds(chkServiceIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceCommentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceCommentController.java
new file mode 100644
index 0000000..d67feb3
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkServiceCommentController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkServiceComment;
+import com.ruoyi.segchk.service.ISegchkServiceCommentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg评价记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_service_comment")
+public class SegchkServiceCommentController extends BaseController
+{
+    @Autowired
+    private ISegchkServiceCommentService segchkServiceCommentService;
+
+    /**
+     * 查询seg评价记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkServiceComment segchkServiceComment)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceComment.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkServiceComment> list = segchkServiceCommentService.selectSegchkServiceCommentList(segchkServiceComment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg评价记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:export')")
+    @Log(title = "seg评价记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkServiceComment segchkServiceComment)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceComment.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkServiceComment> list = segchkServiceCommentService.selectSegchkServiceCommentList(segchkServiceComment);
+        ExcelUtil<SegchkServiceComment> util = new ExcelUtil<SegchkServiceComment>(SegchkServiceComment.class);
+        return util.exportExcel(list, "seg评价记录数据");
+    }
+
+    /**
+     * 获取seg评价记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:query')")
+    @GetMapping(value = "/{commentId}")
+    public AjaxResult getInfo(@PathVariable("commentId") Long commentId)
+    {
+        return AjaxResult.success(segchkServiceCommentService.selectSegchkServiceCommentByCommentId(commentId));
+    }
+
+    /**
+     * 新增seg评价记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:add')")
+    @Log(title = "seg评价记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkServiceComment segchkServiceComment)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceComment.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkServiceCommentService.insertSegchkServiceComment(segchkServiceComment));
+    }
+
+    /**
+     * 修改seg评价记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:edit')")
+    @Log(title = "seg评价记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkServiceComment segchkServiceComment)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkServiceComment.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkServiceCommentService.updateSegchkServiceComment(segchkServiceComment));
+    }
+
+    /**
+     * 删除seg评价记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_service_comment:remove')")
+    @Log(title = "seg评价记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{commentIds}")
+    public AjaxResult remove(@PathVariable Long[] commentIds)
+    {
+        return toAjax(segchkServiceCommentService.deleteSegchkServiceCommentByCommentIds(commentIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSimpleListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSimpleListController.java
new file mode 100644
index 0000000..3a0651b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSimpleListController.java
@@ -0,0 +1,304 @@
+package com.ruoyi.web.controller.segchk;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * seg首页轮播图管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/simple_list")
+public class SegchkSimpleListController extends BaseController
+{
+    @Autowired
+    private ISegchkProviderMgtService segchkProviderMgtService;
+    @Autowired
+    private ISegchkSalerInfoService segchkSalerInfoService;
+    @Autowired
+    private ISegchkStoreBasicInfoService segchkStoreBasicInfoService;
+
+    @Autowired
+    private ISegchkChargeCardService segchkChargeCardService;
+
+    @Autowired
+    private ISegchkKeywordLableService segchkKeywordLableService;
+
+
+    @Autowired
+    private ISegchkPreferenceLableService segchkPreferenceLableService;
+
+    @Autowired
+    private ISegchkDistrictInfoService segchkDistrictInfoService;
+
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/salerList")
+    public TableDataInfo saler_list()
+    {
+        logger.debug("salerList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkSalerInfo segchkSalerInfo = new SegchkSalerInfo();
+        segchkSalerInfo.setProviderId(providerId);
+        List<SegchkSalerInfo> list = segchkSalerInfoService.selectSegchkSalerInfoList(segchkSalerInfo);
+        List<SimpleListObj> collect = list.parallelStream().filter(v -> v.getSalerState() == 0).map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getSalerId()));
+            simpleListObj1.setValue(String.valueOf(v.getSalerName()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        return getDataTable(collect);
+    }
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/providerList")
+    public TableDataInfo provider_list()
+    {
+        logger.debug("providerList is call");
+        SimpleListObj simpleListObj = new SimpleListObj();
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+        segchkProviderMgt.setProviderId(providerId);
+        List<SegchkProviderMgt> list = segchkProviderMgtService.selectSegchkProviderMgtList(segchkProviderMgt);
+        List<SimpleListObj> collect = list.parallelStream().map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getProviderId()));
+            simpleListObj1.setValue(String.valueOf(v.getNickName()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("providerList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/storeList")
+    public TableDataInfo store_list()
+    {
+        logger.debug("storeList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkStoreBasicInfo segchkStoreBasicInfo = new SegchkStoreBasicInfo();
+        segchkStoreBasicInfo.setProviderId(providerId);
+        List<SegchkStoreBasicInfo> list = segchkStoreBasicInfoService.selectSegchkStoreBasicInfoList(segchkStoreBasicInfo);
+        List<SimpleListObj> collect = list.parallelStream().map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getStoreId()));
+            simpleListObj1.setValue(String.valueOf(v.getStoreName()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("providerList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/ChargeCardList")
+    public TableDataInfo charge_card_list()
+    {
+        logger.debug("ChargeCardList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkChargeCard segchkChargeCard = new SegchkChargeCard();
+        segchkChargeCard.setProviderId(providerId);
+        List<SegchkChargeCard> list = segchkChargeCardService.selectSegchkChargeCardList(segchkChargeCard);
+        List<SimpleListObj> collect = list.parallelStream().map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getCardTypeId()));
+            simpleListObj1.setValue(String.valueOf(v.getCardTypeName()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("ChargeCardList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/KerwordList")
+    public TableDataInfo kerword_list()
+    {
+        logger.debug("KerwordList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkKeywordLable segchkKeywordLable = new SegchkKeywordLable();
+        segchkKeywordLable.setProviderId(providerId);
+        List<SegchkKeywordLable> list = segchkKeywordLableService.selectSegchkKeywordLableList(segchkKeywordLable);
+        List<SimpleListObj> collect = list.parallelStream().map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getKeywordId()));
+            simpleListObj1.setValue(String.valueOf(v.getKeywordName()));
+            simpleListObj1.setImgUrl(String.valueOf(v.getKeywordUrl()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("KerwordList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+
+
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/PreferenceLableList")
+    public TableDataInfo preference_lable_list()
+    {
+        logger.debug("PreferenceLableList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+        SegchkPreferenceLable segchkPreferenceLable = new SegchkPreferenceLable();
+        segchkPreferenceLable.setProviderId(providerId);
+        List<SegchkPreferenceLable> list = segchkPreferenceLableService.selectSegchkPreferenceLableList(segchkPreferenceLable);
+        List<SimpleListObj> collect = list.parallelStream().map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(v.getProviderId()));
+            simpleListObj1.setKey(String.valueOf(v.getPreferenceId()));
+            simpleListObj1.setValue(String.valueOf(v.getPreferenceName()));
+            simpleListObj1.setImgUrl(String.valueOf(v.getPreferenceUrl()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("PreferenceLableList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+
+    /**
+     * 查询seg首页轮播图管理列表
+     */
+    @UnAuth
+//    @PreAuthorize("@ss.hasPermi('segchk:segchk_carouse_mgt:list')")
+    @GetMapping("/DistictList")
+    public TableDataInfo distict_list()
+    {
+        logger.debug("DistictList is call");
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+//        sysUser.getNickName();
+        Long providerId = sysUser.getUserId() == 1 ? null : sysUser.getProviderId();
+        startPage();
+
+        SegchkDistrictInfo segchkDistrictInfo = new SegchkDistrictInfo();
+        List<SegchkDistrictInfo> list = segchkDistrictInfoService.selectSegchkDistrictInfoList(segchkDistrictInfo);
+        List<SimpleListObj> collect = list.parallelStream().filter(v -> v.getDistrictLevel() == 0 || v.getDistrictLevel() == 1).map(v -> {
+            SimpleListObj simpleListObj1 = new SimpleListObj();
+            simpleListObj1.setProviderId(String.valueOf(providerId));
+            simpleListObj1.setKey(String.valueOf(v.getDistrictId()));
+            simpleListObj1.setValue(String.valueOf(v.getDistrictName()));
+            return simpleListObj1;
+        }).collect(Collectors.toList());
+        collect.forEach(v -> logger.debug("PreferenceLableList ret : {}", v.toString()));
+        return getDataTable(collect);
+    }
+
+
+    private class SimpleListObj extends BaseEntity {
+        private String providerId;
+        private String key;
+        private String value;
+        private String imgUrl;
+
+        public String getProviderId() {
+            return providerId;
+        }
+
+        public void setProviderId(String providerId) {
+            this.providerId = providerId;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+
+        public String getImgUrl() {
+            return imgUrl;
+        }
+
+        public void setImgUrl(String imgUrl) {
+            this.imgUrl = imgUrl;
+        }
+
+        @Override
+        public String toString() {
+            return "SimpleListObj{" +
+                    "providerId='" + providerId + '\'' +
+                    ", key='" + key + '\'' +
+                    ", value='" + value + '\'' +
+                    ", imgUrl='" + imgUrl + '\'' +
+                    '}';
+        }
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSmsDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSmsDetailController.java
new file mode 100644
index 0000000..dd056a6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSmsDetailController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkSmsDetail;
+import com.ruoyi.segchk.service.ISegchkSmsDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg短信记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_sms_detail")
+public class SegchkSmsDetailController extends BaseController
+{
+    @Autowired
+    private ISegchkSmsDetailService segchkSmsDetailService;
+
+    /**
+     * 查询seg短信记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkSmsDetail segchkSmsDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSmsDetail.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkSmsDetail> list = segchkSmsDetailService.selectSegchkSmsDetailList(segchkSmsDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg短信记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:export')")
+    @Log(title = "seg短信记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkSmsDetail segchkSmsDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSmsDetail.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkSmsDetail> list = segchkSmsDetailService.selectSegchkSmsDetailList(segchkSmsDetail);
+        ExcelUtil<SegchkSmsDetail> util = new ExcelUtil<SegchkSmsDetail>(SegchkSmsDetail.class);
+        return util.exportExcel(list, "seg短信记录数据");
+    }
+
+    /**
+     * 获取seg短信记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:query')")
+    @GetMapping(value = "/{shortMsgId}")
+    public AjaxResult getInfo(@PathVariable("shortMsgId") Long shortMsgId)
+    {
+        return AjaxResult.success(segchkSmsDetailService.selectSegchkSmsDetailByShortMsgId(shortMsgId));
+    }
+
+    /**
+     * 新增seg短信记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:add')")
+    @Log(title = "seg短信记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkSmsDetail segchkSmsDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSmsDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSmsDetailService.insertSegchkSmsDetail(segchkSmsDetail));
+    }
+
+    /**
+     * 修改seg短信记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:edit')")
+    @Log(title = "seg短信记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkSmsDetail segchkSmsDetail)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkSmsDetail.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkSmsDetailService.updateSegchkSmsDetail(segchkSmsDetail));
+    }
+
+    /**
+     * 删除seg短信记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_sms_detail:remove')")
+    @Log(title = "seg短信记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shortMsgIds}")
+    public AjaxResult remove(@PathVariable Long[] shortMsgIds)
+    {
+        return toAjax(segchkSmsDetailService.deleteSegchkSmsDetailByShortMsgIds(shortMsgIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreAccountController.java
new file mode 100644
index 0000000..9bd80f1
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreAccountController.java
@@ -0,0 +1,142 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreAccount;
+import com.ruoyi.segchk.service.ISegchkStoreAccountService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商户余额信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_account")
+public class SegchkStoreAccountController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreAccountService segchkStoreAccountService;
+
+    /**
+     * 查询seg商户余额信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreAccount segchkStoreAccount)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreAccount.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreAccount> list = segchkStoreAccountService.selectSegchkStoreAccountList(segchkStoreAccount);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商户余额信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:export')")
+    @Log(title = "seg商户余额信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreAccount segchkStoreAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreAccount.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreAccount> list = segchkStoreAccountService.selectSegchkStoreAccountList(segchkStoreAccount);
+        ExcelUtil<SegchkStoreAccount> util = new ExcelUtil<SegchkStoreAccount>(SegchkStoreAccount.class);
+        return util.exportExcel(list, "seg商户余额信息数据");
+    }
+
+    /**
+     * 获取seg商户余额信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:query')")
+    @GetMapping(value = "/{accountId}")
+    public AjaxResult getInfo(@PathVariable("accountId") Long accountId)
+    {
+        return AjaxResult.success(segchkStoreAccountService.selectSegchkStoreAccountByAccountId(accountId));
+    }
+
+    /**
+     * 新增seg商户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:add')")
+    @Log(title = "seg商户余额信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreAccount segchkStoreAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreAccount.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreAccountService.insertSegchkStoreAccount(segchkStoreAccount));
+    }
+
+    /**
+     * 修改seg商户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:edit')")
+    @Log(title = "seg商户余额信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreAccount segchkStoreAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreAccount.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreAccountService.updateSegchkStoreAccount(segchkStoreAccount));
+    }
+
+    /**
+     * 删除seg商户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_account:remove')")
+    @Log(title = "seg商户余额信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{accountIds}")
+    public AjaxResult remove(@PathVariable Long[] accountIds)
+    {
+        return toAjax(segchkStoreAccountService.deleteSegchkStoreAccountByAccountIds(accountIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreBasicInfoController.java
new file mode 100644
index 0000000..bd89d10
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreBasicInfoController.java
@@ -0,0 +1,213 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreBasicInfo;
+import com.ruoyi.segchk.service.ISegchkStoreBasicInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家基础信息Controller
+ *
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_basic_info")
+public class SegchkStoreBasicInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreBasicInfoService segchkStoreBasicInfoService;
+
+    /**
+     * 查询seg商家基础信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+//        获取当前登录用户信息
+        LoginUser loginUser = getLoginUser();
+        SysUser sysUser = loginUser.getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        System.out.println("segchk:segchk_store_basic_info:list userinfo:" + loginUser.toString());
+        System.out.println("segchk:segchk_store_basic_info:list userinfo:" + sysUser.getRoleId());
+        sysUser.getRoles().forEach(it -> System.out.println(it.toString()));
+        startPage();
+        List<SegchkStoreBasicInfo> list = segchkStoreBasicInfoService.selectSegchkStoreBasicInfoList(segchkStoreBasicInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家基础信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:export')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreBasicInfo> list = segchkStoreBasicInfoService.selectSegchkStoreBasicInfoList(segchkStoreBasicInfo);
+        ExcelUtil<SegchkStoreBasicInfo> util = new ExcelUtil<SegchkStoreBasicInfo>(SegchkStoreBasicInfo.class);
+        return util.exportExcel(list, "seg商家基础信息数据");
+    }
+
+    /**
+     * 获取seg商家基础信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:query')")
+    @GetMapping(value = "/{storeId}")
+    public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
+    {
+        return AjaxResult.success(segchkStoreBasicInfoService.selectSegchkStoreBasicInfoByStoreId(storeId));
+    }
+
+    /**
+     * 新增seg商家基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:add')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        int i = segchkStoreBasicInfoService.insertSegchkStoreBasicInfo(segchkStoreBasicInfo);
+        if(i < 0){
+            return AjaxResult.error(500, "手机号码已绑定商户");
+        }
+        else {
+            return toAjax(i);
+        }
+    }
+
+    /**
+     * 修改seg商家基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:edit')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping("edit_info")
+    public AjaxResult edit(@RequestBody SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        logger.debug("edit_info with ---> {}", segchkStoreBasicInfo.toString());
+        int i = segchkStoreBasicInfoService.updateSegchkStoreBasicInfo(segchkStoreBasicInfo);
+        if(i < 0){
+            return AjaxResult.error(500, "手机号码已绑定商户");
+        }
+        else {
+            return toAjax(i);
+        }
+    }
+
+    /**
+     * 修改seg商家基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:edit')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping("update_detail")
+    public AjaxResult update_detail(@RequestBody SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        logger.debug("update_detail with ---> {}", segchkStoreBasicInfo.toString());
+        int i = segchkStoreBasicInfoService.updateSegchkStoreDetail(segchkStoreBasicInfo);
+        return toAjax(i);
+    }
+
+    /**
+     * 修改seg商家服务状态
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:edit')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.UPDATE)
+    @PutMapping("service_state")
+//    public AjaxResult service_state(Long providerId, Long storeId, String serviceState)
+    public AjaxResult service_state(@RequestBody SegchkStoreBasicInfo segchkStoreBasicInfo)
+    {
+//        SegchkStoreBasicInfo segchkStoreBasicInfo = new SegchkStoreBasicInfo();
+//        segchkStoreBasicInfo.setProviderId(providerId);
+//        segchkStoreBasicInfo.setStoreId(storeId);
+//        segchkStoreBasicInfo.setServiceState(serviceState);
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        logger.debug("service_state with: {}", segchkStoreBasicInfo.toString());
+        return toAjax(segchkStoreBasicInfoService.updateSegchkStoreServiceStatus(segchkStoreBasicInfo));
+    }
+
+    /**
+     * 删除seg商家基础信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_basic_info:remove')")
+    @Log(title = "seg商家基础信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{storeIds}")
+    public AjaxResult remove(@PathVariable Long[] storeIds)
+    {
+        return toAjax(segchkStoreBasicInfoService.deleteSegchkStoreBasicInfoByStoreIds(storeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreCashController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreCashController.java
new file mode 100644
index 0000000..199bd44
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreCashController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreCash;
+import com.ruoyi.segchk.service.ISegchkStoreCashService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商户户提现记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_cash")
+public class SegchkStoreCashController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreCashService segchkStoreCashService;
+
+    /**
+     * 查询seg商户户提现记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreCash segchkStoreCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCash.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreCash> list = segchkStoreCashService.selectSegchkStoreCashList(segchkStoreCash);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商户户提现记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:export')")
+    @Log(title = "seg商户户提现记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreCash segchkStoreCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCash.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreCash> list = segchkStoreCashService.selectSegchkStoreCashList(segchkStoreCash);
+        ExcelUtil<SegchkStoreCash> util = new ExcelUtil<SegchkStoreCash>(SegchkStoreCash.class);
+        return util.exportExcel(list, "seg商户户提现记录数据");
+    }
+
+    /**
+     * 获取seg商户户提现记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:query')")
+    @GetMapping(value = "/{cashId}")
+    public AjaxResult getInfo(@PathVariable("cashId") Long cashId)
+    {
+        return AjaxResult.success(segchkStoreCashService.selectSegchkStoreCashByCashId(cashId));
+    }
+
+    /**
+     * 新增seg商户户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:add')")
+    @Log(title = "seg商户户提现记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreCash segchkStoreCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCash.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreCashService.insertSegchkStoreCash(segchkStoreCash));
+    }
+
+    /**
+     * 修改seg商户户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:edit')")
+    @Log(title = "seg商户户提现记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreCash segchkStoreCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCash.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreCashService.updateSegchkStoreCash(segchkStoreCash));
+    }
+
+    /**
+     * 删除seg商户户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_cash:remove')")
+    @Log(title = "seg商户户提现记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{cashIds}")
+    public AjaxResult remove(@PathVariable Long[] cashIds)
+    {
+        return toAjax(segchkStoreCashService.deleteSegchkStoreCashByCashIds(cashIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChargeController.java
new file mode 100644
index 0000000..3173959
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChargeController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreCharge;
+import com.ruoyi.segchk.service.ISegchkStoreChargeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商户充值记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_charge")
+public class SegchkStoreChargeController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreChargeService segchkStoreChargeService;
+
+    /**
+     * 查询seg商户充值记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreCharge segchkStoreCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCharge.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreCharge> list = segchkStoreChargeService.selectSegchkStoreChargeList(segchkStoreCharge);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商户充值记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:export')")
+    @Log(title = "seg商户充值记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreCharge segchkStoreCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCharge.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreCharge> list = segchkStoreChargeService.selectSegchkStoreChargeList(segchkStoreCharge);
+        ExcelUtil<SegchkStoreCharge> util = new ExcelUtil<SegchkStoreCharge>(SegchkStoreCharge.class);
+        return util.exportExcel(list, "seg商户充值记录数据");
+    }
+
+    /**
+     * 获取seg商户充值记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:query')")
+    @GetMapping(value = "/{chargeId}")
+    public AjaxResult getInfo(@PathVariable("chargeId") Long chargeId)
+    {
+        return AjaxResult.success(segchkStoreChargeService.selectSegchkStoreChargeByChargeId(chargeId));
+    }
+
+    /**
+     * 新增seg商户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:add')")
+    @Log(title = "seg商户充值记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreCharge segchkStoreCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCharge.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreChargeService.insertSegchkStoreCharge(segchkStoreCharge));
+    }
+
+    /**
+     * 修改seg商户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:edit')")
+    @Log(title = "seg商户充值记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreCharge segchkStoreCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreCharge.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreChargeService.updateSegchkStoreCharge(segchkStoreCharge));
+    }
+
+    /**
+     * 删除seg商户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_charge:remove')")
+    @Log(title = "seg商户充值记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chargeIds}")
+    public AjaxResult remove(@PathVariable Long[] chargeIds)
+    {
+        return toAjax(segchkStoreChargeService.deleteSegchkStoreChargeByChargeIds(chargeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChkMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChkMgtController.java
new file mode 100644
index 0000000..fd30328
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreChkMgtController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreChkMgt;
+import com.ruoyi.segchk.service.ISegchkStoreChkMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家核消卡管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_chk_mgt")
+public class SegchkStoreChkMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreChkMgtService segchkStoreChkMgtService;
+
+    /**
+     * 查询seg商家核消卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreChkMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreChkMgt> list = segchkStoreChkMgtService.selectSegchkStoreChkMgtList(segchkStoreChkMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家核消卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:export')")
+    @Log(title = "seg商家核消卡管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreChkMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreChkMgt> list = segchkStoreChkMgtService.selectSegchkStoreChkMgtList(segchkStoreChkMgt);
+        ExcelUtil<SegchkStoreChkMgt> util = new ExcelUtil<SegchkStoreChkMgt>(SegchkStoreChkMgt.class);
+        return util.exportExcel(list, "seg商家核消卡管理数据");
+    }
+
+    /**
+     * 获取seg商家核消卡管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:query')")
+    @GetMapping(value = "/{mgtId}")
+    public AjaxResult getInfo(@PathVariable("mgtId") Integer mgtId)
+    {
+        return AjaxResult.success(segchkStoreChkMgtService.selectSegchkStoreChkMgtByMgtId(mgtId));
+    }
+
+    /**
+     * 新增seg商家核消卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:add')")
+    @Log(title = "seg商家核消卡管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreChkMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreChkMgtService.insertSegchkStoreChkMgt(segchkStoreChkMgt));
+    }
+
+    /**
+     * 修改seg商家核消卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:edit')")
+    @Log(title = "seg商家核消卡管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreChkMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreChkMgtService.updateSegchkStoreChkMgt(segchkStoreChkMgt));
+    }
+
+    /**
+     * 删除seg商家核消卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_chk_mgt:remove')")
+    @Log(title = "seg商家核消卡管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{mgtIds}")
+    public AjaxResult remove(@PathVariable Integer[] mgtIds)
+    {
+        return toAjax(segchkStoreChkMgtService.deleteSegchkStoreChkMgtByMgtIds(mgtIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreImageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreImageController.java
new file mode 100644
index 0000000..a4d7523
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreImageController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreImage;
+import com.ruoyi.segchk.service.ISegchkStoreImageService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家图片信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_image")
+public class SegchkStoreImageController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreImageService segchkStoreImageService;
+
+    /**
+     * 查询seg商家图片信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreImage segchkStoreImage)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreImage.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreImage> list = segchkStoreImageService.selectSegchkStoreImageList(segchkStoreImage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家图片信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:export')")
+    @Log(title = "seg商家图片信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreImage segchkStoreImage)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreImage.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreImage> list = segchkStoreImageService.selectSegchkStoreImageList(segchkStoreImage);
+        ExcelUtil<SegchkStoreImage> util = new ExcelUtil<SegchkStoreImage>(SegchkStoreImage.class);
+        return util.exportExcel(list, "seg商家图片信息数据");
+    }
+
+    /**
+     * 获取seg商家图片信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:query')")
+    @GetMapping(value = "/{storeId}")
+    public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
+    {
+        return AjaxResult.success(segchkStoreImageService.selectSegchkStoreImageByStoreId(storeId));
+    }
+
+    /**
+     * 新增seg商家图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:add')")
+    @Log(title = "seg商家图片信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreImage segchkStoreImage)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreImage.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreImageService.insertSegchkStoreImage(segchkStoreImage));
+    }
+
+    /**
+     * 修改seg商家图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:edit')")
+    @Log(title = "seg商家图片信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreImage segchkStoreImage)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreImage.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreImageService.updateSegchkStoreImage(segchkStoreImage));
+    }
+
+    /**
+     * 删除seg商家图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_image:remove')")
+    @Log(title = "seg商家图片信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{storeIds}")
+    public AjaxResult remove(@PathVariable Long[] storeIds)
+    {
+        return toAjax(segchkStoreImageService.deleteSegchkStoreImageByStoreIds(storeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreLableMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreLableMgtController.java
new file mode 100644
index 0000000..4108424
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreLableMgtController.java
@@ -0,0 +1,166 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreLableMgt;
+import com.ruoyi.segchk.service.ISegchkStoreLableMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家标签管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_lable_mgt")
+public class SegchkStoreLableMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreLableMgtService segchkStoreLableMgtService;
+
+    /**
+     * 查询seg商家标签管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreLableMgt> list = segchkStoreLableMgtService.selectSegchkStoreLableMgtList(segchkStoreLableMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家标签管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:export')")
+    @Log(title = "seg商家标签管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreLableMgt> list = segchkStoreLableMgtService.selectSegchkStoreLableMgtList(segchkStoreLableMgt);
+        ExcelUtil<SegchkStoreLableMgt> util = new ExcelUtil<SegchkStoreLableMgt>(SegchkStoreLableMgt.class);
+        return util.exportExcel(list, "seg商家标签管理数据");
+    }
+
+    /**
+     * 获取seg商家标签管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:query')")
+    @GetMapping(value = "/{mgtId}")
+    public AjaxResult getInfo(@PathVariable("mgtId") Integer mgtId)
+    {
+        return AjaxResult.success(segchkStoreLableMgtService.selectSegchkStoreLableMgtByMgtId(mgtId));
+    }
+
+    /**
+     * 新增seg商家标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:add')")
+    @Log(title = "seg商家标签管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreLableMgtService.insertSegchkStoreLableMgt(segchkStoreLableMgt));
+    }
+
+    /**
+     * 修改seg商家标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:edit')")
+    @Log(title = "seg商家标签管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreLableMgtService.updateSegchkStoreLableMgt(segchkStoreLableMgt));
+    }
+
+    /**
+     * 修改seg商家标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:edit')")
+    @Log(title = "seg商家标签管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/update_status")
+    public AjaxResult update_status(@RequestBody SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreLableMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreLableMgtService.updateSegchkStoreLableMgt(segchkStoreLableMgt));
+    }
+
+    /**
+     * 删除seg商家标签管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_lable_mgt:remove')")
+    @Log(title = "seg商家标签管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{mgtIds}")
+    public AjaxResult remove(@PathVariable Integer[] mgtIds)
+    {
+        return toAjax(segchkStoreLableMgtService.deleteSegchkStoreLableMgtByMgtIds(mgtIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreRewardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreRewardController.java
new file mode 100644
index 0000000..a510282
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreRewardController.java
@@ -0,0 +1,145 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreReward;
+import com.ruoyi.segchk.service.ISegchkStoreRewardService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商户奖励Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_reward")
+public class SegchkStoreRewardController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreRewardService segchkStoreRewardService;
+
+    /**
+     * 查询seg商户奖励列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreReward segchkStoreReward)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreReward.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreReward> list = segchkStoreRewardService.selectSegchkStoreRewardList(segchkStoreReward);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商户奖励列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:export')")
+    @Log(title = "seg商户奖励", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreReward segchkStoreReward)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreReward.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreReward> list = segchkStoreRewardService.selectSegchkStoreRewardList(segchkStoreReward);
+        ExcelUtil<SegchkStoreReward> util = new ExcelUtil<SegchkStoreReward>(SegchkStoreReward.class);
+        return util.exportExcel(list, "seg商户奖励数据");
+    }
+
+    /**
+     * 获取seg商户奖励详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:query')")
+    @GetMapping(value = "/{rewardId}")
+    public AjaxResult getInfo(@PathVariable("rewardId") Long rewardId)
+    {
+        return AjaxResult.success(segchkStoreRewardService.selectSegchkStoreRewardByRewardId(rewardId));
+    }
+
+    /**
+     * 新增seg商户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:add')")
+    @Log(title = "seg商户奖励", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreReward segchkStoreReward)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreReward.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreRewardService.insertSegchkStoreReward(segchkStoreReward));
+    }
+
+    /**
+     * 修改seg商户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:edit')")
+    @Log(title = "seg商户奖励", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreReward segchkStoreReward)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreReward.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreRewardService.updateSegchkStoreReward(segchkStoreReward));
+    }
+
+    /**
+     * 删除seg商户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_reward:remove')")
+    @Log(title = "seg商户奖励", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rewardIds}")
+    public AjaxResult remove(@PathVariable Long[] rewardIds)
+    {
+        return toAjax(segchkStoreRewardService.deleteSegchkStoreRewardByRewardIds(rewardIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSecurityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSecurityController.java
new file mode 100644
index 0000000..45c3dc5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSecurityController.java
@@ -0,0 +1,145 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreSecurity;
+import com.ruoyi.segchk.service.ISegchkStoreSecurityService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商户密码Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_security")
+public class SegchkStoreSecurityController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreSecurityService segchkStoreSecurityService;
+
+    /**
+     * 查询seg商户密码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreSecurity segchkStoreSecurity)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSecurity.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreSecurity> list = segchkStoreSecurityService.selectSegchkStoreSecurityList(segchkStoreSecurity);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商户密码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:export')")
+    @Log(title = "seg商户密码", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreSecurity segchkStoreSecurity)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSecurity.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreSecurity> list = segchkStoreSecurityService.selectSegchkStoreSecurityList(segchkStoreSecurity);
+        ExcelUtil<SegchkStoreSecurity> util = new ExcelUtil<SegchkStoreSecurity>(SegchkStoreSecurity.class);
+        return util.exportExcel(list, "seg商户密码数据");
+    }
+
+    /**
+     * 获取seg商户密码详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:query')")
+    @GetMapping(value = "/{pwdId}")
+    public AjaxResult getInfo(@PathVariable("pwdId") Long pwdId)
+    {
+        return AjaxResult.success(segchkStoreSecurityService.selectSegchkStoreSecurityByPwdId(pwdId));
+    }
+
+    /**
+     * 新增seg商户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:add')")
+    @Log(title = "seg商户密码", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreSecurity segchkStoreSecurity)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSecurity.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreSecurityService.insertSegchkStoreSecurity(segchkStoreSecurity));
+    }
+
+    /**
+     * 修改seg商户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:edit')")
+    @Log(title = "seg商户密码", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreSecurity segchkStoreSecurity)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSecurity.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreSecurityService.updateSegchkStoreSecurity(segchkStoreSecurity));
+    }
+
+    /**
+     * 删除seg商户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_security:remove')")
+    @Log(title = "seg商户密码", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{pwdIds}")
+    public AjaxResult remove(@PathVariable Long[] pwdIds)
+    {
+        return toAjax(segchkStoreSecurityService.deleteSegchkStoreSecurityByPwdIds(pwdIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSelfMgtController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSelfMgtController.java
new file mode 100644
index 0000000..90b5889
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkStoreSelfMgtController.java
@@ -0,0 +1,142 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkStoreSelfMgt;
+import com.ruoyi.segchk.service.ISegchkStoreSelfMgtService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg商家自定义卡管理Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_store_self_mgt")
+public class SegchkStoreSelfMgtController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreSelfMgtService segchkStoreSelfMgtService;
+
+    /**
+     * 查询seg商家自定义卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSelfMgt.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkStoreSelfMgt> list = segchkStoreSelfMgtService.selectSegchkStoreSelfMgtList(segchkStoreSelfMgt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg商家自定义卡管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:export')")
+    @Log(title = "seg商家自定义卡管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSelfMgt.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkStoreSelfMgt> list = segchkStoreSelfMgtService.selectSegchkStoreSelfMgtList(segchkStoreSelfMgt);
+        ExcelUtil<SegchkStoreSelfMgt> util = new ExcelUtil<SegchkStoreSelfMgt>(SegchkStoreSelfMgt.class);
+        return util.exportExcel(list, "seg商家自定义卡管理数据");
+    }
+
+    /**
+     * 获取seg商家自定义卡管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:query')")
+    @GetMapping(value = "/{freeCardId}")
+    public AjaxResult getInfo(@PathVariable("freeCardId") Long freeCardId)
+    {
+        return AjaxResult.success(segchkStoreSelfMgtService.selectSegchkStoreSelfMgtByFreeCardId(freeCardId));
+    }
+
+    /**
+     * 新增seg商家自定义卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:add')")
+    @Log(title = "seg商家自定义卡管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSelfMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreSelfMgtService.insertSegchkStoreSelfMgt(segchkStoreSelfMgt));
+    }
+
+    /**
+     * 修改seg商家自定义卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:edit')")
+    @Log(title = "seg商家自定义卡管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkStoreSelfMgt.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkStoreSelfMgtService.updateSegchkStoreSelfMgt(segchkStoreSelfMgt));
+    }
+
+    /**
+     * 删除seg商家自定义卡管理
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_store_self_mgt:remove')")
+    @Log(title = "seg商家自定义卡管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{freeCardIds}")
+    public AjaxResult remove(@PathVariable Long[] freeCardIds)
+    {
+        return toAjax(segchkStoreSelfMgtService.deleteSegchkStoreSelfMgtByFreeCardIds(freeCardIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSystemSettingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSystemSettingController.java
new file mode 100644
index 0000000..4bc0eb0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkSystemSettingController.java
@@ -0,0 +1,131 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkBaseInfoSet;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkSystemSetting;
+import com.ruoyi.segchk.service.ISegchkSystemSettingService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 系统设置Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-10-27
+ */
+@RestController
+@RequestMapping("/segchk/segchk_system_setting")
+public class SegchkSystemSettingController extends BaseController
+{
+    @Autowired
+    private ISegchkSystemSettingService segchkSystemSettingService;
+
+    /**
+     * 查询系统设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkSystemSetting segchkSystemSetting)
+    {
+        startPage();
+        List<SegchkSystemSetting> list = segchkSystemSettingService.selectSegchkSystemSettingList(segchkSystemSetting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出系统设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:export')")
+    @Log(title = "系统设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkSystemSetting segchkSystemSetting)
+    {
+        List<SegchkSystemSetting> list = segchkSystemSettingService.selectSegchkSystemSettingList(segchkSystemSetting);
+        ExcelUtil<SegchkSystemSetting> util = new ExcelUtil<SegchkSystemSetting>(SegchkSystemSetting.class);
+        return util.exportExcel(list, "系统设置数据");
+    }
+
+    /**
+     * 获取系统设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(segchkSystemSettingService.selectSegchkSystemSettingById(id));
+    }
+
+    /**
+     * 新增系统设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:add')")
+    @Log(title = "系统设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkSystemSetting segchkSystemSetting)
+    {
+        return toAjax(segchkSystemSettingService.insertSegchkSystemSetting(segchkSystemSetting));
+    }
+
+    /**
+     * 修改系统设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:edit')")
+    @Log(title = "系统设置", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SegchkSystemSetting segchkSystemSetting)
+    {
+        return toAjax(segchkSystemSettingService.updateSegchkSystemSetting(segchkSystemSetting));
+    }
+
+    /**
+     * 删除系统设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting:remove')")
+    @Log(title = "系统设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(segchkSystemSettingService.deleteSegchkSystemSettingByIds(ids));
+    }
+
+    /**
+     * 查询
+     */
+    @UnAuth
+    @GetMapping("/query")
+    public AjaxResult query()
+    {
+        BaseInfoSet baseInfoSet = segchkSystemSettingService.queryBaseInfoSet();
+        return AjaxResult.success(baseInfoSet);
+    }
+
+
+    /**
+     * 修改系统设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_system_setting')")
+    @Log(title = "系统设置", businessType = BusinessType.UPDATE)
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody BaseInfoSet baseInfoSet)
+    {
+        logger.debug("update with --- {}", baseInfoSet.toString());
+        return toAjax(segchkSystemSettingService.editBaseInfoSet(baseInfoSet, 1));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserAccountController.java
new file mode 100644
index 0000000..438fd56
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserAccountController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserAccount;
+import com.ruoyi.segchk.service.ISegchkUserAccountService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户余额信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_account")
+public class SegchkUserAccountController extends BaseController
+{
+    @Autowired
+    private ISegchkUserAccountService segchkUserAccountService;
+
+    /**
+     * 查询seg用户余额信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserAccount segchkUserAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserAccount.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserAccount> list = segchkUserAccountService.selectSegchkUserAccountList(segchkUserAccount);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户余额信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:export')")
+    @Log(title = "seg用户余额信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserAccount segchkUserAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserAccount.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserAccount> list = segchkUserAccountService.selectSegchkUserAccountList(segchkUserAccount);
+        ExcelUtil<SegchkUserAccount> util = new ExcelUtil<SegchkUserAccount>(SegchkUserAccount.class);
+        return util.exportExcel(list, "seg用户余额信息数据");
+    }
+
+    /**
+     * 获取seg用户余额信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:query')")
+    @GetMapping(value = "/{accountId}")
+    public AjaxResult getInfo(@PathVariable("accountId") Long accountId)
+    {
+        return AjaxResult.success(segchkUserAccountService.selectSegchkUserAccountByAccountId(accountId));
+    }
+
+    /**
+     * 新增seg用户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:add')")
+    @Log(title = "seg用户余额信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserAccount segchkUserAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserAccount.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserAccountService.insertSegchkUserAccount(segchkUserAccount));
+    }
+
+    /**
+     * 修改seg用户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:edit')")
+    @Log(title = "seg用户余额信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserAccount segchkUserAccount)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserAccount.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserAccountService.updateSegchkUserAccount(segchkUserAccount));
+    }
+
+    /**
+     * 删除seg用户余额信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_account:remove')")
+    @Log(title = "seg用户余额信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{accountIds}")
+    public AjaxResult remove(@PathVariable Long[] accountIds)
+    {
+        return toAjax(segchkUserAccountService.deleteSegchkUserAccountByAccountIds(accountIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserBasicInfoController.java
new file mode 100644
index 0000000..f7dca79
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserBasicInfoController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+import com.ruoyi.segchk.service.ISegchkUserBasicInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户基本信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_basic_info")
+public class SegchkUserBasicInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkUserBasicInfoService segchkUserBasicInfoService;
+
+    /**
+     * 查询seg用户基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserBasicInfo> list = segchkUserBasicInfoService.selectSegchkUserBasicInfoList(segchkUserBasicInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:export')")
+    @Log(title = "seg用户基本信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserBasicInfo> list = segchkUserBasicInfoService.selectSegchkUserBasicInfoList(segchkUserBasicInfo);
+        ExcelUtil<SegchkUserBasicInfo> util = new ExcelUtil<SegchkUserBasicInfo>(SegchkUserBasicInfo.class);
+        return util.exportExcel(list, "seg用户基本信息数据");
+    }
+
+    /**
+     * 获取seg用户基本信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(segchkUserBasicInfoService.selectSegchkUserBasicInfoByUserId(userId));
+    }
+
+    /**
+     * 新增seg用户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:add')")
+    @Log(title = "seg用户基本信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserBasicInfoService.insertSegchkUserBasicInfo(segchkUserBasicInfo));
+    }
+
+    /**
+     * 修改seg用户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:edit')")
+    @Log(title = "seg用户基本信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserBasicInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserBasicInfoService.updateSegchkUserBasicInfo(segchkUserBasicInfo));
+    }
+
+    /**
+     * 删除seg用户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_basic_info:remove')")
+    @Log(title = "seg用户基本信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(segchkUserBasicInfoService.deleteSegchkUserBasicInfoByUserIds(userIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCashController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCashController.java
new file mode 100644
index 0000000..3b65ba5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCashController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserCash;
+import com.ruoyi.segchk.service.ISegchkUserCashService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户提现记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_cash")
+public class SegchkUserCashController extends BaseController
+{
+    @Autowired
+    private ISegchkUserCashService segchkUserCashService;
+
+    /**
+     * 查询seg用户提现记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserCash segchkUserCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCash.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserCash> list = segchkUserCashService.selectSegchkUserCashList(segchkUserCash);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户提现记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:export')")
+    @Log(title = "seg用户提现记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserCash segchkUserCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCash.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserCash> list = segchkUserCashService.selectSegchkUserCashList(segchkUserCash);
+        ExcelUtil<SegchkUserCash> util = new ExcelUtil<SegchkUserCash>(SegchkUserCash.class);
+        return util.exportExcel(list, "seg用户提现记录数据");
+    }
+
+    /**
+     * 获取seg用户提现记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:query')")
+    @GetMapping(value = "/{cashId}")
+    public AjaxResult getInfo(@PathVariable("cashId") Long cashId)
+    {
+        return AjaxResult.success(segchkUserCashService.selectSegchkUserCashByCashId(cashId));
+    }
+
+    /**
+     * 新增seg用户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:add')")
+    @Log(title = "seg用户提现记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserCash segchkUserCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCash.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCashService.insertSegchkUserCash(segchkUserCash));
+    }
+
+    /**
+     * 修改seg用户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:edit')")
+    @Log(title = "seg用户提现记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserCash segchkUserCash)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCash.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCashService.updateSegchkUserCash(segchkUserCash));
+    }
+
+    /**
+     * 删除seg用户提现记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_cash:remove')")
+    @Log(title = "seg用户提现记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{cashIds}")
+    public AjaxResult remove(@PathVariable Long[] cashIds)
+    {
+        return toAjax(segchkUserCashService.deleteSegchkUserCashByCashIds(cashIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCertificationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCertificationInfoController.java
new file mode 100644
index 0000000..38c86fe
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCertificationInfoController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+import com.ruoyi.segchk.service.ISegchkUserCertificationInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户实名认证信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_certification_info")
+public class SegchkUserCertificationInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkUserCertificationInfoService segchkUserCertificationInfoService;
+
+    /**
+     * 查询seg用户实名认证信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCertificationInfo.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserCertificationInfo> list = segchkUserCertificationInfoService.selectSegchkUserCertificationInfoList(segchkUserCertificationInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户实名认证信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:export')")
+    @Log(title = "seg用户实名认证信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCertificationInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserCertificationInfo> list = segchkUserCertificationInfoService.selectSegchkUserCertificationInfoList(segchkUserCertificationInfo);
+        ExcelUtil<SegchkUserCertificationInfo> util = new ExcelUtil<SegchkUserCertificationInfo>(SegchkUserCertificationInfo.class);
+        return util.exportExcel(list, "seg用户实名认证信息数据");
+    }
+
+    /**
+     * 获取seg用户实名认证信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:query')")
+    @GetMapping(value = "/{usercardId}")
+    public AjaxResult getInfo(@PathVariable("usercardId") Long usercardId)
+    {
+        return AjaxResult.success(segchkUserCertificationInfoService.selectSegchkUserCertificationInfoByUsercardId(usercardId));
+    }
+
+    /**
+     * 新增seg用户实名认证信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:add')")
+    @Log(title = "seg用户实名认证信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCertificationInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCertificationInfoService.insertSegchkUserCertificationInfo(segchkUserCertificationInfo));
+    }
+
+    /**
+     * 修改seg用户实名认证信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:edit')")
+    @Log(title = "seg用户实名认证信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCertificationInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCertificationInfoService.updateSegchkUserCertificationInfo(segchkUserCertificationInfo));
+    }
+
+    /**
+     * 删除seg用户实名认证信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_certification_info:remove')")
+    @Log(title = "seg用户实名认证信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{usercardIds}")
+    public AjaxResult remove(@PathVariable Long[] usercardIds)
+    {
+        return toAjax(segchkUserCertificationInfoService.deleteSegchkUserCertificationInfoByUsercardIds(usercardIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserChargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserChargeController.java
new file mode 100644
index 0000000..18a2d49
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserChargeController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserCharge;
+import com.ruoyi.segchk.service.ISegchkUserChargeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户充值记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_charge")
+public class SegchkUserChargeController extends BaseController
+{
+    @Autowired
+    private ISegchkUserChargeService segchkUserChargeService;
+
+    /**
+     * 查询seg用户充值记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserCharge segchkUserCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCharge.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserCharge> list = segchkUserChargeService.selectSegchkUserChargeList(segchkUserCharge);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户充值记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:export')")
+    @Log(title = "seg用户充值记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserCharge segchkUserCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCharge.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserCharge> list = segchkUserChargeService.selectSegchkUserChargeList(segchkUserCharge);
+        ExcelUtil<SegchkUserCharge> util = new ExcelUtil<SegchkUserCharge>(SegchkUserCharge.class);
+        return util.exportExcel(list, "seg用户充值记录数据");
+    }
+
+    /**
+     * 获取seg用户充值记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:query')")
+    @GetMapping(value = "/{chargeId}")
+    public AjaxResult getInfo(@PathVariable("chargeId") Long chargeId)
+    {
+        return AjaxResult.success(segchkUserChargeService.selectSegchkUserChargeByChargeId(chargeId));
+    }
+
+    /**
+     * 新增seg用户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:add')")
+    @Log(title = "seg用户充值记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserCharge segchkUserCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCharge.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserChargeService.insertSegchkUserCharge(segchkUserCharge));
+    }
+
+    /**
+     * 修改seg用户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:edit')")
+    @Log(title = "seg用户充值记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserCharge segchkUserCharge)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCharge.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserChargeService.updateSegchkUserCharge(segchkUserCharge));
+    }
+
+    /**
+     * 删除seg用户充值记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_charge:remove')")
+    @Log(title = "seg用户充值记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chargeIds}")
+    public AjaxResult remove(@PathVariable Long[] chargeIds)
+    {
+        return toAjax(segchkUserChargeService.deleteSegchkUserChargeByChargeIds(chargeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCollectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCollectController.java
new file mode 100644
index 0000000..363b378
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserCollectController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+import com.ruoyi.segchk.service.ISegchkUserCollectService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户收藏记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_collect")
+public class SegchkUserCollectController extends BaseController
+{
+    @Autowired
+    private ISegchkUserCollectService segchkUserCollectService;
+
+    /**
+     * 查询seg用户收藏记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserCollect segchkUserCollect)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCollect.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserCollect> list = segchkUserCollectService.selectSegchkUserCollectList(segchkUserCollect);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户收藏记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:export')")
+    @Log(title = "seg用户收藏记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserCollect segchkUserCollect)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCollect.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserCollect> list = segchkUserCollectService.selectSegchkUserCollectList(segchkUserCollect);
+        ExcelUtil<SegchkUserCollect> util = new ExcelUtil<SegchkUserCollect>(SegchkUserCollect.class);
+        return util.exportExcel(list, "seg用户收藏记录数据");
+    }
+
+    /**
+     * 获取seg用户收藏记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:query')")
+    @GetMapping(value = "/{collectId}")
+    public AjaxResult getInfo(@PathVariable("collectId") Long collectId)
+    {
+        return AjaxResult.success(segchkUserCollectService.selectSegchkUserCollectByCollectId(collectId));
+    }
+
+    /**
+     * 新增seg用户收藏记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:add')")
+    @Log(title = "seg用户收藏记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserCollect segchkUserCollect)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCollect.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCollectService.insertSegchkUserCollect(segchkUserCollect));
+    }
+
+    /**
+     * 修改seg用户收藏记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:edit')")
+    @Log(title = "seg用户收藏记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserCollect segchkUserCollect)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserCollect.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserCollectService.updateSegchkUserCollect(segchkUserCollect));
+    }
+
+    /**
+     * 删除seg用户收藏记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_collect:remove')")
+    @Log(title = "seg用户收藏记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{collectIds}")
+    public AjaxResult remove(@PathVariable Long[] collectIds)
+    {
+        return toAjax(segchkUserCollectService.deleteSegchkUserCollectByCollectIds(collectIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserExtInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserExtInfoController.java
new file mode 100644
index 0000000..fc4f8db
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserExtInfoController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserExtInfo;
+import com.ruoyi.segchk.service.ISegchkUserExtInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户扩展信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_ext_info")
+public class SegchkUserExtInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkUserExtInfoService segchkUserExtInfoService;
+
+    /**
+     * 查询seg用户扩展信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserExtInfo segchkUserExtInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserExtInfo.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserExtInfo> list = segchkUserExtInfoService.selectSegchkUserExtInfoList(segchkUserExtInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户扩展信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:export')")
+    @Log(title = "seg用户扩展信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserExtInfo segchkUserExtInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserExtInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserExtInfo> list = segchkUserExtInfoService.selectSegchkUserExtInfoList(segchkUserExtInfo);
+        ExcelUtil<SegchkUserExtInfo> util = new ExcelUtil<SegchkUserExtInfo>(SegchkUserExtInfo.class);
+        return util.exportExcel(list, "seg用户扩展信息数据");
+    }
+
+    /**
+     * 获取seg用户扩展信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(segchkUserExtInfoService.selectSegchkUserExtInfoByUserId(userId));
+    }
+
+    /**
+     * 新增seg用户扩展信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:add')")
+    @Log(title = "seg用户扩展信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserExtInfo segchkUserExtInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserExtInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserExtInfoService.insertSegchkUserExtInfo(segchkUserExtInfo));
+    }
+
+    /**
+     * 修改seg用户扩展信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:edit')")
+    @Log(title = "seg用户扩展信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserExtInfo segchkUserExtInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserExtInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserExtInfoService.updateSegchkUserExtInfo(segchkUserExtInfo));
+    }
+
+    /**
+     * 删除seg用户扩展信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_ext_info:remove')")
+    @Log(title = "seg用户扩展信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(segchkUserExtInfoService.deleteSegchkUserExtInfoByUserIds(userIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserLikegoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserLikegoController.java
new file mode 100644
index 0000000..8d6d703
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserLikegoController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+import com.ruoyi.segchk.service.ISegchkUserLikegoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户想去记录Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_likego")
+public class SegchkUserLikegoController extends BaseController
+{
+    @Autowired
+    private ISegchkUserLikegoService segchkUserLikegoService;
+
+    /**
+     * 查询seg用户想去记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserLikego segchkUserLikego)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserLikego.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserLikego> list = segchkUserLikegoService.selectSegchkUserLikegoList(segchkUserLikego);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户想去记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:export')")
+    @Log(title = "seg用户想去记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserLikego segchkUserLikego)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserLikego.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserLikego> list = segchkUserLikegoService.selectSegchkUserLikegoList(segchkUserLikego);
+        ExcelUtil<SegchkUserLikego> util = new ExcelUtil<SegchkUserLikego>(SegchkUserLikego.class);
+        return util.exportExcel(list, "seg用户想去记录数据");
+    }
+
+    /**
+     * 获取seg用户想去记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:query')")
+    @GetMapping(value = "/{likegoId}")
+    public AjaxResult getInfo(@PathVariable("likegoId") Long likegoId)
+    {
+        return AjaxResult.success(segchkUserLikegoService.selectSegchkUserLikegoByLikegoId(likegoId));
+    }
+
+    /**
+     * 新增seg用户想去记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:add')")
+    @Log(title = "seg用户想去记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserLikego segchkUserLikego)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserLikego.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserLikegoService.insertSegchkUserLikego(segchkUserLikego));
+    }
+
+    /**
+     * 修改seg用户想去记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:edit')")
+    @Log(title = "seg用户想去记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserLikego segchkUserLikego)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserLikego.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserLikegoService.updateSegchkUserLikego(segchkUserLikego));
+    }
+
+    /**
+     * 删除seg用户想去记录
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_likego:remove')")
+    @Log(title = "seg用户想去记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{likegoIds}")
+    public AjaxResult remove(@PathVariable Long[] likegoIds)
+    {
+        return toAjax(segchkUserLikegoService.deleteSegchkUserLikegoByLikegoIds(likegoIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardController.java
new file mode 100644
index 0000000..19dc1bd
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserReward;
+import com.ruoyi.segchk.service.ISegchkUserRewardService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户奖励Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_reward")
+public class SegchkUserRewardController extends BaseController
+{
+    @Autowired
+    private ISegchkUserRewardService segchkUserRewardService;
+
+    /**
+     * 查询seg用户奖励列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserReward segchkUserReward)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserReward.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserReward> list = segchkUserRewardService.selectSegchkUserRewardList(segchkUserReward);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户奖励列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:export')")
+    @Log(title = "seg用户奖励", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserReward segchkUserReward)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserReward.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserReward> list = segchkUserRewardService.selectSegchkUserRewardList(segchkUserReward);
+        ExcelUtil<SegchkUserReward> util = new ExcelUtil<SegchkUserReward>(SegchkUserReward.class);
+        return util.exportExcel(list, "seg用户奖励数据");
+    }
+
+    /**
+     * 获取seg用户奖励详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:query')")
+    @GetMapping(value = "/{rewardId}")
+    public AjaxResult getInfo(@PathVariable("rewardId") Long rewardId)
+    {
+        return AjaxResult.success(segchkUserRewardService.selectSegchkUserRewardByRewardId(rewardId));
+    }
+
+    /**
+     * 新增seg用户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:add')")
+    @Log(title = "seg用户奖励", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserReward segchkUserReward)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserReward.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserRewardService.insertSegchkUserReward(segchkUserReward));
+    }
+
+    /**
+     * 修改seg用户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:edit')")
+    @Log(title = "seg用户奖励", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserReward segchkUserReward)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserReward.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserRewardService.updateSegchkUserReward(segchkUserReward));
+    }
+
+    /**
+     * 删除seg用户奖励
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward:remove')")
+    @Log(title = "seg用户奖励", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rewardIds}")
+    public AjaxResult remove(@PathVariable Long[] rewardIds)
+    {
+        return toAjax(segchkUserRewardService.deleteSegchkUserRewardByRewardIds(rewardIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardCtlController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardCtlController.java
new file mode 100644
index 0000000..8e46aa8
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserRewardCtlController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserRewardCtl;
+import com.ruoyi.segchk.service.ISegchkUserRewardCtlService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg会员推荐控制Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_reward_ctl")
+public class SegchkUserRewardCtlController extends BaseController
+{
+    @Autowired
+    private ISegchkUserRewardCtlService segchkUserRewardCtlService;
+
+    /**
+     * 查询seg会员推荐控制列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserRewardCtl.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserRewardCtl> list = segchkUserRewardCtlService.selectSegchkUserRewardCtlList(segchkUserRewardCtl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg会员推荐控制列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:export')")
+    @Log(title = "seg会员推荐控制", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserRewardCtl.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserRewardCtl> list = segchkUserRewardCtlService.selectSegchkUserRewardCtlList(segchkUserRewardCtl);
+        ExcelUtil<SegchkUserRewardCtl> util = new ExcelUtil<SegchkUserRewardCtl>(SegchkUserRewardCtl.class);
+        return util.exportExcel(list, "seg会员推荐控制数据");
+    }
+
+    /**
+     * 获取seg会员推荐控制详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:query')")
+    @GetMapping(value = "/{rewardCtlId}")
+    public AjaxResult getInfo(@PathVariable("rewardCtlId") Integer rewardCtlId)
+    {
+        return AjaxResult.success(segchkUserRewardCtlService.selectSegchkUserRewardCtlByRewardCtlId(rewardCtlId));
+    }
+
+    /**
+     * 新增seg会员推荐控制
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:add')")
+    @Log(title = "seg会员推荐控制", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserRewardCtl.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserRewardCtlService.insertSegchkUserRewardCtl(segchkUserRewardCtl));
+    }
+
+    /**
+     * 修改seg会员推荐控制
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:edit')")
+    @Log(title = "seg会员推荐控制", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserRewardCtl.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserRewardCtlService.updateSegchkUserRewardCtl(segchkUserRewardCtl));
+    }
+
+    /**
+     * 删除seg会员推荐控制
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_reward_ctl:remove')")
+    @Log(title = "seg会员推荐控制", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rewardCtlIds}")
+    public AjaxResult remove(@PathVariable Integer[] rewardCtlIds)
+    {
+        return toAjax(segchkUserRewardCtlService.deleteSegchkUserRewardCtlByRewardCtlIds(rewardCtlIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserSecurityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserSecurityController.java
new file mode 100644
index 0000000..e4a40ae
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserSecurityController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserSecurity;
+import com.ruoyi.segchk.service.ISegchkUserSecurityService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户密码Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_security")
+public class SegchkUserSecurityController extends BaseController
+{
+    @Autowired
+    private ISegchkUserSecurityService segchkUserSecurityService;
+
+    /**
+     * 查询seg用户密码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserSecurity segchkUserSecurity)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserSecurity.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserSecurity> list = segchkUserSecurityService.selectSegchkUserSecurityList(segchkUserSecurity);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户密码列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:export')")
+    @Log(title = "seg用户密码", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserSecurity segchkUserSecurity)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserSecurity.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserSecurity> list = segchkUserSecurityService.selectSegchkUserSecurityList(segchkUserSecurity);
+        ExcelUtil<SegchkUserSecurity> util = new ExcelUtil<SegchkUserSecurity>(SegchkUserSecurity.class);
+        return util.exportExcel(list, "seg用户密码数据");
+    }
+
+    /**
+     * 获取seg用户密码详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:query')")
+    @GetMapping(value = "/{pwdId}")
+    public AjaxResult getInfo(@PathVariable("pwdId") Long pwdId)
+    {
+        return AjaxResult.success(segchkUserSecurityService.selectSegchkUserSecurityByPwdId(pwdId));
+    }
+
+    /**
+     * 新增seg用户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:add')")
+    @Log(title = "seg用户密码", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserSecurity segchkUserSecurity)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserSecurity.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserSecurityService.insertSegchkUserSecurity(segchkUserSecurity));
+    }
+
+    /**
+     * 修改seg用户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:edit')")
+    @Log(title = "seg用户密码", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserSecurity segchkUserSecurity)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserSecurity.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserSecurityService.updateSegchkUserSecurity(segchkUserSecurity));
+    }
+
+    /**
+     * 删除seg用户密码
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_security:remove')")
+    @Log(title = "seg用户密码", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{pwdIds}")
+    public AjaxResult remove(@PathVariable Long[] pwdIds)
+    {
+        return toAjax(segchkUserSecurityService.deleteSegchkUserSecurityByPwdIds(pwdIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserVipController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserVipController.java
new file mode 100644
index 0000000..e084f31
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserVipController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserVip;
+import com.ruoyi.segchk.service.ISegchkUserVipService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg会员卡Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_vip")
+public class SegchkUserVipController extends BaseController
+{
+    @Autowired
+    private ISegchkUserVipService segchkUserVipService;
+
+    /**
+     * 查询seg会员卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserVip segchkUserVip)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserVip.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserVip> list = segchkUserVipService.selectSegchkUserVipList(segchkUserVip);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg会员卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:export')")
+    @Log(title = "seg会员卡", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserVip segchkUserVip)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserVip.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserVip> list = segchkUserVipService.selectSegchkUserVipList(segchkUserVip);
+        ExcelUtil<SegchkUserVip> util = new ExcelUtil<SegchkUserVip>(SegchkUserVip.class);
+        return util.exportExcel(list, "seg会员卡数据");
+    }
+
+    /**
+     * 获取seg会员卡详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:query')")
+    @GetMapping(value = "/{cardId}")
+    public AjaxResult getInfo(@PathVariable("cardId") Long cardId)
+    {
+        return AjaxResult.success(segchkUserVipService.selectSegchkUserVipByCardId(cardId));
+    }
+
+    /**
+     * 新增seg会员卡
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:add')")
+    @Log(title = "seg会员卡", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserVip segchkUserVip)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserVip.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserVipService.insertSegchkUserVip(segchkUserVip));
+    }
+
+    /**
+     * 修改seg会员卡
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:edit')")
+    @Log(title = "seg会员卡", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserVip segchkUserVip)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserVip.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserVipService.updateSegchkUserVip(segchkUserVip));
+    }
+
+    /**
+     * 删除seg会员卡
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_vip:remove')")
+    @Log(title = "seg会员卡", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{cardIds}")
+    public AjaxResult remove(@PathVariable Long[] cardIds)
+    {
+        return toAjax(segchkUserVipService.deleteSegchkUserVipByCardIds(cardIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserWechatController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserWechatController.java
new file mode 100644
index 0000000..7bdd15e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkUserWechatController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.service.ISegchkUserWechatService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg用户微信信息Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_user_wechat")
+public class SegchkUserWechatController extends BaseController
+{
+    @Autowired
+    private ISegchkUserWechatService segchkUserWechatService;
+
+    /**
+     * 查询seg用户微信信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkUserWechat segchkUserWechat)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserWechat.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkUserWechat> list = segchkUserWechatService.selectSegchkUserWechatList(segchkUserWechat);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg用户微信信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:export')")
+    @Log(title = "seg用户微信信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkUserWechat segchkUserWechat)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserWechat.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkUserWechat> list = segchkUserWechatService.selectSegchkUserWechatList(segchkUserWechat);
+        ExcelUtil<SegchkUserWechat> util = new ExcelUtil<SegchkUserWechat>(SegchkUserWechat.class);
+        return util.exportExcel(list, "seg用户微信信息数据");
+    }
+
+    /**
+     * 获取seg用户微信信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(segchkUserWechatService.selectSegchkUserWechatByUserId(userId));
+    }
+
+    /**
+     * 新增seg用户微信信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:add')")
+    @Log(title = "seg用户微信信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkUserWechat segchkUserWechat)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserWechat.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserWechatService.insertSegchkUserWechat(segchkUserWechat));
+    }
+
+    /**
+     * 修改seg用户微信信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:edit')")
+    @Log(title = "seg用户微信信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkUserWechat segchkUserWechat)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkUserWechat.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkUserWechatService.updateSegchkUserWechat(segchkUserWechat));
+    }
+
+    /**
+     * 删除seg用户微信信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_user_wechat:remove')")
+    @Log(title = "seg用户微信信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(segchkUserWechatService.deleteSegchkUserWechatByUserIds(userIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkVipSetInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkVipSetInfoController.java
new file mode 100644
index 0000000..5445bce
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/segchk/SegchkVipSetInfoController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.segchk;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.segchk.domain.SegchkVipSetInfo;
+import com.ruoyi.segchk.service.ISegchkVipSetInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * seg会员卡设置Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/segchk/segchk_vip_set_info")
+public class SegchkVipSetInfoController extends BaseController
+{
+    @Autowired
+    private ISegchkVipSetInfoService segchkVipSetInfoService;
+
+    /**
+     * 查询seg会员卡设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SegchkVipSetInfo segchkVipSetInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkVipSetInfo.setProviderId(sysUser.getProviderId());
+        }
+        startPage();
+        List<SegchkVipSetInfo> list = segchkVipSetInfoService.selectSegchkVipSetInfoList(segchkVipSetInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出seg会员卡设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:export')")
+    @Log(title = "seg会员卡设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SegchkVipSetInfo segchkVipSetInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkVipSetInfo.setProviderId(sysUser.getProviderId());
+        }
+        List<SegchkVipSetInfo> list = segchkVipSetInfoService.selectSegchkVipSetInfoList(segchkVipSetInfo);
+        ExcelUtil<SegchkVipSetInfo> util = new ExcelUtil<SegchkVipSetInfo>(SegchkVipSetInfo.class);
+        return util.exportExcel(list, "seg会员卡设置数据");
+    }
+
+    /**
+     * 获取seg会员卡设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:query')")
+    @GetMapping(value = "/{modeId}")
+    public AjaxResult getInfo(@PathVariable("modeId") Integer modeId)
+    {
+        return AjaxResult.success(segchkVipSetInfoService.selectSegchkVipSetInfoByModeId(modeId));
+    }
+
+    /**
+     * 新增seg会员卡设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:add')")
+    @Log(title = "seg会员卡设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SegchkVipSetInfo segchkVipSetInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkVipSetInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkVipSetInfoService.insertSegchkVipSetInfo(segchkVipSetInfo));
+    }
+
+    /**
+     * 修改seg会员卡设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:edit')")
+    @Log(title = "seg会员卡设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SegchkVipSetInfo segchkVipSetInfo)
+    {
+//        获取当前登录用户信息
+        SysUser sysUser = getLoginUser().getUser();
+        if(sysUser.getUserId() == 1){
+//            说明是超级管理员
+            ;
+        }
+        else{
+            segchkVipSetInfo.setProviderId(sysUser.getProviderId());
+        }
+        return toAjax(segchkVipSetInfoService.updateSegchkVipSetInfo(segchkVipSetInfo));
+    }
+
+    /**
+     * 删除seg会员卡设置
+     */
+    @PreAuthorize("@ss.hasPermi('segchk:segchk_vip_set_info:remove')")
+    @Log(title = "seg会员卡设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{modeIds}")
+    public AjaxResult remove(@PathVariable Integer[] modeIds)
+    {
+        return toAjax(segchkVipSetInfoService.deleteSegchkVipSetInfoByModeIds(modeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
new file mode 100644
index 0000000..f44c392
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -0,0 +1,135 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+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.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        return util.exportExcel(list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId)
+    {
+        return AjaxResult.success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey)
+    {
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    @RepeatSubmit
+    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setCreateBy(getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setUpdateBy(getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
new file mode 100644
index 0000000..51fc807
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -0,0 +1,162 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.Iterator;
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
+
+/**
+ * 部门信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Iterator<SysDept> it = depts.iterator();
+        while (it.hasNext())
+        {
+            SysDept d = (SysDept) it.next();
+            if (d.getDeptId().intValue() == deptId
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+            {
+                it.remove();
+            }
+        }
+        return AjaxResult.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId)
+    {
+        return AjaxResult.success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(dept.getDeptId()))
+        {
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+        {
+            return AjaxResult.error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId)
+    {
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return AjaxResult.error("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return AjaxResult.error("部门存在用户,不允许删除");
+        }
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
new file mode 100644
index 0000000..7609689
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -0,0 +1,120 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        return util.exportExcel(list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable Long dictCode)
+    {
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return AjaxResult.success(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
new file mode 100644
index 0000000..c2e4d74
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -0,0 +1,131 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+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.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysDictType dictType)
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        return util.exportExcel(list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable Long dictId)
+    {
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setCreateBy(getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable Long[] dictIds)
+    {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        dictTypeService.resetDictCache();
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return AjaxResult.success(dictTypes);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
new file mode 100644
index 0000000..13007eb
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -0,0 +1,29 @@
+package com.ruoyi.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 首页
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysIndexController
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /**
+     * 访问首页，提示语
+     */
+    @RequestMapping("/")
+    public String index()
+    {
+        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
new file mode 100644
index 0000000..20803a9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -0,0 +1,102 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.ruoyi.security.web.service.SysLoginService;
+import com.ruoyi.security.web.service.SysPermissionService;
+import com.ruoyi.segchk.service.ISegchkProviderMgtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+
+
+    @Autowired
+    private ISegchkProviderMgtService segchkProviderMgtService;
+    /**
+     * 登录方法
+     * 
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        System.out.println("login token is : " + token);
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     * 
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo()
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long providerId = segchkProviderMgtService.getProviderIdByPhoneNo(user.getPhonenumber());
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        user.setProviderId(providerId);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        System.out.println("getInfo with " + user.toString());
+        System.out.println("getInfo with " + String.join(",", roles));
+        System.out.println("getInfo with " + String.join(",", permissions));
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     * 
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters()
+    {
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        List<String> collect = menus.parallelStream().map(v -> v.toString()).collect(Collectors.toList());
+        System.out.println(String.format("getRouters with {}---{}", userId, String.join(",", collect)));
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
new file mode 100644
index 0000000..4a9f73f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -0,0 +1,142 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 菜单信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return AjaxResult.success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable Long menuId)
+    {
+        return AjaxResult.success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    {
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return AjaxResult.error("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return AjaxResult.error("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
new file mode 100644
index 0000000..4da9f04
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable Long noticeId)
+    {
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(getUsername());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
new file mode 100644
index 0000000..c2501c7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -0,0 +1,129 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+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.SysPost;
+import com.ruoyi.system.service.ISysPostService;
+
+/**
+ * 岗位信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+    
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        return util.exportExcel(list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable Long postId)
+    {
+        return AjaxResult.success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setCreateBy(getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setUpdateBy(getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable Long[] postIds)
+    {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return AjaxResult.success(posts);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
new file mode 100644
index 0000000..90eb8f3
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -0,0 +1,141 @@
+package com.ruoyi.web.controller.system;
+
+import java.io.IOException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        LoginUser loginUser = getLoginUser();
+        SysUser sysUser = loginUser.getUser();
+        user.setUserId(sysUser.getUserId());
+        user.setPassword(null);
+        if (userService.updateUserProfile(user) > 0)
+        {
+            // 更新缓存用户信息
+            sysUser.setNickName(user.getNickName());
+            sysUser.setPhonenumber(user.getPhonenumber());
+            sysUser.setEmail(user.getEmail());
+            sysUser.setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        LoginUser loginUser = getLoginUser();
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = getLoginUser();
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return AjaxResult.error("上传图片异常，请联系管理员");
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
new file mode 100644
index 0000000..762f1d9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -0,0 +1,38 @@
+package com.ruoyi.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.framework.web.service.SysRegisterService;
+import com.ruoyi.system.service.ISysConfigService;
+
+/**
+ * 注册验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysRegisterController extends BaseController
+{
+    @Autowired
+    private SysRegisterService registerService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @PostMapping("/register")
+    public AjaxResult register(@RequestBody RegisterBody user)
+    {
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+        {
+            return error("当前系统没有开启注册功能！");
+        }
+        String msg = registerService.register(user);
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
new file mode 100644
index 0000000..1f9359f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -0,0 +1,240 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+
+import com.ruoyi.security.web.service.SysPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController
+{
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+    
+    @Autowired
+    private SysPermissionService permissionService;
+    
+    @Autowired
+    private ISysUserService userService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysRole role)
+    {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        return util.exportExcel(list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId)
+    {
+        return AjaxResult.success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(getUsername());
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(getUsername());
+        
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        role.setUpdateBy(getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        return AjaxResult.success(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    {
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
new file mode 100644
index 0000000..1eadb54
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -0,0 +1,249 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 用户信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        String operName = getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.importTemplateExcel("用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        if (StringUtils.isNotNull(userId))
+        {
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+        }
+        return ajax;
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        if (ArrayUtils.contains(userIds, getUserId()))
+        {
+            return error("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+
+    /**
+     * 重置密码admin忘记密码时
+     */
+//    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+//    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetadminself")
+    public AjaxResult resetadminself()
+    {
+//        userService.checkUserAllowed(user);
+        SysUser user = new SysUser();
+        user.setPassword("yzy123456");
+        user.setUserId(1L);
+        user.setUserName("admin");
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(user.getUserName());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/authRole/{userId}")
+    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        SysUser user = userService.selectUserById(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        ajax.put("user", user);
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        return ajax;
+    }
+
+    /**
+     * 用户授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    {
+        userService.insertUserAuth(userId, roleIds);
+        return success();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
new file mode 100644
index 0000000..f66ca24
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
@@ -0,0 +1,24 @@
+package com.ruoyi.web.controller.tool;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.controller.BaseController;
+
+/**
+ * swagger 接口
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/tool/swagger")
+public class SwaggerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
+    @GetMapping()
+    public String index()
+    {
+        return redirect("/swagger-ui.html");
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
new file mode 100644
index 0000000..381ab13
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@@ -0,0 +1,181 @@
+package com.ruoyi.web.controller.tool;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * swagger 用户测试方法
+ * 
+ * @author ruoyi
+ */
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/test/user")
+public class TestController extends BaseController
+{
+    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+    {
+        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+    }
+
+    @ApiOperation("获取用户列表")
+    @GetMapping("/list")
+    public AjaxResult userList()
+    {
+        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
+        return AjaxResult.success(userList);
+    }
+
+    @ApiOperation("获取用户详细")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
+    @GetMapping("/{userId}")
+    public AjaxResult getUser(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            return AjaxResult.success(users.get(userId));
+        }
+        else
+        {
+            return error("用户不存在");
+        }
+    }
+
+    @ApiOperation("新增用户")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer"),
+        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String"),
+        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String"),
+        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String")
+    })
+    @PostMapping("/save")
+    public AjaxResult save(UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return error("用户ID不能为空");
+        }
+        return AjaxResult.success(users.put(user.getUserId(), user));
+    }
+
+    @ApiOperation("更新用户")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return error("用户ID不能为空");
+        }
+        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        {
+            return error("用户不存在");
+        }
+        users.remove(user.getUserId());
+        return AjaxResult.success(users.put(user.getUserId(), user));
+    }
+
+    @ApiOperation("删除用户信息")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
+    @DeleteMapping("/{userId}")
+    public AjaxResult delete(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            users.remove(userId);
+            return success();
+        }
+        else
+        {
+            return error("用户不存在");
+        }
+    }
+}
+
+@ApiModel(value = "UserEntity", description = "用户实体")
+class UserEntity
+{
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户密码")
+    private String password;
+
+    @ApiModelProperty("用户手机")
+    private String mobile;
+
+    public UserEntity()
+    {
+
+    }
+
+    public UserEntity(Integer userId, String username, String password, String mobile)
+    {
+        this.userId = userId;
+        this.username = username;
+        this.password = password;
+        this.mobile = mobile;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getMobile()
+    {
+        return mobile;
+    }
+
+    public void setMobile(String mobile)
+    {
+        this.mobile = mobile;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
new file mode 100644
index 0000000..ae1c3ec
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -0,0 +1,125 @@
+package com.ruoyi.web.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * Swagger2的接口配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class SwaggerConfig
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /** 是否开启swagger */
+    @Value("${swagger.enabled}")
+    private boolean enabled;
+
+    /** 设置请求的统一前缀 */
+    @Value("${swagger.pathMapping}")
+    private String pathMapping;
+
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi()
+    {
+        return new Docket(DocumentationType.OAS_30)
+                // 是否启用Swagger
+                .enable(enabled)
+                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                // 扫描指定包中的swagger注解
+                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                /* 设置安全模式，swagger可以设置访问token */
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts())
+                .pathMapping(pathMapping);
+    }
+
+    /**
+     * 安全模式，这里指定token通过Authorization头请求头传递
+     */
+    private List<SecurityScheme> securitySchemes()
+    {
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+        return apiKeyList;
+    }
+
+    /**
+     * 安全上下文
+     */
+    private List<SecurityContext> securityContexts()
+    {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+                        .build());
+        return securityContexts;
+    }
+
+    /**
+     * 默认的安全上引用
+     */
+    private List<SecurityReference> defaultAuth()
+    {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+    /**
+     * 添加摘要信息
+     */
+    private ApiInfo apiInfo()
+    {
+        // 用ApiInfoBuilder进行定制
+        return new ApiInfoBuilder()
+                // 设置标题
+                .title("标题：若依管理系统_接口文档")
+                // 描述
+                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                // 作者信息
+                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                // 版本
+                .version("版本号:" + ruoyiConfig.getVersion())
+                .build();
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
new file mode 100644
index 0000000..2b23f85
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson.*.jar
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
new file mode 100644
index 0000000..fbedc1f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -0,0 +1,119 @@
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.6.0
+    # 版权年份
+    copyrightYear: 2021
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath F:\ideaproj\RuoYi-Vue\uploadPath）
+    profile: F:\ideaproj\RuoYi-Vue\uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 7070
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # tomcat最大线程数，默认为200
+        max-threads: 800
+        # Tomcat启动初始化的线程数，默认值25
+        min-spare-threads: 30
+
+# 日志配置
+logging:
+    level:
+        com.ruoyi: debug
+        org.springframework: warn
+
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://10.1.192.113:13306/yzy_ruoyi_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                username: yzyuser
+                password: yzy123456
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: 10.1.192.113
+        # 端口，默认为6379
+        port: 63795
+        # 数据库索引
+        database: 0
+        # 密码
+        password: retinabd@2020
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+debug: true
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-kaleprod.yml b/ruoyi-admin/src/main/resources/application-kaleprod.yml
new file mode 100644
index 0000000..ec50130
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-kaleprod.yml
@@ -0,0 +1,118 @@
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.6.0
+    # 版权年份
+    copyrightYear: 2021
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /home/seg_yinzy/data/applet
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 7070
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # tomcat最大线程数，默认为200
+        max-threads: 800
+        # Tomcat启动初始化的线程数，默认值25
+        min-spare-threads: 30
+
+# 日志配置
+logging:
+    level:
+        com.ruoyi: debug
+        org.springframework: warn
+
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.2.30:8306/segchksaas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                username: segchksaas
+                password: 2wsx@WSX
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.2.40
+        # 端口，默认为6379
+        port: 63795
+        # 数据库索引
+        database: 3
+        # 密码
+        password: seg_123456
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
new file mode 100644
index 0000000..080cdc5
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -0,0 +1,118 @@
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.6.0
+    # 版权年份
+    copyrightYear: 2021
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /home/seg_yinzy/data/applet
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 7070
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # tomcat最大线程数，默认为200
+        max-threads: 800
+        # Tomcat启动初始化的线程数，默认值25
+        min-spare-threads: 30
+
+# 日志配置
+logging:
+    level:
+        com.ruoyi: debug
+        org.springframework: warn
+
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.2.30:8306/kaletest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                username: segchksaas
+                password: 2wsx@WSX
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.2.40
+        # 端口，默认为6379
+        port: 63795
+        # 数据库索引
+        database: 2
+        # 密码
+        password: seg_123456
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
new file mode 100644
index 0000000..536a0f8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -0,0 +1,98 @@
+# 项目相关配置
+#ruoyi:
+#  # 名称
+#  name: RuoYi
+#  # 版本
+#  version: 3.6.0
+#  # 版权年份
+#  copyrightYear: 2021
+#  # 实例演示开关
+#  demoEnabled: true
+#  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+#  profile: D:/ruoyi/uploadPath
+#  # 获取ip地址开关
+#  addressEnabled: false
+#  # 验证码类型 math 数组计算 char 字符验证
+#  captchaType: math
+
+## 开发环境配置
+#server:
+#  # 服务器的HTTP端口，默认为8080
+#  port: 7070
+#  servlet:
+#    # 应用的访问路径
+#    context-path: /
+#  tomcat:
+#    # tomcat的URI编码
+#    uri-encoding: UTF-8
+#    # tomcat最大线程数，默认为200
+#    max-threads: 800
+#    # Tomcat启动初始化的线程数，默认值25
+#    min-spare-threads: 30
+#
+## 日志配置
+#logging:
+#  level:
+#    com.ruoyi: debug
+#    org.springframework: warn
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles: 
+    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+  
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper: 
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql 
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+# 防止XSS攻击
+xss: 
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt
new file mode 100644
index 0000000..0931cb8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/banner.txt
@@ -0,0 +1,24 @@
+Application Version: ${ruoyi.version}
+Spring Boot Version: ${spring-boot.version}
+////////////////////////////////////////////////////////////////////
+//                          _ooOoo_                               //
+//                         o8888888o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -:- |||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
+//             佛祖保佑       永不宕机      永无BUG               //
+////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties
new file mode 100644
index 0000000..71cf52d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -0,0 +1,37 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+ 
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
new file mode 100644
index 0000000..01528cf
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="adminlogs" />
+    <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+	<!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+	
+	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+	
+	<!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+	
+	<!-- 系统模块日志级别控制  -->
+	<logger name="com.ruoyi" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+	
+	<!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+</configuration> 
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
new file mode 100644
index 0000000..e8b52be
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+	
+	<settings>
+		<setting name="cacheEnabled"             value="true" />  <!-- 全局映射器启用缓存 -->
+		<setting name="useGeneratedKeys"         value="true" />  <!-- 允许 JDBC 支持自动生成主键 -->
+		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 配置默认的执行器 -->
+		<setting name="logImpl"                  value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
+	</settings>
+	
+</configuration>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
new file mode 100644
index 0000000..834840e
--- /dev/null
+++ b/ruoyi-common/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common</artifactId>
+
+    <description>
+        common通用工具
+    </description>
+
+    <dependencies>
+
+        <!-- Spring框架基本的核心工具 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
+        <!-- SpringWeb模块 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- spring security 安全认证 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+
+        <!--常用工具类 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+  
+        <!-- JSON工具类 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- 阿里JSON解析器 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <!-- io常用工具类 -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <!-- 文件上传工具类 -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <!-- excel工具 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
+        <!-- yml解析器 -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
+        <!--Token生成与解析-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <!-- redis 缓存操作 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- pool 对象池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!-- 解析客户端操作系统、浏览器等 -->
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+        </dependency>
+
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
new file mode 100644
index 0000000..176878e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据权限过滤注解
+ * 
+ * @author ruoyi
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope
+{
+    /**
+     * 部门表的别名
+     */
+    public String deptAlias() default "";
+
+    /**
+     * 用户表的别名
+     */
+    public String userAlias() default "";
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
new file mode 100644
index 0000000..79cd191
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.ruoyi.common.enums.DataSourceType;
+
+/**
+ * 自定义多数据源切换注解
+ *
+ * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
+ *
+ * @author ruoyi
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DataSource
+{
+    /**
+     * 切换数据源名称
+     */
+    public DataSourceType value() default DataSourceType.MASTER;
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
new file mode 100644
index 0000000..b09f4ce
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -0,0 +1,165 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.math.BigDecimal;
+
+/**
+ * 自定义导出Excel数据注解
+ * 
+ * @author ruoyi
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Excel
+{
+    /**
+     * 导出时在excel中排序
+     */
+    public int sort() default Integer.MAX_VALUE;
+
+    /**
+     * 导出到Excel中的名字.
+     */
+    public String name() default "";
+
+    /**
+     * 日期格式, 如: yyyy-MM-dd
+     */
+    public String dateFormat() default "";
+
+    /**
+     * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
+     */
+    public String dictType() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    public String readConverterExp() default "";
+
+    /**
+     * 分隔符，读取字符串组内容
+     */
+    public String separator() default ",";
+
+    /**
+     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+     */
+    public int scale() default -1;
+
+    /**
+     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+     */
+    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
+    /**
+     * 导出类型（0数字 1字符串）
+     */
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出时在excel中每个列的高度 单位为字符
+     */
+    public double height() default 14;
+
+    /**
+     * 导出时在excel中每个列的宽 单位为字符
+     */
+    public double width() default 16;
+
+    /**
+     * 文字后缀,如% 90 变成90%
+     */
+    public String suffix() default "";
+
+    /**
+     * 当值为空时,字段的默认值
+     */
+    public String defaultValue() default "";
+
+    /**
+     * 提示信息
+     */
+    public String prompt() default "";
+
+    /**
+     * 设置只能选择不能输入的列内容.
+     */
+    public String[] combo() default {};
+
+    /**
+     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
+     */
+    public boolean isExport() default true;
+
+    /**
+     * 另一个类中的属性名称,支持多级获取,以小数点隔开
+     */
+    public String targetAttr() default "";
+
+    /**
+     * 是否自动统计数据,在最后追加一行统计数据总和
+     */
+    public boolean isStatistics() default false;
+
+    /**
+     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+     */
+    Align align() default Align.AUTO;
+
+    public enum Align
+    {
+        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
+        private final int value;
+
+        Align(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    /**
+     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
+     */
+    Type type() default Type.ALL;
+
+    public enum Type
+    {
+        ALL(0), EXPORT(1), IMPORT(2);
+        private final int value;
+
+        Type(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    public enum ColumnType
+    {
+        NUMERIC(0), STRING(1), IMAGE(2);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
new file mode 100644
index 0000000..1f1cc81
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
@@ -0,0 +1,18 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ * 
+ * @author ruoyi
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels
+{
+    public Excel[] value();
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
new file mode 100644
index 0000000..eb05dc7
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
@@ -0,0 +1,41 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.OperatorType;
+
+/**
+ * 自定义操作日志记录注解
+ * 
+ * @author ruoyi
+ *
+ */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log
+{
+    /**
+     * 模块 
+     */
+    public String title() default "";
+
+    /**
+     * 功能
+     */
+    public BusinessType businessType() default BusinessType.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    public OperatorType operatorType() default OperatorType.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    public boolean isSaveRequestData() default true;
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
new file mode 100644
index 0000000..69461ea
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.enums.LimitType;
+
+/**
+ * 限流注解
+ * 
+ * @author ruoyi
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RateLimiter
+{
+    /**
+     * 限流key
+     */
+    public String key() default Constants.RATE_LIMIT_KEY;
+
+    /**
+     * 限流时间,单位秒
+     */
+    public int time() default 60;
+
+    /**
+     * 限流次数
+     */
+    public int count() default 100;
+
+    /**
+     * 限流类型
+     */
+    public LimitType limitType() default LimitType.DEFAULT;
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
new file mode 100644
index 0000000..9e350f1
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
@@ -0,0 +1,23 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义注解防止表单重复提交
+ * 
+ * @author ruoyi
+ *
+ */
+@Inherited
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit
+{
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/UnAuth.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/UnAuth.java
new file mode 100644
index 0000000..e8f1c95
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/UnAuth.java
@@ -0,0 +1,14 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 不需要拦截注解
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UnAuth {
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
new file mode 100644
index 0000000..faf25be
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -0,0 +1,124 @@
+package com.ruoyi.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取项目相关配置
+ * 
+ * @author ruoyi
+ */
+@Component
+@ConfigurationProperties(prefix = "ruoyi")
+public class RuoYiConfig
+{
+    /** 项目名称 */
+    private String name;
+
+    /** 版本 */
+    private String version;
+
+    /** 版权年份 */
+    private String copyrightYear;
+
+    /** 实例演示开关 */
+    private boolean demoEnabled;
+
+    /** 上传路径 */
+    private static String profile;
+
+    /** 获取地址开关 */
+    private static boolean addressEnabled;
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public void setVersion(String version)
+    {
+        this.version = version;
+    }
+
+    public String getCopyrightYear()
+    {
+        return copyrightYear;
+    }
+
+    public void setCopyrightYear(String copyrightYear)
+    {
+        this.copyrightYear = copyrightYear;
+    }
+
+    public boolean isDemoEnabled()
+    {
+        return demoEnabled;
+    }
+
+    public void setDemoEnabled(boolean demoEnabled)
+    {
+        this.demoEnabled = demoEnabled;
+    }
+
+    public static String getProfile()
+    {
+        return profile;
+    }
+
+    public void setProfile(String profile)
+    {
+        RuoYiConfig.profile = profile;
+    }
+
+    public static boolean isAddressEnabled()
+    {
+        return addressEnabled;
+    }
+
+    public void setAddressEnabled(boolean addressEnabled)
+    {
+        RuoYiConfig.addressEnabled = addressEnabled;
+    }
+
+    /**
+     * 获取导入上传路径
+     */
+    public static String getImportPath()
+    {
+        return getProfile() + "/import";
+    }
+
+    /**
+     * 获取头像上传路径
+     */
+    public static String getAvatarPath()
+    {
+        return getProfile() + "/avatar";
+    }
+
+    /**
+     * 获取下载路径
+     */
+    public static String getDownloadPath()
+    {
+        return getProfile() + "/download/";
+    }
+
+    /**
+     * 获取上传路径
+     */
+    public static String getUploadPath()
+    {
+        return getProfile() + "/upload";
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
new file mode 100644
index 0000000..d36253c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -0,0 +1,151 @@
+package com.ruoyi.common.constant;
+
+import io.jsonwebtoken.Claims;
+
+/**
+ * 通用常量信息
+ * 
+ * @author ruoyi
+ */
+public class Constants
+{
+    /**
+     * UTF-8 字符集
+     */
+    public static final String UTF8 = "UTF-8";
+
+    /**
+     * GBK 字符集
+     */
+    public static final String GBK = "GBK";
+
+    /**
+     * http请求
+     */
+    public static final String HTTP = "http://";
+
+    /**
+     * https请求
+     */
+    public static final String HTTPS = "https://";
+
+    /**
+     * 通用成功标识
+     */
+    public static final String SUCCESS = "0";
+
+    /**
+     * 通用失败标识
+     */
+    public static final String FAIL = "1";
+
+    /**
+     * 登录成功
+     */
+    public static final String LOGIN_SUCCESS = "Success";
+
+    /**
+     * 注销
+     */
+    public static final String LOGOUT = "Logout";
+
+    /**
+     * 注册
+     */
+    public static final String REGISTER = "Register";
+
+    /**
+     * 登录失败
+     */
+    public static final String LOGIN_FAIL = "Error";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    public static final String RATE_LIMIT_KEY = "rate_limit:";
+
+    /**
+     * 验证码有效期（分钟）
+     */
+    public static final Integer CAPTCHA_EXPIRATION = 2;
+
+    /**
+     * 令牌
+     */
+    public static final String TOKEN = "token";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String TOKEN_PREFIX = "Bearer ";
+
+    /**
+     * 令牌前缀
+     */
+    public static final String LOGIN_USER_KEY = "login_user_key";
+
+    /**
+     * 用户ID
+     */
+    public static final String JWT_USERID = "userid";
+
+    /**
+     * 用户名称
+     */
+    public static final String JWT_USERNAME = Claims.SUBJECT;
+
+    /**
+     * 用户头像
+     */
+    public static final String JWT_AVATAR = "avatar";
+
+    /**
+     * 创建时间
+     */
+    public static final String JWT_CREATED = "created";
+
+    /**
+     * 用户权限
+     */
+    public static final String JWT_AUTHORITIES = "authorities";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * RMI 远程方法调用
+     */
+    public static final String LOOKUP_RMI = "rmi://";
+
+    /**
+     * LDAP 远程方法调用
+     */
+    public static final String LOOKUP_LDAP = "ldap://";
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
new file mode 100644
index 0000000..1fa328e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -0,0 +1,114 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 代码生成通用常量
+ * 
+ * @author ruoyi
+ */
+public class GenConstants
+{
+    /** 单表（增删改查） */
+    public static final String TPL_CRUD = "crud";
+
+    /** 树表（增删改查） */
+    public static final String TPL_TREE = "tree";
+
+    /** 主子表（增删改查） */
+    public static final String TPL_SUB = "sub";
+
+    /** 树编码字段 */
+    public static final String TREE_CODE = "treeCode";
+
+    /** 树父编码字段 */
+    public static final String TREE_PARENT_CODE = "treeParentCode";
+
+    /** 树名称字段 */
+    public static final String TREE_NAME = "treeName";
+
+    /** 上级菜单ID字段 */
+    public static final String PARENT_MENU_ID = "parentMenuId";
+
+    /** 上级菜单名称字段 */
+    public static final String PARENT_MENU_NAME = "parentMenuName";
+
+    /** 数据库字符串类型 */
+    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+    /** 数据库文本类型 */
+    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+
+    /** 数据库时间类型 */
+    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+
+    /** 数据库数字类型 */
+    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bit", "bigint", "float", "double", "decimal" };
+
+    /** 页面不需要编辑字段 */
+    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+
+    /** 页面不需要显示的列表字段 */
+    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time" };
+
+    /** 页面不需要查询字段 */
+    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark" };
+
+    /** Entity基类字段 */
+    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+
+    /** Tree基类字段 */
+    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+
+    /** 文本框 */
+    public static final String HTML_INPUT = "input";
+
+    /** 文本域 */
+    public static final String HTML_TEXTAREA = "textarea";
+
+    /** 下拉框 */
+    public static final String HTML_SELECT = "select";
+
+    /** 单选框 */
+    public static final String HTML_RADIO = "radio";
+
+    /** 复选框 */
+    public static final String HTML_CHECKBOX = "checkbox";
+
+    /** 日期控件 */
+    public static final String HTML_DATETIME = "datetime";
+
+    /** 图片上传控件 */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /** 文件上传控件 */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
+
+    /** 富文本控件 */
+    public static final String HTML_EDITOR = "editor";
+
+    /** 字符串类型 */
+    public static final String TYPE_STRING = "String";
+
+    /** 整型 */
+    public static final String TYPE_INTEGER = "Integer";
+
+    /** 长整型 */
+    public static final String TYPE_LONG = "Long";
+
+    /** 浮点型 */
+    public static final String TYPE_DOUBLE = "Double";
+
+    /** 高精度计算类型 */
+    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /** 时间类型 */
+    public static final String TYPE_DATE = "Date";
+
+    /** 模糊查询 */
+    public static final String QUERY_LIKE = "LIKE";
+
+    /** 需要 */
+    public static final String REQUIRE = "1";
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
new file mode 100644
index 0000000..d60afee
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
@@ -0,0 +1,89 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 返回状态码
+ * 
+ * @author ruoyi
+ */
+public class HttpStatus
+{
+    /**
+     * 操作成功
+     */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 对象创建成功
+     */
+    public static final int CREATED = 201;
+
+    /**
+     * 请求已经被接受
+     */
+    public static final int ACCEPTED = 202;
+
+    /**
+     * 操作已经执行成功，但是没有返回数据
+     */
+    public static final int NO_CONTENT = 204;
+
+    /**
+     * 资源已被移除
+     */
+    public static final int MOVED_PERM = 301;
+
+    /**
+     * 重定向
+     */
+    public static final int SEE_OTHER = 303;
+
+    /**
+     * 资源没有被修改
+     */
+    public static final int NOT_MODIFIED = 304;
+
+    /**
+     * 参数列表错误（缺少，格式不匹配）
+     */
+    public static final int BAD_REQUEST = 400;
+
+    /**
+     * 未授权
+     */
+    public static final int UNAUTHORIZED = 401;
+
+    /**
+     * 访问受限，授权过期
+     */
+    public static final int FORBIDDEN = 403;
+
+    /**
+     * 资源，服务未找到
+     */
+    public static final int NOT_FOUND = 404;
+
+    /**
+     * 不允许的http方法
+     */
+    public static final int BAD_METHOD = 405;
+
+    /**
+     * 资源冲突，或者资源被锁
+     */
+    public static final int CONFLICT = 409;
+
+    /**
+     * 不支持的数据，媒体类型
+     */
+    public static final int UNSUPPORTED_TYPE = 415;
+
+    /**
+     * 系统内部错误
+     */
+    public static final int ERROR = 500;
+
+    /**
+     * 接口未实现
+     */
+    public static final int NOT_IMPLEMENTED = 501;
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
new file mode 100644
index 0000000..62ad815
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@@ -0,0 +1,50 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 任务调度通用常量
+ * 
+ * @author ruoyi
+ */
+public class ScheduleConstants
+{
+    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
+
+    /** 执行目标key */
+    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
+
+    /** 默认 */
+    public static final String MISFIRE_DEFAULT = "0";
+
+    /** 立即触发执行 */
+    public static final String MISFIRE_IGNORE_MISFIRES = "1";
+
+    /** 触发一次执行 */
+    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
+
+    /** 不触发立即执行 */
+    public static final String MISFIRE_DO_NOTHING = "3";
+
+    public enum Status
+    {
+        /**
+         * 正常
+         */
+        NORMAL("0"),
+        /**
+         * 暂停
+         */
+        PAUSE("1");
+
+        private String value;
+
+        private Status(String value)
+        {
+            this.value = value;
+        }
+
+        public String getValue()
+        {
+            return value;
+        }
+    }
+}
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
new file mode 100644
index 0000000..4ed6009
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -0,0 +1,78 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 用户常量信息
+ * 
+ * @author ruoyi
+ */
+public class UserConstants
+{
+    /**
+     * 平台内系统用户的唯一标志
+     */
+    public static final String SYS_USER = "SYS_USER";
+
+    /** 正常状态 */
+    public static final String NORMAL = "0";
+
+    /** 异常状态 */
+    public static final String EXCEPTION = "1";
+
+    /** 用户封禁状态 */
+    public static final String USER_DISABLE = "1";
+
+    /** 角色封禁状态 */
+    public static final String ROLE_DISABLE = "1";
+
+    /** 部门正常状态 */
+    public static final String DEPT_NORMAL = "0";
+
+    /** 部门停用状态 */
+    public static final String DEPT_DISABLE = "1";
+
+    /** 字典正常状态 */
+    public static final String DICT_NORMAL = "0";
+
+    /** 是否为系统默认（是） */
+    public static final String YES = "Y";
+
+    /** 是否菜单外链（是） */
+    public static final String YES_FRAME = "0";
+
+    /** 是否菜单外链（否） */
+    public static final String NO_FRAME = "1";
+
+    /** 菜单类型（目录） */
+    public static final String TYPE_DIR = "M";
+
+    /** 菜单类型（菜单） */
+    public static final String TYPE_MENU = "C";
+
+    /** 菜单类型（按钮） */
+    public static final String TYPE_BUTTON = "F";
+
+    /** Layout组件标识 */
+    public final static String LAYOUT = "Layout";
+    
+    /** ParentView组件标识 */
+    public final static String PARENT_VIEW = "ParentView";
+
+    /** InnerLink组件标识 */
+    public final static String INNER_LINK = "InnerLink";
+
+    /** 校验返回结果码 */
+    public final static String UNIQUE = "0";
+    public final static String NOT_UNIQUE = "1";
+
+    /**
+     * 用户名长度限制
+     */
+    public static final int USERNAME_MIN_LENGTH = 2;
+    public static final int USERNAME_MAX_LENGTH = 20;
+
+    /**
+     * 密码长度限制
+     */
+    public static final int PASSWORD_MIN_LENGTH = 5;
+    public static final int PASSWORD_MAX_LENGTH = 20;
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
new file mode 100644
index 0000000..d164f3f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -0,0 +1,184 @@
+package com.ruoyi.common.core.controller;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
+
+/**
+ * web层通用数据处理
+ * 
+ * @author ruoyi
+ */
+public class BaseController
+{
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder)
+    {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+        {
+            @Override
+            public void setAsText(String text)
+            {
+                setValue(DateUtils.parseDate(text));
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
+    /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable(List<?> list)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+    /**
+     * 返回成功
+     */
+    public AjaxResult success()
+    {
+        return AjaxResult.success();
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error()
+    {
+        return AjaxResult.error();
+    }
+
+    /**
+     * 返回成功消息
+     */
+    public AjaxResult success(String message)
+    {
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error(String message)
+    {
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 响应返回结果
+     * 
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(int rows)
+    {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 响应返回结果
+     * 
+     * @param result 结果
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(boolean result)
+    {
+        return result ? success() : error();
+    }
+
+    /**
+     * 页面跳转
+     */
+    public String redirect(String url)
+    {
+        return StringUtils.format("redirect:{}", url);
+    }
+
+    /**
+     * 获取用户缓存信息
+     */
+    public LoginUser getLoginUser()
+    {
+        return SecurityUtils.getLoginUser();
+    }
+
+    /**
+     * 获取登录用户id
+     */
+    public Long getUserId()
+    {
+        return getLoginUser().getUser().getUserId();
+    }
+
+    /**
+     * 获取登录部门id
+     */
+    public Long getDeptId()
+    {
+        return getLoginUser().getDeptId();
+    }
+
+    /**
+     * 获取登录用户名
+     */
+    public String getUsername()
+    {
+        return getLoginUser().getUsername();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
new file mode 100644
index 0000000..28e5a68
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -0,0 +1,148 @@
+package com.ruoyi.common.core.domain;
+
+import java.util.HashMap;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 操作消息提醒
+ * 
+ * @author ruoyi
+ */
+public class AjaxResult extends HashMap<String, Object>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 状态码 */
+    public static final String CODE_TAG = "code";
+
+    /** 返回内容 */
+    public static final String MSG_TAG = "msg";
+
+    /** 数据对象 */
+    public static final String DATA_TAG = "data";
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
+     */
+    public AjaxResult()
+    {
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     */
+    public AjaxResult(int code, String msg)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     * @param data 数据对象
+     */
+    public AjaxResult(int code, String msg, Object data)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+        if (StringUtils.isNotNull(data))
+        {
+            super.put(DATA_TAG, data);
+        }
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @return 成功消息
+     */
+    public static AjaxResult success()
+    {
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 返回成功数据
+     * 
+     * @return 成功消息
+     */
+    public static AjaxResult success(Object data)
+    {
+        return AjaxResult.success("操作成功", data);
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 返回内容
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg)
+    {
+        return AjaxResult.success(msg, null);
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @return
+     */
+    public static AjaxResult error()
+    {
+        return AjaxResult.error("操作失败");
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static AjaxResult error(String msg)
+    {
+        return AjaxResult.error(msg, null);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
+     */
+    public static AjaxResult error(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.ERROR, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param code 状态码
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static AjaxResult error(int code, String msg)
+    {
+        return new AjaxResult(code, msg, null);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
new file mode 100644
index 0000000..f7d5bf4
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -0,0 +1,114 @@
+package com.ruoyi.common.core.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * Entity基类
+ * 
+ * @author ruoyi
+ */
+public class BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 搜索值 */
+    private String searchValue;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    private Map<String, Object> params;
+
+    public String getSearchValue()
+    {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue)
+    {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateBy()
+    {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy()
+    {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime)
+    {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
new file mode 100644
index 0000000..a180a18
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -0,0 +1,79 @@
+package com.ruoyi.common.core.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tree基类
+ * 
+ * @author ruoyi
+ */
+public class TreeEntity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 父菜单名称 */
+    private String parentName;
+
+    /** 父菜单ID */
+    private Long parentId;
+
+    /** 显示顺序 */
+    private Integer orderNum;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 子部门 */
+    private List<?> children = new ArrayList<>();
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
+
+    public List<?> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<?> children)
+    {
+        this.children = children;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
new file mode 100644
index 0000000..bd835db
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@@ -0,0 +1,77 @@
+package com.ruoyi.common.core.domain;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+
+/**
+ * Treeselect树结构实体类
+ * 
+ * @author ruoyi
+ */
+public class TreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelect> children;
+
+    public TreeSelect()
+    {
+
+    }
+
+    public TreeSelect(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public TreeSelect(SysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    public List<TreeSelect> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelect> children)
+    {
+        this.children = children;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
new file mode 100644
index 0000000..c9238e2
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -0,0 +1,202 @@
+package com.ruoyi.common.core.domain.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 部门表 sys_dept
+ * 
+ * @author ruoyi
+ */
+public class SysDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 父部门ID */
+    private Long parentId;
+
+    /** 祖级列表 */
+    private String ancestors;
+
+    /** 部门名称 */
+    private String deptName;
+
+    /** 显示顺序 */
+    private String orderNum;
+
+    /** 负责人 */
+    private String leader;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 邮箱 */
+    private String email;
+
+    /** 部门状态:0正常,1停用 */
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 父部门名称 */
+    private String parentName;
+    
+    /** 子部门 */
+    private List<SysDept> children = new ArrayList<SysDept>();
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
+
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    @NotBlank(message = "显示顺序不能为空")
+    public String getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    public String getLeader()
+    {
+        return leader;
+    }
+
+    public void setLeader(String leader)
+    {
+        this.leader = leader;
+    }
+
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    public String getPhone()
+    {
+        return phone;
+    }
+
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public List<SysDept> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<SysDept> children)
+    {
+        this.children = children;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deptId", getDeptId())
+            .append("parentId", getParentId())
+            .append("ancestors", getAncestors())
+            .append("deptName", getDeptName())
+            .append("orderNum", getOrderNum())
+            .append("leader", getLeader())
+            .append("phone", getPhone())
+            .append("email", getEmail())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
new file mode 100644
index 0000000..3f152b3
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -0,0 +1,176 @@
+package com.ruoyi.common.core.domain.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 字典数据表 sys_dict_data
+ * 
+ * @author ruoyi
+ */
+public class SysDictData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    private Long dictCode;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    private Long dictSort;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    private String cssClass;
+
+    /** 表格字典样式 */
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    private String isDefault;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictCode()
+    {
+        return dictCode;
+    }
+
+    public void setDictCode(Long dictCode)
+    {
+        this.dictCode = dictCode;
+    }
+
+    public Long getDictSort()
+    {
+        return dictSort;
+    }
+
+    public void setDictSort(Long dictSort)
+    {
+        this.dictSort = dictSort;
+    }
+
+    @NotBlank(message = "字典标签不能为空")
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+    public String getDictLabel()
+    {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel)
+    {
+        this.dictLabel = dictLabel;
+    }
+
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    public String getDictValue()
+    {
+        return dictValue;
+    }
+
+    public void setDictValue(String dictValue)
+    {
+        this.dictValue = dictValue;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+    public String getCssClass()
+    {
+        return cssClass;
+    }
+
+    public void setCssClass(String cssClass)
+    {
+        this.cssClass = cssClass;
+    }
+
+    public String getListClass()
+    {
+        return listClass;
+    }
+
+    public void setListClass(String listClass)
+    {
+        this.listClass = listClass;
+    }
+
+    public boolean getDefault()
+    {
+        return UserConstants.YES.equals(this.isDefault) ? true : false;
+    }
+
+    public String getIsDefault()
+    {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault)
+    {
+        this.isDefault = isDefault;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictCode", getDictCode())
+            .append("dictSort", getDictSort())
+            .append("dictLabel", getDictLabel())
+            .append("dictValue", getDictValue())
+            .append("dictType", getDictType())
+            .append("cssClass", getCssClass())
+            .append("listClass", getListClass())
+            .append("isDefault", getIsDefault())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
new file mode 100644
index 0000000..d2c4249
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -0,0 +1,94 @@
+package com.ruoyi.common.core.domain.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 字典类型表 sys_dict_type
+ * 
+ * @author ruoyi
+ */
+public class SysDictType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典主键 */
+    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    private Long dictId;
+
+    /** 字典名称 */
+    @Excel(name = "字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictId()
+    {
+        return dictId;
+    }
+
+    public void setDictId(Long dictId)
+    {
+        this.dictId = dictId;
+    }
+
+    @NotBlank(message = "字典名称不能为空")
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+    public String getDictName()
+    {
+        return dictName;
+    }
+
+    public void setDictName(String dictName)
+    {
+        this.dictName = dictName;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictId", getDictId())
+            .append("dictName", getDictName())
+            .append("dictType", getDictType())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
new file mode 100644
index 0000000..94d654a
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -0,0 +1,245 @@
+package com.ruoyi.common.core.domain.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 菜单权限表 sys_menu
+ * 
+ * @author ruoyi
+ */
+public class SysMenu extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    /** 菜单名称 */
+    private String menuName;
+
+    /** 父菜单名称 */
+    private String parentName;
+
+    /** 父菜单ID */
+    private Long parentId;
+
+    /** 显示顺序 */
+    private String orderNum;
+
+    /** 路由地址 */
+    private String path;
+
+    /** 组件路径 */
+    private String component;
+
+    /** 是否为外链（0是 1否） */
+    private String isFrame;
+
+    /** 是否缓存（0缓存 1不缓存） */
+    private String isCache;
+
+    /** 类型（M目录 C菜单 F按钮） */
+    private String menuType;
+
+    /** 显示状态（0显示 1隐藏） */
+    private String visible;
+    
+    /** 菜单状态（0显示 1隐藏） */
+    private String status;
+
+    /** 权限字符串 */
+    private String perms;
+
+    /** 菜单图标 */
+    private String icon;
+
+    /** 子菜单 */
+    private List<SysMenu> children = new ArrayList<SysMenu>();
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    @NotBlank(message = "菜单名称不能为空")
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+    public String getMenuName()
+    {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName)
+    {
+        this.menuName = menuName;
+    }
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    @NotBlank(message = "显示顺序不能为空")
+    public String getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+    public String getComponent()
+    {
+        return component;
+    }
+
+    public void setComponent(String component)
+    {
+        this.component = component;
+    }
+
+    public String getIsFrame()
+    {
+        return isFrame;
+    }
+
+    public void setIsFrame(String isFrame)
+    {
+        this.isFrame = isFrame;
+    }
+
+    public String getIsCache()
+    {
+        return isCache;
+    }
+
+    public void setIsCache(String isCache)
+    {
+        this.isCache = isCache;
+    }
+
+    @NotBlank(message = "菜单类型不能为空")
+    public String getMenuType()
+    {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType)
+    {
+        this.menuType = menuType;
+    }
+
+    public String getVisible()
+    {
+        return visible;
+    }
+
+    public void setVisible(String visible)
+    {
+        this.visible = visible;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+    public String getPerms()
+    {
+        return perms;
+    }
+
+    public void setPerms(String perms)
+    {
+        this.perms = perms;
+    }
+
+    public String getIcon()
+    {
+        return icon;
+    }
+
+    public void setIcon(String icon)
+    {
+        this.icon = icon;
+    }
+
+    public List<SysMenu> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<SysMenu> children)
+    {
+        this.children = children;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("menuId", getMenuId())
+            .append("menuName", getMenuName())
+            .append("parentId", getParentId())
+            .append("orderNum", getOrderNum())
+            .append("path", getPath())
+            .append("component", getComponent())
+            .append("isFrame", getIsFrame())
+            .append("IsCache", getIsCache())
+            .append("menuType", getMenuType())
+            .append("visible", getVisible())
+            .append("status ", getStatus())
+            .append("perms", getPerms())
+            .append("icon", getIcon())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
new file mode 100644
index 0000000..36629eb
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -0,0 +1,226 @@
+package com.ruoyi.common.core.domain.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 角色表 sys_role
+ * 
+ * @author ruoyi
+ */
+public class SysRole extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    private Long roleId;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    /** 角色权限 */
+    @Excel(name = "角色权限")
+    private String roleKey;
+
+    /** 角色排序 */
+    @Excel(name = "角色排序")
+    private String roleSort;
+
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+    private String dataScope;
+
+    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    private boolean menuCheckStrictly;
+
+    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    private boolean deptCheckStrictly;
+
+    /** 角色状态（0正常 1停用） */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 用户是否存在此角色标识 默认不存在 */
+    private boolean flag = false;
+
+    /** 菜单组 */
+    private Long[] menuIds;
+
+    /** 部门组（数据权限） */
+    private Long[] deptIds;
+
+    public SysRole()
+    {
+
+    }
+
+    public SysRole(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.roleId);
+    }
+
+    public static boolean isAdmin(Long roleId)
+    {
+        return roleId != null && 1L == roleId;
+    }
+
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+    public String getRoleName()
+    {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName)
+    {
+        this.roleName = roleName;
+    }
+
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+    public String getRoleKey()
+    {
+        return roleKey;
+    }
+
+    public void setRoleKey(String roleKey)
+    {
+        this.roleKey = roleKey;
+    }
+
+    @NotBlank(message = "显示顺序不能为空")
+    public String getRoleSort()
+    {
+        return roleSort;
+    }
+
+    public void setRoleSort(String roleSort)
+    {
+        this.roleSort = roleSort;
+    }
+
+    public String getDataScope()
+    {
+        return dataScope;
+    }
+
+    public void setDataScope(String dataScope)
+    {
+        this.dataScope = dataScope;
+    }
+
+    public boolean isMenuCheckStrictly()
+    {
+        return menuCheckStrictly;
+    }
+
+    public void setMenuCheckStrictly(boolean menuCheckStrictly)
+    {
+        this.menuCheckStrictly = menuCheckStrictly;
+    }
+
+    public boolean isDeptCheckStrictly()
+    {
+        return deptCheckStrictly;
+    }
+
+    public void setDeptCheckStrictly(boolean deptCheckStrictly)
+    {
+        this.deptCheckStrictly = deptCheckStrictly;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public boolean isFlag()
+    {
+        return flag;
+    }
+
+    public void setFlag(boolean flag)
+    {
+        this.flag = flag;
+    }
+
+    public Long[] getMenuIds()
+    {
+        return menuIds;
+    }
+
+    public void setMenuIds(Long[] menuIds)
+    {
+        this.menuIds = menuIds;
+    }
+
+    public Long[] getDeptIds()
+    {
+        return deptIds;
+    }
+
+    public void setDeptIds(Long[] deptIds)
+    {
+        this.deptIds = deptIds;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("roleName", getRoleName())
+            .append("roleKey", getRoleKey())
+            .append("roleSort", getRoleSort())
+            .append("dataScope", getDataScope())
+            .append("menuCheckStrictly", isMenuCheckStrictly())
+            .append("deptCheckStrictly", isDeptCheckStrictly())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
new file mode 100644
index 0000000..dc03436
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -0,0 +1,365 @@
+package com.ruoyi.common.core.domain.entity;
+
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.Excel.Type;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author ruoyi
+ */
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Type.IMPORT)
+    private Long deptId;
+
+    /** 用户账号 */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 盐加密 */
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Type.EXPORT)
+    private String loginIp;
+
+    /** 最后登录时间 */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    private Date loginDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+    })
+    private SysDept dept;
+
+    /** 角色对象 */
+    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    /** 角色ID */
+    private Long roleId;
+
+//    行政代码
+    private Long distictId;
+
+//    运营商id
+    private Long providerId;
+
+    public SysUser()
+    {
+
+    }
+
+    public SysUser(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    @JsonIgnore
+    @JsonProperty
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getSalt()
+    {
+        return salt;
+    }
+
+    public void setSalt(String salt)
+    {
+        this.salt = salt;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
+
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+    }
+
+    public List<SysRole> getRoles()
+    {
+        return roles;
+    }
+
+    public void setRoles(List<SysRole> roles)
+    {
+        this.roles = roles;
+    }
+
+    public Long[] getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(Long[] roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public Long[] getPostIds()
+    {
+        return postIds;
+    }
+
+    public void setPostIds(Long[] postIds)
+    {
+        this.postIds = postIds;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("userName", getUserName())
+            .append("nickName", getNickName())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("salt", getSalt())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("dept", getDept())
+            .append("distict", getDistictId())
+            .append("provider", getProviderId())
+            .toString();
+    }
+
+    public Long getDistictId() {
+        return distictId;
+    }
+
+    public void setDistictId(Long distictId) {
+        this.distictId = distictId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
new file mode 100644
index 0000000..03948b4
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -0,0 +1,69 @@
+package com.ruoyi.common.core.domain.model;
+
+/**
+ * 用户登录对象
+ * 
+ * @author ruoyi
+ */
+public class LoginBody
+{
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    private String uuid = "";
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(String uuid)
+    {
+        this.uuid = uuid;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
new file mode 100644
index 0000000..a8a0d0f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -0,0 +1,266 @@
+package com.ruoyi.common.core.domain.model;
+
+import java.util.Collection;
+import java.util.Set;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.core.domain.entity.SysUser;
+
+/**
+ * 登录用户身份权限
+ * 
+ * @author ruoyi
+ */
+public class LoginUser implements UserDetails
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 权限列表
+     */
+    private Set<String> permissions;
+
+    /**
+     * 用户信息
+     */
+    private SysUser user;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public String getToken()
+    {
+        return token;
+    }
+
+    public void setToken(String token)
+    {
+        this.token = token;
+    }
+
+    public LoginUser()
+    {
+    }
+
+    public LoginUser(SysUser user, Set<String> permissions)
+    {
+        this.user = user;
+        this.permissions = permissions;
+    }
+
+    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    {
+        this.userId = userId;
+        this.deptId = deptId;
+        this.user = user;
+        this.permissions = permissions;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getPassword()
+    {
+        return user.getPassword();
+    }
+
+    @Override
+    public String getUsername()
+    {
+        return user.getUserName();
+    }
+
+    /**
+     * 账户是否未过期,过期无法验证
+     */
+    @JsonIgnore
+    @Override
+    public boolean isAccountNonExpired()
+    {
+        return true;
+    }
+
+    /**
+     * 指定用户是否解锁,锁定的用户无法进行身份验证
+     * 
+     * @return
+     */
+    @JsonIgnore
+    @Override
+    public boolean isAccountNonLocked()
+    {
+        return true;
+    }
+
+    /**
+     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+     * 
+     * @return
+     */
+    @JsonIgnore
+    @Override
+    public boolean isCredentialsNonExpired()
+    {
+        return true;
+    }
+
+    /**
+     * 是否可用 ,禁用的用户不能身份验证
+     * 
+     * @return
+     */
+    @JsonIgnore
+    @Override
+    public boolean isEnabled()
+    {
+        return true;
+    }
+
+    public Long getLoginTime()
+    {
+        return loginTime;
+    }
+
+    public void setLoginTime(Long loginTime)
+    {
+        this.loginTime = loginTime;
+    }
+
+    public String getIpaddr()
+    {
+        return ipaddr;
+    }
+
+    public void setIpaddr(String ipaddr)
+    {
+        this.ipaddr = ipaddr;
+    }
+
+    public String getLoginLocation()
+    {
+        return loginLocation;
+    }
+
+    public void setLoginLocation(String loginLocation)
+    {
+        this.loginLocation = loginLocation;
+    }
+
+    public String getBrowser()
+    {
+        return browser;
+    }
+
+    public void setBrowser(String browser)
+    {
+        this.browser = browser;
+    }
+
+    public String getOs()
+    {
+        return os;
+    }
+
+    public void setOs(String os)
+    {
+        this.os = os;
+    }
+
+    public Long getExpireTime()
+    {
+        return expireTime;
+    }
+
+    public void setExpireTime(Long expireTime)
+    {
+        this.expireTime = expireTime;
+    }
+
+    public Set<String> getPermissions()
+    {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions)
+    {
+        this.permissions = permissions;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities()
+    {
+        return null;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
new file mode 100644
index 0000000..868a1fc
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@@ -0,0 +1,11 @@
+package com.ruoyi.common.core.domain.model;
+
+/**
+ * 用户注册对象
+ * 
+ * @author ruoyi
+ */
+public class RegisterBody extends LoginBody
+{
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
new file mode 100644
index 0000000..b9d5e6e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@@ -0,0 +1,84 @@
+package com.ruoyi.common.core.page;
+
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 分页数据
+ * 
+ * @author ruoyi
+ */
+public class PageDomain
+{
+    /** 当前记录起始索引 */
+    private Integer pageNum;
+
+    /** 每页显示记录数 */
+    private Integer pageSize;
+
+    /** 排序列 */
+    private String orderByColumn;
+
+    /** 排序的方向desc或者asc */
+    private String isAsc = "asc";
+
+    public String getOrderBy()
+    {
+        if (StringUtils.isEmpty(orderByColumn))
+        {
+            return "";
+        }
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+    }
+
+    public Integer getPageNum()
+    {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum)
+    {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderByColumn()
+    {
+        return orderByColumn;
+    }
+
+    public void setOrderByColumn(String orderByColumn)
+    {
+        this.orderByColumn = orderByColumn;
+    }
+
+    public String getIsAsc()
+    {
+        return isAsc;
+    }
+
+    public void setIsAsc(String isAsc)
+    {
+        if (StringUtils.isNotEmpty(isAsc))
+        {
+            // 兼容前端排序类型
+            if ("ascending".equals(isAsc))
+            {
+                isAsc = "asc";
+            }
+            else if ("descending".equals(isAsc))
+            {
+                isAsc = "desc";
+            }
+            this.isAsc = isAsc;
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
new file mode 100644
index 0000000..847685b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@@ -0,0 +1,85 @@
+package com.ruoyi.common.core.page;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 表格分页数据对象
+ * 
+ * @author ruoyi
+ */
+public class TableDataInfo implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 总记录数 */
+    private long total;
+
+    /** 列表数据 */
+    private List<?> rows;
+
+    /** 消息状态码 */
+    private int code;
+
+    /** 消息内容 */
+    private String msg;
+
+    /**
+     * 表格数据对象
+     */
+    public TableDataInfo()
+    {
+    }
+
+    /**
+     * 分页
+     * 
+     * @param list 列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<?> list, int total)
+    {
+        this.rows = list;
+        this.total = total;
+    }
+
+    public long getTotal()
+    {
+        return total;
+    }
+
+    public void setTotal(long total)
+    {
+        this.total = total;
+    }
+
+    public List<?> getRows()
+    {
+        return rows;
+    }
+
+    public void setRows(List<?> rows)
+    {
+        this.rows = rows;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+
+    public void setCode(int code)
+    {
+        this.code = code;
+    }
+
+    public String getMsg()
+    {
+        return msg;
+    }
+
+    public void setMsg(String msg)
+    {
+        this.msg = msg;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
new file mode 100644
index 0000000..14eb1e1
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
@@ -0,0 +1,49 @@
+package com.ruoyi.common.core.page;
+
+import com.ruoyi.common.utils.ServletUtils;
+
+/**
+ * 表格数据处理
+ * 
+ * @author ruoyi
+ */
+public class TableSupport
+{
+    /**
+     * 当前记录起始索引
+     */
+    public static final String PAGE_NUM = "pageNum";
+
+    /**
+     * 每页显示记录数
+     */
+    public static final String PAGE_SIZE = "pageSize";
+
+    /**
+     * 排序列
+     */
+    public static final String ORDER_BY_COLUMN = "orderByColumn";
+
+    /**
+     * 排序的方向 "desc" 或者 "asc".
+     */
+    public static final String IS_ASC = "isAsc";
+
+    /**
+     * 封装分页对象
+     */
+    public static PageDomain getPageDomain()
+    {
+        PageDomain pageDomain = new PageDomain();
+        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
+        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
+        pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
+        pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
+        return pageDomain;
+    }
+
+    public static PageDomain buildPageRequest()
+    {
+        return getPageDomain();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
new file mode 100644
index 0000000..22a610d
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -0,0 +1,234 @@
+package com.ruoyi.common.core.redis;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+/**
+ * spring redis 工具类
+ *
+ * @author ruoyi
+ **/
+@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@Component
+public class RedisCache
+{
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     */
+    public <T> void setCacheObject(final String key, final T value)
+    {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     * @param timeout 时间
+     * @param timeUnit 时间颗粒度
+     */
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+    {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout)
+    {
+        return expire(key, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @param unit 时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+    {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> T getCacheObject(final String key)
+    {
+        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+        return operation.get(key);
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean deleteObject(final String key)
+    {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     * @return
+     */
+    public long deleteObject(final Collection collection)
+    {
+        return redisTemplate.delete(collection);
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key 缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public <T> long setCacheList(final String key, final List<T> dataList)
+    {
+        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+        return count == null ? 0 : count;
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> List<T> getCacheList(final String key)
+    {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key 缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+    {
+        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+        Iterator<T> it = dataSet.iterator();
+        while (it.hasNext())
+        {
+            setOperation.add(it.next());
+        }
+        return setOperation;
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key)
+    {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key
+     * @param dataMap
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+    {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key
+     * @return
+     */
+    public <T> Map<String, T> getCacheMap(final String key)
+    {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+    {
+        redisTemplate.opsForHash().put(key, hKey, value);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public <T> T getCacheMapValue(final String key, final String hKey)
+    {
+        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+        return opsForHash.get(key, hKey);
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+    {
+        return redisTemplate.opsForHash().multiGet(key, hKeys);
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public Collection<String> keys(final String pattern)
+    {
+        return redisTemplate.keys(pattern);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
new file mode 100644
index 0000000..84124aa
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -0,0 +1,86 @@
+package com.ruoyi.common.core.text;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 字符集工具类
+ * 
+ * @author ruoyi
+ */
+public class CharsetKit
+{
+    /** ISO-8859-1 */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+    /** UTF-8 */
+    public static final String UTF_8 = "UTF-8";
+    /** GBK */
+    public static final String GBK = "GBK";
+
+    /** ISO-8859-1 */
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+    /** UTF-8 */
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    /** GBK */
+    public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+    /**
+     * 转换为Charset对象
+     * 
+     * @param charset 字符集，为空则返回默认字符集
+     * @return Charset
+     */
+    public static Charset charset(String charset)
+    {
+        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     * 
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, String srcCharset, String destCharset)
+    {
+        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+    }
+
+    /**
+     * 转换字符串的字符集编码
+     * 
+     * @param source 字符串
+     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param destCharset 目标字符集，默认UTF-8
+     * @return 转换后的字符集
+     */
+    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    {
+        if (null == srcCharset)
+        {
+            srcCharset = StandardCharsets.ISO_8859_1;
+        }
+
+        if (null == destCharset)
+        {
+            destCharset = StandardCharsets.UTF_8;
+        }
+
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        {
+            return source;
+        }
+        return new String(source.getBytes(srcCharset), destCharset);
+    }
+
+    /**
+     * @return 系统字符集编码
+     */
+    public static String systemCharset()
+    {
+        return Charset.defaultCharset().name();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
new file mode 100644
index 0000000..1fb7461
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -0,0 +1,1005 @@
+package com.ruoyi.common.core.text;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+import com.ruoyi.common.utils.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+/**
+ * 类型转换器
+ *
+ * @author ruoyi
+ */
+public class Convert
+{
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static String toStr(Object value, String defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof String)
+        {
+            return (String) value;
+        }
+        return value.toString();
+    }
+
+    /**
+     * 转换为字符串<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static String toStr(Object value)
+    {
+        return toStr(value, null);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为null，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Character toChar(Object value, Character defaultValue)
+    {
+        if (null == value)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Character)
+        {
+            return (Character) value;
+        }
+
+        final String valueStr = toStr(value, null);
+        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+    }
+
+    /**
+     * 转换为字符<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Character toChar(Object value)
+    {
+        return toChar(value, null);
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Byte toByte(Object value, Byte defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Byte)
+        {
+            return (Byte) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).byteValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Byte.parseByte(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为byte<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Byte toByte(Object value)
+    {
+        return toByte(value, null);
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Short toShort(Object value, Short defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Short)
+        {
+            return (Short) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).shortValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Short.parseShort(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Short<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Short toShort(Object value)
+    {
+        return toShort(value, null);
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Number toNumber(Object value, Number defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Number)
+        {
+            return (Number) value;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return NumberFormat.getInstance().parse(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Number<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Number toNumber(Object value)
+    {
+        return toNumber(value, null);
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Integer toInt(Object value, Integer defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Integer)
+        {
+            return (Integer) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).intValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Integer.parseInt(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为int<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Integer toInt(Object value)
+    {
+        return toInt(value, null);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String str)
+    {
+        return toIntArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str)
+    {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Integer数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static Integer[] toIntArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Integer[] {};
+        }
+        String[] arr = str.split(split);
+        final Integer[] ints = new Integer[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Integer v = toInt(arr[i], 0);
+            ints[i] = v;
+        }
+        return ints;
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str)
+    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new Long[] {};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++)
+        {
+            final Long v = toLong(arr[i], null);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str)
+    {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param split 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str)
+    {
+        return str.split(split);
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Long toLong(Object value, Long defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Long)
+        {
+            return (Long) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).longValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).longValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为long<br>
+     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Long toLong(Object value)
+    {
+        return toLong(value, null);
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Double toDouble(Object value, Double defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Double)
+        {
+            return (Double) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).doubleValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            // 支持科学计数法
+            return new BigDecimal(valueStr.trim()).doubleValue();
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为double<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Double toDouble(Object value)
+    {
+        return toDouble(value, null);
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Float toFloat(Object value, Float defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Float)
+        {
+            return (Float) value;
+        }
+        if (value instanceof Number)
+        {
+            return ((Number) value).floatValue();
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Float.parseFloat(valueStr.trim());
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Float<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Float toFloat(Object value)
+    {
+        return toFloat(value, null);
+    }
+
+    /**
+     * 转换为boolean<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value, Boolean defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof Boolean)
+        {
+            return (Boolean) value;
+        }
+        String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        valueStr = valueStr.trim().toLowerCase();
+        switch (valueStr)
+        {
+            case "true":
+                return true;
+            case "false":
+                return false;
+            case "yes":
+                return true;
+            case "ok":
+                return true;
+            case "no":
+                return false;
+            case "1":
+                return true;
+            case "0":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为boolean<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static Boolean toBool(Object value)
+    {
+        return toBool(value, null);
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @param defaultValue 默认值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (clazz.isAssignableFrom(value.getClass()))
+        {
+            @SuppressWarnings("unchecked")
+            E myE = (E) value;
+            return myE;
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return Enum.valueOf(clazz, valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为Enum对象<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     *
+     * @param clazz Enum的Class
+     * @param value 值
+     * @return Enum
+     */
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value)
+    {
+        return toEnum(clazz, value, null);
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigInteger)
+        {
+            return (BigInteger) value;
+        }
+        if (value instanceof Long)
+        {
+            return BigInteger.valueOf((Long) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigInteger(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigInteger<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigInteger toBigInteger(Object value)
+    {
+        return toBigInteger(value, null);
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @param defaultValue 转换错误时的默认值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
+    {
+        if (value == null)
+        {
+            return defaultValue;
+        }
+        if (value instanceof BigDecimal)
+        {
+            return (BigDecimal) value;
+        }
+        if (value instanceof Long)
+        {
+            return new BigDecimal((Long) value);
+        }
+        if (value instanceof Double)
+        {
+            return new BigDecimal((Double) value);
+        }
+        if (value instanceof Integer)
+        {
+            return new BigDecimal((Integer) value);
+        }
+        final String valueStr = toStr(value, null);
+        if (StringUtils.isEmpty(valueStr))
+        {
+            return defaultValue;
+        }
+        try
+        {
+            return new BigDecimal(valueStr);
+        }
+        catch (Exception e)
+        {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * 转换为BigDecimal<br>
+     * 如果给定的值为空，或者转换失败，返回默认值<br>
+     * 转换失败不会报错
+     *
+     * @param value 被转换的值
+     * @return 结果
+     */
+    public static BigDecimal toBigDecimal(Object value)
+    {
+        return toBigDecimal(value, null);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @return 字符串
+     */
+    public static String utf8Str(Object obj)
+    {
+        return str(obj, CharsetKit.CHARSET_UTF_8);
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charsetName 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, String charsetName)
+    {
+        return str(obj, Charset.forName(charsetName));
+    }
+
+    /**
+     * 将对象转为字符串<br>
+     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+     *
+     * @param obj 对象
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(Object obj, Charset charset)
+    {
+        if (null == obj)
+        {
+            return null;
+        }
+
+        if (obj instanceof String)
+        {
+            return (String) obj;
+        }
+        else if (obj instanceof byte[])
+        {
+            return str((byte[]) obj, charset);
+        }
+        else if (obj instanceof Byte[])
+        {
+            byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
+            return str(bytes, charset);
+        }
+        else if (obj instanceof ByteBuffer)
+        {
+            return str((ByteBuffer) obj, charset);
+        }
+        return obj.toString();
+    }
+
+    /**
+     * 将byte数组转为字符串
+     *
+     * @param bytes byte数组
+     * @param charset 字符集
+     * @return 字符串
+     */
+    public static String str(byte[] bytes, String charset)
+    {
+        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+    }
+
+    /**
+     * 解码字节码
+     *
+     * @param data 字符串
+     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
+     * @return 解码后的字符串
+     */
+    public static String str(byte[] data, Charset charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        if (null == charset)
+        {
+            return new String(data);
+        }
+        return new String(data, charset);
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, String charset)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        return str(data, Charset.forName(charset));
+    }
+
+    /**
+     * 将编码的byteBuffer数据转换为字符串
+     *
+     * @param data 数据
+     * @param charset 字符集，如果为空使用当前系统字符集
+     * @return 字符串
+     */
+    public static String str(ByteBuffer data, Charset charset)
+    {
+        if (null == charset)
+        {
+            charset = Charset.defaultCharset();
+        }
+        return charset.decode(data).toString();
+    }
+
+    // ----------------------------------------------------------------------- 全角半角转换
+    /**
+     * 半角转全角
+     *
+     * @param input String.
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input)
+    {
+        return toSBC(input, null);
+    }
+
+    /**
+     * 半角转全角
+     *
+     * @param input String
+     * @param notConvertSet 不替换的字符集合
+     * @return 全角字符串.
+     */
+    public static String toSBC(String input, Set<Character> notConvertSet)
+    {
+        char c[] = input.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == ' ')
+            {
+                c[i] = '\u3000';
+            }
+            else if (c[i] < '\177')
+            {
+                c[i] = (char) (c[i] + 65248);
+
+            }
+        }
+        return new String(c);
+    }
+
+    /**
+     * 全角转半角
+     *
+     * @param input String.
+     * @return 半角字符串
+     */
+    public static String toDBC(String input)
+    {
+        return toDBC(input, null);
+    }
+
+    /**
+     * 替换全角为半角
+     *
+     * @param text 文本
+     * @param notConvertSet 不替换的字符集合
+     * @return 替换后的字符
+     */
+    public static String toDBC(String text, Set<Character> notConvertSet)
+    {
+        char c[] = text.toCharArray();
+        for (int i = 0; i < c.length; i++)
+        {
+            if (null != notConvertSet && notConvertSet.contains(c[i]))
+            {
+                // 跳过不替换的字符
+                continue;
+            }
+
+            if (c[i] == '\u3000')
+            {
+                c[i] = ' ';
+            }
+            else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
+            {
+                c[i] = (char) (c[i] - 65248);
+            }
+        }
+        String returnString = new String(c);
+
+        return returnString;
+    }
+
+    /**
+     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+     *
+     * @param n 数字
+     * @return 中文大写数字
+     */
+    public static String digitUppercase(double n)
+    {
+        String[] fraction = { "角", "分" };
+        String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
+        String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
+
+        String head = n < 0 ? "负" : "";
+        n = Math.abs(n);
+
+        String s = "";
+        for (int i = 0; i < fraction.length; i++)
+        {
+            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+        }
+        if (s.length() < 1)
+        {
+            s = "整";
+        }
+        int integerPart = (int) Math.floor(n);
+
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++)
+        {
+            String p = "";
+            for (int j = 0; j < unit[1].length && n > 0; j++)
+            {
+                p = digit[integerPart % 10] + unit[1][j] + p;
+                integerPart = integerPart / 10;
+            }
+            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+        }
+        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
new file mode 100644
index 0000000..c78ac77
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
@@ -0,0 +1,92 @@
+package com.ruoyi.common.core.text;
+
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 字符串格式化
+ * 
+ * @author ruoyi
+ */
+public class StrFormatter
+{
+    public static final String EMPTY_JSON = "{}";
+    public static final char C_BACKSLASH = '\\';
+    public static final char C_DELIM_START = '{';
+    public static final char C_DELIM_END = '}';
+
+    /**
+     * 格式化字符串<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     * 
+     * @param strPattern 字符串模板
+     * @param argArray 参数列表
+     * @return 结果
+     */
+    public static String format(final String strPattern, final Object... argArray)
+    {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
+        {
+            return strPattern;
+        }
+        final int strPatternLength = strPattern.length();
+
+        // 初始化定义好的长度以获得更好的性能
+        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
+
+        int handledPosition = 0;
+        int delimIndex;// 占位符所在位置
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
+        {
+            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
+            if (delimIndex == -1)
+            {
+                if (handledPosition == 0)
+                {
+                    return strPattern;
+                }
+                else
+                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+                    sbuf.append(strPattern, handledPosition, strPatternLength);
+                    return sbuf.toString();
+                }
+            }
+            else
+            {
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
+                {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
+                    {
+                        // 转义符之前还有一个转义符，占位符依旧有效
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                        handledPosition = delimIndex + 2;
+                    }
+                    else
+                    {
+                        // 占位符被转义
+                        argIndex--;
+                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
+                        sbuf.append(C_DELIM_START);
+                        handledPosition = delimIndex + 1;
+                    }
+                }
+                else
+                {
+                    // 正常占位符
+                    sbuf.append(strPattern, handledPosition, delimIndex);
+                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
+                    handledPosition = delimIndex + 2;
+                }
+            }
+        }
+        // 加入最后一个占位符后所有的字符
+        sbuf.append(strPattern, handledPosition, strPattern.length());
+
+        return sbuf.toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
new file mode 100644
index 0000000..10b7306
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
@@ -0,0 +1,20 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 操作状态
+ * 
+ * @author ruoyi
+ *
+ */
+public enum BusinessStatus
+{
+    /**
+     * 成功
+     */
+    SUCCESS,
+
+    /**
+     * 失败
+     */
+    FAIL,
+}
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
new file mode 100644
index 0000000..2e17c4a
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
@@ -0,0 +1,59 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 业务操作类型
+ * 
+ * @author ruoyi
+ */
+public enum BusinessType
+{
+    /**
+     * 其它
+     */
+    OTHER,
+
+    /**
+     * 新增
+     */
+    INSERT,
+
+    /**
+     * 修改
+     */
+    UPDATE,
+
+    /**
+     * 删除
+     */
+    DELETE,
+
+    /**
+     * 授权
+     */
+    GRANT,
+
+    /**
+     * 导出
+     */
+    EXPORT,
+
+    /**
+     * 导入
+     */
+    IMPORT,
+
+    /**
+     * 强退
+     */
+    FORCE,
+
+    /**
+     * 生成代码
+     */
+    GENCODE,
+    
+    /**
+     * 清空数据
+     */
+    CLEAN,
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
new file mode 100644
index 0000000..0d945be
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -0,0 +1,19 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 数据源
+ * 
+ * @author ruoyi
+ */
+public enum DataSourceType
+{
+    /**
+     * 主库
+     */
+    MASTER,
+
+    /**
+     * 从库
+     */
+    SLAVE
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java
new file mode 100644
index 0000000..be6f739
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java
@@ -0,0 +1,36 @@
+package com.ruoyi.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.springframework.lang.Nullable;
+
+/**
+ * 请求方式
+ *
+ * @author ruoyi
+ */
+public enum HttpMethod
+{
+    GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
+
+    private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
+
+    static
+    {
+        for (HttpMethod httpMethod : values())
+        {
+            mappings.put(httpMethod.name(), httpMethod);
+        }
+    }
+
+    @Nullable
+    public static HttpMethod resolve(@Nullable String method)
+    {
+        return (method != null ? mappings.get(method) : null);
+    }
+
+    public boolean matches(String method)
+    {
+        return (this == resolve(method));
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
new file mode 100644
index 0000000..c609fd8
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
@@ -0,0 +1,20 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 限流类型
+ *
+ * @author ruoyi
+ */
+
+public enum LimitType
+{
+    /**
+     * 默认策略全局限流
+     */
+    DEFAULT,
+
+    /**
+     * 根据请求者IP进行限流
+     */
+    IP
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
new file mode 100644
index 0000000..bdd143c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
@@ -0,0 +1,24 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 操作人类别
+ * 
+ * @author ruoyi
+ */
+public enum OperatorType
+{
+    /**
+     * 其它
+     */
+    OTHER,
+
+    /**
+     * 后台用户
+     */
+    MANAGE,
+
+    /**
+     * 手机端用户
+     */
+    MOBILE
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java
new file mode 100644
index 0000000..d7ff44a
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java
@@ -0,0 +1,30 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 用户状态
+ * 
+ * @author ruoyi
+ */
+public enum UserStatus
+{
+    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+
+    private final String code;
+    private final String info;
+
+    UserStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
new file mode 100644
index 0000000..b9ee3af
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
@@ -0,0 +1,37 @@
+package com.ruoyi.common.exception;
+
+/**
+ * 自定义异常
+ *
+ * @author ruoyi
+ */
+public class CustomException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    private Integer code;
+
+    private String message;
+
+    public CustomException(String message) {
+        this.message = message;
+    }
+
+    public CustomException(String message, Integer code) {
+        this.message = message;
+        this.code = code;
+    }
+
+    public CustomException(String message, Throwable e) {
+        super(message, e);
+        this.message = message;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java
new file mode 100644
index 0000000..f6ad2ab
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java
@@ -0,0 +1,15 @@
+package com.ruoyi.common.exception;
+
+/**
+ * 演示模式异常
+ * 
+ * @author ruoyi
+ */
+public class DemoModeException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    public DemoModeException()
+    {
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
new file mode 100644
index 0000000..211441b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
@@ -0,0 +1,58 @@
+package com.ruoyi.common.exception;
+
+/**
+ * 全局异常
+ * 
+ * @author ruoyi
+ */
+public class GlobalException extends RuntimeException
+{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误提示
+     */
+    private String message;
+
+    /**
+     * 错误明细，内部调试错误
+     *
+     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     */
+    private String detailMessage;
+
+    /**
+     * 空构造方法，避免反序列化问题
+     */
+    public GlobalException()
+    {
+    }
+
+    public GlobalException(String message)
+    {
+        this.message = message;
+    }
+
+    public String getDetailMessage()
+    {
+        return detailMessage;
+    }
+
+    public GlobalException setDetailMessage(String detailMessage)
+    {
+        this.detailMessage = detailMessage;
+        return this;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public GlobalException setMessage(String message)
+    {
+        this.message = message;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
new file mode 100644
index 0000000..cce6052
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
@@ -0,0 +1,77 @@
+package com.ruoyi.common.exception;
+
+/**
+ * 业务异常
+ * 
+ * @author ruoyi
+ */
+public class ServiceException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误提示
+     */
+    private String message;
+
+    /**
+     * 错误明细，内部调试错误
+     *
+     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     */
+    private String detailMessage;
+
+    /**
+     * 空构造方法，避免反序列化问题
+     */
+    public ServiceException()
+    {
+    }
+
+    public ServiceException(String message)
+    {
+        this.message = message;
+    }
+
+    public ServiceException(String message, Integer code)
+    {
+        this.message = message;
+        this.code = code;
+    }
+
+    public String getDetailMessage()
+    {
+        return detailMessage;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public ServiceException setMessage(String message)
+    {
+        this.message = message;
+        return this;
+    }
+
+    public ServiceException setDetailMessage(String detailMessage)
+    {
+        this.detailMessage = detailMessage;
+        return this;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java
new file mode 100644
index 0000000..980fa46
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java
@@ -0,0 +1,26 @@
+package com.ruoyi.common.exception;
+
+/**
+ * 工具类异常
+ * 
+ * @author ruoyi
+ */
+public class UtilException extends RuntimeException
+{
+    private static final long serialVersionUID = 8247610319171014183L;
+
+    public UtilException(Throwable e)
+    {
+        super(e.getMessage(), e);
+    }
+
+    public UtilException(String message)
+    {
+        super(message);
+    }
+
+    public UtilException(String message, Throwable throwable)
+    {
+        super(message, throwable);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
new file mode 100644
index 0000000..b55d72e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
@@ -0,0 +1,97 @@
+package com.ruoyi.common.exception.base;
+
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 基础异常
+ * 
+ * @author ruoyi
+ */
+public class BaseException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属模块
+     */
+    private String module;
+
+    /**
+     * 错误码
+     */
+    private String code;
+
+    /**
+     * 错误码对应的参数
+     */
+    private Object[] args;
+
+    /**
+     * 错误消息
+     */
+    private String defaultMessage;
+
+    public BaseException(String module, String code, Object[] args, String defaultMessage)
+    {
+        this.module = module;
+        this.code = code;
+        this.args = args;
+        this.defaultMessage = defaultMessage;
+    }
+
+    public BaseException(String module, String code, Object[] args)
+    {
+        this(module, code, args, null);
+    }
+
+    public BaseException(String module, String defaultMessage)
+    {
+        this(module, null, null, defaultMessage);
+    }
+
+    public BaseException(String code, Object[] args)
+    {
+        this(null, code, args, null);
+    }
+
+    public BaseException(String defaultMessage)
+    {
+        this(null, null, null, defaultMessage);
+    }
+
+    @Override
+    public String getMessage()
+    {
+        String message = null;
+        if (!StringUtils.isEmpty(code))
+        {
+            message = MessageUtils.message(code, args);
+        }
+        if (message == null)
+        {
+            message = defaultMessage;
+        }
+        return message;
+    }
+
+    public String getModule()
+    {
+        return module;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public Object[] getArgs()
+    {
+        return args;
+    }
+
+    public String getDefaultMessage()
+    {
+        return defaultMessage;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
new file mode 100644
index 0000000..871f09b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
@@ -0,0 +1,19 @@
+package com.ruoyi.common.exception.file;
+
+import com.ruoyi.common.exception.base.BaseException;
+
+/**
+ * 文件信息异常类
+ * 
+ * @author ruoyi
+ */
+public class FileException extends BaseException
+{
+    private static final long serialVersionUID = 1L;
+
+    public FileException(String code, Object[] args)
+    {
+        super("file", code, args, null);
+    }
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
new file mode 100644
index 0000000..70e0ec9
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.file;
+
+/**
+ * 文件名称超长限制异常类
+ * 
+ * @author ruoyi
+ */
+public class FileNameLengthLimitExceededException extends FileException
+{
+    private static final long serialVersionUID = 1L;
+
+    public FileNameLengthLimitExceededException(int defaultFileNameLength)
+    {
+        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
new file mode 100644
index 0000000..ec6ab05
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.file;
+
+/**
+ * 文件名大小限制异常类
+ * 
+ * @author ruoyi
+ */
+public class FileSizeLimitExceededException extends FileException
+{
+    private static final long serialVersionUID = 1L;
+
+    public FileSizeLimitExceededException(long defaultMaxSize)
+    {
+        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
new file mode 100644
index 0000000..f1c8e83
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
@@ -0,0 +1,81 @@
+package com.ruoyi.common.exception.file;
+
+import java.util.Arrays;
+import org.apache.commons.fileupload.FileUploadException;
+
+/**
+ * 文件上传 误异常类
+ * 
+ * @author ruoyi
+ */
+public class InvalidExtensionException extends FileUploadException
+{
+    private static final long serialVersionUID = 1L;
+
+    private String[] allowedExtension;
+    private String extension;
+    private String filename;
+
+    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+    {
+        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+        this.allowedExtension = allowedExtension;
+        this.extension = extension;
+        this.filename = filename;
+    }
+
+    public String[] getAllowedExtension()
+    {
+        return allowedExtension;
+    }
+
+    public String getExtension()
+    {
+        return extension;
+    }
+
+    public String getFilename()
+    {
+        return filename;
+    }
+
+    public static class InvalidImageExtensionException extends InvalidExtensionException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+        {
+            super(allowedExtension, extension, filename);
+        }
+    }
+
+    public static class InvalidFlashExtensionException extends InvalidExtensionException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+        {
+            super(allowedExtension, extension, filename);
+        }
+    }
+
+    public static class InvalidMediaExtensionException extends InvalidExtensionException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+        {
+            super(allowedExtension, extension, filename);
+        }
+    }
+
+    public static class InvalidVideoExtensionException extends InvalidExtensionException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
+        {
+            super(allowedExtension, extension, filename);
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
new file mode 100644
index 0000000..a567b40
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
@@ -0,0 +1,34 @@
+package com.ruoyi.common.exception.job;
+
+/**
+ * 计划策略异常
+ * 
+ * @author ruoyi
+ */
+public class TaskException extends Exception
+{
+    private static final long serialVersionUID = 1L;
+
+    private Code code;
+
+    public TaskException(String msg, Code code)
+    {
+        this(msg, code, null);
+    }
+
+    public TaskException(String msg, Code code, Exception nestedEx)
+    {
+        super(msg, nestedEx);
+        this.code = code;
+    }
+
+    public Code getCode()
+    {
+        return code;
+    }
+
+    public enum Code
+    {
+        TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
new file mode 100644
index 0000000..389dbc7
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.user;
+
+/**
+ * 验证码错误异常类
+ * 
+ * @author ruoyi
+ */
+public class CaptchaException extends UserException
+{
+    private static final long serialVersionUID = 1L;
+
+    public CaptchaException()
+    {
+        super("user.jcaptcha.error", null);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
new file mode 100644
index 0000000..85f9486
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.user;
+
+/**
+ * 验证码失效异常类
+ * 
+ * @author ruoyi
+ */
+public class CaptchaExpireException extends UserException
+{
+    private static final long serialVersionUID = 1L;
+
+    public CaptchaExpireException()
+    {
+        super("user.jcaptcha.expire", null);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
new file mode 100644
index 0000000..c292d70
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
@@ -0,0 +1,18 @@
+package com.ruoyi.common.exception.user;
+
+import com.ruoyi.common.exception.base.BaseException;
+
+/**
+ * 用户信息异常类
+ * 
+ * @author ruoyi
+ */
+public class UserException extends BaseException
+{
+    private static final long serialVersionUID = 1L;
+
+    public UserException(String code, Object[] args)
+    {
+        super("user", code, args, null);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
new file mode 100644
index 0000000..a7f3e5f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.user;
+
+/**
+ * 用户密码不正确或不符合规范异常类
+ * 
+ * @author ruoyi
+ */
+public class UserPasswordNotMatchException extends UserException
+{
+    private static final long serialVersionUID = 1L;
+
+    public UserPasswordNotMatchException()
+    {
+        super("user.password.not.match", null);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
new file mode 100644
index 0000000..a1bcfe2
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
@@ -0,0 +1,52 @@
+package com.ruoyi.common.filter;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.MediaType;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * Repeatable 过滤器
+ * 
+ * @author ruoyi
+ */
+public class RepeatableFilter implements Filter
+{
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException
+    {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException
+    {
+        ServletRequest requestWrapper = null;
+        if (request instanceof HttpServletRequest
+                && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))
+        {
+            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
+        }
+        if (null == requestWrapper)
+        {
+            chain.doFilter(request, response);
+        }
+        else
+        {
+            chain.doFilter(requestWrapper, response);
+        }
+    }
+
+    @Override
+    public void destroy()
+    {
+
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
new file mode 100644
index 0000000..614c24c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
@@ -0,0 +1,75 @@
+package com.ruoyi.common.filter;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import com.ruoyi.common.utils.http.HttpHelper;
+
+/**
+ * 构建可重复读取inputStream的request
+ * 
+ * @author ruoyi
+ */
+public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
+{
+    private final byte[] body;
+
+    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException
+    {
+        super(request);
+        request.setCharacterEncoding("UTF-8");
+        response.setCharacterEncoding("UTF-8");
+
+        body = HttpHelper.getBodyString(request).getBytes("UTF-8");
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException
+    {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException
+    {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+        return new ServletInputStream()
+        {
+            @Override
+            public int read() throws IOException
+            {
+                return bais.read();
+            }
+
+            @Override
+            public int available() throws IOException
+            {
+                return body.length;
+            }
+
+            @Override
+            public boolean isFinished()
+            {
+                return false;
+            }
+
+            @Override
+            public boolean isReady()
+            {
+                return false;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener)
+            {
+
+            }
+        };
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
new file mode 100644
index 0000000..99323ed
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
@@ -0,0 +1,74 @@
+package com.ruoyi.common.filter;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 防止XSS攻击的过滤器
+ * 
+ * @author ruoyi
+ */
+public class XssFilter implements Filter
+{
+    /**
+     * 排除链接
+     */
+    public List<String> excludes = new ArrayList<>();
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException
+    {
+        String tempExcludes = filterConfig.getInitParameter("excludes");
+        if (StringUtils.isNotEmpty(tempExcludes))
+        {
+            String[] url = tempExcludes.split(",");
+            for (int i = 0; url != null && i < url.length; i++)
+            {
+                excludes.add(url[i]);
+            }
+        }
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException
+    {
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse resp = (HttpServletResponse) response;
+        if (handleExcludeURL(req, resp))
+        {
+            chain.doFilter(request, response);
+            return;
+        }
+        XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request);
+        chain.doFilter(xssRequest, response);
+    }
+
+    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response)
+    {
+        String url = request.getServletPath();
+        String method = request.getMethod();
+        // GET DELETE 不过滤
+        if (method == null || method.matches("GET") || method.matches("DELETE"))
+        {
+            return true;
+        }
+        return StringUtils.matches(url, excludes);
+    }
+
+    @Override
+    public void destroy()
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
new file mode 100644
index 0000000..4508c92
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
@@ -0,0 +1,104 @@
+package com.ruoyi.common.filter;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.html.EscapeUtil;
+
+/**
+ * XSS过滤处理
+ * 
+ * @author ruoyi
+ */
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
+{
+    /**
+     * @param request
+     */
+    public XssHttpServletRequestWrapper(HttpServletRequest request)
+    {
+        super(request);
+    }
+
+    @Override
+    public String[] getParameterValues(String name)
+    {
+        String[] values = super.getParameterValues(name);
+        if (values != null)
+        {
+            int length = values.length;
+            String[] escapseValues = new String[length];
+            for (int i = 0; i < length; i++)
+            {
+                // 防xss攻击和过滤前后空格
+                escapseValues[i] = EscapeUtil.clean(values[i]).trim();
+            }
+            return escapseValues;
+        }
+        return super.getParameterValues(name);
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException
+    {
+        // 非json类型，直接返回
+        if (!isJsonRequest())
+        {
+            return super.getInputStream();
+        }
+
+        // 为空，直接返回
+        String json = IOUtils.toString(super.getInputStream(), "utf-8");
+        if (StringUtils.isEmpty(json))
+        {
+            return super.getInputStream();
+        }
+
+        // xss过滤
+        json = EscapeUtil.clean(json).trim();
+        final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
+        return new ServletInputStream()
+        {
+            @Override
+            public boolean isFinished()
+            {
+                return true;
+            }
+
+            @Override
+            public boolean isReady()
+            {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener)
+            {
+            }
+
+            @Override
+            public int read() throws IOException
+            {
+                return bis.read();
+            }
+        };
+    }
+
+    /**
+     * 是否是Json请求
+     * 
+     * @param request
+     */
+    public boolean isJsonRequest()
+    {
+        String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
+        return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
new file mode 100644
index 0000000..b6326c2
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
@@ -0,0 +1,114 @@
+package com.ruoyi.common.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * 精确的浮点数运算
+ * 
+ * @author ruoyi
+ */
+public class Arith
+{
+
+    /** 默认除法运算精度 */
+    private static final int DEF_DIV_SCALE = 10;
+
+    /** 这个类不能实例化 */
+    private Arith()
+    {
+    }
+
+    /**
+     * 提供精确的加法运算。
+     * @param v1 被加数
+     * @param v2 加数
+     * @return 两个参数的和
+     */
+    public static double add(double v1, double v2)
+    {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.add(b2).doubleValue();
+    }
+
+    /**
+     * 提供精确的减法运算。
+     * @param v1 被减数
+     * @param v2 减数
+     * @return 两个参数的差
+     */
+    public static double sub(double v1, double v2)
+    {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.subtract(b2).doubleValue();
+    }
+
+    /**
+     * 提供精确的乘法运算。
+     * @param v1 被乘数
+     * @param v2 乘数
+     * @return 两个参数的积
+     */
+    public static double mul(double v1, double v2)
+    {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.multiply(b2).doubleValue();
+    }
+
+    /**
+     * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到
+     * 小数点以后10位，以后的数字四舍五入。
+     * @param v1 被除数
+     * @param v2 除数
+     * @return 两个参数的商
+     */
+    public static double div(double v1, double v2)
+    {
+        return div(v1, v2, DEF_DIV_SCALE);
+    }
+
+    /**
+     * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指
+     * 定精度，以后的数字四舍五入。
+     * @param v1 被除数
+     * @param v2 除数
+     * @param scale 表示表示需要精确到小数点以后几位。
+     * @return 两个参数的商
+     */
+    public static double div(double v1, double v2, int scale)
+    {
+        if (scale < 0)
+        {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        if (b1.compareTo(BigDecimal.ZERO) == 0)
+        {
+            return BigDecimal.ZERO.doubleValue();
+        }
+        return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
+    }
+
+    /**
+     * 提供精确的小数位四舍五入处理。
+     * @param v 需要四舍五入的数字
+     * @param scale 小数点后保留几位
+     * @return 四舍五入后的结果
+     */
+    public static double round(double v, int scale)
+    {
+        if (scale < 0)
+        {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b = new BigDecimal(Double.toString(v));
+        BigDecimal one = BigDecimal.ONE;
+        return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
new file mode 100644
index 0000000..536cb3c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -0,0 +1,155 @@
+package com.ruoyi.common.utils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+/**
+ * 时间工具类
+ * 
+ * @author ruoyi
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+    
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     * 
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate()
+    {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     * 
+     * @return String
+     */
+    public static String getDate()
+    {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime()
+    {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow()
+    {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format)
+    {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date)
+    {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date)
+    {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts)
+    {
+        try
+        {
+            return new SimpleDateFormat(format).parse(ts);
+        }
+        catch (ParseException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        try
+        {
+            return parseDate(str.toString(), parsePatterns);
+        }
+        catch (ParseException e)
+        {
+            return null;
+        }
+    }
+    
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate()
+    {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算两个时间差
+     */
+    public static String getDatePoor(Date endDate, Date nowDate)
+    {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
new file mode 100644
index 0000000..fd9946d
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -0,0 +1,183 @@
+package com.ruoyi.common.utils;
+
+import java.util.Collection;
+import java.util.List;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
+
+/**
+ * 字典工具类
+ * 
+ * @author ruoyi
+ */
+public class DictUtils
+{
+    /**
+     * 分隔符
+     */
+    public static final String SEPARATOR = ",";
+
+    /**
+     * 设置字典缓存
+     * 
+     * @param key 参数键
+     * @param dictDatas 字典数据列表
+     */
+    public static void setDictCache(String key, List<SysDictData> dictDatas)
+    {
+        SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
+    }
+
+    /**
+     * 获取字典缓存
+     * 
+     * @param key 参数键
+     * @return dictDatas 字典数据列表
+     */
+    public static List<SysDictData> getDictCache(String key)
+    {
+        Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
+        if (StringUtils.isNotNull(cacheObj))
+        {
+            List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
+            return dictDatas;
+        }
+        return null;
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     * 
+     * @param dictType 字典类型
+     * @param dictValue 字典值
+     * @return 字典标签
+     */
+    public static String getDictLabel(String dictType, String dictValue)
+    {
+        return getDictLabel(dictType, dictValue, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     * 
+     * @param dictType 字典类型
+     * @param dictLabel 字典标签
+     * @return 字典值
+     */
+    public static String getDictValue(String dictType, String dictLabel)
+    {
+        return getDictValue(dictType, dictLabel, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     * 
+     * @param dictType 字典类型
+     * @param dictValue 字典值
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    public static String getDictLabel(String dictType, String dictValue, String separator)
+    {
+        StringBuilder propertyString = new StringBuilder();
+        List<SysDictData> datas = getDictCache(dictType);
+
+        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
+        {
+            for (SysDictData dict : datas)
+            {
+                for (String value : dictValue.split(separator))
+                {
+                    if (value.equals(dict.getDictValue()))
+                    {
+                        propertyString.append(dict.getDictLabel() + separator);
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            for (SysDictData dict : datas)
+            {
+                if (dictValue.equals(dict.getDictValue()))
+                {
+                    return dict.getDictLabel();
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     * 
+     * @param dictType 字典类型
+     * @param dictLabel 字典标签
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    public static String getDictValue(String dictType, String dictLabel, String separator)
+    {
+        StringBuilder propertyString = new StringBuilder();
+        List<SysDictData> datas = getDictCache(dictType);
+
+        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
+        {
+            for (SysDictData dict : datas)
+            {
+                for (String label : dictLabel.split(separator))
+                {
+                    if (label.equals(dict.getDictLabel()))
+                    {
+                        propertyString.append(dict.getDictValue() + separator);
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            for (SysDictData dict : datas)
+            {
+                if (dictLabel.equals(dict.getDictLabel()))
+                {
+                    return dict.getDictValue();
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 删除指定字典缓存
+     * 
+     * @param key 字典键
+     */
+    public static void removeDictCache(String key)
+    {
+        SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key));
+    }
+
+    /**
+     * 清空字典缓存
+     */
+    public static void clearDictCache()
+    {
+        Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
+        SpringUtils.getBean(RedisCache.class).deleteObject(keys);
+    }
+
+    /**
+     * 设置cache key
+     * 
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    public static String getCacheKey(String configKey)
+    {
+        return Constants.SYS_DICT_KEY + configKey;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
new file mode 100644
index 0000000..ae81a69
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+/**
+ * 错误信息处理类。
+ *
+ * @author ruoyi
+ */
+public class ExceptionUtil
+{
+    /**
+     * 获取exception的详细错误信息。
+     */
+    public static String getExceptionMessage(Throwable e)
+    {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        String str = sw.toString();
+        return str;
+    }
+
+    public static String getRootErrorMessage(Exception e)
+    {
+        Throwable root = ExceptionUtils.getRootCause(e);
+        root = (root == null ? e : root);
+        if (root == null)
+        {
+            return "";
+        }
+        String msg = root.getMessage();
+        if (msg == null)
+        {
+            return "null";
+        }
+        return StringUtils.defaultString(msg);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java
new file mode 100644
index 0000000..0de30c6
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java
@@ -0,0 +1,18 @@
+package com.ruoyi.common.utils;
+
+/**
+ * 处理并记录日志文件
+ * 
+ * @author ruoyi
+ */
+public class LogUtils
+{
+    public static String getBlock(Object msg)
+    {
+        if (msg == null)
+        {
+            msg = "";
+        }
+        return "[" + msg.toString() + "]";
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
new file mode 100644
index 0000000..7dac75a
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
@@ -0,0 +1,26 @@
+package com.ruoyi.common.utils;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import com.ruoyi.common.utils.spring.SpringUtils;
+
+/**
+ * 获取i18n资源文件
+ * 
+ * @author ruoyi
+ */
+public class MessageUtils
+{
+    /**
+     * 根据消息键和参数 获取消息 委托给spring messageSource
+     *
+     * @param code 消息键
+     * @param args 参数
+     * @return 获取国际化翻译值
+     */
+    public static String message(String code, Object... args)
+    {
+        MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
+        return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisCahceKey.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisCahceKey.java
new file mode 100644
index 0000000..9888118
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisCahceKey.java
@@ -0,0 +1,91 @@
+package com.ruoyi.common.utils;
+
+/**
+ * Created by 魔金商城 on 18/2/6.
+ * redis缓存中的key
+ */
+public interface RedisCahceKey {
+
+    /**
+     * mobile端首页缓存key
+     */
+    String MOBILE_TEMPLATE = "MOBILE_TEMPLATE";
+
+    /**
+     * 地区缓存key
+     */
+    String AREA = "AREA";
+
+    /**
+     * 基本信息设置缓存key
+     */
+    String BASE_INFO_SET = "BASE_INFO_SET";
+
+    /**
+     * pc端首页缓存key
+     */
+    String PC_TEMPLATE = "PC_TEMPLATE";
+
+
+    // pc端店铺首页模版缓存key
+    String STORE_PC_TEMPLATE = "STORE_PC_TEMPLATE";
+
+    /**
+     * 手机端专题页缓存key
+     */
+    String MOBILE_THEMATIC = "MOBILE_THEMATIC";
+
+    /**
+     * PC端专题页缓存key
+     */
+    String PC_THEMATIC = "PC_THEMATIC";
+
+    /**
+     * APP端首页模版缓存key
+     */
+    String APP_INDEX_TEMPLATE = "APP_INDEX_TEMPLATE";
+
+    /**
+     * APP 专题页缓存
+     */
+    String APP_THEMATIC = "APP_THEMATIC";
+
+    /**
+     * APPLET 端首页模版缓存key
+     */
+    String APPLET_INDEX_TEMPLATE = "APPLET_INDEX_TEMPLATE";
+
+    /**
+     * APPLET 专题页缓存
+     */
+    String APPLET_THEMATIC = "APPLET_THEMATIC";
+
+
+    /**
+     * 促销设置缓存key
+     */
+    String MARKETING_SETTING = "MARKETING_SETTING";
+
+    /**
+     * 微信用户关联缓存key
+     */
+    String WE_CHAT_CUSTOMER_LINK = "WE_CHAT_CUSTOMER_LINK";
+
+    /**
+     * 微信用户关联缓存key
+     */
+    String WE_CHAT_OPENID = "WE_CHAT_OPENID";
+
+    /**
+     * app版本
+     */
+    String APP_VERSION = "APP_VERSION";
+    /**
+     * 社区团购设置
+     */
+    String COMMUNITY_BUY_SETTING = "COMMUNITY_BUY_SETTING";
+    /**
+     * 社区推广
+     */
+    String COMMUNITY_BUY_INDEX = "COMMUNITY_BUY_INDEX";
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
new file mode 100644
index 0000000..a6f3d53
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -0,0 +1,120 @@
+package com.ruoyi.common.utils;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.ServiceException;
+
+/**
+ * 安全服务工具类
+ * 
+ * @author ruoyi
+ */
+public class SecurityUtils
+{
+    /**
+     * 用户ID
+     **/
+    public static Long getUserId()
+    {
+        try
+        {
+            return getLoginUser().getUserId();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
+    /**
+     * 获取部门ID
+     **/
+    public static Long getDeptId()
+    {
+        try
+        {
+            return getLoginUser().getDeptId();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+    
+    /**
+     * 获取用户账户
+     **/
+    public static String getUsername()
+    {
+        try
+        {
+            return getLoginUser().getUsername();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
+    /**
+     * 获取用户
+     **/
+    public static LoginUser getLoginUser()
+    {
+        try
+        {
+            return (LoginUser) getAuthentication().getPrincipal();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
+    /**
+     * 获取Authentication
+     */
+    public static Authentication getAuthentication()
+    {
+        return SecurityContextHolder.getContext().getAuthentication();
+    }
+
+    /**
+     * 生成BCryptPasswordEncoder密码
+     *
+     * @param password 密码
+     * @return 加密字符串
+     */
+    public static String encryptPassword(String password)
+    {
+        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+        return passwordEncoder.encode(password);
+    }
+
+    /**
+     * 判断密码是否相同
+     *
+     * @param rawPassword 真实密码
+     * @param encodedPassword 加密后字符
+     * @return 结果
+     */
+    public static boolean matchesPassword(String rawPassword, String encodedPassword)
+    {
+        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+        return passwordEncoder.matches(rawPassword, encodedPassword);
+    }
+
+    /**
+     * 是否为管理员
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
new file mode 100644
index 0000000..ab9ebcf
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -0,0 +1,136 @@
+package com.ruoyi.common.utils;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 客户端工具类
+ * 
+ * @author ruoyi
+ */
+public class ServletUtils
+{
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name)
+    {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name, String defaultValue)
+    {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name)
+    {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue)
+    {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取request
+     */
+    public static HttpServletRequest getRequest()
+    {
+        return getRequestAttributes().getRequest();
+    }
+
+    /**
+     * 获取response
+     */
+    public static HttpServletResponse getResponse()
+    {
+        return getRequestAttributes().getResponse();
+    }
+
+    /**
+     * 获取session
+     */
+    public static HttpSession getSession()
+    {
+        return getRequest().getSession();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes()
+    {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        return (ServletRequestAttributes) attributes;
+    }
+
+    /**
+     * 将字符串渲染到客户端
+     * 
+     * @param response 渲染对象
+     * @param string 待渲染的字符串
+     * @return null
+     */
+    public static String renderString(HttpServletResponse response, String string)
+    {
+        try
+        {
+            response.setStatus(200);
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            response.getWriter().print(string);
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 是否是Ajax异步请求
+     * 
+     * @param request
+     */
+    public static boolean isAjaxRequest(HttpServletRequest request)
+    {
+        String accept = request.getHeader("accept");
+        if (accept != null && accept.indexOf("application/json") != -1)
+        {
+            return true;
+        }
+
+        String xRequestedWith = request.getHeader("X-Requested-With");
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+        {
+            return true;
+        }
+
+        String uri = request.getRequestURI();
+        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+        {
+            return true;
+        }
+
+        String ajax = request.getParameter("__ajax");
+        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+        {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SnowflakeIdWorker.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SnowflakeIdWorker.java
new file mode 100644
index 0000000..ece52e1
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SnowflakeIdWorker.java
@@ -0,0 +1,171 @@
+package com.ruoyi.common.utils;
+
+
+/**
+ * Created by 魔金商城 on 17/11/02.
+ * <p>
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeIdWorker {
+    /**
+     * 开始时间截 (2015-01-01)
+     */
+    private final long twepoch = 1420041600000L;
+
+    /**
+     * 机器id所占的位数
+     */
+    private final long workerIdBits = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private final long datacenterIdBits = 5L;
+
+    /**
+     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+     */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /**
+     * 支持的最大数据标识id，结果是31
+     */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /**
+     * 序列在id中占的位数
+     */
+    private final long sequenceBits = 12L;
+
+    /**
+     * 机器ID向左移12位
+     */
+    private final long workerIdShift = sequenceBits;
+
+    /**
+     * 数据标识id向左移17位(12+5)
+     */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /**
+     * 时间截向左移22位(5+5+12)
+     */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /**
+     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+     */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
new file mode 100644
index 0000000..4ca2bfc
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -0,0 +1,534 @@
+package com.ruoyi.common.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.springframework.util.AntPathMatcher;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.text.StrFormatter;
+
+/**
+ * 字符串工具类
+ * 
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils
+{
+    /** 空字符串 */
+    private static final String NULLSTR = "";
+
+    /** 下划线 */
+    private static final char SEPARATOR = '_';
+
+    /**
+     * 获取参数不为空值
+     * 
+     * @param value defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static <T> T nvl(T value, T defaultValue)
+    {
+        return value != null ? value : defaultValue;
+    }
+
+    /**
+     * * 判断一个Collection是否为空， 包含List，Set，Queue
+     * 
+     * @param coll 要判断的Collection
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Collection<?> coll)
+    {
+        return isNull(coll) || coll.isEmpty();
+    }
+
+    /**
+     * * 判断一个Collection是否非空，包含List，Set，Queue
+     * 
+     * @param coll 要判断的Collection
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Collection<?> coll)
+    {
+        return !isEmpty(coll);
+    }
+
+    /**
+     * * 判断一个对象数组是否为空
+     * 
+     * @param objects 要判断的对象数组
+     ** @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Object[] objects)
+    {
+        return isNull(objects) || (objects.length == 0);
+    }
+
+    /**
+     * * 判断一个对象数组是否非空
+     * 
+     * @param objects 要判断的对象数组
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Object[] objects)
+    {
+        return !isEmpty(objects);
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     * 
+     * @param map 要判断的Map
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(Map<?, ?> map)
+    {
+        return isNull(map) || map.isEmpty();
+    }
+
+    /**
+     * * 判断一个Map是否为空
+     * 
+     * @param map 要判断的Map
+     * @return true：非空 false：空
+     */
+    public static boolean isNotEmpty(Map<?, ?> map)
+    {
+        return !isEmpty(map);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     * 
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str)
+    {
+        return isNull(str) || NULLSTR.equals(str.trim());
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     * 
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str)
+    {
+        return !isEmpty(str);
+    }
+
+    /**
+     * * 判断一个对象是否为空
+     * 
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     * 
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
+    /**
+     * * 判断一个对象是否是数组类型（Java基本型别的数组）
+     * 
+     * @param object 对象
+     * @return true：是数组 false：不是数组
+     */
+    public static boolean isArray(Object object)
+    {
+        return isNotNull(object) && object.getClass().isArray();
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str)
+    {
+        return (str == null ? "" : str.trim());
+    }
+
+    /**
+     * 截取字符串
+     * 
+     * @param str 字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (start > str.length())
+        {
+            return NULLSTR;
+        }
+
+        return str.substring(start);
+    }
+
+    /**
+     * 截取字符串
+     * 
+     * @param str 字符串
+     * @param start 开始
+     * @param end 结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end)
+    {
+        if (str == null)
+        {
+            return NULLSTR;
+        }
+
+        if (end < 0)
+        {
+            end = str.length() + end;
+        }
+        if (start < 0)
+        {
+            start = str.length() + start;
+        }
+
+        if (end > str.length())
+        {
+            end = str.length();
+        }
+
+        if (start > end)
+        {
+            return NULLSTR;
+        }
+
+        if (start < 0)
+        {
+            start = 0;
+        }
+        if (end < 0)
+        {
+            end = 0;
+        }
+
+        return str.substring(start, end);
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     * 
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params 参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params)
+    {
+        if (isEmpty(params) || isEmpty(template))
+        {
+            return template;
+        }
+        return StrFormatter.format(template, params);
+    }
+
+    /**
+     * 是否为http(s)://开头
+     * 
+     * @param link 链接
+     * @return 结果
+     */
+    public static boolean ishttp(String link)
+    {
+        return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
+    }
+
+    /**
+     * 字符串转set
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep)
+    {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim 去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
+    {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str))
+        {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str))
+        {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split)
+        {
+            if (filterBlank && StringUtils.isBlank(string))
+            {
+                continue;
+            }
+            if (trim)
+            {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs 指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
+    {
+        if (isEmpty(cs) || isEmpty(searchCharSequences))
+        {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences)
+        {
+            if (containsIgnoreCase(cs, testStr))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        // 前置字符是否大写
+        boolean preCharIsUpperCase = true;
+        // 当前字符是否大写
+        boolean curreCharIsUpperCase = true;
+        // 下一字符是否大写
+        boolean nexteCharIsUpperCase = true;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char c = str.charAt(i);
+            if (i > 0)
+            {
+                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+            }
+            else
+            {
+                preCharIsUpperCase = false;
+            }
+
+            curreCharIsUpperCase = Character.isUpperCase(c);
+
+            if (i < (str.length() - 1))
+            {
+                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+            }
+
+            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
+            {
+                sb.append(SEPARATOR);
+            }
+            sb.append(Character.toLowerCase(c));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * 是否包含字符串
+     * 
+     * @param str 验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs)
+    {
+        if (str != null && strs != null)
+        {
+            for (String s : strs)
+            {
+                if (str.equalsIgnoreCase(trim(s)))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     * 
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name)
+    {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty())
+        {
+            // 没必要转换
+            return "";
+        }
+        else if (!name.contains("_"))
+        {
+            // 不含下划线，仅将首字母大写
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String[] camels = name.split("_");
+        for (String camel : camels)
+        {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty())
+            {
+                continue;
+            }
+            // 首字母大写
+            result.append(camel.substring(0, 1).toUpperCase());
+            result.append(camel.substring(1).toLowerCase());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 驼峰式命名法 例如：user_name->userName
+     */
+    public static String toCamelCase(String s)
+    {
+        if (s == null)
+        {
+            return null;
+        }
+        s = s.toLowerCase();
+        StringBuilder sb = new StringBuilder(s.length());
+        boolean upperCase = false;
+        for (int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+
+            if (c == SEPARATOR)
+            {
+                upperCase = true;
+            }
+            else if (upperCase)
+            {
+                sb.append(Character.toUpperCase(c));
+                upperCase = false;
+            }
+            else
+            {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     * 
+     * @param str 指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs)
+    {
+        if (isEmpty(str) || isEmpty(strs))
+        {
+            return false;
+        }
+        for (String pattern : strs)
+        {
+            if (isMatch(pattern, str))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置: 
+     * ? 表示单个字符; 
+     * * 表示一层路径内的任意字符串，不可跨层级; 
+     * ** 表示任意层路径;
+     * 
+     * @param pattern 匹配规则
+     * @param url 需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url)
+    {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj)
+    {
+        return (T) obj;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
new file mode 100644
index 0000000..1934195
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
@@ -0,0 +1,99 @@
+package com.ruoyi.common.utils;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 线程相关工具类.
+ * 
+ * @author ruoyi
+ */
+public class Threads
+{
+    private static final Logger logger = LoggerFactory.getLogger(Threads.class);
+
+    /**
+     * sleep等待,单位为毫秒
+     */
+    public static void sleep(long milliseconds)
+    {
+        try
+        {
+            Thread.sleep(milliseconds);
+        }
+        catch (InterruptedException e)
+        {
+            return;
+        }
+    }
+
+    /**
+     * 停止线程池
+     * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务.
+     * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数.
+     * 如果仍人超時，則強制退出.
+     * 另对在shutdown时线程本身被调用中断做了处理.
+     */
+    public static void shutdownAndAwaitTermination(ExecutorService pool)
+    {
+        if (pool != null && !pool.isShutdown())
+        {
+            pool.shutdown();
+            try
+            {
+                if (!pool.awaitTermination(120, TimeUnit.SECONDS))
+                {
+                    pool.shutdownNow();
+                    if (!pool.awaitTermination(120, TimeUnit.SECONDS))
+                    {
+                        logger.info("Pool did not terminate");
+                    }
+                }
+            }
+            catch (InterruptedException ie)
+            {
+                pool.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /**
+     * 打印线程异常信息
+     */
+    public static void printException(Runnable r, Throwable t)
+    {
+        if (t == null && r instanceof Future<?>)
+        {
+            try
+            {
+                Future<?> future = (Future<?>) r;
+                if (future.isDone())
+                {
+                    future.get();
+                }
+            }
+            catch (CancellationException ce)
+            {
+                t = ce;
+            }
+            catch (ExecutionException ee)
+            {
+                t = ee.getCause();
+            }
+            catch (InterruptedException ie)
+            {
+                Thread.currentThread().interrupt();
+            }
+        }
+        if (t != null)
+        {
+            logger.error(t.getMessage(), t);
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
new file mode 100644
index 0000000..5fdf3a9
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
@@ -0,0 +1,228 @@
+package com.ruoyi.common.utils;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Random;
+import javax.imageio.ImageIO;
+
+/**
+ * 验证码工具类
+ * 
+ * @author ruoyi
+ */
+public class VerifyCodeUtils
+{
+    // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
+    public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
+
+    private static Random random = new SecureRandom();
+
+    /**
+     * 使用系统默认字符源生成验证码
+     * 
+     * @param verifySize 验证码长度
+     * @return
+     */
+    public static String generateVerifyCode(int verifySize)
+    {
+        return generateVerifyCode(verifySize, VERIFY_CODES);
+    }
+
+    /**
+     * 使用指定源生成验证码
+     * 
+     * @param verifySize 验证码长度
+     * @param sources 验证码字符源
+     * @return
+     */
+    public static String generateVerifyCode(int verifySize, String sources)
+    {
+        if (sources == null || sources.length() == 0)
+        {
+            sources = VERIFY_CODES;
+        }
+        int codesLen = sources.length();
+        Random rand = new Random(System.currentTimeMillis());
+        StringBuilder verifyCode = new StringBuilder(verifySize);
+        for (int i = 0; i < verifySize; i++)
+        {
+            verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
+        }
+        return verifyCode.toString();
+    }
+
+    /**
+     * 输出指定验证码图片流
+     * 
+     * @param w
+     * @param h
+     * @param os
+     * @param code
+     * @throws IOException
+     */
+    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException
+    {
+        int verifySize = code.length();
+        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+        Random rand = new Random();
+        Graphics2D g2 = image.createGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        Color[] colors = new Color[5];
+        Color[] colorSpaces = new Color[] { Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
+                Color.ORANGE, Color.PINK, Color.YELLOW };
+        float[] fractions = new float[colors.length];
+        for (int i = 0; i < colors.length; i++)
+        {
+            colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
+            fractions[i] = rand.nextFloat();
+        }
+        Arrays.sort(fractions);
+
+        g2.setColor(Color.GRAY);// 设置边框色
+        g2.fillRect(0, 0, w, h);
+
+        Color c = getRandColor(200, 250);
+        g2.setColor(c);// 设置背景色
+        g2.fillRect(0, 2, w, h - 4);
+
+        // 绘制干扰线
+        Random random = new Random();
+        g2.setColor(getRandColor(160, 200));// 设置线条的颜色
+        for (int i = 0; i < 20; i++)
+        {
+            int x = random.nextInt(w - 1);
+            int y = random.nextInt(h - 1);
+            int xl = random.nextInt(6) + 1;
+            int yl = random.nextInt(12) + 1;
+            g2.drawLine(x, y, x + xl + 40, y + yl + 20);
+        }
+
+        // 添加噪点
+        float yawpRate = 0.05f;// 噪声率
+        int area = (int) (yawpRate * w * h);
+        for (int i = 0; i < area; i++)
+        {
+            int x = random.nextInt(w);
+            int y = random.nextInt(h);
+            int rgb = getRandomIntColor();
+            image.setRGB(x, y, rgb);
+        }
+
+        shear(g2, w, h, c);// 使图片扭曲
+
+        g2.setColor(getRandColor(100, 160));
+        int fontSize = h - 4;
+        Font font = new Font("Algerian", Font.ITALIC, fontSize);
+        g2.setFont(font);
+        char[] chars = code.toCharArray();
+        for (int i = 0; i < verifySize; i++)
+        {
+            AffineTransform affine = new AffineTransform();
+            affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
+                    (w / verifySize) * i + fontSize / 2, h / 2);
+            g2.setTransform(affine);
+            g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
+        }
+
+        g2.dispose();
+        ImageIO.write(image, "jpg", os);
+    }
+
+    private static Color getRandColor(int fc, int bc)
+    {
+        if (fc > 255) {
+            fc = 255;
+        }
+        if (bc > 255) {
+            bc = 255;
+        }
+        int r = fc + random.nextInt(bc - fc);
+        int g = fc + random.nextInt(bc - fc);
+        int b = fc + random.nextInt(bc - fc);
+        return new Color(r, g, b);
+    }
+
+    private static int getRandomIntColor()
+    {
+        int[] rgb = getRandomRgb();
+        int color = 0;
+        for (int c : rgb)
+        {
+            color = color << 8;
+            color = color | c;
+        }
+        return color;
+    }
+
+    private static int[] getRandomRgb()
+    {
+        int[] rgb = new int[3];
+        for (int i = 0; i < 3; i++)
+        {
+            rgb[i] = random.nextInt(255);
+        }
+        return rgb;
+    }
+
+    private static void shear(Graphics g, int w1, int h1, Color color)
+    {
+        shearX(g, w1, h1, color);
+        shearY(g, w1, h1, color);
+    }
+
+    private static void shearX(Graphics g, int w1, int h1, Color color)
+    {
+
+        int period = random.nextInt(2);
+
+        boolean borderGap = true;
+        int frames = 1;
+        int phase = random.nextInt(2);
+
+        for (int i = 0; i < h1; i++)
+        {
+            double d = (double) (period >> 1)
+                    * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+            g.copyArea(0, i, w1, 1, (int) d, 0);
+            if (borderGap)
+            {
+                g.setColor(color);
+                g.drawLine((int) d, i, 0, i);
+                g.drawLine((int) d + w1, i, w1, i);
+            }
+        }
+
+    }
+
+    private static void shearY(Graphics g, int w1, int h1, Color color)
+    {
+
+        int period = random.nextInt(40) + 10; // 50;
+
+        boolean borderGap = true;
+        int frames = 20;
+        int phase = 7;
+        for (int i = 0; i < w1; i++)
+        {
+            double d = (double) (period >> 1)
+                    * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+            g.copyArea(i, 0, 1, h1, 0, (int) d);
+            if (borderGap)
+            {
+                g.setColor(color);
+                g.drawLine(i, (int) d, i, 0);
+                g.drawLine(i, (int) d + h1, i, h1);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
new file mode 100644
index 0000000..4463662
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
@@ -0,0 +1,110 @@
+package com.ruoyi.common.utils.bean;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Bean 工具类
+ * 
+ * @author ruoyi
+ */
+public class BeanUtils extends org.springframework.beans.BeanUtils
+{
+    /** Bean方法名中属性名开始的下标 */
+    private static final int BEAN_METHOD_PROP_INDEX = 3;
+
+    /** * 匹配getter方法的正则表达式 */
+    private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
+
+    /** * 匹配setter方法的正则表达式 */
+    private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
+
+    /**
+     * Bean属性复制工具方法。
+     * 
+     * @param dest 目标对象
+     * @param src 源对象
+     */
+    public static void copyBeanProp(Object dest, Object src)
+    {
+        try
+        {
+            copyProperties(src, dest);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取对象的setter方法。
+     * 
+     * @param obj 对象
+     * @return 对象的setter方法列表
+     */
+    public static List<Method> getSetterMethods(Object obj)
+    {
+        // setter方法列表
+        List<Method> setterMethods = new ArrayList<Method>();
+
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+
+        // 查找setter方法
+
+        for (Method method : methods)
+        {
+            Matcher m = SET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 1))
+            {
+                setterMethods.add(method);
+            }
+        }
+        // 返回setter方法列表
+        return setterMethods;
+    }
+
+    /**
+     * 获取对象的getter方法。
+     * 
+     * @param obj 对象
+     * @return 对象的getter方法列表
+     */
+
+    public static List<Method> getGetterMethods(Object obj)
+    {
+        // getter方法列表
+        List<Method> getterMethods = new ArrayList<Method>();
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+        // 查找getter方法
+        for (Method method : methods)
+        {
+            Matcher m = GET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 0))
+            {
+                getterMethods.add(method);
+            }
+        }
+        // 返回getter方法列表
+        return getterMethods;
+    }
+
+    /**
+     * 检查Bean方法名中的属性名是否相等。<br>
+     * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
+     * 
+     * @param m1 方法名1
+     * @param m2 方法名2
+     * @return 属性名一样返回true，否则返回false
+     */
+
+    public static boolean isMethodPropEquals(String m1, String m2)
+    {
+        return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java
new file mode 100644
index 0000000..68130b9
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java
@@ -0,0 +1,76 @@
+package com.ruoyi.common.utils.file;
+
+import java.io.File;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 文件类型工具类
+ *
+ * @author ruoyi
+ */
+public class FileTypeUtils
+{
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     * 
+     * @param file 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(File file)
+    {
+        if (null == file)
+        {
+            return StringUtils.EMPTY;
+        }
+        return getFileType(file.getName());
+    }
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param fileName 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(String fileName)
+    {
+        int separatorIndex = fileName.lastIndexOf(".");
+        if (separatorIndex < 0)
+        {
+            return "";
+        }
+        return fileName.substring(separatorIndex + 1).toLowerCase();
+    }
+
+    /**
+     * 获取文件类型
+     * 
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "JPG";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "GIF";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "JPG";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "BMP";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
new file mode 100644
index 0000000..eb12806
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -0,0 +1,235 @@
+package com.ruoyi.common.utils.file;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
+import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
+import com.ruoyi.common.exception.file.InvalidExtensionException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+
+/**
+ * 文件上传工具类
+ *
+ * @author ruoyi
+ */
+public class FileUploadUtils
+{
+    /**
+     * 默认大小 50M
+     */
+    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+    /**
+     * 默认的文件名最大长度 100
+     */
+    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+    /**
+     * 默认上传的地址
+     */
+    private static String defaultBaseDir = RuoYiConfig.getProfile();
+
+    public static void setDefaultBaseDir(String defaultBaseDir)
+    {
+        FileUploadUtils.defaultBaseDir = defaultBaseDir;
+    }
+
+    public static String getDefaultBaseDir()
+    {
+        return defaultBaseDir;
+    }
+
+    /**
+     * 以默认配置进行文件上传
+     *
+     * @param file 上传的文件
+     * @return 文件名称
+     * @throws Exception
+     */
+    public static final String upload(MultipartFile file) throws IOException
+    {
+        try
+        {
+            return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        }
+        catch (Exception e)
+        {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 根据文件路径上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @return 文件名称
+     * @throws IOException
+     */
+    public static final String upload(String baseDir, MultipartFile file) throws IOException
+    {
+        try
+        {
+            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        }
+        catch (Exception e)
+        {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @param allowedExtension 上传文件类型
+     * @return 返回上传成功的文件名
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws FileNameLengthLimitExceededException 文件名太长
+     * @throws IOException 比如读写文件出错时
+     * @throws InvalidExtensionException 文件校验异常
+     */
+    public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
+            InvalidExtensionException
+    {
+        int fileNamelength = file.getOriginalFilename().length();
+        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+        {
+            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
+        }
+
+        assertAllowed(file, allowedExtension);
+
+        String fileName = extractFilename(file);
+
+        File desc = getAbsoluteFile(baseDir, fileName);
+        file.transferTo(desc);
+        String pathFileName = getPathFileName(baseDir, fileName);
+        return pathFileName;
+    }
+
+    /**
+     * 编码文件名
+     */
+    public static final String extractFilename(MultipartFile file)
+    {
+        String fileName = file.getOriginalFilename();
+        String extension = getExtension(file);
+        fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+        return fileName;
+    }
+
+    public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists())
+        {
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc;
+    }
+
+    public static final String getPathFileName(String uploadDir, String fileName) throws IOException
+    {
+        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+        String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+        return pathFileName;
+    }
+
+    /**
+     * 文件大小校验
+     *
+     * @param file 上传的文件
+     * @return
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws InvalidExtensionException
+     */
+    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, InvalidExtensionException
+    {
+        long size = file.getSize();
+        if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
+        {
+            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+        }
+
+        String fileName = file.getOriginalFilename();
+        String extension = getExtension(file);
+        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+        {
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else
+            {
+                throw new InvalidExtensionException(allowedExtension, extension, fileName);
+            }
+        }
+
+    }
+
+    /**
+     * 判断MIME类型是否是允许的MIME类型
+     *
+     * @param extension
+     * @param allowedExtension
+     * @return
+     */
+    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+    {
+        for (String str : allowedExtension)
+        {
+            if (str.equalsIgnoreCase(extension))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 获取文件名的后缀
+     *
+     * @param file 表单文件
+     * @return 后缀名
+     */
+    public static final String getExtension(MultipartFile file)
+    {
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (StringUtils.isEmpty(extension))
+        {
+            extension = MimeTypeUtils.getExtension(file.getContentType());
+        }
+        return extension;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
new file mode 100644
index 0000000..ff33055
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -0,0 +1,256 @@
+package com.ruoyi.common.utils.file;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+
+/**
+ * 文件处理工具类
+ * 
+ * @author ruoyi
+ */
+public class FileUtils
+{
+    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+
+    /**
+     * 输出指定文件的byte数组
+     * 
+     * @param filePath 文件路径
+     * @param os 输出流
+     * @return
+     */
+    public static void writeBytes(String filePath, OutputStream os) throws IOException
+    {
+        FileInputStream fis = null;
+        try
+        {
+            File file = new File(filePath);
+            if (!file.exists())
+            {
+                throw new FileNotFoundException(filePath);
+            }
+            fis = new FileInputStream(file);
+            byte[] b = new byte[1024];
+            int length;
+            while ((length = fis.read(b)) > 0)
+            {
+                os.write(b, 0, length);
+            }
+        }
+        catch (IOException e)
+        {
+            throw e;
+        }
+        finally
+        {
+            IOUtils.close(os);
+            IOUtils.close(fis);
+        }
+    }
+
+    /**
+     * 写数据到文件中
+     *
+     * @param data 数据
+     * @return 目标文件
+     * @throws IOException IO异常
+     */
+    public static String writeImportBytes(byte[] data) throws IOException
+    {
+        return writeBytes(data, RuoYiConfig.getImportPath());
+    }
+
+    /**
+     * 写数据到文件中
+     *
+     * @param data 数据
+     * @param uploadDir 目标文件
+     * @return 目标文件
+     * @throws IOException IO异常
+     */
+    public static String writeBytes(byte[] data, String uploadDir) throws IOException
+    {
+        FileOutputStream fos = null;
+        String pathName = "";
+        try
+        {
+            String extension = getFileExtendName(data);
+            pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+            File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName);
+            fos = new FileOutputStream(file);
+            fos.write(data);
+        }
+        finally
+        {
+            IOUtils.close(fos);
+        }
+        return FileUploadUtils.getPathFileName(uploadDir, pathName);
+    }
+
+    /**
+     * 删除文件
+     * 
+     * @param filePath 文件
+     * @return
+     */
+    public static boolean deleteFile(String filePath)
+    {
+        boolean flag = false;
+        File file = new File(filePath);
+        // 路径为文件且不为空则进行删除
+        if (file.isFile() && file.exists())
+        {
+            file.delete();
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 文件名称验证
+     * 
+     * @param filename 文件名称
+     * @return true 正常 false 非法
+     */
+    public static boolean isValidFilename(String filename)
+    {
+        return filename.matches(FILENAME_PATTERN);
+    }
+
+    /**
+     * 检查文件是否可下载
+     * 
+     * @param resource 需要下载的文件
+     * @return true 正常 false 非法
+     */
+    public static boolean checkAllowDownload(String resource)
+    {
+        // 禁止目录上跳级别
+        if (StringUtils.contains(resource, ".."))
+        {
+            return false;
+        }
+
+        // 检查允许下载的文件规则
+        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
+        {
+            return true;
+        }
+
+        // 不在允许下载的文件规则
+        return false;
+    }
+
+    /**
+     * 下载文件名重新编码
+     * 
+     * @param request 请求对象
+     * @param fileName 文件名
+     * @return 编码后的文件名
+     */
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
+    {
+        final String agent = request.getHeader("USER-AGENT");
+        String filename = fileName;
+        if (agent.contains("MSIE"))
+        {
+            // IE浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+            filename = filename.replace("+", " ");
+        }
+        else if (agent.contains("Firefox"))
+        {
+            // 火狐浏览器
+            filename = new String(fileName.getBytes(), "ISO8859-1");
+        }
+        else if (agent.contains("Chrome"))
+        {
+            // google浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        else
+        {
+            // 其它浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        return filename;
+    }
+
+    /**
+     * 下载文件名重新编码
+     *
+     * @param response 响应对象
+     * @param realFileName 真实文件名
+     * @return
+     */
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
+    {
+        String percentEncodedFileName = percentEncode(realFileName);
+
+        StringBuilder contentDispositionValue = new StringBuilder();
+        contentDispositionValue.append("attachment; filename=")
+                .append(percentEncodedFileName)
+                .append(";")
+                .append("filename*=")
+                .append("utf-8''")
+                .append(percentEncodedFileName);
+
+        response.setHeader("Content-disposition", contentDispositionValue.toString());
+    }
+
+    /**
+     * 百分号编码工具方法
+     *
+     * @param s 需要百分号编码的字符串
+     * @return 百分号编码后的字符串
+     */
+    public static String percentEncode(String s) throws UnsupportedEncodingException
+    {
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
+        return encode.replaceAll("\\+", "%20");
+    }
+
+    /**
+     * 获取图像后缀
+     * 
+     * @param photoByte 图像数据
+     * @return 后缀名
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "jpg";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "gif";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "jpg";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "bmp";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "png";
+        }
+        return strFileExtendName;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
new file mode 100644
index 0000000..0b7b5aa
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
@@ -0,0 +1,101 @@
+package com.ruoyi.common.utils.file;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 图片处理工具类
+ *
+ * @author ruoyi
+ */
+public class ImageUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
+
+    public static byte[] getImage(String imagePath)
+    {
+        InputStream is = getFile(imagePath);
+        try
+        {
+            return IOUtils.toByteArray(is);
+        }
+        catch (Exception e)
+        {
+            log.error("图片加载异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
+    public static InputStream getFile(String imagePath)
+    {
+        try
+        {
+            byte[] result = readFile(imagePath);
+            result = Arrays.copyOf(result, result.length);
+            return new ByteArrayInputStream(result);
+        }
+        catch (Exception e)
+        {
+            log.error("获取图片异常 {}", e);
+        }
+        return null;
+    }
+
+    /**
+     * 读取文件为字节数据
+     * 
+     * @param key 地址
+     * @return 字节数据
+     */
+    public static byte[] readFile(String url)
+    {
+        InputStream in = null;
+        ByteArrayOutputStream baos = null;
+        try
+        {
+            if (url.startsWith("http"))
+            {
+                // 网络地址
+                URL urlObj = new URL(url);
+                URLConnection urlConnection = urlObj.openConnection();
+                urlConnection.setConnectTimeout(30 * 1000);
+                urlConnection.setReadTimeout(60 * 1000);
+                urlConnection.setDoInput(true);
+                in = urlConnection.getInputStream();
+            }
+            else
+            {
+                // 本机地址
+                String localPath = RuoYiConfig.getProfile();
+                String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
+                in = new FileInputStream(downloadPath);
+            }
+            return IOUtils.toByteArray(in);
+        }
+        catch (Exception e)
+        {
+            log.error("获取文件路径异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(in);
+            IOUtils.closeQuietly(baos);
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
new file mode 100644
index 0000000..f968f1a
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
@@ -0,0 +1,59 @@
+package com.ruoyi.common.utils.file;
+
+/**
+ * 媒体类型工具类
+ * 
+ * @author ruoyi
+ */
+public class MimeTypeUtils
+{
+    public static final String IMAGE_PNG = "image/png";
+
+    public static final String IMAGE_JPG = "image/jpg";
+
+    public static final String IMAGE_JPEG = "image/jpeg";
+
+    public static final String IMAGE_BMP = "image/bmp";
+
+    public static final String IMAGE_GIF = "image/gif";
+    
+    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+            "asf", "rm", "rmvb" };
+
+    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+
+    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+            // 图片
+            "bmp", "gif", "jpg", "jpeg", "png",
+            // word excel powerpoint
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+            // 压缩文件
+            "rar", "zip", "gz", "bz2",
+            // 视频格式
+            "mp4", "avi", "rmvb",
+            // pdf
+            "pdf" };
+
+    public static String getExtension(String prefix)
+    {
+        switch (prefix)
+        {
+            case IMAGE_PNG:
+                return "png";
+            case IMAGE_JPG:
+                return "jpg";
+            case IMAGE_JPEG:
+                return "jpeg";
+            case IMAGE_BMP:
+                return "bmp";
+            case IMAGE_GIF:
+                return "gif";
+            default:
+                return "";
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
new file mode 100644
index 0000000..7f74ac2
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
@@ -0,0 +1,155 @@
+package com.ruoyi.common.utils.html;
+
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 转义和反转义工具类
+ * 
+ * @author ruoyi
+ */
+public class EscapeUtil
+{
+    public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
+
+    private static final char[][] TEXT = new char[64][];
+
+    static
+    {
+        for (int i = 0; i < 64; i++)
+        {
+            TEXT[i] = new char[] { (char) i };
+        }
+
+        // special HTML characters
+        TEXT['\''] = "&#039;".toCharArray(); // 单引号
+        TEXT['"'] = "&#34;".toCharArray(); // 双引号
+        TEXT['&'] = "&#38;".toCharArray(); // &符
+        TEXT['<'] = "&#60;".toCharArray(); // 小于号
+        TEXT['>'] = "&#62;".toCharArray(); // 大于号
+    }
+
+    /**
+     * 转义文本中的HTML字符为安全的字符
+     * 
+     * @param text 被转义的文本
+     * @return 转义后的文本
+     */
+    public static String escape(String text)
+    {
+        return encode(text);
+    }
+
+    /**
+     * 还原被转义的HTML特殊字符
+     * 
+     * @param content 包含转义符的HTML内容
+     * @return 转换后的字符串
+     */
+    public static String unescape(String content)
+    {
+        return decode(content);
+    }
+
+    /**
+     * 清除所有HTML标签，但是不删除标签内的内容
+     * 
+     * @param content 文本
+     * @return 清除标签后的文本
+     */
+    public static String clean(String content)
+    {
+        return new HTMLFilter().filter(content);
+    }
+
+    /**
+     * Escape编码
+     * 
+     * @param text 被编码的文本
+     * @return 编码后的字符
+     */
+    private static String encode(String text)
+    {
+        int len;
+        if ((text == null) || ((len = text.length()) == 0))
+        {
+            return StringUtils.EMPTY;
+        }
+        StringBuilder buffer = new StringBuilder(len + (len >> 2));
+        char c;
+        for (int i = 0; i < len; i++)
+        {
+            c = text.charAt(i);
+            if (c < 64)
+            {
+                buffer.append(TEXT[c]);
+            }
+            else
+            {
+                buffer.append(c);
+            }
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * Escape解码
+     * 
+     * @param content 被转义的内容
+     * @return 解码后的字符串
+     */
+    public static String decode(String content)
+    {
+        if (StringUtils.isEmpty(content))
+        {
+            return content;
+        }
+
+        StringBuilder tmp = new StringBuilder(content.length());
+        int lastPos = 0, pos = 0;
+        char ch;
+        while (lastPos < content.length())
+        {
+            pos = content.indexOf("%", lastPos);
+            if (pos == lastPos)
+            {
+                if (content.charAt(pos + 1) == 'u')
+                {
+                    ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
+                    tmp.append(ch);
+                    lastPos = pos + 6;
+                }
+                else
+                {
+                    ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
+                    tmp.append(ch);
+                    lastPos = pos + 3;
+                }
+            }
+            else
+            {
+                if (pos == -1)
+                {
+                    tmp.append(content.substring(lastPos));
+                    lastPos = content.length();
+                }
+                else
+                {
+                    tmp.append(content.substring(lastPos, pos));
+                    lastPos = pos;
+                }
+            }
+        }
+        return tmp.toString();
+    }
+
+    public static void main(String[] args)
+    {
+        String html = "<script>alert(1);</script>";
+        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
+        // String html = "<123";
+        // String html = "123>";
+        System.out.println(EscapeUtil.clean(html));
+        System.out.println(EscapeUtil.escape(html));
+        System.out.println(EscapeUtil.unescape(html));
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
new file mode 100644
index 0000000..cd8cd4f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
@@ -0,0 +1,570 @@
+package com.ruoyi.common.utils.html;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * HTML过滤器，用于去除XSS漏洞隐患。
+ *
+ * @author ruoyi
+ */
+public final class HTMLFilter
+{
+    /**
+     * regex flag union representing /si modifiers in php
+     **/
+    private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
+    private static final Pattern P_COMMENTS = Pattern.compile("<!--(.*?)-->", Pattern.DOTALL);
+    private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
+    private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
+    private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
+    private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
+    private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
+    private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
+    private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
+    private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
+    private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
+    private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
+    private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
+    private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
+    private static final Pattern P_END_ARROW = Pattern.compile("^>");
+    private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
+    private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
+    private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
+    private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
+    private static final Pattern P_AMP = Pattern.compile("&");
+    private static final Pattern P_QUOTE = Pattern.compile("\"");
+    private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
+    private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
+    private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
+
+    // @xxx could grow large... maybe use sesat's ReferenceMap
+    private static final ConcurrentMap<String, Pattern> P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Pattern> P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>();
+
+    /**
+     * set of allowed html elements, along with allowed attributes for each element
+     **/
+    private final Map<String, List<String>> vAllowed;
+    /**
+     * counts of open tags for each (allowable) html element
+     **/
+    private final Map<String, Integer> vTagCounts = new HashMap<>();
+
+    /**
+     * html elements which must always be self-closing (e.g. "<img />")
+     **/
+    private final String[] vSelfClosingTags;
+    /**
+     * html elements which must always have separate opening and closing tags (e.g. "<b></b>")
+     **/
+    private final String[] vNeedClosingTags;
+    /**
+     * set of disallowed html elements
+     **/
+    private final String[] vDisallowed;
+    /**
+     * attributes which should be checked for valid protocols
+     **/
+    private final String[] vProtocolAtts;
+    /**
+     * allowed protocols
+     **/
+    private final String[] vAllowedProtocols;
+    /**
+     * tags which should be removed if they contain no content (e.g. "<b></b>" or "<b />")
+     **/
+    private final String[] vRemoveBlanks;
+    /**
+     * entities allowed within html markup
+     **/
+    private final String[] vAllowedEntities;
+    /**
+     * flag determining whether comments are allowed in input String.
+     */
+    private final boolean stripComment;
+    private final boolean encodeQuotes;
+    /**
+     * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>"
+     * becomes "<b> text </b>"). If set to false, unbalanced angle brackets will be html escaped.
+     */
+    private final boolean alwaysMakeTags;
+
+    /**
+     * Default constructor.
+     */
+    public HTMLFilter()
+    {
+        vAllowed = new HashMap<>();
+
+        final ArrayList<String> a_atts = new ArrayList<>();
+        a_atts.add("href");
+        a_atts.add("target");
+        vAllowed.put("a", a_atts);
+
+        final ArrayList<String> img_atts = new ArrayList<>();
+        img_atts.add("src");
+        img_atts.add("width");
+        img_atts.add("height");
+        img_atts.add("alt");
+        vAllowed.put("img", img_atts);
+
+        final ArrayList<String> no_atts = new ArrayList<>();
+        vAllowed.put("b", no_atts);
+        vAllowed.put("strong", no_atts);
+        vAllowed.put("i", no_atts);
+        vAllowed.put("em", no_atts);
+
+        vSelfClosingTags = new String[] { "img" };
+        vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" };
+        vDisallowed = new String[] {};
+        vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp.
+        vProtocolAtts = new String[] { "src", "href" };
+        vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" };
+        vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
+        stripComment = true;
+        encodeQuotes = true;
+        alwaysMakeTags = false;
+    }
+
+    /**
+     * Map-parameter configurable constructor.
+     *
+     * @param conf map containing configuration. keys match field names.
+     */
+    @SuppressWarnings("unchecked")
+    public HTMLFilter(final Map<String, Object> conf)
+    {
+
+        assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
+        assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
+        assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
+        assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
+        assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
+        assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
+        assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
+        assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
+
+        vAllowed = Collections.unmodifiableMap((HashMap<String, List<String>>) conf.get("vAllowed"));
+        vSelfClosingTags = (String[]) conf.get("vSelfClosingTags");
+        vNeedClosingTags = (String[]) conf.get("vNeedClosingTags");
+        vDisallowed = (String[]) conf.get("vDisallowed");
+        vAllowedProtocols = (String[]) conf.get("vAllowedProtocols");
+        vProtocolAtts = (String[]) conf.get("vProtocolAtts");
+        vRemoveBlanks = (String[]) conf.get("vRemoveBlanks");
+        vAllowedEntities = (String[]) conf.get("vAllowedEntities");
+        stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true;
+        encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true;
+        alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
+    }
+
+    private void reset()
+    {
+        vTagCounts.clear();
+    }
+
+    // ---------------------------------------------------------------
+    // my versions of some PHP library functions
+    public static String chr(final int decimal)
+    {
+        return String.valueOf((char) decimal);
+    }
+
+    public static String htmlSpecialChars(final String s)
+    {
+        String result = s;
+        result = regexReplace(P_AMP, "&amp;", result);
+        result = regexReplace(P_QUOTE, "&quot;", result);
+        result = regexReplace(P_LEFT_ARROW, "&lt;", result);
+        result = regexReplace(P_RIGHT_ARROW, "&gt;", result);
+        return result;
+    }
+
+    // ---------------------------------------------------------------
+
+    /**
+     * given a user submitted input String, filter out any invalid or restricted html.
+     *
+     * @param input text (i.e. submitted by a user) than may contain html
+     * @return "clean" version of input, with only valid, whitelisted html elements allowed
+     */
+    public String filter(final String input)
+    {
+        reset();
+        String s = input;
+
+        s = escapeComments(s);
+
+        s = balanceHTML(s);
+
+        s = checkTags(s);
+
+        s = processRemoveBlanks(s);
+
+        // s = validateEntities(s);
+
+        return s;
+    }
+
+    public boolean isAlwaysMakeTags()
+    {
+        return alwaysMakeTags;
+    }
+
+    public boolean isStripComments()
+    {
+        return stripComment;
+    }
+
+    private String escapeComments(final String s)
+    {
+        final Matcher m = P_COMMENTS.matcher(s);
+        final StringBuffer buf = new StringBuffer();
+        if (m.find())
+        {
+            final String match = m.group(1); // (.*?)
+            m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
+        }
+        m.appendTail(buf);
+
+        return buf.toString();
+    }
+
+    private String balanceHTML(String s)
+    {
+        if (alwaysMakeTags)
+        {
+            //
+            // try and form html
+            //
+            s = regexReplace(P_END_ARROW, "", s);
+            // 不追加结束标签
+            s = regexReplace(P_BODY_TO_END, "<$1>", s);
+            s = regexReplace(P_XML_CONTENT, "$1<$2", s);
+
+        }
+        else
+        {
+            //
+            // escape stray brackets
+            //
+            s = regexReplace(P_STRAY_LEFT_ARROW, "&lt;$1", s);
+            s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2&gt;<", s);
+
+            //
+            // the last regexp causes '<>' entities to appear
+            // (we need to do a lookahead assertion so that the last bracket can
+            // be used in the next pass of the regexp)
+            //
+            s = regexReplace(P_BOTH_ARROWS, "", s);
+        }
+
+        return s;
+    }
+
+    private String checkTags(String s)
+    {
+        Matcher m = P_TAGS.matcher(s);
+
+        final StringBuffer buf = new StringBuffer();
+        while (m.find())
+        {
+            String replaceStr = m.group(1);
+            replaceStr = processTag(replaceStr);
+            m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
+        }
+        m.appendTail(buf);
+
+        // these get tallied in processTag
+        // (remember to reset before subsequent calls to filter method)
+        final StringBuilder sBuilder = new StringBuilder(buf.toString());
+        for (String key : vTagCounts.keySet())
+        {
+            for (int ii = 0; ii < vTagCounts.get(key); ii++)
+            {
+                sBuilder.append("</").append(key).append(">");
+            }
+        }
+        s = sBuilder.toString();
+
+        return s;
+    }
+
+    private String processRemoveBlanks(final String s)
+    {
+        String result = s;
+        for (String tag : vRemoveBlanks)
+        {
+            if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
+            {
+                P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?></" + tag + ">"));
+            }
+            result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
+            if (!P_REMOVE_SELF_BLANKS.containsKey(tag))
+            {
+                P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
+            }
+            result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
+        }
+
+        return result;
+    }
+
+    private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
+    {
+        Matcher m = regex_pattern.matcher(s);
+        return m.replaceAll(replacement);
+    }
+
+    private String processTag(final String s)
+    {
+        // ending tags
+        Matcher m = P_END_TAG.matcher(s);
+        if (m.find())
+        {
+            final String name = m.group(1).toLowerCase();
+            if (allowed(name))
+            {
+                if (false == inArray(name, vSelfClosingTags))
+                {
+                    if (vTagCounts.containsKey(name))
+                    {
+                        vTagCounts.put(name, vTagCounts.get(name) - 1);
+                        return "</" + name + ">";
+                    }
+                }
+            }
+        }
+
+        // starting tags
+        m = P_START_TAG.matcher(s);
+        if (m.find())
+        {
+            final String name = m.group(1).toLowerCase();
+            final String body = m.group(2);
+            String ending = m.group(3);
+
+            // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
+            if (allowed(name))
+            {
+                final StringBuilder params = new StringBuilder();
+
+                final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
+                final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
+                final List<String> paramNames = new ArrayList<>();
+                final List<String> paramValues = new ArrayList<>();
+                while (m2.find())
+                {
+                    paramNames.add(m2.group(1)); // ([a-z0-9]+)
+                    paramValues.add(m2.group(3)); // (.*?)
+                }
+                while (m3.find())
+                {
+                    paramNames.add(m3.group(1)); // ([a-z0-9]+)
+                    paramValues.add(m3.group(3)); // ([^\"\\s']+)
+                }
+
+                String paramName, paramValue;
+                for (int ii = 0; ii < paramNames.size(); ii++)
+                {
+                    paramName = paramNames.get(ii).toLowerCase();
+                    paramValue = paramValues.get(ii);
+
+                    // debug( "paramName='" + paramName + "'" );
+                    // debug( "paramValue='" + paramValue + "'" );
+                    // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
+
+                    if (allowedAttribute(name, paramName))
+                    {
+                        if (inArray(paramName, vProtocolAtts))
+                        {
+                            paramValue = processParamProtocol(paramValue);
+                        }
+                        params.append(' ').append(paramName).append("=\"").append(paramValue).append("\"");
+                    }
+                }
+
+                if (inArray(name, vSelfClosingTags))
+                {
+                    ending = " /";
+                }
+
+                if (inArray(name, vNeedClosingTags))
+                {
+                    ending = "";
+                }
+
+                if (ending == null || ending.length() < 1)
+                {
+                    if (vTagCounts.containsKey(name))
+                    {
+                        vTagCounts.put(name, vTagCounts.get(name) + 1);
+                    }
+                    else
+                    {
+                        vTagCounts.put(name, 1);
+                    }
+                }
+                else
+                {
+                    ending = " /";
+                }
+                return "<" + name + params + ending + ">";
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        // comments
+        m = P_COMMENT.matcher(s);
+        if (!stripComment && m.find())
+        {
+            return "<" + m.group() + ">";
+        }
+
+        return "";
+    }
+
+    private String processParamProtocol(String s)
+    {
+        s = decodeEntities(s);
+        final Matcher m = P_PROTOCOL.matcher(s);
+        if (m.find())
+        {
+            final String protocol = m.group(1);
+            if (!inArray(protocol, vAllowedProtocols))
+            {
+                // bad protocol, turn into local anchor link instead
+                s = "#" + s.substring(protocol.length() + 1);
+                if (s.startsWith("#//"))
+                {
+                    s = "#" + s.substring(3);
+                }
+            }
+        }
+
+        return s;
+    }
+
+    private String decodeEntities(String s)
+    {
+        StringBuffer buf = new StringBuffer();
+
+        Matcher m = P_ENTITY.matcher(s);
+        while (m.find())
+        {
+            final String match = m.group(1);
+            final int decimal = Integer.decode(match).intValue();
+            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+        }
+        m.appendTail(buf);
+        s = buf.toString();
+
+        buf = new StringBuffer();
+        m = P_ENTITY_UNICODE.matcher(s);
+        while (m.find())
+        {
+            final String match = m.group(1);
+            final int decimal = Integer.valueOf(match, 16).intValue();
+            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+        }
+        m.appendTail(buf);
+        s = buf.toString();
+
+        buf = new StringBuffer();
+        m = P_ENCODE.matcher(s);
+        while (m.find())
+        {
+            final String match = m.group(1);
+            final int decimal = Integer.valueOf(match, 16).intValue();
+            m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+        }
+        m.appendTail(buf);
+        s = buf.toString();
+
+        s = validateEntities(s);
+        return s;
+    }
+
+    private String validateEntities(final String s)
+    {
+        StringBuffer buf = new StringBuffer();
+
+        // validate entities throughout the string
+        Matcher m = P_VALID_ENTITIES.matcher(s);
+        while (m.find())
+        {
+            final String one = m.group(1); // ([^&;]*)
+            final String two = m.group(2); // (?=(;|&|$))
+            m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
+        }
+        m.appendTail(buf);
+
+        return encodeQuotes(buf.toString());
+    }
+
+    private String encodeQuotes(final String s)
+    {
+        if (encodeQuotes)
+        {
+            StringBuffer buf = new StringBuffer();
+            Matcher m = P_VALID_QUOTES.matcher(s);
+            while (m.find())
+            {
+                final String one = m.group(1); // (>|^)
+                final String two = m.group(2); // ([^<]+?)
+                final String three = m.group(3); // (<|$)
+                // 不替换双引号为&quot;，防止json格式无效 regexReplace(P_QUOTE, "&quot;", two)
+                m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three));
+            }
+            m.appendTail(buf);
+            return buf.toString();
+        }
+        else
+        {
+            return s;
+        }
+    }
+
+    private String checkEntity(final String preamble, final String term)
+    {
+
+        return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&amp;" + preamble;
+    }
+
+    private boolean isValidEntity(final String entity)
+    {
+        return inArray(entity, vAllowedEntities);
+    }
+
+    private static boolean inArray(final String s, final String[] array)
+    {
+        for (String item : array)
+        {
+            if (item != null && item.equals(s))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean allowed(final String name)
+    {
+        return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
+    }
+
+    private boolean allowedAttribute(final String name, final String paramName)
+    {
+        return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
new file mode 100644
index 0000000..dac60ad
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
@@ -0,0 +1,55 @@
+package com.ruoyi.common.utils.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import javax.servlet.ServletRequest;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 通用http工具封装
+ * 
+ * @author ruoyi
+ */
+public class HttpHelper
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
+
+    public static String getBodyString(ServletRequest request)
+    {
+        StringBuilder sb = new StringBuilder();
+        BufferedReader reader = null;
+        try (InputStream inputStream = request.getInputStream())
+        {
+            reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+            String line = "";
+            while ((line = reader.readLine()) != null)
+            {
+                sb.append(line);
+            }
+        }
+        catch (IOException e)
+        {
+            LOGGER.warn("getBodyString出现问题！");
+        }
+        finally
+        {
+            if (reader != null)
+            {
+                try
+                {
+                    reader.close();
+                }
+                catch (IOException e)
+                {
+                    LOGGER.error(ExceptionUtils.getMessage(e));
+                }
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
new file mode 100644
index 0000000..9aee92e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -0,0 +1,262 @@
+package com.ruoyi.common.utils.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.constant.Constants;
+
+/**
+ * 通用http发送方法
+ * 
+ * @author ruoyi
+ */
+public class HttpUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
+
+    /**
+     * 向指定 URL 发送GET方法的请求
+     *
+     * @param url 发送请求的 URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendGet(String url, String param)
+    {
+        return sendGet(url, param, Constants.UTF8);
+    }
+
+    /**
+     * 向指定 URL 发送GET方法的请求
+     *
+     * @param url 发送请求的 URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @param contentType 编码类型
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendGet(String url, String param, String contentType)
+    {
+        StringBuilder result = new StringBuilder();
+        BufferedReader in = null;
+        try
+        {
+            String urlNameString = url + "?" + param;
+            log.info("sendGet - {}", urlNameString);
+            URL realUrl = new URL(urlNameString);
+            URLConnection connection = realUrl.openConnection();
+            connection.setRequestProperty("accept", "*/*");
+            connection.setRequestProperty("connection", "Keep-Alive");
+            connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            connection.connect();
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
+            String line;
+            while ((line = in.readLine()) != null)
+            {
+                result.append(line);
+            }
+            log.info("recv - {}", result);
+        }
+        catch (ConnectException e)
+        {
+            log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
+        }
+        catch (SocketTimeoutException e)
+        {
+            log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
+        }
+        catch (IOException e)
+        {
+            log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
+        }
+        catch (Exception e)
+        {
+            log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
+        }
+        finally
+        {
+            try
+            {
+                if (in != null)
+                {
+                    in.close();
+                }
+            }
+            catch (Exception ex)
+            {
+                log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     *
+     * @param url 发送请求的 URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendPost(String url, String param)
+    {
+        PrintWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new StringBuilder();
+        try
+        {
+            String urlNameString = url;
+            log.info("sendPost - {}", urlNameString);
+            URL realUrl = new URL(urlNameString);
+            URLConnection conn = realUrl.openConnection();
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Accept-Charset", "utf-8");
+            conn.setRequestProperty("contentType", "utf-8");
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            out = new PrintWriter(conn.getOutputStream());
+            out.print(param);
+            out.flush();
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
+            String line;
+            while ((line = in.readLine()) != null)
+            {
+                result.append(line);
+            }
+            log.info("recv - {}", result);
+        }
+        catch (ConnectException e)
+        {
+            log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
+        }
+        catch (SocketTimeoutException e)
+        {
+            log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+        }
+        catch (IOException e)
+        {
+            log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
+        }
+        catch (Exception e)
+        {
+            log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
+        }
+        finally
+        {
+            try
+            {
+                if (out != null)
+                {
+                    out.close();
+                }
+                if (in != null)
+                {
+                    in.close();
+                }
+            }
+            catch (IOException ex)
+            {
+                log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
+            }
+        }
+        return result.toString();
+    }
+
+    public static String sendSSLPost(String url, String param)
+    {
+        StringBuilder result = new StringBuilder();
+        String urlNameString = url + "?" + param;
+        try
+        {
+            log.info("sendSSLPost - {}", urlNameString);
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom());
+            URL console = new URL(urlNameString);
+            HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Accept-Charset", "utf-8");
+            conn.setRequestProperty("contentType", "utf-8");
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+
+            conn.setSSLSocketFactory(sc.getSocketFactory());
+            conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+            conn.connect();
+            InputStream is = conn.getInputStream();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is));
+            String ret = "";
+            while ((ret = br.readLine()) != null)
+            {
+                if (ret != null && !"".equals(ret.trim()))
+                {
+                    result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
+                }
+            }
+            log.info("recv - {}", result);
+            conn.disconnect();
+            br.close();
+        }
+        catch (ConnectException e)
+        {
+            log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
+        }
+        catch (SocketTimeoutException e)
+        {
+            log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+        }
+        catch (IOException e)
+        {
+            log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
+        }
+        catch (Exception e)
+        {
+            log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
+        }
+        return result.toString();
+    }
+
+    private static class TrustAnyTrustManager implements X509TrustManager
+    {
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType)
+        {
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType)
+        {
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers()
+        {
+            return new X509Certificate[] {};
+        }
+    }
+
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier
+    {
+        @Override
+        public boolean verify(String hostname, SSLSession session)
+        {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
new file mode 100644
index 0000000..01c24fc
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -0,0 +1,56 @@
+package com.ruoyi.common.utils.ip;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
+
+/**
+ * 获取地址类
+ * 
+ * @author ruoyi
+ */
+public class AddressUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
+
+    // IP地址查询
+    public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
+
+    // 未知地址
+    public static final String UNKNOWN = "XX XX";
+
+    public static String getRealAddressByIP(String ip)
+    {
+        String address = UNKNOWN;
+        // 内网不查询
+        if (IpUtils.internalIp(ip))
+        {
+            return "内网IP";
+        }
+        if (RuoYiConfig.isAddressEnabled())
+        {
+            try
+            {
+                String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
+                if (StringUtils.isEmpty(rspStr))
+                {
+                    log.error("获取地理位置异常 {}", ip);
+                    return UNKNOWN;
+                }
+                JSONObject obj = JSONObject.parseObject(rspStr);
+                String region = obj.getString("pro");
+                String city = obj.getString("city");
+                return String.format("%s %s", region, city);
+            }
+            catch (Exception e)
+            {
+                log.error("获取地理位置异常 {}", ip);
+            }
+        }
+        return address;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
new file mode 100644
index 0000000..1b3f42b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
@@ -0,0 +1,195 @@
+package com.ruoyi.common.utils.ip;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.html.EscapeUtil;
+
+/**
+ * 获取IP方法
+ * 
+ * @author ruoyi
+ */
+public class IpUtils
+{
+    public static String getIpAddr(HttpServletRequest request)
+    {
+        if (request == null)
+        {
+            return "unknown";
+        }
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        {
+            ip = request.getHeader("X-Forwarded-For");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        {
+            ip = request.getHeader("X-Real-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        {
+            ip = request.getRemoteAddr();
+        }
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip);
+    }
+
+    public static boolean internalIp(String ip)
+    {
+        byte[] addr = textToNumericFormatV4(ip);
+        return internalIp(addr) || "127.0.0.1".equals(ip);
+    }
+
+    private static boolean internalIp(byte[] addr)
+    {
+        if (StringUtils.isNull(addr) || addr.length < 2)
+        {
+            return true;
+        }
+        final byte b0 = addr[0];
+        final byte b1 = addr[1];
+        // 10.x.x.x/8
+        final byte SECTION_1 = 0x0A;
+        // 172.16.x.x/12
+        final byte SECTION_2 = (byte) 0xAC;
+        final byte SECTION_3 = (byte) 0x10;
+        final byte SECTION_4 = (byte) 0x1F;
+        // 192.168.x.x/16
+        final byte SECTION_5 = (byte) 0xC0;
+        final byte SECTION_6 = (byte) 0xA8;
+        switch (b0)
+        {
+            case SECTION_1:
+                return true;
+            case SECTION_2:
+                if (b1 >= SECTION_3 && b1 <= SECTION_4)
+                {
+                    return true;
+                }
+            case SECTION_5:
+                switch (b1)
+                {
+                    case SECTION_6:
+                        return true;
+                }
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 将IPv4地址转换成字节
+     * 
+     * @param text IPv4地址
+     * @return byte 字节
+     */
+    public static byte[] textToNumericFormatV4(String text)
+    {
+        if (text.length() == 0)
+        {
+            return null;
+        }
+
+        byte[] bytes = new byte[4];
+        String[] elements = text.split("\\.", -1);
+        try
+        {
+            long l;
+            int i;
+            switch (elements.length)
+            {
+                case 1:
+                    l = Long.parseLong(elements[0]);
+                    if ((l < 0L) || (l > 4294967295L)) {
+                        return null;
+                    }
+                    bytes[0] = (byte) (int) (l >> 24 & 0xFF);
+                    bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 2:
+                    l = Integer.parseInt(elements[0]);
+                    if ((l < 0L) || (l > 255L)) {
+                        return null;
+                    }
+                    bytes[0] = (byte) (int) (l & 0xFF);
+                    l = Integer.parseInt(elements[1]);
+                    if ((l < 0L) || (l > 16777215L)) {
+                        return null;
+                    }
+                    bytes[1] = (byte) (int) (l >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 3:
+                    for (i = 0; i < 2; ++i)
+                    {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L)) {
+                            return null;
+                        }
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    l = Integer.parseInt(elements[2]);
+                    if ((l < 0L) || (l > 65535L)) {
+                        return null;
+                    }
+                    bytes[2] = (byte) (int) (l >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 4:
+                    for (i = 0; i < 4; ++i)
+                    {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L)) {
+                            return null;
+                        }
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    break;
+                default:
+                    return null;
+            }
+        }
+        catch (NumberFormatException e)
+        {
+            return null;
+        }
+        return bytes;
+    }
+
+    public static String getHostIp()
+    {
+        try
+        {
+            return InetAddress.getLocalHost().getHostAddress();
+        }
+        catch (UnknownHostException e)
+        {
+        }
+        return "127.0.0.1";
+    }
+
+    public static String getHostName()
+    {
+        try
+        {
+            return InetAddress.getLocalHost().getHostName();
+        }
+        catch (UnknownHostException e)
+        {
+        }
+        return "未知";
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
new file mode 100644
index 0000000..4862a4b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -0,0 +1,1256 @@
+package com.ruoyi.common.utils.poi;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFPicture;
+import org.apache.poi.hssf.usermodel.HSSFPictureData;
+import org.apache.poi.hssf.usermodel.HSSFShape;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.PictureData;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.apache.poi.xssf.usermodel.XSSFDrawing;
+import org.apache.poi.xssf.usermodel.XSSFPicture;
+import org.apache.poi.xssf.usermodel.XSSFShape;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.Excel.Type;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.exception.UtilException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileTypeUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.file.ImageUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
+
+/**
+ * Excel相关处理
+ * 
+ * @author ruoyi
+ */
+public class ExcelUtil<T>
+{
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
+
+    /**
+     * Excel sheet最大行数，默认65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 工作表名称
+     */
+    private String sheetName;
+
+    /**
+     * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
+     */
+    private Type type;
+
+    /**
+     * 工作薄对象
+     */
+    private Workbook wb;
+
+    /**
+     * 工作表对象
+     */
+    private Sheet sheet;
+
+    /**
+     * 样式列表
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 导入导出数据列表
+     */
+    private List<T> list;
+
+    /**
+     * 注解列表
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 最大高度
+     */
+    private short maxHeight;
+
+    /**
+     * 统计列表
+     */
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+
+    /**
+     * 数字格式
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
+    /**
+     * 实体对象
+     */
+    public Class<T> clazz;
+
+    public ExcelUtil(Class<T> clazz)
+    {
+        this.clazz = clazz;
+    }
+
+    public void init(List<T> list, String sheetName, Type type)
+    {
+        if (list == null)
+        {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        createExcelField();
+        createWorkbook();
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     * 
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is) throws Exception
+    {
+        return importExcel(StringUtils.EMPTY, is);
+    }
+
+    /**
+     * 对excel表单指定表格索引名转换成list
+     * 
+     * @param sheetName 表格索引名
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(String sheetName, InputStream is) throws Exception
+    {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
+        Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
+        if (sheet == null)
+        {
+            throw new IOException("文件sheet不存在");
+        }
+        boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
+        Map<String, PictureData> pictures;
+        if (isXSSFWorkbook)
+        {
+            pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
+        }
+        else
+        {
+            pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
+        }
+        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
+        int rows = sheet.getLastRowNum();
+
+        if (rows > 0)
+        {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(0);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell))
+                {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                }
+                else
+                {
+                    cellMap.put(null, i);
+                }
+            }
+            // 有数据时才处理 得到类的所有field.
+            Field[] allFields = clazz.getDeclaredFields();
+            // 定义一个map用于存放列的序号和field.
+            Map<Integer, Field> fieldsMap = new HashMap<Integer, Field>();
+            for (int col = 0; col < allFields.length; col++)
+            {
+                Field field = allFields[col];
+                Excel attr = field.getAnnotation(Excel.class);
+                if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+                {
+                    // 设置类的私有字段属性可访问.
+                    field.setAccessible(true);
+                    Integer column = cellMap.get(attr.name());
+                    if (column != null)
+                    {
+                        fieldsMap.put(column, field);
+                    }
+                }
+            }
+            for (int i = 1; i <= rows; i++)
+            {
+                // 从第2行开始取数据,默认第一行是表头.
+                Row row = sheet.getRow(i);
+                // 判断当前行是否是空行
+                if (isRowEmpty(row))
+                {
+                    continue;
+                }
+                T entity = null;
+                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())
+                {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = fieldsMap.get(entry.getKey());
+                    // 取得类型,并根据对象类型设置值.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType)
+                    {
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0"))
+                        {
+                            val = StringUtils.substringBefore(s, ".0");
+                        }
+                        else
+                        {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat))
+                            {
+                                val = DateUtils.parseDateToStr(dateFormat, (Date) val);
+                            }
+                            else
+                            {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    }
+                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
+                    {
+                        val = Convert.toInt(val);
+                    }
+                    else if (Long.TYPE == fieldType || Long.class == fieldType)
+                    {
+                        val = Convert.toLong(val);
+                    }
+                    else if (Double.TYPE == fieldType || Double.class == fieldType)
+                    {
+                        val = Convert.toDouble(val);
+                    }
+                    else if (Float.TYPE == fieldType || Float.class == fieldType)
+                    {
+                        val = Convert.toFloat(val);
+                    }
+                    else if (BigDecimal.class == fieldType)
+                    {
+                        val = Convert.toBigDecimal(val);
+                    }
+                    else if (Date.class == fieldType)
+                    {
+                        if (val instanceof String)
+                        {
+                            val = DateUtils.parseDate(val);
+                        }
+                        else if (val instanceof Double)
+                        {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    }
+                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
+                    {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StringUtils.isNotNull(fieldType))
+                    {
+                        Excel attr = field.getAnnotation(Excel.class);
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr()))
+                        {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        }
+                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))
+                        {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        }
+                        else if (StringUtils.isNotEmpty(attr.dictType()))
+                        {
+                            val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
+                        }
+                        else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
+                        {
+                            PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
+                            if (image == null)
+                            {
+                                val = "";
+                            }
+                            byte[] data = image.getData();
+                            val = FileUtils.writeImportBytes(data);
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @param list 导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public AjaxResult exportExcel(List<T> list, String sheetName)
+    {
+        this.init(list, sheetName, Type.EXPORT);
+        return exportExcel();
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @param response 返回数据
+     * @param list 导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     * @throws IOException
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) throws IOException
+    {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        this.init(list, sheetName, Type.EXPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public AjaxResult importTemplateExcel(String sheetName)
+    {
+        this.init(null, sheetName, Type.IMPORT);
+        return exportExcel();
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException
+    {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        this.init(null, sheetName, Type.IMPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @return 结果
+     */
+    public void exportExcel(OutputStream out)
+    {
+        try
+        {
+            writeSheet();
+            wb.write(out);
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel异常{}", e.getMessage());
+        }
+        finally
+        {
+            IOUtils.closeQuietly(wb);
+            IOUtils.closeQuietly(out);
+        }
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     * 
+     * @return 结果
+     */
+    public AjaxResult exportExcel()
+    {
+        OutputStream out = null;
+        try
+        {
+            writeSheet();
+            String filename = encodingFilename(sheetName);
+            out = new FileOutputStream(getAbsoluteFile(filename));
+            wb.write(out);
+            return AjaxResult.success(filename);
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel异常{}", e.getMessage());
+            throw new UtilException("导出Excel失败，请联系网站管理员！");
+        }
+        finally
+        {
+            IOUtils.closeQuietly(wb);
+            IOUtils.closeQuietly(out);
+        }
+    }
+
+    /**
+     * 创建写入数据到Sheet
+     */
+    public void writeSheet()
+    {
+        // 取出一共有多少个sheet.
+        double sheetNo = Math.ceil(list.size() / sheetSize);
+        for (int index = 0; index <= sheetNo; index++)
+        {
+            createSheet(sheetNo, index);
+
+            // 产生一行
+            Row row = sheet.createRow(0);
+            int column = 0;
+            // 写入各个字段的列头名称
+            for (Object[] os : fields)
+            {
+                Excel excel = (Excel) os[1];
+                this.createCell(excel, row, column++);
+            }
+            if (Type.EXPORT.equals(type))
+            {
+                fillExcelData(index, row);
+                addStatisticsRow();
+            }
+        }
+    }
+
+    /**
+     * 填充excel数据
+     * 
+     * @param index 序号
+     * @param row 单元格行
+     */
+    public void fillExcelData(int index, Row row)
+    {
+        int startNo = index * sheetSize;
+        int endNo = Math.min(startNo + sheetSize, list.size());
+        for (int i = startNo; i < endNo; i++)
+        {
+            row = sheet.createRow(i + 1 - startNo);
+            // 得到导出对象.
+            T vo = (T) list.get(i);
+            int column = 0;
+            for (Object[] os : fields)
+            {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                // 设置实体类私有属性可访问
+                field.setAccessible(true);
+                this.addCell(excel, row, vo, field, column++);
+            }
+        }
+    }
+
+    /**
+     * 创建表格样式
+     * 
+     * @param wb 工作薄对象
+     * @return 样式列表
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb)
+    {
+        // 写入各条记录,每条记录对应excel表中的一行
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = wb.createFont();
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 10);
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(headerFont);
+        styles.put("header", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font totalFont = wb.createFont();
+        totalFont.setFontName("Arial");
+        totalFont.setFontHeightInPoints((short) 10);
+        style.setFont(totalFont);
+        styles.put("total", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.LEFT);
+        styles.put("data1", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        styles.put("data2", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        styles.put("data3", style);
+
+        return styles;
+    }
+
+    /**
+     * 创建单元格
+     */
+    public Cell createCell(Excel attr, Row row, int column)
+    {
+        // 创建列
+        Cell cell = row.createCell(column);
+        // 写入列信息
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get("header"));
+        return cell;
+    }
+
+    /**
+     * 设置单元格信息
+     * 
+     * @param value 单元格值
+     * @param attr 注解相关
+     * @param cell 单元格信息
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell)
+    {
+        if (ColumnType.STRING == attr.cellType())
+        {
+            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
+        }
+        else if (ColumnType.NUMERIC == attr.cellType())
+        {
+            if (StringUtils.isNotNull(value))
+            {
+                cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+            }
+        }
+        else if (ColumnType.IMAGE == attr.cellType())
+        {
+            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
+            String imagePath = Convert.toStr(value);
+            if (StringUtils.isNotEmpty(imagePath))
+            {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 获取画布
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet)
+    {
+        if (sheet.getDrawingPatriarch() == null)
+        {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 获取图片类型,设置图片插入类型
+     */
+    public int getImageType(byte[] value)
+    {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type))
+        {
+            return Workbook.PICTURE_TYPE_JPEG;
+        }
+        else if ("PNG".equalsIgnoreCase(type))
+        {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
+    }
+
+    /**
+     * 创建表格样式
+     */
+    public void setDataValidation(Excel attr, Row row, int column)
+    {
+        if (attr.name().indexOf("注：") >= 0)
+        {
+            sheet.setColumnWidth(column, 6000);
+        }
+        else
+        {
+            // 设置列宽
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+        }
+        // 如果设置了提示信息则鼠标放上去提示.
+        if (StringUtils.isNotEmpty(attr.prompt()))
+        {
+            // 这里默认设了2-101列提示.
+            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+        }
+        // 如果设置了combo属性则本列只能选择不能输入
+        if (attr.combo().length > 0)
+        {
+            // 这里默认设了2-101列只能选择不能输入.
+            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+        }
+    }
+
+    /**
+     * 添加单元格
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
+    {
+        Cell cell = null;
+        try
+        {
+            // 设置行高
+            row.setHeight(maxHeight);
+            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
+            if (attr.isExport())
+            {
+                // 创建cell
+                cell = row.createCell(column);
+                int align = attr.align().value();
+                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+
+                // 用于读取对象中的属性
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                String dictType = attr.dictType();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
+                {
+                    cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
+                }
+                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
+                {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                }
+                else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
+                {
+                    cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
+                }
+                else if (value instanceof BigDecimal && -1 != attr.scale())
+                {
+                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
+                }
+                else
+                {
+                    // 设置列类型
+                    setCellVo(value, attr, cell);
+                }
+                addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel失败{}", e);
+        }
+        return cell;
+    }
+
+    /**
+     * 设置 POI XSSFSheet 单元格提示
+     * 
+     * @param sheet 表单
+     * @param promptTitle 提示标题
+     * @param promptContent 提示内容
+     * @param firstRow 开始行
+     * @param endRow 结束行
+     * @param firstCol 开始列
+     * @param endCol 结束列
+     */
+    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+            int firstCol, int endCol)
+    {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        dataValidation.createPromptBox(promptTitle, promptContent);
+        dataValidation.setShowPromptBox(true);
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 设置某些列的值只能输入预制的数据,显示下拉框.
+     * 
+     * @param sheet 要设置的sheet.
+     * @param textlist 下拉框显示的内容
+     * @param firstRow 开始行
+     * @param endRow 结束行
+     * @param firstCol 开始列
+     * @param endCol 结束列
+     * @return 设置好的sheet.
+     */
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
+    {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        // 加载下拉列表内容
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        // 数据有效性对象
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation)
+        {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        }
+        else
+        {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     * 
+     * @param propertyValue 参数值
+     * @param converterExp 翻译注解
+     * @param separator 分隔符
+     * @return 解析后值
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator)
+    {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource)
+        {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue))
+            {
+                for (String value : propertyValue.split(separator))
+                {
+                    if (itemArray[0].equals(value))
+                    {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                if (itemArray[0].equals(propertyValue))
+                {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     * 
+     * @param propertyValue 参数值
+     * @param converterExp 翻译注解
+     * @param separator 分隔符
+     * @return 解析后值
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator)
+    {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource)
+        {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue))
+            {
+                for (String value : propertyValue.split(separator))
+                {
+                    if (itemArray[1].equals(value))
+                    {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                if (itemArray[1].equals(propertyValue))
+                {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 解析字典值
+     * 
+     * @param dictValue 字典值
+     * @param dictType 字典类型
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    public static String convertDictByExp(String dictValue, String dictType, String separator)
+    {
+        return DictUtils.getDictLabel(dictType, dictValue, separator);
+    }
+
+    /**
+     * 反向解析值字典值
+     * 
+     * @param dictLabel 字典标签
+     * @param dictType 字典类型
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    public static String reverseDictByExp(String dictLabel, String dictType, String separator)
+    {
+        return DictUtils.getDictValue(dictType, dictLabel, separator);
+    }
+
+    /**
+     * 合计统计信息
+     */
+    private void addStatisticsData(Integer index, String text, Excel entity)
+    {
+        if (entity != null && entity.isStatistics())
+        {
+            Double temp = 0D;
+            if (!statistics.containsKey(index))
+            {
+                statistics.put(index, temp);
+            }
+            try
+            {
+                temp = Double.valueOf(text);
+            }
+            catch (NumberFormatException e)
+            {
+            }
+            statistics.put(index, statistics.get(index) + temp);
+        }
+    }
+
+    /**
+     * 创建统计行
+     */
+    public void addStatisticsRow()
+    {
+        if (statistics.size() > 0)
+        {
+            Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+            Set<Integer> keys = statistics.keySet();
+            Cell cell = row.createCell(0);
+            cell.setCellStyle(styles.get("total"));
+            cell.setCellValue("合计");
+
+            for (Integer key : keys)
+            {
+                cell = row.createCell(key);
+                cell.setCellStyle(styles.get("total"));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+            }
+            statistics.clear();
+        }
+    }
+
+    /**
+     * 编码文件名
+     */
+    public String encodingFilename(String filename)
+    {
+        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+        return filename;
+    }
+
+    /**
+     * 获取下载路径
+     * 
+     * @param filename 文件名称
+     */
+    public String getAbsoluteFile(String filename)
+    {
+        String downloadPath = RuoYiConfig.getDownloadPath() + filename;
+        File desc = new File(downloadPath);
+        if (!desc.getParentFile().exists())
+        {
+            desc.getParentFile().mkdirs();
+        }
+        return downloadPath;
+    }
+
+    /**
+     * 获取bean中的属性值
+     * 
+     * @param vo 实体对象
+     * @param field 字段
+     * @param excel 注解
+     * @return 最终的属性值
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
+    {
+        Object o = field.get(vo);
+        if (StringUtils.isNotEmpty(excel.targetAttr()))
+        {
+            String target = excel.targetAttr();
+            if (target.indexOf(".") > -1)
+            {
+                String[] targets = target.split("[.]");
+                for (String name : targets)
+                {
+                    o = getValue(o, name);
+                }
+            }
+            else
+            {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 以类的属性的get方法方法形式获取值
+     * 
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception
+    {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
+        {
+            Class<?> clazz = o.getClass();
+            Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            o = field.get(o);
+        }
+        return o;
+    }
+
+    /**
+     * 得到所有定义字段
+     */
+    private void createExcelField()
+    {
+        this.fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields)
+        {
+            // 单注解
+            if (field.isAnnotationPresent(Excel.class))
+            {
+                putToField(field, field.getAnnotation(Excel.class));
+            }
+
+            // 多注解
+            if (field.isAnnotationPresent(Excels.class))
+            {
+                Excels attrs = field.getAnnotation(Excels.class);
+                Excel[] excels = attrs.value();
+                for (Excel excel : excels)
+                {
+                    putToField(field, excel);
+                }
+            }
+        }
+        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+
+    /**
+     * 根据注解获取最大行高
+     */
+    public short getRowHeight()
+    {
+        double maxHeight = 0;
+        for (Object[] os : this.fields)
+        {
+            Excel excel = (Excel) os[1];
+            maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+        }
+        return (short) (maxHeight * 20);
+    }
+
+    /**
+     * 放到字段集合中
+     */
+    private void putToField(Field field, Excel attr)
+    {
+        if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+        {
+            this.fields.add(new Object[] { field, attr });
+        }
+    }
+
+    /**
+     * 创建一个工作簿
+     */
+    public void createWorkbook()
+    {
+        this.wb = new SXSSFWorkbook(500);
+    }
+
+    /**
+     * 创建工作表
+     * 
+     * @param sheetNo sheet数量
+     * @param index 序号
+     */
+    public void createSheet(double sheetNo, int index)
+    {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        // 设置工作表的名称.
+        if (sheetNo == 0)
+        {
+            wb.setSheetName(index, sheetName);
+        }
+        else
+        {
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+
+    /**
+     * 获取单元格值
+     * 
+     * @param row 获取的行
+     * @param column 获取单元格列号
+     * @return 单元格值
+     */
+    public Object getCellValue(Row row, int column)
+    {
+        if (row == null)
+        {
+            return row;
+        }
+        Object val = "";
+        try
+        {
+            Cell cell = row.getCell(column);
+            if (StringUtils.isNotNull(cell))
+            {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
+                {
+                    val = cell.getNumericCellValue();
+                    if (DateUtil.isCellDateFormatted(cell))
+                    {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
+                    }
+                    else
+                    {
+                        if ((Double) val % 1 != 0)
+                        {
+                            val = new BigDecimal(val.toString());
+                        }
+                        else
+                        {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                }
+                else if (cell.getCellType() == CellType.STRING)
+                {
+                    val = cell.getStringCellValue();
+                }
+                else if (cell.getCellType() == CellType.BOOLEAN)
+                {
+                    val = cell.getBooleanCellValue();
+                }
+                else if (cell.getCellType() == CellType.ERROR)
+                {
+                    val = cell.getErrorCellValue();
+                }
+
+            }
+        }
+        catch (Exception e)
+        {
+            return val;
+        }
+        return val;
+    }
+
+    /**
+     * 判断是否是空行
+     * 
+     * @param row 判断的行
+     * @return
+     */
+    private boolean isRowEmpty(Row row)
+    {
+        if (row == null)
+        {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
+        {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 获取Excel2003图片
+     *
+     * @param sheet 当前sheet对象
+     * @param workbook 工作簿对象
+     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
+     */
+    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
+    {
+        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
+        List<HSSFPictureData> pictures = workbook.getAllPictures();
+        if (!pictures.isEmpty())
+        {
+            for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
+            {
+                HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
+                if (shape instanceof HSSFPicture)
+                {
+                    HSSFPicture pic = (HSSFPicture) shape;
+                    int pictureIndex = pic.getPictureIndex() - 1;
+                    HSSFPictureData picData = pictures.get(pictureIndex);
+                    String picIndex = String.valueOf(anchor.getRow1()) + "_" + String.valueOf(anchor.getCol1());
+                    sheetIndexPicMap.put(picIndex, picData);
+                }
+            }
+            return sheetIndexPicMap;
+        }
+        else
+        {
+            return sheetIndexPicMap;
+        }
+    }
+
+    /**
+     * 获取Excel2007图片
+     *
+     * @param sheet 当前sheet对象
+     * @param workbook 工作簿对象
+     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
+     */
+    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
+    {
+        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
+        for (POIXMLDocumentPart dr : sheet.getRelations())
+        {
+            if (dr instanceof XSSFDrawing)
+            {
+                XSSFDrawing drawing = (XSSFDrawing) dr;
+                List<XSSFShape> shapes = drawing.getShapes();
+                for (XSSFShape shape : shapes)
+                {
+                    if (shape instanceof XSSFPicture)
+                    {
+                        XSSFPicture pic = (XSSFPicture) shape;
+                        XSSFClientAnchor anchor = pic.getPreferredSize();
+                        CTMarker ctMarker = anchor.getFrom();
+                        String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();
+                        sheetIndexPicMap.put(picIndex, pic.getPictureData());
+                    }
+                }
+            }
+        }
+        return sheetIndexPicMap;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
new file mode 100644
index 0000000..b19953e
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@@ -0,0 +1,410 @@
+package com.ruoyi.common.utils.reflect;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ * 
+ * @author ruoyi
+ */
+@SuppressWarnings("rawtypes")
+public class ReflectUtils
+{
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    private static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName)
+    {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, "."))
+        {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value)
+    {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++)
+        {
+            if (i < names.length - 1)
+            {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+            }
+            else
+            {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                invokeMethodByName(object, setterMethodName, new Object[] { value });
+            }
+        }
+    }
+
+    /**
+     * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E getFieldValue(final Object obj, final String fieldName)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return null;
+        }
+        E result = null;
+        try
+        {
+            result = (E) field.get(obj);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常{}", e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
+     */
+    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return;
+        }
+        try
+        {
+            field.set(obj, value);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符.
+     * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
+     * 同时匹配方法名+参数类型，
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
+            final Object[] args)
+    {
+        if (obj == null || methodName == null)
+        {
+            return null;
+        }
+        Method method = getAccessibleMethod(obj, methodName, parameterTypes);
+        if (method == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符，
+     * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
+     * 只匹配函数名，如果有多个同名函数调用第一个。
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
+    {
+        Method method = getAccessibleMethodByName(obj, methodName, args.length);
+        if (method == null)
+        {
+            // 如果为空不报错，直接返回空。
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            // 类型转换（将参数数据类型转换为目标方法参数类型）
+            Class<?>[] cs = method.getParameterTypes();
+            for (int i = 0; i < cs.length; i++)
+            {
+                if (args[i] != null && !args[i].getClass().equals(cs[i]))
+                {
+                    if (cs[i] == String.class)
+                    {
+                        args[i] = Convert.toStr(args[i]);
+                        if (StringUtils.endsWith((String) args[i], ".0"))
+                        {
+                            args[i] = StringUtils.substringBefore((String) args[i], ".0");
+                        }
+                    }
+                    else if (cs[i] == Integer.class)
+                    {
+                        args[i] = Convert.toInt(args[i]);
+                    }
+                    else if (cs[i] == Long.class)
+                    {
+                        args[i] = Convert.toLong(args[i]);
+                    }
+                    else if (cs[i] == Double.class)
+                    {
+                        args[i] = Convert.toDouble(args[i]);
+                    }
+                    else if (cs[i] == Float.class)
+                    {
+                        args[i] = Convert.toFloat(args[i]);
+                    }
+                    else if (cs[i] == Date.class)
+                    {
+                        if (args[i] instanceof String)
+                        {
+                            args[i] = DateUtils.parseDate(args[i]);
+                        }
+                        else
+                        {
+                            args[i] = DateUtil.getJavaDate((Double) args[i]);
+                        }
+                    }
+                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)
+                    {
+                        args[i] = Convert.toBool(args[i]);
+                    }
+                }
+            }
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     */
+    public static Field getAccessibleField(final Object obj, final String fieldName)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(fieldName, "fieldName can't be blank");
+        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
+        {
+            try
+            {
+                Field field = superClass.getDeclaredField(fieldName);
+                makeAccessible(field);
+                return field;
+            }
+            catch (NoSuchFieldException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 匹配函数名+参数类型。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethod(final Object obj, final String methodName,
+            final Class<?>... parameterTypes)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            try
+            {
+                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
+                makeAccessible(method);
+                return method;
+            }
+            catch (NoSuchMethodException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 只匹配函数名。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            Method[] methods = searchType.getDeclaredMethods();
+            for (Method method : methods)
+            {
+                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
+                {
+                    makeAccessible(method);
+                    return method;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Method method)
+    {
+        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
+                && !method.isAccessible())
+        {
+            method.setAccessible(true);
+        }
+    }
+
+    /**
+     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Field field)
+    {
+        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
+                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
+        {
+            field.setAccessible(true);
+        }
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
+     * 如无法找到, 返回Object.class.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getClassGenricType(final Class clazz)
+    {
+        return getClassGenricType(clazz, 0);
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
+     * 如无法找到, 返回Object.class.
+     */
+    public static Class getClassGenricType(final Class clazz, final int index)
+    {
+        Type genType = clazz.getGenericSuperclass();
+
+        if (!(genType instanceof ParameterizedType))
+        {
+            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+            return Object.class;
+        }
+
+        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+
+        if (index >= params.length || index < 0)
+        {
+            logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
+                    + params.length);
+            return Object.class;
+        }
+        if (!(params[index] instanceof Class))
+        {
+            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+            return Object.class;
+        }
+
+        return (Class) params[index];
+    }
+
+    public static Class<?> getUserClass(Object instance)
+    {
+        if (instance == null)
+        {
+            throw new RuntimeException("Instance must not be null");
+        }
+        Class clazz = instance.getClass();
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
+        {
+            Class<?> superClass = clazz.getSuperclass();
+            if (superClass != null && !Object.class.equals(superClass))
+            {
+                return superClass;
+            }
+        }
+        return clazz;
+
+    }
+
+    /**
+     * 将反射时的checked exception转换为unchecked exception.
+     */
+    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
+    {
+        if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
+                || e instanceof NoSuchMethodException)
+        {
+            return new IllegalArgumentException(msg, e);
+        }
+        else if (e instanceof InvocationTargetException)
+        {
+            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
+        }
+        return new RuntimeException(msg, e);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java
new file mode 100644
index 0000000..ca1cd92
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java
@@ -0,0 +1,291 @@
+package com.ruoyi.common.utils.sign;
+
+/**
+ * Base64工具类
+ * 
+ * @author ruoyi
+ */
+public final class Base64
+{
+    static private final int     BASELENGTH           = 128;
+    static private final int     LOOKUPLENGTH         = 64;
+    static private final int     TWENTYFOURBITGROUP   = 24;
+    static private final int     EIGHTBIT             = 8;
+    static private final int     SIXTEENBIT           = 16;
+    static private final int     FOURBYTE             = 4;
+    static private final int     SIGN                 = -128;
+    static private final char    PAD                  = '=';
+    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
+    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+
+    static
+    {
+        for (int i = 0; i < BASELENGTH; ++i)
+        {
+            base64Alphabet[i] = -1;
+        }
+        for (int i = 'Z'; i >= 'A'; i--)
+        {
+            base64Alphabet[i] = (byte) (i - 'A');
+        }
+        for (int i = 'z'; i >= 'a'; i--)
+        {
+            base64Alphabet[i] = (byte) (i - 'a' + 26);
+        }
+
+        for (int i = '9'; i >= '0'; i--)
+        {
+            base64Alphabet[i] = (byte) (i - '0' + 52);
+        }
+
+        base64Alphabet['+'] = 62;
+        base64Alphabet['/'] = 63;
+
+        for (int i = 0; i <= 25; i++)
+        {
+            lookUpBase64Alphabet[i] = (char) ('A' + i);
+        }
+
+        for (int i = 26, j = 0; i <= 51; i++, j++)
+        {
+            lookUpBase64Alphabet[i] = (char) ('a' + j);
+        }
+
+        for (int i = 52, j = 0; i <= 61; i++, j++)
+        {
+            lookUpBase64Alphabet[i] = (char) ('0' + j);
+        }
+        lookUpBase64Alphabet[62] = (char) '+';
+        lookUpBase64Alphabet[63] = (char) '/';
+    }
+
+    private static boolean isWhiteSpace(char octect)
+    {
+        return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
+    }
+
+    private static boolean isPad(char octect)
+    {
+        return (octect == PAD);
+    }
+
+    private static boolean isData(char octect)
+    {
+        return (octect < BASELENGTH && base64Alphabet[octect] != -1);
+    }
+
+    /**
+     * Encodes hex octects into Base64
+     *
+     * @param binaryData Array containing binaryData
+     * @return Encoded Base64 array
+     */
+    public static String encode(byte[] binaryData)
+    {
+        if (binaryData == null)
+        {
+            return null;
+        }
+
+        int lengthDataBits = binaryData.length * EIGHTBIT;
+        if (lengthDataBits == 0)
+        {
+            return "";
+        }
+
+        int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
+        int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
+        int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
+        char encodedData[] = null;
+
+        encodedData = new char[numberQuartet * 4];
+
+        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+
+        int encodedIndex = 0;
+        int dataIndex = 0;
+
+        for (int i = 0; i < numberTriplets; i++)
+        {
+            b1 = binaryData[dataIndex++];
+            b2 = binaryData[dataIndex++];
+            b3 = binaryData[dataIndex++];
+
+            l = (byte) (b2 & 0x0f);
+            k = (byte) (b1 & 0x03);
+
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+            byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
+
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
+        }
+
+        // form integral number of 6-bit groups
+        if (fewerThan24bits == EIGHTBIT)
+        {
+            b1 = binaryData[dataIndex];
+            k = (byte) (b1 & 0x03);
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+            encodedData[encodedIndex++] = PAD;
+            encodedData[encodedIndex++] = PAD;
+        }
+        else if (fewerThan24bits == SIXTEENBIT)
+        {
+            b1 = binaryData[dataIndex];
+            b2 = binaryData[dataIndex + 1];
+            l = (byte) (b2 & 0x0f);
+            k = (byte) (b1 & 0x03);
+
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+            encodedData[encodedIndex++] = PAD;
+        }
+        return new String(encodedData);
+    }
+
+    /**
+     * Decodes Base64 data into octects
+     *
+     * @param encoded string containing Base64 data
+     * @return Array containind decoded data.
+     */
+    public static byte[] decode(String encoded)
+    {
+        if (encoded == null)
+        {
+            return null;
+        }
+
+        char[] base64Data = encoded.toCharArray();
+        // remove white spaces
+        int len = removeWhiteSpace(base64Data);
+
+        if (len % FOURBYTE != 0)
+        {
+            return null;// should be divisible by four
+        }
+
+        int numberQuadruple = (len / FOURBYTE);
+
+        if (numberQuadruple == 0)
+        {
+            return new byte[0];
+        }
+
+        byte decodedData[] = null;
+        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+        char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
+
+        int i = 0;
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        decodedData = new byte[(numberQuadruple) * 3];
+
+        for (; i < numberQuadruple - 1; i++)
+        {
+
+            if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
+                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
+            {
+                return null;
+            } // if found "no data" just return null
+
+            b1 = base64Alphabet[d1];
+            b2 = base64Alphabet[d2];
+            b3 = base64Alphabet[d3];
+            b4 = base64Alphabet[d4];
+
+            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+        }
+
+        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
+        {
+            return null;// if found "no data" just return null
+        }
+
+        b1 = base64Alphabet[d1];
+        b2 = base64Alphabet[d2];
+
+        d3 = base64Data[dataIndex++];
+        d4 = base64Data[dataIndex++];
+        if (!isData((d3)) || !isData((d4)))
+        {// Check if they are PAD characters
+            if (isPad(d3) && isPad(d4))
+            {
+                if ((b2 & 0xf) != 0)// last 4 bits should be zero
+                {
+                    return null;
+                }
+                byte[] tmp = new byte[i * 3 + 1];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+                return tmp;
+            }
+            else if (!isPad(d3) && isPad(d4))
+            {
+                b3 = base64Alphabet[d3];
+                if ((b3 & 0x3) != 0)// last 2 bits should be zero
+                {
+                    return null;
+                }
+                byte[] tmp = new byte[i * 3 + 2];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+                tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+                return tmp;
+            }
+            else
+            {
+                return null;
+            }
+        }
+        else
+        { // No PAD e.g 3cQl
+            b3 = base64Alphabet[d3];
+            b4 = base64Alphabet[d4];
+            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+
+        }
+        return decodedData;
+    }
+
+    /**
+     * remove WhiteSpace from MIME containing encoded Base64 data.
+     *
+     * @param data the byte array of base64 data (with WS)
+     * @return the new length
+     */
+    private static int removeWhiteSpace(char[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        // count characters that's not whitespace
+        int newSize = 0;
+        int len = data.length;
+        for (int i = 0; i < len; i++)
+        {
+            if (!isWhiteSpace(data[i]))
+            {
+                data[newSize++] = data[i];
+            }
+        }
+        return newSize;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
new file mode 100644
index 0000000..de77ee8
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
@@ -0,0 +1,66 @@
+package com.ruoyi.common.utils.sign;
+
+import java.security.MessageDigest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Md5加密方法
+ * 
+ * @author ruoyi
+ */
+public class Md5Utils
+{
+    private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
+
+    private static byte[] md5(String s)
+    {
+        MessageDigest algorithm;
+        try
+        {
+            algorithm = MessageDigest.getInstance("MD5");
+            algorithm.reset();
+            algorithm.update(s.getBytes("UTF-8"));
+            byte[] messageDigest = algorithm.digest();
+            return messageDigest;
+        }
+        catch (Exception e)
+        {
+            log.error("MD5 Error...", e);
+        }
+        return null;
+    }
+
+    private static final String toHex(byte hash[])
+    {
+        if (hash == null)
+        {
+            return null;
+        }
+        StringBuffer buf = new StringBuffer(hash.length * 2);
+        int i;
+
+        for (i = 0; i < hash.length; i++)
+        {
+            if ((hash[i] & 0xff) < 0x10)
+            {
+                buf.append("0");
+            }
+            buf.append(Long.toString(hash[i] & 0xff, 16));
+        }
+        return buf.toString();
+    }
+
+    public static String hash(String s)
+    {
+        try
+        {
+            return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
+        }
+        catch (Exception e)
+        {
+            log.error("not supported charset...{}", e);
+            return s;
+        }
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
new file mode 100644
index 0000000..9993b98
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -0,0 +1,146 @@
+package com.ruoyi.common.utils.spring;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * spring工具类 方便在非spring管理环境中获取bean
+ * 
+ * @author ruoyi
+ */
+@Component
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware 
+{
+    /** Spring应用上下文环境 */
+    private static ConfigurableListableBeanFactory beanFactory;
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException 
+    {
+        SpringUtils.beanFactory = beanFactory;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException 
+    {
+        SpringUtils.applicationContext = applicationContext;
+    }
+
+    /**
+     * 获取对象
+     *
+     * @param name
+     * @return Object 一个以所给名字注册的bean的实例
+     * @throws org.springframework.beans.BeansException
+     *
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getBean(String name) throws BeansException
+    {
+        return (T) beanFactory.getBean(name);
+    }
+
+    /**
+     * 获取类型为requiredType的对象
+     *
+     * @param clz
+     * @return
+     * @throws org.springframework.beans.BeansException
+     *
+     */
+    public static <T> T getBean(Class<T> clz) throws BeansException
+    {
+        T result = (T) beanFactory.getBean(clz);
+        return result;
+    }
+
+    /**
+     * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+     *
+     * @param name
+     * @return boolean
+     */
+    public static boolean containsBean(String name)
+    {
+        return beanFactory.containsBean(name);
+    }
+
+    /**
+     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+     *
+     * @param name
+     * @return boolean
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.isSingleton(name);
+    }
+
+    /**
+     * @param name
+     * @return Class 注册对象的类型
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getType(name);
+    }
+
+    /**
+     * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+     *
+     * @param name
+     * @return
+     * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+     *
+     */
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getAliases(name);
+    }
+
+    /**
+     * 获取aop代理对象
+     * 
+     * @param invoker
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker)
+    {
+        return (T) AopContext.currentProxy();
+    }
+
+    /**
+     * 获取当前的环境配置，无配置返回null
+     *
+     * @return 当前的环境配置
+     */
+    public static String[] getActiveProfiles()
+    {
+        return applicationContext.getEnvironment().getActiveProfiles();
+    }
+
+    /**
+     * 获取当前的环境配置，当有多个环境配置时，只获取第一个
+     *
+     * @return 当前的环境配置
+     */
+    public static String getActiveProfile()
+    {
+        final String[] activeProfiles = getActiveProfiles();
+        return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
new file mode 100644
index 0000000..a198946
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
@@ -0,0 +1,37 @@
+package com.ruoyi.common.utils.sql;
+
+import com.ruoyi.common.exception.UtilException;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * sql操作工具类
+ * 
+ * @author ruoyi
+ */
+public class SqlUtil
+{
+    /**
+     * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
+     */
+    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
+
+    /**
+     * 检查字符，防止注入绕过
+     */
+    public static String escapeOrderBySql(String value)
+    {
+        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
+        {
+            throw new UtilException("参数不符合规范，不能进行查询");
+        }
+        return value;
+    }
+
+    /**
+     * 验证 order by 语法是否符合规范
+     */
+    public static boolean isValidOrderBySql(String value)
+    {
+        return value.matches(SQL_PATTERN);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
new file mode 100644
index 0000000..2c84427
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
@@ -0,0 +1,49 @@
+package com.ruoyi.common.utils.uuid;
+
+/**
+ * ID生成器工具类
+ * 
+ * @author ruoyi
+ */
+public class IdUtils
+{
+    /**
+     * 获取随机UUID
+     * 
+     * @return 随机UUID
+     */
+    public static String randomUUID()
+    {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 简化的UUID，去掉了横线
+     * 
+     * @return 简化的UUID，去掉了横线
+     */
+    public static String simpleUUID()
+    {
+        return UUID.randomUUID().toString(true);
+    }
+
+    /**
+     * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID
+     * 
+     * @return 随机UUID
+     */
+    public static String fastUUID()
+    {
+        return UUID.fastUUID().toString();
+    }
+
+    /**
+     * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
+     * 
+     * @return 简化的UUID，去掉了横线
+     */
+    public static String fastSimpleUUID()
+    {
+        return UUID.fastUUID().toString(true);
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
new file mode 100644
index 0000000..062d633
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
@@ -0,0 +1,484 @@
+package com.ruoyi.common.utils.uuid;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import com.ruoyi.common.exception.UtilException;
+
+/**
+ * 提供通用唯一识别码（universally unique identifier）（UUID）实现
+ *
+ * @author ruoyi
+ */
+public final class UUID implements java.io.Serializable, Comparable<UUID>
+{
+    private static final long serialVersionUID = -1185015143654744140L;
+
+    /**
+     * SecureRandom 的单例
+     *
+     */
+    private static class Holder
+    {
+        static final SecureRandom numberGenerator = getSecureRandom();
+    }
+
+    /** 此UUID的最高64有效位 */
+    private final long mostSigBits;
+
+    /** 此UUID的最低64有效位 */
+    private final long leastSigBits;
+
+    /**
+     * 私有构造
+     * 
+     * @param data 数据
+     */
+    private UUID(byte[] data)
+    {
+        long msb = 0;
+        long lsb = 0;
+        assert data.length == 16 : "data must be 16 bytes in length";
+        for (int i = 0; i < 8; i++)
+        {
+            msb = (msb << 8) | (data[i] & 0xff);
+        }
+        for (int i = 8; i < 16; i++)
+        {
+            lsb = (lsb << 8) | (data[i] & 0xff);
+        }
+        this.mostSigBits = msb;
+        this.leastSigBits = lsb;
+    }
+
+    /**
+     * 使用指定的数据构造新的 UUID。
+     *
+     * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
+     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
+     */
+    public UUID(long mostSigBits, long leastSigBits)
+    {
+        this.mostSigBits = mostSigBits;
+        this.leastSigBits = leastSigBits;
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
+     * 
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID fastUUID()
+    {
+        return randomUUID(false);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     * 
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID()
+    {
+        return randomUUID(true);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     * 
+     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID(boolean isSecure)
+    {
+        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+
+        byte[] randomBytes = new byte[16];
+        ng.nextBytes(randomBytes);
+        randomBytes[6] &= 0x0f; /* clear version */
+        randomBytes[6] |= 0x40; /* set to version 4 */
+        randomBytes[8] &= 0x3f; /* clear variant */
+        randomBytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(randomBytes);
+    }
+
+    /**
+     * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
+     *
+     * @param name 用于构造 UUID 的字节数组。
+     *
+     * @return 根据指定数组生成的 {@code UUID}
+     */
+    public static UUID nameUUIDFromBytes(byte[] name)
+    {
+        MessageDigest md;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException nsae)
+        {
+            throw new InternalError("MD5 not supported");
+        }
+        byte[] md5Bytes = md.digest(name);
+        md5Bytes[6] &= 0x0f; /* clear version */
+        md5Bytes[6] |= 0x30; /* set to version 3 */
+        md5Bytes[8] &= 0x3f; /* clear variant */
+        md5Bytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(md5Bytes);
+    }
+
+    /**
+     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
+     *
+     * @param name 指定 {@code UUID} 字符串
+     * @return 具有指定值的 {@code UUID}
+     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
+     *
+     */
+    public static UUID fromString(String name)
+    {
+        String[] components = name.split("-");
+        if (components.length != 5)
+        {
+            throw new IllegalArgumentException("Invalid UUID string: " + name);
+        }
+        for (int i = 0; i < 5; i++)
+        {
+            components[i] = "0x" + components[i];
+        }
+
+        long mostSigBits = Long.decode(components[0]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[1]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[2]).longValue();
+
+        long leastSigBits = Long.decode(components[3]).longValue();
+        leastSigBits <<= 48;
+        leastSigBits |= Long.decode(components[4]).longValue();
+
+        return new UUID(mostSigBits, leastSigBits);
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最低有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中的最低有效 64 位。
+     */
+    public long getLeastSignificantBits()
+    {
+        return leastSigBits;
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最高有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中最高有效 64 位。
+     */
+    public long getMostSignificantBits()
+    {
+        return mostSigBits;
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
+     * <p>
+     * 版本号具有以下含意:
+     * <ul>
+     * <li>1 基于时间的 UUID
+     * <li>2 DCE 安全 UUID
+     * <li>3 基于名称的 UUID
+     * <li>4 随机生成的 UUID
+     * </ul>
+     *
+     * @return 此 {@code UUID} 的版本号
+     */
+    public int version()
+    {
+        // Version is bits masked by 0x000000000000F000 in MS long
+        return (int) ((mostSigBits >> 12) & 0x0f);
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
+     * <p>
+     * 变体号具有以下含意：
+     * <ul>
+     * <li>0 为 NCS 向后兼容保留
+     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
+     * <li>6 保留，微软向后兼容
+     * <li>7 保留供以后定义使用
+     * </ul>
+     *
+     * @return 此 {@code UUID} 相关联的变体号
+     */
+    public int variant()
+    {
+        // This field is composed of a varying number of bits.
+        // 0 - - Reserved for NCS backward compatibility
+        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
+        // 1 1 0 Reserved, Microsoft backward compatibility
+        // 1 1 1 Reserved for future definition.
+        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
+    }
+
+    /**
+     * 与此 UUID 相关联的时间戳值。
+     *
+     * <p>
+     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
+     * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
+     *
+     * <p>
+     * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
+     */
+    public long timestamp() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (mostSigBits & 0x0FFFL) << 48//
+                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
+                | mostSigBits >>> 32;
+    }
+
+    /**
+     * 与此 UUID 相关联的时钟序列值。
+     *
+     * <p>
+     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
+     * <p>
+     * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
+     * UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的时钟序列
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public int clockSequence() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
+    }
+
+    /**
+     * 与此 UUID 相关的节点值。
+     *
+     * <p>
+     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
+     * <p>
+     * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的节点值
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public long node() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return leastSigBits & 0x0000FFFFFFFFFFFFL;
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     * 
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     * 
+     * </blockquote>
+     *
+     * @return 此{@code UUID} 的字符串表现形式
+     * @see #toString(boolean)
+     */
+    @Override
+    public String toString()
+    {
+        return toString(false);
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     * 
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     * 
+     * </blockquote>
+     *
+     * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
+     * @return 此{@code UUID} 的字符串表现形式
+     */
+    public String toString(boolean isSimple)
+    {
+        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
+        // time_low
+        builder.append(digits(mostSigBits >> 32, 8));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_mid
+        builder.append(digits(mostSigBits >> 16, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_high_and_version
+        builder.append(digits(mostSigBits, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // variant_and_sequence
+        builder.append(digits(leastSigBits >> 48, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // node
+        builder.append(digits(leastSigBits, 12));
+
+        return builder.toString();
+    }
+
+    /**
+     * 返回此 UUID 的哈希码。
+     *
+     * @return UUID 的哈希码值。
+     */
+    @Override
+    public int hashCode()
+    {
+        long hilo = mostSigBits ^ leastSigBits;
+        return ((int) (hilo >> 32)) ^ (int) hilo;
+    }
+
+    /**
+     * 将此对象与指定对象比较。
+     * <p>
+     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
+     *
+     * @param obj 要与之比较的对象
+     *
+     * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if ((null == obj) || (obj.getClass() != UUID.class))
+        {
+            return false;
+        }
+        UUID id = (UUID) obj;
+        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
+    }
+
+    // Comparison Operations
+
+    /**
+     * 将此 UUID 与指定的 UUID 比较。
+     *
+     * <p>
+     * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
+     *
+     * @param val 与此 UUID 比较的 UUID
+     *
+     * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
+     *
+     */
+    @Override
+    public int compareTo(UUID val)
+    {
+        // The ordering is intentionally set up so that the UUIDs
+        // can simply be numerically compared as two numbers
+        return (this.mostSigBits < val.mostSigBits ? -1 : //
+                (this.mostSigBits > val.mostSigBits ? 1 : //
+                        (this.leastSigBits < val.leastSigBits ? -1 : //
+                                (this.leastSigBits > val.leastSigBits ? 1 : //
+                                        0))));
+    }
+
+    // -------------------------------------------------------------------------------------------------------------------
+    // Private method start
+    /**
+     * 返回指定数字对应的hex值
+     * 
+     * @param val 值
+     * @param digits 位
+     * @return 值
+     */
+    private static String digits(long val, int digits)
+    {
+        long hi = 1L << (digits * 4);
+        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+    }
+
+    /**
+     * 检查是否为time-based版本UUID
+     */
+    private void checkTimeBase()
+    {
+        if (version() != 1)
+        {
+            throw new UnsupportedOperationException("Not a time-based UUID");
+        }
+    }
+
+    /**
+     * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
+     * 
+     * @return {@link SecureRandom}
+     */
+    public static SecureRandom getSecureRandom()
+    {
+        try
+        {
+            return SecureRandom.getInstance("SHA1PRNG");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new UtilException(e);
+        }
+    }
+
+    /**
+     * 获取随机数生成器对象<br>
+     * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
+     * 
+     * @return {@link ThreadLocalRandom}
+     */
+    public static ThreadLocalRandom getRandom()
+    {
+        return ThreadLocalRandom.current();
+    }
+}
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
new file mode 100644
index 0000000..15f13e8
--- /dev/null
+++ b/ruoyi-framework/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-framework</artifactId>
+
+    <description>
+        framework框架核心
+    </description>
+
+    <dependencies>
+
+        <!-- SpringBoot Web容器 -->
+         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- SpringBoot 拦截器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <!-- 阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 验证码 -->
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 获取系统信息 -->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+        </dependency>
+
+        <!-- 系统模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
new file mode 100644
index 0000000..226e150
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -0,0 +1,181 @@
+package com.ruoyi.framework.aspectj;
+
+import java.lang.reflect.Method;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+
+/**
+ * 数据过滤处理
+ *
+ * @author ruoyi
+ */
+@Aspect
+@Component
+public class DataScopeAspect
+{
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 自定数据权限
+     */
+    public static final String DATA_SCOPE_CUSTOM = "2";
+
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "3";
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "5";
+
+    /**
+     * 数据权限过滤关键字
+     */
+    public static final String DATA_SCOPE = "dataScope";
+
+    // 配置织入点
+    @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)")
+    public void dataScopePointCut()
+    {
+    }
+
+    @Before("dataScopePointCut()")
+    public void doBefore(JoinPoint point) throws Throwable
+    {
+        clearDataScope(point);
+        handleDataScope(point);
+    }
+
+    protected void handleDataScope(final JoinPoint joinPoint)
+    {
+        // 获得注解
+        DataScope controllerDataScope = getAnnotationLog(joinPoint);
+        if (controllerDataScope == null)
+        {
+            return;
+        }
+        // 获取当前的用户
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (StringUtils.isNotNull(loginUser))
+        {
+            SysUser currentUser = loginUser.getUser();
+            // 如果是超级管理员，则不过滤数据
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
+            {
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+                        controllerDataScope.userAlias());
+            }
+        }
+    }
+
+    /**
+     * 数据范围过滤
+     *
+     * @param joinPoint 切点
+     * @param user 用户
+     * @param userAlias 别名
+     */
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
+    {
+        StringBuilder sqlString = new StringBuilder();
+
+        for (SysRole role : user.getRoles())
+        {
+            String dataScope = role.getDataScope();
+            if (DATA_SCOPE_ALL.equals(dataScope))
+            {
+                sqlString = new StringBuilder();
+                break;
+            }
+            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
+            {
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+                        role.getRoleId()));
+            }
+            else if (DATA_SCOPE_DEPT.equals(dataScope))
+            {
+                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+            }
+            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            {
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        deptAlias, user.getDeptId(), user.getDeptId()));
+            }
+            else if (DATA_SCOPE_SELF.equals(dataScope))
+            {
+                if (StringUtils.isNotBlank(userAlias))
+                {
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                }
+                else
+                {
+                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
+                    sqlString.append(" OR 1=0 ");
+                }
+            }
+        }
+
+        if (StringUtils.isNotBlank(sqlString.toString()))
+        {
+            Object params = joinPoint.getArgs()[0];
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+            {
+                BaseEntity baseEntity = (BaseEntity) params;
+                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+            }
+        }
+    }
+
+    /**
+     * 是否存在注解，如果存在就获取
+     */
+    private DataScope getAnnotationLog(JoinPoint joinPoint)
+    {
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Method method = methodSignature.getMethod();
+
+        if (method != null)
+        {
+            return method.getAnnotation(DataScope.class);
+        }
+        return null;
+    }
+
+    /**
+     * 拼接权限sql前先清空params.dataScope参数防止注入
+     */
+    private void clearDataScope(final JoinPoint joinPoint)
+    {
+        Object params = joinPoint.getArgs()[0];
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+        {
+            BaseEntity baseEntity = (BaseEntity) params;
+            baseEntity.getParams().put(DATA_SCOPE, "");
+        }
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
new file mode 100644
index 0000000..8c2c9f4
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -0,0 +1,72 @@
+package com.ruoyi.framework.aspectj;
+
+import java.util.Objects;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
+
+/**
+ * 多数据源处理
+ * 
+ * @author ruoyi
+ */
+@Aspect
+@Order(1)
+@Component
+public class DataSourceAspect
+{
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
+            + "|| @within(com.ruoyi.common.annotation.DataSource)")
+    public void dsPointCut()
+    {
+
+    }
+
+    @Around("dsPointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable
+    {
+        DataSource dataSource = getDataSource(point);
+
+        if (StringUtils.isNotNull(dataSource))
+        {
+            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
+        }
+
+        try
+        {
+            return point.proceed();
+        }
+        finally
+        {
+            // 销毁数据源 在执行方法之后
+            DynamicDataSourceContextHolder.clearDataSourceType();
+        }
+    }
+
+    /**
+     * 获取需要切换的数据源
+     */
+    public DataSource getDataSource(ProceedingJoinPoint point)
+    {
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
+        if (Objects.nonNull(dataSource))
+        {
+            return dataSource;
+        }
+
+        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
new file mode 100644
index 0000000..89b5a32
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -0,0 +1,243 @@
+package com.ruoyi.framework.aspectj;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.HandlerMapping;
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessStatus;
+import com.ruoyi.common.enums.HttpMethod;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.system.domain.SysOperLog;
+
+/**
+ * 操作日志记录处理
+ * 
+ * @author ruoyi
+ */
+@Aspect
+@Component
+public class LogAspect
+{
+    private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
+
+    // 配置织入点
+    @Pointcut("@annotation(com.ruoyi.common.annotation.Log)")
+    public void logPointCut()
+    {
+    }
+
+    /**
+     * 处理完请求后执行
+     *
+     * @param joinPoint 切点
+     */
+    @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
+    {
+        handleLog(joinPoint, null, jsonResult);
+    }
+
+    /**
+     * 拦截异常操作
+     * 
+     * @param joinPoint 切点
+     * @param e 异常
+     */
+    @AfterThrowing(value = "logPointCut()", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
+    {
+        handleLog(joinPoint, e, null);
+    }
+
+    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
+    {
+        try
+        {
+            // 获得注解
+            Log controllerLog = getAnnotationLog(joinPoint);
+            if (controllerLog == null)
+            {
+                return;
+            }
+
+            // 获取当前的用户
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+
+            // *========数据库日志=========*//
+            SysOperLog operLog = new SysOperLog();
+            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+            // 请求的地址
+            String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+            operLog.setOperIp(ip);
+            // 返回参数
+            operLog.setJsonResult(JSON.toJSONString(jsonResult));
+
+            operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
+            if (loginUser != null)
+            {
+                operLog.setOperName(loginUser.getUsername());
+            }
+
+            if (e != null)
+            {
+                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+            }
+            // 设置方法名称
+            String className = joinPoint.getTarget().getClass().getName();
+            String methodName = joinPoint.getSignature().getName();
+            operLog.setMethod(className + "." + methodName + "()");
+            // 设置请求方式
+            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+            // 处理设置注解上的参数
+            getControllerMethodDescription(joinPoint, controllerLog, operLog);
+            // 保存数据库
+            AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
+        }
+        catch (Exception exp)
+        {
+            // 记录本地异常日志
+            log.error("==前置通知异常==");
+            log.error("异常信息:{}", exp.getMessage());
+            exp.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取注解中对方法的描述信息 用于Controller层注解
+     * 
+     * @param log 日志
+     * @param operLog 操作日志
+     * @throws Exception
+     */
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
+    {
+        // 设置action动作
+        operLog.setBusinessType(log.businessType().ordinal());
+        // 设置标题
+        operLog.setTitle(log.title());
+        // 设置操作人类别
+        operLog.setOperatorType(log.operatorType().ordinal());
+        // 是否需要保存request，参数和值
+        if (log.isSaveRequestData())
+        {
+            // 获取参数的信息，传入到数据库中。
+            setRequestValue(joinPoint, operLog);
+        }
+    }
+
+    /**
+     * 获取请求的参数，放到log中
+     * 
+     * @param operLog 操作日志
+     * @throws Exception 异常
+     */
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
+    {
+        String requestMethod = operLog.getRequestMethod();
+        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
+        {
+            String params = argsArrayToString(joinPoint.getArgs());
+            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+        }
+        else
+        {
+            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
+        }
+    }
+
+    /**
+     * 是否存在注解，如果存在就获取
+     */
+    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
+    {
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Method method = methodSignature.getMethod();
+
+        if (method != null)
+        {
+            return method.getAnnotation(Log.class);
+        }
+        return null;
+    }
+
+    /**
+     * 参数拼装
+     */
+    private String argsArrayToString(Object[] paramsArray)
+    {
+        String params = "";
+        if (paramsArray != null && paramsArray.length > 0)
+        {
+            for (int i = 0; i < paramsArray.length; i++)
+            {
+                if (StringUtils.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
+                {
+                    Object jsonObj = JSON.toJSON(paramsArray[i]);
+                    params += jsonObj.toString() + " ";
+                }
+            }
+        }
+        return params.trim();
+    }
+
+    /**
+     * 判断是否需要过滤的对象。
+     * 
+     * @param o 对象信息。
+     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+     */
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o)
+    {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray())
+        {
+            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
+        }
+        else if (Collection.class.isAssignableFrom(clazz))
+        {
+            Collection collection = (Collection) o;
+            for (Iterator iter = collection.iterator(); iter.hasNext();)
+            {
+                return iter.next() instanceof MultipartFile;
+            }
+        }
+        else if (Map.class.isAssignableFrom(clazz))
+        {
+            Map map = (Map) o;
+            for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)
+            {
+                Map.Entry entry = (Map.Entry) iter.next();
+                return entry.getValue() instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+                || o instanceof BindingResult;
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
new file mode 100644
index 0000000..12aa291
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
@@ -0,0 +1,116 @@
+package com.ruoyi.framework.aspectj;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.RedisScript;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.annotation.RateLimiter;
+import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+
+/**
+ * 限流处理
+ *
+ * @author ruoyi
+ */
+@Aspect
+@Component
+public class RateLimiterAspect
+{
+    private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class);
+
+    private RedisTemplate<Object, Object> redisTemplate;
+
+    private RedisScript<Long> limitScript;
+
+    @Autowired
+    public void setRedisTemplate1(RedisTemplate<Object, Object> redisTemplate)
+    {
+        this.redisTemplate = redisTemplate;
+    }
+
+    @Autowired
+    public void setLimitScript(RedisScript<Long> limitScript)
+    {
+        this.limitScript = limitScript;
+    }
+
+    // 配置织入点
+    @Pointcut("@annotation(com.ruoyi.common.annotation.RateLimiter)")
+    public void rateLimiterPointCut()
+    {
+    }
+
+    @Before("rateLimiterPointCut()")
+    public void doBefore(JoinPoint point) throws Throwable
+    {
+        RateLimiter rateLimiter = getAnnotationRateLimiter(point);
+        String key = rateLimiter.key();
+        int time = rateLimiter.time();
+        int count = rateLimiter.count();
+
+        String combineKey = getCombineKey(rateLimiter, point);
+        List<Object> keys = Collections.singletonList(combineKey);
+        try
+        {
+            Long number = redisTemplate.execute(limitScript, keys, count, time);
+            if (StringUtils.isNull(number) || number.intValue() > count)
+            {
+                throw new ServiceException("访问过于频繁，请稍后再试");
+            }
+            log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key);
+        }
+        catch (ServiceException e)
+        {
+            throw e;
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("服务器限流异常，请稍后再试");
+        }
+    }
+
+    /**
+     * 是否存在注解，如果存在就获取
+     */
+    private RateLimiter getAnnotationRateLimiter(JoinPoint joinPoint)
+    {
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Method method = methodSignature.getMethod();
+
+        if (method != null)
+        {
+            return method.getAnnotation(RateLimiter.class);
+        }
+        return null;
+    }
+
+    public String getCombineKey(RateLimiter rateLimiter, JoinPoint point)
+    {
+        StringBuffer stringBuffer = new StringBuffer(rateLimiter.key());
+        if (rateLimiter.limitType() == LimitType.IP)
+        {
+            stringBuffer.append(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        }
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = signature.getMethod();
+        Class<?> targetClass = method.getDeclaringClass();
+        stringBuffer.append("-").append(targetClass.getName()).append("- ").append(method.getName());
+        return stringBuffer.toString();
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
new file mode 100644
index 0000000..1d4dc1f
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
@@ -0,0 +1,30 @@
+package com.ruoyi.framework.config;
+
+import java.util.TimeZone;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+/**
+ * 程序注解配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+// 表示通过aop框架暴露该代理对象,AopContext能够访问
+@EnableAspectJAutoProxy(exposeProxy = true)
+// 指定要扫描的Mapper类的包的路径
+@MapperScan("com.ruoyi.**.mapper")
+public class ApplicationConfig
+{
+    /**
+     * 时区配置
+     */
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
+    {
+        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java
new file mode 100644
index 0000000..43e78ae
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java
@@ -0,0 +1,83 @@
+package com.ruoyi.framework.config;
+
+import java.util.Properties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import static com.google.code.kaptcha.Constants.*;
+
+/**
+ * 验证码配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class CaptchaConfig
+{
+    @Bean(name = "captchaProducer")
+    public DefaultKaptcha getKaptchaBean()
+    {
+        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+        Properties properties = new Properties();
+        // 是否有边框 默认为true 我们可以自己设置yes，no
+        properties.setProperty(KAPTCHA_BORDER, "yes");
+        // 验证码文本字符颜色 默认为Color.BLACK
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
+        // 验证码图片宽度 默认为200
+        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
+        // 验证码图片高度 默认为50
+        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
+        // 验证码文本字符大小 默认为40
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
+        // KAPTCHA_SESSION_KEY
+        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
+        // 验证码文本字符长度 默认为5
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
+        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
+        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
+        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+        Config config = new Config(properties);
+        defaultKaptcha.setConfig(config);
+        return defaultKaptcha;
+    }
+
+    @Bean(name = "captchaProducerMath")
+    public DefaultKaptcha getKaptchaBeanMath()
+    {
+        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+        Properties properties = new Properties();
+        // 是否有边框 默认为true 我们可以自己设置yes，no
+        properties.setProperty(KAPTCHA_BORDER, "yes");
+        // 边框颜色 默认为Color.BLACK
+        properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90");
+        // 验证码文本字符颜色 默认为Color.BLACK
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue");
+        // 验证码图片宽度 默认为200
+        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
+        // 验证码图片高度 默认为50
+        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
+        // 验证码文本字符大小 默认为40
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35");
+        // KAPTCHA_SESSION_KEY
+        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
+        // 验证码文本生成器
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator");
+        // 验证码文本字符间距 默认为2
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
+        // 验证码文本字符长度 默认为5
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
+        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
+        // 验证码噪点颜色 默认为Color.BLACK
+        properties.setProperty(KAPTCHA_NOISE_COLOR, "white");
+        // 干扰实现类
+        properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
+        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
+        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+        Config config = new Config(properties);
+        defaultKaptcha.setConfig(config);
+        return defaultKaptcha;
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
new file mode 100644
index 0000000..f6abac1
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -0,0 +1,126 @@
+package com.ruoyi.framework.config;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.sql.DataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.util.Utils;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.config.properties.DruidProperties;
+import com.ruoyi.framework.datasource.DynamicDataSource;
+
+/**
+ * druid 配置多数据源
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class DruidConfig
+{
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.master")
+    public DataSource masterDataSource(DruidProperties druidProperties)
+    {
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        return druidProperties.dataSource(dataSource);
+    }
+
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.slave")
+    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
+    public DataSource slaveDataSource(DruidProperties druidProperties)
+    {
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        return druidProperties.dataSource(dataSource);
+    }
+
+    @Bean(name = "dynamicDataSource")
+    @Primary
+    public DynamicDataSource dataSource(DataSource masterDataSource)
+    {
+        Map<Object, Object> targetDataSources = new HashMap<>();
+        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
+        setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
+        return new DynamicDataSource(masterDataSource, targetDataSources);
+    }
+    
+    /**
+     * 设置数据源
+     * 
+     * @param targetDataSources 备选数据源集合
+     * @param sourceName 数据源名称
+     * @param beanName bean名称
+     */
+    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
+    {
+        try
+        {
+            DataSource dataSource = SpringUtils.getBean(beanName);
+            targetDataSources.put(sourceName, dataSource);
+        }
+        catch (Exception e)
+        {
+        }
+    }
+
+    /**
+     * 去除监控页面底部的广告
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Bean
+    @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
+    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
+    {
+        // 获取web监控页面的参数
+        DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
+        // 提取common.js的配置路径
+        String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*";
+        String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
+        final String filePath = "support/http/resources/js/common.js";
+        // 创建filter进行过滤
+        Filter filter = new Filter()
+        {
+            @Override
+            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
+            {
+            }
+            @Override
+            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+                    throws IOException, ServletException
+            {
+                chain.doFilter(request, response);
+                // 重置缓冲区，响应头不会被重置
+                response.resetBuffer();
+                // 获取common.js
+                String text = Utils.readFromResource(filePath);
+                // 正则替换banner, 除去底部的广告信息
+                text = text.replaceAll("<a.*?banner\"></a><br/>", "");
+                text = text.replaceAll("powered.*?shrek.wang</a>", "");
+                response.getWriter().write(text);
+            }
+            @Override
+            public void destroy()
+            {
+            }
+        };
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(filter);
+        registrationBean.addUrlPatterns(commonJsPattern);
+        return registrationBean;
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
new file mode 100644
index 0000000..59812ea
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
@@ -0,0 +1,71 @@
+package com.ruoyi.framework.config;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+import com.alibaba.fastjson.parser.ParserConfig;
+import org.springframework.util.Assert;
+import java.nio.charset.Charset;
+
+/**
+ * Redis使用FastJson序列化
+ * 
+ * @author ruoyi
+ */
+public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
+{
+    @SuppressWarnings("unused")
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+
+    private Class<T> clazz;
+
+    static
+    {
+        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
+    }
+
+    public FastJson2JsonRedisSerializer(Class<T> clazz)
+    {
+        super();
+        this.clazz = clazz;
+    }
+
+    @Override
+    public byte[] serialize(T t) throws SerializationException
+    {
+        if (t == null)
+        {
+            return new byte[0];
+        }
+        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
+    }
+
+    @Override
+    public T deserialize(byte[] bytes) throws SerializationException
+    {
+        if (bytes == null || bytes.length <= 0)
+        {
+            return null;
+        }
+        String str = new String(bytes, DEFAULT_CHARSET);
+
+        return JSON.parseObject(str, clazz);
+    }
+
+    public void setObjectMapper(ObjectMapper objectMapper)
+    {
+        Assert.notNull(objectMapper, "'objectMapper' must not be null");
+        this.objectMapper = objectMapper;
+    }
+
+    protected JavaType getJavaType(Class<?> clazz)
+    {
+        return TypeFactory.defaultInstance().constructType(clazz);
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
new file mode 100644
index 0000000..87b3750
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
@@ -0,0 +1,58 @@
+package com.ruoyi.framework.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.DispatcherType;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.ruoyi.common.filter.RepeatableFilter;
+import com.ruoyi.common.filter.XssFilter;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * Filter配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+@ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
+public class FilterConfig
+{
+    @Value("${xss.excludes}")
+    private String excludes;
+
+    @Value("${xss.urlPatterns}")
+    private String urlPatterns;
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Bean
+    public FilterRegistrationBean xssFilterRegistration()
+    {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        registration.setFilter(new XssFilter());
+        registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
+        registration.setName("xssFilter");
+        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+        Map<String, String> initParameters = new HashMap<String, String>();
+        initParameters.put("excludes", excludes);
+        registration.setInitParameters(initParameters);
+        return registration;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Bean
+    public FilterRegistrationBean someFilterRegistration()
+    {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(new RepeatableFilter());
+        registration.addUrlPatterns("/*");
+        registration.setName("repeatableFilter");
+        registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
+        return registration;
+    }
+
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
new file mode 100644
index 0000000..3e74580
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -0,0 +1,75 @@
+package com.ruoyi.framework.config;
+
+import java.util.Random;
+import com.google.code.kaptcha.text.impl.DefaultTextCreator;
+
+/**
+ * 验证码文本生成器
+ * 
+ * @author ruoyi
+ */
+public class KaptchaTextCreator extends DefaultTextCreator
+{
+    private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
+
+    @Override
+    public String getText()
+    {
+        Integer result = 0;
+        Random random = new Random();
+        int x = random.nextInt(10);
+        int y = random.nextInt(10);
+        StringBuilder suChinese = new StringBuilder();
+        int randomoperands = (int) Math.round(Math.random() * 2);
+        if (randomoperands == 0)
+        {
+            result = x * y;
+            suChinese.append(CNUMBERS[x]);
+            suChinese.append("*");
+            suChinese.append(CNUMBERS[y]);
+        }
+        else if (randomoperands == 1)
+        {
+            if (!(x == 0) && y % x == 0)
+            {
+                result = y / x;
+                suChinese.append(CNUMBERS[y]);
+                suChinese.append("/");
+                suChinese.append(CNUMBERS[x]);
+            }
+            else
+            {
+                result = x + y;
+                suChinese.append(CNUMBERS[x]);
+                suChinese.append("+");
+                suChinese.append(CNUMBERS[y]);
+            }
+        }
+        else if (randomoperands == 2)
+        {
+            if (x >= y)
+            {
+                result = x - y;
+                suChinese.append(CNUMBERS[x]);
+                suChinese.append("-");
+                suChinese.append(CNUMBERS[y]);
+            }
+            else
+            {
+                result = y - x;
+                suChinese.append(CNUMBERS[y]);
+                suChinese.append("-");
+                suChinese.append(CNUMBERS[x]);
+            }
+        }
+        else
+        {
+            result = x + y;
+            suChinese.append(CNUMBERS[x]);
+            suChinese.append("+");
+            suChinese.append(CNUMBERS[y]);
+        }
+        suChinese.append("=?@" + result);
+        return suChinese.toString();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
new file mode 100644
index 0000000..057c941
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
@@ -0,0 +1,132 @@
+package com.ruoyi.framework.config;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import javax.sql.DataSource;
+import org.apache.ibatis.io.VFS;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
+import org.springframework.util.ClassUtils;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * Mybatis支持*匹配扫描包
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class MyBatisConfig
+{
+    @Autowired
+    private Environment env;
+
+    static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
+
+    public static String setTypeAliasesPackage(String typeAliasesPackage)
+    {
+        ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
+        MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
+        List<String> allResult = new ArrayList<String>();
+        try
+        {
+            for (String aliasesPackage : typeAliasesPackage.split(","))
+            {
+                List<String> result = new ArrayList<String>();
+                aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+                        + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
+                Resource[] resources = resolver.getResources(aliasesPackage);
+                if (resources != null && resources.length > 0)
+                {
+                    MetadataReader metadataReader = null;
+                    for (Resource resource : resources)
+                    {
+                        if (resource.isReadable())
+                        {
+                            metadataReader = metadataReaderFactory.getMetadataReader(resource);
+                            try
+                            {
+                                result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
+                            }
+                            catch (ClassNotFoundException e)
+                            {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+                if (result.size() > 0)
+                {
+                    HashSet<String> hashResult = new HashSet<String>(result);
+                    allResult.addAll(hashResult);
+                }
+            }
+            if (allResult.size() > 0)
+            {
+                typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
+            }
+            else
+            {
+                throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
+            }
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return typeAliasesPackage;
+    }
+
+    public Resource[] resolveMapperLocations(String[] mapperLocations)
+    {
+        ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
+        List<Resource> resources = new ArrayList<Resource>();
+        if (mapperLocations != null)
+        {
+            for (String mapperLocation : mapperLocations)
+            {
+                try
+                {
+                    Resource[] mappers = resourceResolver.getResources(mapperLocation);
+                    resources.addAll(Arrays.asList(mappers));
+                }
+                catch (IOException e)
+                {
+                    // ignore
+                }
+            }
+        }
+        return resources.toArray(new Resource[resources.size()]);
+    }
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
+    {
+        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
+        String mapperLocations = env.getProperty("mybatis.mapperLocations");
+        String configLocation = env.getProperty("mybatis.configLocation");
+        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
+        VFS.addImplClass(SpringBootVFS.class);
+
+        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
+        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
+        return sessionFactory.getObject();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
new file mode 100644
index 0000000..3c3185e
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@@ -0,0 +1,79 @@
+package com.ruoyi.framework.config;
+
+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.script.DefaultRedisScript;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+
+/**
+ * redis配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport
+{
+    @Bean
+    @SuppressWarnings(value = { "unchecked", "rawtypes" })
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
+    {
+        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+
+        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+        serializer.setObjectMapper(mapper);
+
+        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash的key也采用StringRedisSerializer的序列化方式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+
+    @Bean
+    public DefaultRedisScript<Long> limitScript()
+    {
+        DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
+        redisScript.setScriptText(limitScriptText());
+        redisScript.setResultType(Long.class);
+        return redisScript;
+    }
+
+    /**
+     * 限流脚本
+     */
+    private String limitScriptText()
+    {
+        return "local key = KEYS[1]\n" +
+                "local count = tonumber(ARGV[1])\n" +
+                "local time = tonumber(ARGV[2])\n" +
+                "local current = redis.call('get', key);\n" +
+                "if current and tonumber(current) > count then\n" +
+                "    return current;\n" +
+                "end\n" +
+                "current = redis.call('incr', key)\n" +
+                "if tonumber(current) == 1 then\n" +
+                "    redis.call('expire', key, time)\n" +
+                "end\n" +
+                "return current;";
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
new file mode 100644
index 0000000..4f197d7
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -0,0 +1,65 @@
+package com.ruoyi.framework.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+
+/**
+ * 通用配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class ResourcesConfig implements WebMvcConfigurer
+{
+    @Autowired
+    private RepeatSubmitInterceptor repeatSubmitInterceptor;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry)
+    {
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+
+        /** swagger配置 */
+        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+    }
+
+    /**
+     * 自定义拦截规则
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry)
+    {
+        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+    }
+
+    /**
+     * 跨域配置
+     */
+//    @Bean
+//    public CorsFilter corsFilter()
+//    {
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        CorsConfiguration config = new CorsConfiguration();
+//        config.setAllowCredentials(true);
+//        // 设置访问源地址
+//        config.addAllowedOrigin("*");
+//        // 设置访问源请求头
+//        config.addAllowedHeader("*");
+//        // 设置访问源请求方法
+//        config.addAllowedMethod("*");
+//        // 对接口配置跨域设置
+//        source.registerCorsConfiguration("/**", config);
+//        return new CorsFilter(source);
+//    }
+}
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java
new file mode 100644
index 0000000..b5b7de3
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java
@@ -0,0 +1,32 @@
+package com.ruoyi.framework.config;
+
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.utils.ServletUtils;
+
+/**
+ * 服务相关配置
+ * 
+ * @author ruoyi
+ */
+@Component
+public class ServerConfig
+{
+    /**
+     * 获取完整的请求路径，包括：域名，端口，上下文访问路径
+     * 
+     * @return 服务地址
+     */
+    public String getUrl()
+    {
+        HttpServletRequest request = ServletUtils.getRequest();
+        return getDomain(request);
+    }
+
+    public static String getDomain(HttpServletRequest request)
+    {
+        StringBuffer url = request.getRequestURL();
+        String contextPath = request.getServletContext().getContextPath();
+        return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
new file mode 100644
index 0000000..0d67c22
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
@@ -0,0 +1,62 @@
+package com.ruoyi.framework.config;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import com.ruoyi.common.utils.Threads;
+
+/**
+ * 线程池配置
+ *
+ * @author ruoyi
+ **/
+@Configuration
+public class ThreadPoolConfig
+{
+    // 核心线程池大小
+    private int corePoolSize = 50;
+
+    // 最大可创建的线程数
+    private int maxPoolSize = 200;
+
+    // 队列最大长度
+    private int queueCapacity = 1000;
+
+    // 线程池维护线程所允许的空闲时间
+    private int keepAliveSeconds = 300;
+
+    @Bean(name = "threadPoolTaskExecutor")
+    public ThreadPoolTaskExecutor threadPoolTaskExecutor()
+    {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setCorePoolSize(corePoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setKeepAliveSeconds(keepAliveSeconds);
+        // 线程池对拒绝任务(无线程可用)的处理策略
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return executor;
+    }
+
+    /**
+     * 执行周期性或定时任务
+     */
+    @Bean(name = "scheduledExecutorService")
+    protected ScheduledExecutorService scheduledExecutorService()
+    {
+        return new ScheduledThreadPoolExecutor(corePoolSize,
+                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build())
+        {
+            @Override
+            protected void afterExecute(Runnable r, Throwable t)
+            {
+                super.afterExecute(r, t);
+                Threads.printException(r, t);
+            }
+        };
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
new file mode 100644
index 0000000..84f7e00
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
@@ -0,0 +1,77 @@
+package com.ruoyi.framework.config.properties;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import com.alibaba.druid.pool.DruidDataSource;
+
+/**
+ * druid 配置属性
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class DruidProperties
+{
+    @Value("${spring.datasource.druid.initialSize}")
+    private int initialSize;
+
+    @Value("${spring.datasource.druid.minIdle}")
+    private int minIdle;
+
+    @Value("${spring.datasource.druid.maxActive}")
+    private int maxActive;
+
+    @Value("${spring.datasource.druid.maxWait}")
+    private int maxWait;
+
+    @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
+    private int timeBetweenEvictionRunsMillis;
+
+    @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
+    private int minEvictableIdleTimeMillis;
+
+    @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
+    private int maxEvictableIdleTimeMillis;
+
+    @Value("${spring.datasource.druid.validationQuery}")
+    private String validationQuery;
+
+    @Value("${spring.datasource.druid.testWhileIdle}")
+    private boolean testWhileIdle;
+
+    @Value("${spring.datasource.druid.testOnBorrow}")
+    private boolean testOnBorrow;
+
+    @Value("${spring.datasource.druid.testOnReturn}")
+    private boolean testOnReturn;
+
+    public DruidDataSource dataSource(DruidDataSource datasource)
+    {
+        /** 配置初始化大小、最小、最大 */
+        datasource.setInitialSize(initialSize);
+        datasource.setMaxActive(maxActive);
+        datasource.setMinIdle(minIdle);
+
+        /** 配置获取连接等待超时的时间 */
+        datasource.setMaxWait(maxWait);
+
+        /** 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 */
+        datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+
+        /** 配置一个连接在池中最小、最大生存的时间，单位是毫秒 */
+        datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+        datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
+
+        /**
+         * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。
+         */
+        datasource.setValidationQuery(validationQuery);
+        /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */
+        datasource.setTestWhileIdle(testWhileIdle);
+        /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */
+        datasource.setTestOnBorrow(testOnBorrow);
+        /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */
+        datasource.setTestOnReturn(testOnReturn);
+        return datasource;
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
new file mode 100644
index 0000000..e70b8cf
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
@@ -0,0 +1,26 @@
+package com.ruoyi.framework.datasource;
+
+import java.util.Map;
+import javax.sql.DataSource;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+
+/**
+ * 动态数据源
+ * 
+ * @author ruoyi
+ */
+public class DynamicDataSource extends AbstractRoutingDataSource
+{
+    public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources)
+    {
+        super.setDefaultTargetDataSource(defaultTargetDataSource);
+        super.setTargetDataSources(targetDataSources);
+        super.afterPropertiesSet();
+    }
+
+    @Override
+    protected Object determineCurrentLookupKey()
+    {
+        return DynamicDataSourceContextHolder.getDataSourceType();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
new file mode 100644
index 0000000..3572db9
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
@@ -0,0 +1,45 @@
+package com.ruoyi.framework.datasource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 数据源切换处理
+ * 
+ * @author ruoyi
+ */
+public class DynamicDataSourceContextHolder
+{
+    public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);
+
+    /**
+     * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本，
+     *  所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
+     */
+    private static final ThreadLocal<String> CONTEXT_HOLDER = new ThreadLocal<>();
+
+    /**
+     * 设置数据源的变量
+     */
+    public static void setDataSourceType(String dsType)
+    {
+        log.info("切换到{}数据源", dsType);
+        CONTEXT_HOLDER.set(dsType);
+    }
+
+    /**
+     * 获得数据源的变量
+     */
+    public static String getDataSourceType()
+    {
+        return CONTEXT_HOLDER.get();
+    }
+
+    /**
+     * 清空数据源变量
+     */
+    public static void clearDataSourceType()
+    {
+        CONTEXT_HOLDER.remove();
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
new file mode 100644
index 0000000..17d607f
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -0,0 +1,55 @@
+package com.ruoyi.framework.interceptor;
+
+import java.lang.reflect.Method;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.ServletUtils;
+
+/**
+ * 防止重复提交拦截器
+ *
+ * @author ruoyi
+ */
+@Component
+public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
+{
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
+    {
+        if (handler instanceof HandlerMethod)
+        {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            Method method = handlerMethod.getMethod();
+            RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
+            if (annotation != null)
+            {
+                if (this.isRepeatSubmit(request))
+                {
+                    AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
+                    ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+                    return false;
+                }
+            }
+            return true;
+        }
+        else
+        {
+            return super.preHandle(request, response, handler);
+        }
+    }
+
+    /**
+     * 验证是否重复提交由子类实现具体的防重复提交的规则
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    public abstract boolean isRepeatSubmit(HttpServletRequest request);
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
new file mode 100644
index 0000000..cb4edbe
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -0,0 +1,125 @@
+package com.ruoyi.framework.interceptor.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpHelper;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+
+/**
+ * 判断请求url和数据是否和上一次相同，
+ * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。
+ * 
+ * @author ruoyi
+ */
+@Component
+public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
+{
+    public final String REPEAT_PARAMS = "repeatParams";
+
+    public final String REPEAT_TIME = "repeatTime";
+
+    // 令牌自定义标识
+    @Value("${token.header}")
+    private String header;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 间隔时间，单位:秒 默认10秒
+     * 
+     * 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据
+     */
+    private int intervalTime = 10;
+
+    public void setIntervalTime(int intervalTime)
+    {
+        this.intervalTime = intervalTime;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean isRepeatSubmit(HttpServletRequest request)
+    {
+        String nowParams = "";
+        if (request instanceof RepeatedlyRequestWrapper)
+        {
+            RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request;
+            nowParams = HttpHelper.getBodyString(repeatedlyRequest);
+        }
+
+        // body参数为空，获取Parameter的数据
+        if (StringUtils.isEmpty(nowParams))
+        {
+            nowParams = JSONObject.toJSONString(request.getParameterMap());
+        }
+        Map<String, Object> nowDataMap = new HashMap<String, Object>();
+        nowDataMap.put(REPEAT_PARAMS, nowParams);
+        nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
+
+        // 请求地址（作为存放cache的key值）
+        String url = request.getRequestURI();
+
+        // 唯一值（没有消息头则使用请求地址）
+        String submitKey = request.getHeader(header);
+        if (StringUtils.isEmpty(submitKey))
+        {
+            submitKey = url;
+        }
+
+        // 唯一标识（指定key + 消息头）
+        String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
+
+        Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
+        if (sessionObj != null)
+        {
+            Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
+            if (sessionMap.containsKey(url))
+            {
+                Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
+                if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
+                {
+                    return true;
+                }
+            }
+        }
+        Map<String, Object> cacheMap = new HashMap<String, Object>();
+        cacheMap.put(url, nowDataMap);
+        redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
+        return false;
+    }
+
+    /**
+     * 判断参数是否相同
+     */
+    private boolean compareParams(Map<String, Object> nowMap, Map<String, Object> preMap)
+    {
+        String nowParams = (String) nowMap.get(REPEAT_PARAMS);
+        String preParams = (String) preMap.get(REPEAT_PARAMS);
+        return nowParams.equals(preParams);
+    }
+
+    /**
+     * 判断两次间隔时间
+     */
+    private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
+    {
+        long time1 = (Long) nowMap.get(REPEAT_TIME);
+        long time2 = (Long) preMap.get(REPEAT_TIME);
+        if ((time1 - time2) < (this.intervalTime * 1000))
+        {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
new file mode 100644
index 0000000..7387a02
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
@@ -0,0 +1,55 @@
+package com.ruoyi.framework.manager;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import com.ruoyi.common.utils.Threads;
+import com.ruoyi.common.utils.spring.SpringUtils;
+
+/**
+ * 异步任务管理器
+ * 
+ * @author ruoyi
+ */
+public class AsyncManager
+{
+    /**
+     * 操作延迟10毫秒
+     */
+    private final int OPERATE_DELAY_TIME = 10;
+
+    /**
+     * 异步操作任务调度线程池
+     */
+    private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
+
+    /**
+     * 单例模式
+     */
+    private AsyncManager(){}
+
+    private static AsyncManager me = new AsyncManager();
+
+    public static AsyncManager me()
+    {
+        return me;
+    }
+
+    /**
+     * 执行任务
+     * 
+     * @param task 任务
+     */
+    public void execute(TimerTask task)
+    {
+        executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 停止任务线程池
+     */
+    public void shutdown()
+    {
+        Threads.shutdownAndAwaitTermination(executor);
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
new file mode 100644
index 0000000..e36ca3c
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
@@ -0,0 +1,39 @@
+package com.ruoyi.framework.manager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import javax.annotation.PreDestroy;
+
+/**
+ * 确保应用退出时能关闭后台线程
+ *
+ * @author ruoyi
+ */
+@Component
+public class ShutdownManager
+{
+    private static final Logger logger = LoggerFactory.getLogger("sys-user");
+
+    @PreDestroy
+    public void destroy()
+    {
+        shutdownAsyncManager();
+    }
+
+    /**
+     * 停止异步执行任务
+     */
+    private void shutdownAsyncManager()
+    {
+        try
+        {
+            logger.info("====关闭后台任务任务线程池====");
+            AsyncManager.me().shutdown();
+        }
+        catch (Exception e)
+        {
+            logger.error(e.getMessage(), e);
+        }
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
new file mode 100644
index 0000000..23d0230
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -0,0 +1,102 @@
+package com.ruoyi.framework.manager.factory;
+
+import java.util.TimerTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.LogUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.service.ISysLogininforService;
+import com.ruoyi.system.service.ISysOperLogService;
+import eu.bitwalker.useragentutils.UserAgent;
+
+/**
+ * 异步工厂（产生任务用）
+ * 
+ * @author ruoyi
+ */
+public class AsyncFactory
+{
+    private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
+
+    /**
+     * 记录登录信息
+     * 
+     * @param username 用户名
+     * @param status 状态
+     * @param message 消息
+     * @param args 列表
+     * @return 任务task
+     */
+    public static TimerTask recordLogininfor(final String username, final String status, final String message,
+            final Object... args)
+    {
+        final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+        final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        return new TimerTask()
+        {
+            @Override
+            public void run()
+            {
+                String address = AddressUtils.getRealAddressByIP(ip);
+                StringBuilder s = new StringBuilder();
+                s.append(LogUtils.getBlock(ip));
+                s.append(address);
+                s.append(LogUtils.getBlock(username));
+                s.append(LogUtils.getBlock(status));
+                s.append(LogUtils.getBlock(message));
+                // 打印信息到日志
+                sys_user_logger.info(s.toString(), args);
+                // 获取客户端操作系统
+                String os = userAgent.getOperatingSystem().getName();
+                // 获取客户端浏览器
+                String browser = userAgent.getBrowser().getName();
+                // 封装对象
+                SysLogininfor logininfor = new SysLogininfor();
+                logininfor.setUserName(username);
+                logininfor.setIpaddr(ip);
+                logininfor.setLoginLocation(address);
+                logininfor.setBrowser(browser);
+                logininfor.setOs(os);
+                logininfor.setMsg(message);
+                // 日志状态
+                if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
+                {
+                    logininfor.setStatus(Constants.SUCCESS);
+                }
+                else if (Constants.LOGIN_FAIL.equals(status))
+                {
+                    logininfor.setStatus(Constants.FAIL);
+                }
+                // 插入数据
+                SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor);
+            }
+        };
+    }
+
+    /**
+     * 操作日志记录
+     * 
+     * @param operLog 操作日志信息
+     * @return 任务task
+     */
+    public static TimerTask recordOper(final SysOperLog operLog)
+    {
+        return new TimerTask()
+        {
+            @Override
+            public void run()
+            {
+                // 远程查询操作地点
+                operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+                SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
+            }
+        };
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
new file mode 100644
index 0000000..0f2db93
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -0,0 +1,115 @@
+package com.ruoyi.framework.web.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.user.CaptchaException;
+import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 注册校验方法
+ * 
+ * @author ruoyi
+ */
+@Component
+public class SysRegisterService
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 注册
+     */
+    public String register(RegisterBody registerBody)
+    {
+        String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
+
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        // 验证码开关
+        if (captchaOnOff)
+        {
+            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
+        }
+
+        if (StringUtils.isEmpty(username))
+        {
+            msg = "用户名不能为空";
+        }
+        else if (StringUtils.isEmpty(password))
+        {
+            msg = "用户密码不能为空";
+        }
+        else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+        {
+            msg = "账户长度必须在2到20个字符之间";
+        }
+        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+        {
+            msg = "密码长度必须在5到20个字符之间";
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
+        {
+            msg = "保存用户'" + username + "'失败，注册账号已存在";
+        }
+        else
+        {
+            SysUser sysUser = new SysUser();
+            sysUser.setUserName(username);
+            sysUser.setNickName(username);
+            sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
+            boolean regFlag = userService.registerUser(sysUser);
+            if (!regFlag)
+            {
+                msg = "注册失败,请联系系统管理人员";
+            }
+            else
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER,
+                        MessageUtils.message("user.register.success")));
+            }
+        }
+        return msg;
+    }
+
+    /**
+     * 校验验证码
+     * 
+     * @param username 用户名
+     * @param code 验证码
+     * @param uuid 唯一标识
+     * @return 结果
+     */
+    public void validateCaptcha(String username, String code, String uuid)
+    {
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        String captcha = redisCache.getCacheObject(verifyKey);
+        redisCache.deleteObject(verifyKey);
+        if (captcha == null)
+        {
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha))
+        {
+            throw new CaptchaException();
+        }
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
new file mode 100644
index 0000000..bf28e0f
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -0,0 +1,225 @@
+package com.ruoyi.framework.web.service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import eu.bitwalker.useragentutils.UserAgent;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+/**
+ * token验证处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class TokenService
+{
+    // 令牌自定义标识
+    @Value("${token.header}")
+    private String header;
+
+    // 令牌秘钥
+    @Value("${token.secret}")
+    private String secret;
+
+    // 令牌有效期（默认30分钟）
+    @Value("${token.expireTime}")
+    private int expireTime;
+
+    protected static final long MILLIS_SECOND = 1000;
+
+    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
+
+    private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 获取用户身份信息
+     *
+     * @return 用户信息
+     */
+    public LoginUser getLoginUser(HttpServletRequest request)
+    {
+        // 获取请求携带的令牌
+        String token = getToken(request);
+        if (StringUtils.isNotEmpty(token))
+        {
+            try
+            {
+                Claims claims = parseToken(token);
+                // 解析对应的权限以及用户信息
+                String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
+                String userKey = getTokenKey(uuid);
+                LoginUser user = redisCache.getCacheObject(userKey);
+                return user;
+            }
+            catch (Exception e)
+            {
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 设置用户身份信息
+     */
+    public void setLoginUser(LoginUser loginUser)
+    {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
+        {
+            refreshToken(loginUser);
+        }
+    }
+
+    /**
+     * 删除用户身份信息
+     */
+    public void delLoginUser(String token)
+    {
+        if (StringUtils.isNotEmpty(token))
+        {
+            String userKey = getTokenKey(token);
+            redisCache.deleteObject(userKey);
+        }
+    }
+
+    /**
+     * 创建令牌
+     *
+     * @param loginUser 用户信息
+     * @return 令牌
+     */
+    public String createToken(LoginUser loginUser)
+    {
+        String token = IdUtils.fastUUID();
+        loginUser.setToken(token);
+        setUserAgent(loginUser);
+        refreshToken(loginUser);
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        return createToken(claims);
+    }
+
+    /**
+     * 验证令牌有效期，相差不足20分钟，自动刷新缓存
+     *
+     * @param loginUser
+     * @return 令牌
+     */
+    public void verifyToken(LoginUser loginUser)
+    {
+        long expireTime = loginUser.getExpireTime();
+        long currentTime = System.currentTimeMillis();
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        {
+            refreshToken(loginUser);
+        }
+    }
+
+    /**
+     * 刷新令牌有效期
+     *
+     * @param loginUser 登录信息
+     */
+    public void refreshToken(LoginUser loginUser)
+    {
+        loginUser.setLoginTime(System.currentTimeMillis());
+        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
+        // 根据uuid将loginUser缓存
+        String userKey = getTokenKey(loginUser.getToken());
+        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+    }
+
+    /**
+     * 设置用户代理信息
+     *
+     * @param loginUser 登录信息
+     */
+    public void setUserAgent(LoginUser loginUser)
+    {
+        UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        loginUser.setIpaddr(ip);
+        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        loginUser.setBrowser(userAgent.getBrowser().getName());
+        loginUser.setOs(userAgent.getOperatingSystem().getName());
+    }
+
+    /**
+     * 从数据声明生成令牌
+     *
+     * @param claims 数据声明
+     * @return 令牌
+     */
+    private String createToken(Map<String, Object> claims)
+    {
+        String token = Jwts.builder()
+                .setClaims(claims)
+                .signWith(SignatureAlgorithm.HS512, secret).compact();
+        return token;
+    }
+
+    /**
+     * 从令牌中获取数据声明
+     *
+     * @param token 令牌
+     * @return 数据声明
+     */
+    private Claims parseToken(String token)
+    {
+        return Jwts.parser()
+                .setSigningKey(secret)
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    /**
+     * 从令牌中获取用户名
+     *
+     * @param token 令牌
+     * @return 用户名
+     */
+    public String getUsernameFromToken(String token)
+    {
+        Claims claims = parseToken(token);
+        return claims.getSubject();
+    }
+
+    /**
+     * 获取请求token
+     *
+     * @param request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request)
+    {
+        String token = request.getHeader(header);
+        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+        {
+            token = token.replace(Constants.TOKEN_PREFIX, "");
+        }
+        return token;
+    }
+
+    private String getTokenKey(String uuid)
+    {
+        return Constants.LOGIN_TOKEN_KEY + uuid;
+    }
+}
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
new file mode 100644
index 0000000..c3ff924
--- /dev/null
+++ b/ruoyi-generator/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-generator</artifactId>
+
+    <description>
+        generator代码生成
+    </description>
+
+    <dependencies>
+
+        <!--velocity代码生成使用模板 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <!-- collections工具类 -->
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
new file mode 100644
index 0000000..cc4cd14
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
@@ -0,0 +1,73 @@
+package com.ruoyi.generator.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取代码生成相关配置
+ * 
+ * @author ruoyi
+ */
+@Component
+@ConfigurationProperties(prefix = "gen")
+@PropertySource(value = { "classpath:generator.yml" })
+public class GenConfig
+{
+    /** 作者 */
+    public static String author;
+
+    /** 生成包路径 */
+    public static String packageName;
+
+    /** 自动去除表前缀，默认是false */
+    public static boolean autoRemovePre;
+
+    /** 表前缀(类名不会包含表前缀) */
+    public static String tablePrefix;
+
+    public static String getAuthor()
+    {
+        return author;
+    }
+
+    @Value("${author}")
+    public void setAuthor(String author)
+    {
+        GenConfig.author = author;
+    }
+
+    public static String getPackageName()
+    {
+        return packageName;
+    }
+
+    @Value("${packageName}")
+    public void setPackageName(String packageName)
+    {
+        GenConfig.packageName = packageName;
+    }
+
+    public static boolean getAutoRemovePre()
+    {
+        return autoRemovePre;
+    }
+
+    @Value("${autoRemovePre}")
+    public void setAutoRemovePre(boolean autoRemovePre)
+    {
+        GenConfig.autoRemovePre = autoRemovePre;
+    }
+
+    public static String getTablePrefix()
+    {
+        return tablePrefix;
+    }
+
+    @Value("${tablePrefix}")
+    public void setTablePrefix(String tablePrefix)
+    {
+        GenConfig.tablePrefix = tablePrefix;
+    }
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
new file mode 100644
index 0000000..6dfe5e3
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -0,0 +1,214 @@
+package com.ruoyi.generator.controller;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.page.TableDataInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.service.IGenTableColumnService;
+import com.ruoyi.generator.service.IGenTableService;
+
+/**
+ * 代码生成 操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/tool/gen")
+public class GenController extends BaseController
+{
+    @Autowired
+    private IGenTableService genTableService;
+
+    @Autowired
+    private IGenTableColumnService genTableColumnService;
+
+    /**
+     * 查询代码生成列表
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    @GetMapping("/list")
+    public TableDataInfo genList(GenTable genTable)
+    {
+        startPage();
+        List<GenTable> list = genTableService.selectGenTableList(genTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改代码生成业务
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+    @GetMapping(value = "/{talbleId}")
+    public AjaxResult getInfo(@PathVariable Long talbleId)
+    {
+        GenTable table = genTableService.selectGenTableById(talbleId);
+        List<GenTable> tables = genTableService.selectGenTableAll();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("info", table);
+        map.put("rows", list);
+        map.put("tables", tables);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 查询数据库列表
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    @GetMapping("/db/list")
+    public TableDataInfo dataList(GenTable genTable)
+    {
+        startPage();
+        List<GenTable> list = genTableService.selectDbTableList(genTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询数据表字段列表
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    @GetMapping(value = "/column/{talbleId}")
+    public TableDataInfo columnList(Long tableId)
+    {
+        TableDataInfo dataInfo = new TableDataInfo();
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+        dataInfo.setRows(list);
+        dataInfo.setTotal(list.size());
+        return dataInfo;
+    }
+
+    /**
+     * 导入表结构（保存）
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+    @PostMapping("/importTable")
+    public AjaxResult importTableSave(String tables)
+    {
+        String[] tableNames = Convert.toStrArray(tables);
+        // 查询表信息
+        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
+        genTableService.importGenTable(tableList);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改保存代码生成业务
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
+    {
+        genTableService.validateEdit(genTable);
+        genTableService.updateGenTable(genTable);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除代码生成
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+    @Log(title = "代码生成", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{tableIds}")
+    public AjaxResult remove(@PathVariable Long[] tableIds)
+    {
+        genTableService.deleteGenTableByIds(tableIds);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 预览代码
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+    @GetMapping("/preview/{tableId}")
+    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
+    {
+        Map<String, String> dataMap = genTableService.previewCode(tableId);
+        return AjaxResult.success(dataMap);
+    }
+
+    /**
+     * 生成代码（下载方式）
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/download/{tableName}")
+    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+    {
+        byte[] data = genTableService.downloadCode(tableName);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/genCode/{tableName}")
+    public AjaxResult genCode(@PathVariable("tableName") String tableName)
+    {
+        genTableService.generatorCode(tableName);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 同步数据库
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @GetMapping("/synchDb/{tableName}")
+    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
+    {
+        genTableService.synchDb(tableName);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 批量生成代码
+     */
+    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/batchGenCode")
+    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
+    {
+        String[] tableNames = Convert.toStrArray(tables);
+        byte[] data = genTableService.downloadCode(tableNames);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成zip文件
+     */
+    private void genCode(HttpServletResponse response, byte[] data) throws IOException
+    {
+        response.reset();
+        response.addHeader("Access-Control-Allow-Origin", "*");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+        IOUtils.write(data, response.getOutputStream());
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
new file mode 100644
index 0000000..269779c
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -0,0 +1,372 @@
+package com.ruoyi.generator.domain;
+
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import org.apache.commons.lang3.ArrayUtils;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 业务表 gen_table
+ * 
+ * @author ruoyi
+ */
+public class GenTable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long tableId;
+
+    /** 表名称 */
+    @NotBlank(message = "表名称不能为空")
+    private String tableName;
+
+    /** 表描述 */
+    @NotBlank(message = "表描述不能为空")
+    private String tableComment;
+
+    /** 关联父表的表名 */
+    private String subTableName;
+
+    /** 本表关联父表的外键名 */
+    private String subTableFkName;
+
+    /** 实体类名称(首字母大写) */
+    @NotBlank(message = "实体类名称不能为空")
+    private String className;
+
+    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
+    private String tplCategory;
+
+    /** 生成包路径 */
+    @NotBlank(message = "生成包路径不能为空")
+    private String packageName;
+
+    /** 生成模块名 */
+    @NotBlank(message = "生成模块名不能为空")
+    private String moduleName;
+
+    /** 生成业务名 */
+    @NotBlank(message = "生成业务名不能为空")
+    private String businessName;
+
+    /** 生成功能名 */
+    @NotBlank(message = "生成功能名不能为空")
+    private String functionName;
+
+    /** 生成作者 */
+    @NotBlank(message = "作者不能为空")
+    private String functionAuthor;
+
+    /** 生成代码方式（0zip压缩包 1自定义路径） */
+    private String genType;
+
+    /** 生成路径（不填默认项目路径） */
+    private String genPath;
+
+    /** 主键信息 */
+    private GenTableColumn pkColumn;
+
+    /** 子表信息 */
+    private GenTable subTable;
+
+    /** 表列信息 */
+    @Valid
+    private List<GenTableColumn> columns;
+
+    /** 其它生成选项 */
+    private String options;
+
+    /** 树编码字段 */
+    private String treeCode;
+
+    /** 树父编码字段 */
+    private String treeParentCode;
+
+    /** 树名称字段 */
+    private String treeName;
+
+    /** 上级菜单ID字段 */
+    private String parentMenuId;
+
+    /** 上级菜单名称字段 */
+    private String parentMenuName;
+
+    public Long getTableId()
+    {
+        return tableId;
+    }
+
+    public void setTableId(Long tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public String getTableName()
+    {
+        return tableName;
+    }
+
+    public void setTableName(String tableName)
+    {
+        this.tableName = tableName;
+    }
+
+    public String getTableComment()
+    {
+        return tableComment;
+    }
+
+    public void setTableComment(String tableComment)
+    {
+        this.tableComment = tableComment;
+    }
+
+    public String getSubTableName()
+    {
+        return subTableName;
+    }
+
+    public void setSubTableName(String subTableName)
+    {
+        this.subTableName = subTableName;
+    }
+
+    public String getSubTableFkName()
+    {
+        return subTableFkName;
+    }
+
+    public void setSubTableFkName(String subTableFkName)
+    {
+        this.subTableFkName = subTableFkName;
+    }
+
+    public String getClassName()
+    {
+        return className;
+    }
+
+    public void setClassName(String className)
+    {
+        this.className = className;
+    }
+
+    public String getTplCategory()
+    {
+        return tplCategory;
+    }
+
+    public void setTplCategory(String tplCategory)
+    {
+        this.tplCategory = tplCategory;
+    }
+
+    public String getPackageName()
+    {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        this.packageName = packageName;
+    }
+
+    public String getModuleName()
+    {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName)
+    {
+        this.moduleName = moduleName;
+    }
+
+    public String getBusinessName()
+    {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName)
+    {
+        this.businessName = businessName;
+    }
+
+    public String getFunctionName()
+    {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName)
+    {
+        this.functionName = functionName;
+    }
+
+    public String getFunctionAuthor()
+    {
+        return functionAuthor;
+    }
+
+    public void setFunctionAuthor(String functionAuthor)
+    {
+        this.functionAuthor = functionAuthor;
+    }
+
+    public String getGenType()
+    {
+        return genType;
+    }
+
+    public void setGenType(String genType)
+    {
+        this.genType = genType;
+    }
+
+    public String getGenPath()
+    {
+        return genPath;
+    }
+
+    public void setGenPath(String genPath)
+    {
+        this.genPath = genPath;
+    }
+
+    public GenTableColumn getPkColumn()
+    {
+        return pkColumn;
+    }
+
+    public void setPkColumn(GenTableColumn pkColumn)
+    {
+        this.pkColumn = pkColumn;
+    }
+
+    public GenTable getSubTable()
+    {
+        return subTable;
+    }
+
+    public void setSubTable(GenTable subTable)
+    {
+        this.subTable = subTable;
+    }
+
+    public List<GenTableColumn> getColumns()
+    {
+        return columns;
+    }
+
+    public void setColumns(List<GenTableColumn> columns)
+    {
+        this.columns = columns;
+    }
+
+    public String getOptions()
+    {
+        return options;
+    }
+
+    public void setOptions(String options)
+    {
+        this.options = options;
+    }
+
+    public String getTreeCode()
+    {
+        return treeCode;
+    }
+
+    public void setTreeCode(String treeCode)
+    {
+        this.treeCode = treeCode;
+    }
+
+    public String getTreeParentCode()
+    {
+        return treeParentCode;
+    }
+
+    public void setTreeParentCode(String treeParentCode)
+    {
+        this.treeParentCode = treeParentCode;
+    }
+
+    public String getTreeName()
+    {
+        return treeName;
+    }
+
+    public void setTreeName(String treeName)
+    {
+        this.treeName = treeName;
+    }
+
+    public String getParentMenuId()
+    {
+        return parentMenuId;
+    }
+
+    public void setParentMenuId(String parentMenuId)
+    {
+        this.parentMenuId = parentMenuId;
+    }
+
+    public String getParentMenuName()
+    {
+        return parentMenuName;
+    }
+
+    public void setParentMenuName(String parentMenuName)
+    {
+        this.parentMenuName = parentMenuName;
+    }
+
+    public boolean isSub()
+    {
+        return isSub(this.tplCategory);
+    }
+
+    public static boolean isSub(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+    }
+
+    public boolean isTree()
+    {
+        return isTree(this.tplCategory);
+    }
+
+    public static boolean isTree(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+    }
+
+    public boolean isCrud()
+    {
+        return isCrud(this.tplCategory);
+    }
+
+    public static boolean isCrud(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+    }
+
+    public boolean isSuperColumn(String javaField)
+    {
+        return isSuperColumn(this.tplCategory, javaField);
+    }
+
+    public static boolean isSuperColumn(String tplCategory, String javaField)
+    {
+        if (isTree(tplCategory))
+        {
+            return StringUtils.equalsAnyIgnoreCase(javaField,
+                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+        }
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
new file mode 100644
index 0000000..d1733b6
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -0,0 +1,373 @@
+package com.ruoyi.generator.domain;
+
+import javax.validation.constraints.NotBlank;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 代码生成业务字段表 gen_table_column
+ * 
+ * @author ruoyi
+ */
+public class GenTableColumn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long columnId;
+
+    /** 归属表编号 */
+    private Long tableId;
+
+    /** 列名称 */
+    private String columnName;
+
+    /** 列描述 */
+    private String columnComment;
+
+    /** 列类型 */
+    private String columnType;
+
+    /** JAVA类型 */
+    private String javaType;
+
+    /** JAVA字段名 */
+    @NotBlank(message = "Java属性不能为空")
+    private String javaField;
+
+    /** 是否主键（1是） */
+    private String isPk;
+
+    /** 是否自增（1是） */
+    private String isIncrement;
+
+    /** 是否必填（1是） */
+    private String isRequired;
+
+    /** 是否为插入字段（1是） */
+    private String isInsert;
+
+    /** 是否编辑字段（1是） */
+    private String isEdit;
+
+    /** 是否列表字段（1是） */
+    private String isList;
+
+    /** 是否查询字段（1是） */
+    private String isQuery;
+
+    /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
+    private String queryType;
+
+    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
+    private String htmlType;
+
+    /** 字典类型 */
+    private String dictType;
+
+    /** 排序 */
+    private Integer sort;
+
+    public void setColumnId(Long columnId)
+    {
+        this.columnId = columnId;
+    }
+
+    public Long getColumnId()
+    {
+        return columnId;
+    }
+
+    public void setTableId(Long tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public Long getTableId()
+    {
+        return tableId;
+    }
+
+    public void setColumnName(String columnName)
+    {
+        this.columnName = columnName;
+    }
+
+    public String getColumnName()
+    {
+        return columnName;
+    }
+
+    public void setColumnComment(String columnComment)
+    {
+        this.columnComment = columnComment;
+    }
+
+    public String getColumnComment()
+    {
+        return columnComment;
+    }
+
+    public void setColumnType(String columnType)
+    {
+        this.columnType = columnType;
+    }
+
+    public String getColumnType()
+    {
+        return columnType;
+    }
+
+    public void setJavaType(String javaType)
+    {
+        this.javaType = javaType;
+    }
+
+    public String getJavaType()
+    {
+        return javaType;
+    }
+
+    public void setJavaField(String javaField)
+    {
+        this.javaField = javaField;
+    }
+
+    public String getJavaField()
+    {
+        return javaField;
+    }
+
+    public String getCapJavaField()
+    {
+        return StringUtils.capitalize(javaField);
+    }
+
+    public void setIsPk(String isPk)
+    {
+        this.isPk = isPk;
+    }
+
+    public String getIsPk()
+    {
+        return isPk;
+    }
+
+    public boolean isPk()
+    {
+        return isPk(this.isPk);
+    }
+
+    public boolean isPk(String isPk)
+    {
+        return isPk != null && StringUtils.equals("1", isPk);
+    }
+
+    public String getIsIncrement()
+    {
+        return isIncrement;
+    }
+
+    public void setIsIncrement(String isIncrement)
+    {
+        this.isIncrement = isIncrement;
+    }
+
+    public boolean isIncrement()
+    {
+        return isIncrement(this.isIncrement);
+    }
+
+    public boolean isIncrement(String isIncrement)
+    {
+        return isIncrement != null && StringUtils.equals("1", isIncrement);
+    }
+
+    public void setIsRequired(String isRequired)
+    {
+        this.isRequired = isRequired;
+    }
+
+    public String getIsRequired()
+    {
+        return isRequired;
+    }
+
+    public boolean isRequired()
+    {
+        return isRequired(this.isRequired);
+    }
+
+    public boolean isRequired(String isRequired)
+    {
+        return isRequired != null && StringUtils.equals("1", isRequired);
+    }
+
+    public void setIsInsert(String isInsert)
+    {
+        this.isInsert = isInsert;
+    }
+
+    public String getIsInsert()
+    {
+        return isInsert;
+    }
+
+    public boolean isInsert()
+    {
+        return isInsert(this.isInsert);
+    }
+
+    public boolean isInsert(String isInsert)
+    {
+        return isInsert != null && StringUtils.equals("1", isInsert);
+    }
+
+    public void setIsEdit(String isEdit)
+    {
+        this.isEdit = isEdit;
+    }
+
+    public String getIsEdit()
+    {
+        return isEdit;
+    }
+
+    public boolean isEdit()
+    {
+        return isInsert(this.isEdit);
+    }
+
+    public boolean isEdit(String isEdit)
+    {
+        return isEdit != null && StringUtils.equals("1", isEdit);
+    }
+
+    public void setIsList(String isList)
+    {
+        this.isList = isList;
+    }
+
+    public String getIsList()
+    {
+        return isList;
+    }
+
+    public boolean isList()
+    {
+        return isList(this.isList);
+    }
+
+    public boolean isList(String isList)
+    {
+        return isList != null && StringUtils.equals("1", isList);
+    }
+
+    public void setIsQuery(String isQuery)
+    {
+        this.isQuery = isQuery;
+    }
+
+    public String getIsQuery()
+    {
+        return isQuery;
+    }
+
+    public boolean isQuery()
+    {
+        return isQuery(this.isQuery);
+    }
+
+    public boolean isQuery(String isQuery)
+    {
+        return isQuery != null && StringUtils.equals("1", isQuery);
+    }
+
+    public void setQueryType(String queryType)
+    {
+        this.queryType = queryType;
+    }
+
+    public String getQueryType()
+    {
+        return queryType;
+    }
+
+    public String getHtmlType()
+    {
+        return htmlType;
+    }
+
+    public void setHtmlType(String htmlType)
+    {
+        this.htmlType = htmlType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setSort(Integer sort)
+    {
+        this.sort = sort;
+    }
+
+    public Integer getSort()
+    {
+        return sort;
+    }
+
+    public boolean isSuperColumn()
+    {
+        return isSuperColumn(this.javaField);
+    }
+
+    public static boolean isSuperColumn(String javaField)
+    {
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                // BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                // TreeEntity
+                "parentName", "parentId", "orderNum", "ancestors");
+    }
+
+    public boolean isUsableColumn()
+    {
+        return isUsableColumn(javaField);
+    }
+
+    public static boolean isUsableColumn(String javaField)
+    {
+        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+    }
+
+    public String readConverterExp()
+    {
+        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+        StringBuffer sb = new StringBuffer();
+        if (StringUtils.isNotEmpty(remarks))
+        {
+            for (String value : remarks.split(" "))
+            {
+                if (StringUtils.isNotEmpty(value))
+                {
+                    Object startStr = value.subSequence(0, 1);
+                    String endStr = value.substring(1);
+                    sb.append("").append(startStr).append("=").append(endStr).append(",");
+                }
+            }
+            return sb.deleteCharAt(sb.length() - 1).toString();
+        }
+        else
+        {
+            return this.columnComment;
+        }
+    }
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
new file mode 100644
index 0000000..951e166
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
@@ -0,0 +1,60 @@
+package com.ruoyi.generator.mapper;
+
+import java.util.List;
+import com.ruoyi.generator.domain.GenTableColumn;
+
+/**
+ * 业务字段 数据层
+ * 
+ * @author ruoyi
+ */
+public interface GenTableColumnMapper
+{
+    /**
+     * 根据表名称查询列信息
+     * 
+     * @param tableName 表名称
+     * @return 列信息
+     */
+    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+
+    /**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段
+     * 
+     * @param genTableColumns 列数据
+     * @return 结果
+     */
+    public int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
+
+    /**
+     * 批量删除业务字段
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(Long[] ids);
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
new file mode 100644
index 0000000..9b330df
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
@@ -0,0 +1,83 @@
+package com.ruoyi.generator.mapper;
+
+import java.util.List;
+import com.ruoyi.generator.domain.GenTable;
+
+/**
+ * 业务 数据层
+ * 
+ * @author ruoyi
+ */
+public interface GenTableMapper
+{
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询表ID业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 查询表名称业务信息
+     * 
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    public GenTable selectGenTableByName(String tableName);
+
+    /**
+     * 新增业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int insertGenTable(GenTable genTable);
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public int updateGenTable(GenTable genTable);
+
+    /**
+     * 批量删除业务
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableByIds(Long[] ids);
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
new file mode 100644
index 0000000..0679689
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
@@ -0,0 +1,68 @@
+package com.ruoyi.generator.service;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.mapper.GenTableColumnMapper;
+
+/**
+ * 业务字段 服务层实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class GenTableColumnServiceImpl implements IGenTableColumnService 
+{
+	@Autowired
+	private GenTableColumnMapper genTableColumnMapper;
+
+	/**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+	@Override
+	public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId)
+	{
+	    return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+	}
+	
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+	@Override
+	public int insertGenTableColumn(GenTableColumn genTableColumn)
+	{
+	    return genTableColumnMapper.insertGenTableColumn(genTableColumn);
+	}
+	
+	/**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+	@Override
+	public int updateGenTableColumn(GenTableColumn genTableColumn)
+	{
+	    return genTableColumnMapper.updateGenTableColumn(genTableColumn);
+	}
+
+	/**
+     * 删除业务字段对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+	@Override
+	public int deleteGenTableColumnByIds(String ids)
+	{
+		return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+	}
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
new file mode 100644
index 0000000..499da03
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -0,0 +1,500 @@
+package com.ruoyi.generator.service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.text.CharsetKit;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.mapper.GenTableColumnMapper;
+import com.ruoyi.generator.mapper.GenTableMapper;
+import com.ruoyi.generator.util.GenUtils;
+import com.ruoyi.generator.util.VelocityInitializer;
+import com.ruoyi.generator.util.VelocityUtils;
+
+/**
+ * 业务 服务层实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class GenTableServiceImpl implements IGenTableService
+{
+    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
+
+    @Autowired
+    private GenTableMapper genTableMapper;
+
+    @Autowired
+    private GenTableColumnMapper genTableColumnMapper;
+
+    /**
+     * 查询业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    @Override
+    public GenTable selectGenTableById(Long id)
+    {
+        GenTable genTable = genTableMapper.selectGenTableById(id);
+        setTableFromOptions(genTable);
+        return genTable;
+    }
+
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    @Override
+    public List<GenTable> selectGenTableList(GenTable genTable)
+    {
+        return genTableMapper.selectGenTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableList(GenTable genTable)
+    {
+        return genTableMapper.selectDbTableList(genTable);
+    }
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    @Override
+    public List<GenTable> selectDbTableListByNames(String[] tableNames)
+    {
+        return genTableMapper.selectDbTableListByNames(tableNames);
+    }
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    @Override
+    public List<GenTable> selectGenTableAll()
+    {
+        return genTableMapper.selectGenTableAll();
+    }
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void updateGenTable(GenTable genTable)
+    {
+        String options = JSON.toJSONString(genTable.getParams());
+        genTable.setOptions(options);
+        int row = genTableMapper.updateGenTable(genTable);
+        if (row > 0)
+        {
+            for (GenTableColumn cenTableColumn : genTable.getColumns())
+            {
+                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+            }
+        }
+    }
+
+    /**
+     * 删除业务对象
+     * 
+     * @param tableIds 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void deleteGenTableByIds(Long[] tableIds)
+    {
+        genTableMapper.deleteGenTableByIds(tableIds);
+        genTableColumnMapper.deleteGenTableColumnByIds(tableIds);
+    }
+
+    /**
+     * 导入表结构
+     * 
+     * @param tableList 导入表列表
+     */
+    @Override
+    @Transactional
+    public void importGenTable(List<GenTable> tableList)
+    {
+        String operName = SecurityUtils.getUsername();
+        try
+        {
+            for (GenTable table : tableList)
+            {
+                String tableName = table.getTableName();
+                GenUtils.initTable(table, operName);
+                int row = genTableMapper.insertGenTable(table);
+                if (row > 0)
+                {
+                    // 保存列信息
+                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+                    for (GenTableColumn column : genTableColumns)
+                    {
+                        GenUtils.initColumnField(column, table);
+                        genTableColumnMapper.insertGenTableColumn(column);
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 预览代码
+     * 
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    @Override
+    public Map<String, String> previewCode(Long tableId)
+    {
+        Map<String, String> dataMap = new LinkedHashMap<>();
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableById(tableId);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            dataMap.put(template, sw.toString());
+        }
+        return dataMap;
+    }
+
+    /**
+     * 生成代码（下载方式）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String tableName)
+    {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableName, zip);
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     * 
+     * @param tableName 表名称
+     */
+    @Override
+    public void generatorCode(String tableName)
+    {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
+            {
+                // 渲染模板
+                StringWriter sw = new StringWriter();
+                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+                tpl.merge(context, sw);
+                try
+                {
+                    String path = getGenPath(table, template);
+                    FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);
+                }
+                catch (IOException e)
+                {
+                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
+                }
+            }
+        }
+    }
+
+    /**
+     * 同步数据库
+     * 
+     * @param tableName 表名称
+     */
+    @Override
+    @Transactional
+    public void synchDb(String tableName)
+    {
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        List<GenTableColumn> tableColumns = table.getColumns();
+        List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+
+        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+        if (StringUtils.isEmpty(dbTableColumns))
+        {
+            throw new ServiceException("同步数据失败，原表结构不存在");
+        }
+        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+
+        dbTableColumns.forEach(column -> {
+            if (!tableColumnNames.contains(column.getColumnName()))
+            {
+                GenUtils.initColumnField(column, table);
+                genTableColumnMapper.insertGenTableColumn(column);
+            }
+        });
+
+        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(delColumns))
+        {
+            genTableColumnMapper.deleteGenTableColumns(delColumns);
+        }
+    }
+
+    /**
+     * 批量生成代码（下载方式）
+     * 
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String[] tableNames)
+    {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        for (String tableName : tableNames)
+        {
+            generatorCode(tableName, zip);
+        }
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 查询表信息并生成代码
+     */
+    private void generatorCode(String tableName, ZipOutputStream zip)
+    {
+        // 查询表信息
+        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates)
+        {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            try
+            {
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IOUtils.write(sw.toString(), zip, Constants.UTF8);
+                IOUtils.closeQuietly(sw);
+				zip.flush();
+                zip.closeEntry();
+            }
+            catch (IOException e)
+            {
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            }
+        }
+    }
+
+    /**
+     * 修改保存参数校验
+     * 
+     * @param genTable 业务信息
+     */
+    @Override
+    public void validateEdit(GenTable genTable)
+    {
+        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
+        {
+            String options = JSON.toJSONString(genTable.getParams());
+            JSONObject paramsObj = JSONObject.parseObject(options);
+            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
+            {
+                throw new ServiceException("树编码字段不能为空");
+            }
+            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
+            {
+                throw new ServiceException("树父编码字段不能为空");
+            }
+            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
+            {
+                throw new ServiceException("树名称字段不能为空");
+            }
+            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+            {
+                if (StringUtils.isEmpty(genTable.getSubTableName()))
+                {
+                    throw new ServiceException("关联子表的表名不能为空");
+                }
+                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
+                {
+                    throw new ServiceException("子表关联的外键名不能为空");
+                }
+            }
+        }
+    }
+
+    /**
+     * 设置主键列信息
+     * 
+     * @param table 业务表信息
+     */
+    public void setPkColumn(GenTable table)
+    {
+        for (GenTableColumn column : table.getColumns())
+        {
+            if (column.isPk())
+            {
+                table.setPkColumn(column);
+                break;
+            }
+        }
+        if (StringUtils.isNull(table.getPkColumn()))
+        {
+            table.setPkColumn(table.getColumns().get(0));
+        }
+        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))
+        {
+            for (GenTableColumn column : table.getSubTable().getColumns())
+            {
+                if (column.isPk())
+                {
+                    table.getSubTable().setPkColumn(column);
+                    break;
+                }
+            }
+            if (StringUtils.isNull(table.getSubTable().getPkColumn()))
+            {
+                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+            }
+        }
+    }
+
+    /**
+     * 设置主子表信息
+     * 
+     * @param table 业务表信息
+     */
+    public void setSubTable(GenTable table)
+    {
+        String subTableName = table.getSubTableName();
+        if (StringUtils.isNotEmpty(subTableName))
+        {
+            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
+        }
+    }
+
+    /**
+     * 设置代码生成其他选项值
+     * 
+     * @param genTable 设置后的生成对象
+     */
+    public void setTableFromOptions(GenTable genTable)
+    {
+        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
+        if (StringUtils.isNotNull(paramsObj))
+        {
+            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
+            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
+            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
+            
+            genTable.setTreeCode(treeCode);
+            genTable.setTreeParentCode(treeParentCode);
+            genTable.setTreeName(treeName);
+            genTable.setParentMenuId(parentMenuId);
+            genTable.setParentMenuName(parentMenuName);
+        }
+    }
+
+    /**
+     * 获取代码生成地址
+     * 
+     * @param table 业务表信息
+     * @param template 模板文件路径
+     * @return 生成地址
+     */
+    public static String getGenPath(GenTable table, String template)
+    {
+        String genPath = table.getGenPath();
+        if (StringUtils.equals(genPath, "/"))
+        {
+            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
+        }
+        return genPath + File.separator + VelocityUtils.getFileName(template, table);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
new file mode 100644
index 0000000..3037f70
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
@@ -0,0 +1,44 @@
+package com.ruoyi.generator.service;
+
+import java.util.List;
+import com.ruoyi.generator.domain.GenTableColumn;
+
+/**
+ * 业务字段 服务层
+ * 
+ * @author ruoyi
+ */
+public interface IGenTableColumnService
+{
+    /**
+     * 查询业务字段列表
+     * 
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 新增业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 修改业务字段
+     * 
+     * @param genTableColumn 业务字段信息
+     * @return 结果
+     */
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
+
+    /**
+     * 删除业务字段信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteGenTableColumnByIds(String ids);
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
new file mode 100644
index 0000000..9d53f95
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
@@ -0,0 +1,121 @@
+package com.ruoyi.generator.service;
+
+import java.util.List;
+import java.util.Map;
+import com.ruoyi.generator.domain.GenTable;
+
+/**
+ * 业务 服务层
+ * 
+ * @author ruoyi
+ */
+public interface IGenTableService
+{
+    /**
+     * 查询业务列表
+     * 
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    public List<GenTable> selectGenTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableList(GenTable genTable);
+
+    /**
+     * 查询据库列表
+     * 
+     * @param tableNames 表名称组
+     * @return 数据库表集合
+     */
+    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+
+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询业务信息
+     * 
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    public GenTable selectGenTableById(Long id);
+
+    /**
+     * 修改业务
+     * 
+     * @param genTable 业务信息
+     * @return 结果
+     */
+    public void updateGenTable(GenTable genTable);
+
+    /**
+     * 删除业务信息
+     * 
+     * @param tableIds 需要删除的表数据ID
+     * @return 结果
+     */
+    public void deleteGenTableByIds(Long[] tableIds);
+
+    /**
+     * 导入表结构
+     * 
+     * @param tableList 导入表列表
+     */
+    public void importGenTable(List<GenTable> tableList);
+
+    /**
+     * 预览代码
+     * 
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    public Map<String, String> previewCode(Long tableId);
+
+    /**
+     * 生成代码（下载方式）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public byte[] downloadCode(String tableName);
+
+    /**
+     * 生成代码（自定义路径）
+     * 
+     * @param tableName 表名称
+     * @return 数据
+     */
+    public void generatorCode(String tableName);
+
+    /**
+     * 同步数据库
+     * 
+     * @param tableName 表名称
+     */
+    public void synchDb(String tableName);
+
+    /**
+     * 批量生成代码（下载方式）
+     * 
+     * @param tableNames 表数组
+     * @return 数据
+     */
+    public byte[] downloadCode(String[] tableNames);
+
+    /**
+     * 修改保存参数校验
+     * 
+     * @param genTable 业务信息
+     */
+    public void validateEdit(GenTable genTable);
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
new file mode 100644
index 0000000..06c6821
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -0,0 +1,258 @@
+package com.ruoyi.generator.util;
+
+import java.util.Arrays;
+import org.apache.commons.lang3.RegExUtils;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.config.GenConfig;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+
+/**
+ * 代码生成器 工具类
+ * 
+ * @author ruoyi
+ */
+public class GenUtils
+{
+    /**
+     * 初始化表信息
+     */
+    public static void initTable(GenTable genTable, String operName)
+    {
+        genTable.setClassName(convertClassName(genTable.getTableName()));
+        genTable.setPackageName(GenConfig.getPackageName());
+        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
+        genTable.setFunctionName(replaceText(genTable.getTableComment()));
+        genTable.setFunctionAuthor(GenConfig.getAuthor());
+        genTable.setCreateBy(operName);
+    }
+
+    /**
+     * 初始化列属性字段
+     */
+    public static void initColumnField(GenTableColumn column, GenTable table)
+    {
+        String dataType = getDbType(column.getColumnType());
+        String columnName = column.getColumnName();
+        column.setTableId(table.getTableId());
+        column.setCreateBy(table.getCreateBy());
+        // 设置java字段名
+        column.setJavaField(StringUtils.toCamelCase(columnName));
+        // 设置默认类型
+        column.setJavaType(GenConstants.TYPE_STRING);
+
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
+        {
+            // 字符串长度超过500设置为文本域
+            Integer columnLength = getColumnLength(column.getColumnType());
+            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+            column.setHtmlType(htmlType);
+        }
+        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
+        {
+            column.setJavaType(GenConstants.TYPE_DATE);
+            column.setHtmlType(GenConstants.HTML_DATETIME);
+        }
+        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
+        {
+            column.setHtmlType(GenConstants.HTML_INPUT);
+
+            // 如果是浮点型 统一用BigDecimal
+            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
+            {
+                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+            }
+            // 如果是整形
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            {
+                column.setJavaType(GenConstants.TYPE_INTEGER);
+            }
+            // 长整形
+            else
+            {
+                column.setJavaType(GenConstants.TYPE_LONG);
+            }
+        }
+
+        // 插入字段（默认所有字段都需要插入）
+        column.setIsInsert(GenConstants.REQUIRE);
+
+        // 编辑字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+        {
+            column.setIsEdit(GenConstants.REQUIRE);
+        }
+        // 列表字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        {
+            column.setIsList(GenConstants.REQUIRE);
+        }
+        // 查询字段
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        {
+            column.setIsQuery(GenConstants.REQUIRE);
+        }
+
+        // 查询字段类型
+        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
+        {
+            column.setQueryType(GenConstants.QUERY_LIKE);
+        }
+        // 状态字段设置单选框
+        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
+        {
+            column.setHtmlType(GenConstants.HTML_RADIO);
+        }
+        // 类型&性别字段设置下拉框
+        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
+        {
+            column.setHtmlType(GenConstants.HTML_SELECT);
+        }
+        // 图片字段设置图片上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+        {
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 文件字段设置文件上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
+        }
+        // 内容字段设置富文本控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+        {
+            column.setHtmlType(GenConstants.HTML_EDITOR);
+        }
+    }
+
+    /**
+     * 校验数组是否包含指定值
+     * 
+     * @param arr 数组
+     * @param targetValue 值
+     * @return 是否包含
+     */
+    public static boolean arraysContains(String[] arr, String targetValue)
+    {
+        return Arrays.asList(arr).contains(targetValue);
+    }
+
+    /**
+     * 获取模块名
+     * 
+     * @param packageName 包名
+     * @return 模块名
+     */
+    public static String getModuleName(String packageName)
+    {
+        int lastIndex = packageName.lastIndexOf(".");
+        int nameLength = packageName.length();
+        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
+        return moduleName;
+    }
+
+    /**
+     * 获取业务名
+     * 
+     * @param tableName 表名
+     * @return 业务名
+     */
+    public static String getBusinessName(String tableName)
+    {
+        int lastIndex = tableName.lastIndexOf("_");
+        int nameLength = tableName.length();
+        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
+        return businessName;
+    }
+
+    /**
+     * 表名转换成Java类名
+     * 
+     * @param tableName 表名称
+     * @return 类名
+     */
+    public static String convertClassName(String tableName)
+    {
+        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+        String tablePrefix = GenConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+        {
+            String[] searchList = StringUtils.split(tablePrefix, ",");
+            tableName = replaceFirst(tableName, searchList);
+        }
+        return StringUtils.convertToCamelCase(tableName);
+    }
+
+    /**
+     * 批量替换前缀
+     * 
+     * @param replacementm 替换值
+     * @param searchList 替换列表
+     * @return
+     */
+    public static String replaceFirst(String replacementm, String[] searchList)
+    {
+        String text = replacementm;
+        for (String searchString : searchList)
+        {
+            if (replacementm.startsWith(searchString))
+            {
+                text = replacementm.replaceFirst(searchString, "");
+                break;
+            }
+        }
+        return text;
+    }
+
+    /**
+     * 关键字替换
+     * 
+     * @param text 需要被替换的名字
+     * @return 替换后的名字
+     */
+    public static String replaceText(String text)
+    {
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+    }
+
+    /**
+     * 获取数据库类型字段
+     * 
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static String getDbType(String columnType)
+    {
+        if (StringUtils.indexOf(columnType, "(") > 0)
+        {
+            return StringUtils.substringBefore(columnType, "(");
+        }
+        else
+        {
+            return columnType;
+        }
+    }
+
+    /**
+     * 获取字段长度
+     * 
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static Integer getColumnLength(String columnType)
+    {
+        if (StringUtils.indexOf(columnType, "(") > 0)
+        {
+            String length = StringUtils.substringBetween(columnType, "(", ")");
+            return Integer.valueOf(length);
+        }
+        else
+        {
+            return 0;
+        }
+    }
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
new file mode 100644
index 0000000..32452b8
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
@@ -0,0 +1,35 @@
+package com.ruoyi.generator.util;
+
+import java.util.Properties;
+import org.apache.velocity.app.Velocity;
+import com.ruoyi.common.constant.Constants;
+
+/**
+ * VelocityEngine工厂
+ * 
+ * @author ruoyi
+ */
+public class VelocityInitializer
+{
+    /**
+     * 初始化vm方法
+     */
+    public static void initVelocity()
+    {
+        Properties p = new Properties();
+        try
+        {
+            // 加载classpath目录下的vm文件
+            p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+            // 定义字符集
+            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
+            p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
+            // 初始化Velocity引擎，指定配置Properties
+            Velocity.init(p);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
new file mode 100644
index 0000000..4472928
--- /dev/null
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -0,0 +1,362 @@
+package com.ruoyi.generator.util;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import org.apache.velocity.VelocityContext;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+
+/**
+ * 模板处理工具类
+ * 
+ * @author ruoyi
+ */
+public class VelocityUtils
+{
+    /** 项目空间路径 */
+    private static final String PROJECT_PATH = "main/java";
+
+    /** mybatis空间路径 */
+    private static final String MYBATIS_PATH = "main/resources/mapper";
+
+    /** 默认上级菜单，系统工具 */
+    private static final String DEFAULT_PARENT_MENU_ID = "3";
+
+    /**
+     * 设置模板变量信息
+     *
+     * @return 模板列表
+     */
+    public static VelocityContext prepareContext(GenTable genTable)
+    {
+        String moduleName = genTable.getModuleName();
+        String businessName = genTable.getBusinessName();
+        String packageName = genTable.getPackageName();
+        String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
+
+        VelocityContext velocityContext = new VelocityContext();
+        velocityContext.put("tplCategory", genTable.getTplCategory());
+        velocityContext.put("tableName", genTable.getTableName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+        velocityContext.put("ClassName", genTable.getClassName());
+        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+        velocityContext.put("moduleName", genTable.getModuleName());
+        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+        velocityContext.put("businessName", genTable.getBusinessName());
+        velocityContext.put("basePackage", getPackagePrefix(packageName));
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("author", genTable.getFunctionAuthor());
+        velocityContext.put("datetime", DateUtils.getDate());
+        velocityContext.put("pkColumn", genTable.getPkColumn());
+        velocityContext.put("importList", getImportList(genTable));
+        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("columns", genTable.getColumns());
+        velocityContext.put("table", genTable);
+        setMenuVelocityContext(velocityContext, genTable);
+        if (GenConstants.TPL_TREE.equals(tplCategory))
+        {
+            setTreeVelocityContext(velocityContext, genTable);
+        }
+        if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            setSubVelocityContext(velocityContext, genTable);
+        }
+        return velocityContext;
+    }
+
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String parentMenuId = getParentMenuId(paramsObj);
+        context.put("parentMenuId", parentMenuId);
+    }
+
+    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String treeCode = getTreecode(paramsObj);
+        String treeParentCode = getTreeParentCode(paramsObj);
+        String treeName = getTreeName(paramsObj);
+
+        context.put("treeCode", treeCode);
+        context.put("treeParentCode", treeParentCode);
+        context.put("treeName", treeName);
+        context.put("expandColumn", getExpandColumn(genTable));
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        {
+            context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        {
+            context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
+        }
+    }
+
+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        GenTable subTable = genTable.getSubTable();
+        String subTableName = genTable.getSubTableName();
+        String subTableFkName = genTable.getSubTableFkName();
+        String subClassName = genTable.getSubTable().getClassName();
+        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+
+        context.put("subTable", subTable);
+        context.put("subTableName", subTableName);
+        context.put("subTableFkName", subTableFkName);
+        context.put("subTableFkClassName", subTableFkClassName);
+        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+        context.put("subClassName", subClassName);
+        context.put("subclassName", StringUtils.uncapitalize(subClassName));
+        context.put("subImportList", getImportList(genTable.getSubTable()));
+    }
+
+    /**
+     * 获取模板信息
+     *
+     * @return 模板列表
+     */
+    public static List<String> getTemplateList(String tplCategory)
+    {
+        List<String> templates = new ArrayList<String>();
+        templates.add("vm/java/domain.java.vm");
+        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/service.java.vm");
+        templates.add("vm/java/serviceImpl.java.vm");
+        templates.add("vm/java/controller.java.vm");
+        templates.add("vm/xml/mapper.xml.vm");
+        templates.add("vm/sql/sql.vm");
+        templates.add("vm/js/api.js.vm");
+        if (GenConstants.TPL_CRUD.equals(tplCategory))
+        {
+            templates.add("vm/vue/index.vue.vm");
+        }
+        else if (GenConstants.TPL_TREE.equals(tplCategory))
+        {
+            templates.add("vm/vue/index-tree.vue.vm");
+        }
+        else if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            templates.add("vm/vue/index.vue.vm");
+            templates.add("vm/java/sub-domain.java.vm");
+        }
+        return templates;
+    }
+
+    /**
+     * 获取文件名
+     */
+    public static String getFileName(String template, GenTable genTable)
+    {
+        // 文件名称
+        String fileName = "";
+        // 包路径
+        String packageName = genTable.getPackageName();
+        // 模块名
+        String moduleName = genTable.getModuleName();
+        // 大写类名
+        String className = genTable.getClassName();
+        // 业务名称
+        String businessName = genTable.getBusinessName();
+
+        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
+        String vuePath = "vue";
+
+        if (template.contains("domain.java.vm"))
+        {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
+        }
+        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
+        {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
+        }
+        else if (template.contains("mapper.java.vm"))
+        {
+            fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
+        }
+        else if (template.contains("service.java.vm"))
+        {
+            fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+        }
+        else if (template.contains("serviceImpl.java.vm"))
+        {
+            fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
+        }
+        else if (template.contains("controller.java.vm"))
+        {
+            fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
+        }
+        else if (template.contains("mapper.xml.vm"))
+        {
+            fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
+        }
+        else if (template.contains("sql.vm"))
+        {
+            fileName = businessName + "Menu.sql";
+        }
+        else if (template.contains("api.js.vm"))
+        {
+            fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
+        }
+        else if (template.contains("index.vue.vm"))
+        {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        else if (template.contains("index-tree.vue.vm"))
+        {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        return fileName;
+    }
+
+    /**
+     * 获取包前缀
+     *
+     * @param packageName 包名称
+     * @return 包前缀名称
+     */
+    public static String getPackagePrefix(String packageName)
+    {
+        int lastIndex = packageName.lastIndexOf(".");
+        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
+        return basePackage;
+    }
+
+    /**
+     * 根据列类型获取导入包
+     * 
+     * @param genTable 业务表对象
+     * @return 返回需要导入的包列表
+     */
+    public static HashSet<String> getImportList(GenTable genTable)
+    {
+        List<GenTableColumn> columns = genTable.getColumns();
+        GenTable subGenTable = genTable.getSubTable();
+        HashSet<String> importList = new HashSet<String>();
+        if (StringUtils.isNotNull(subGenTable))
+        {
+            importList.add("java.util.List");
+        }
+        for (GenTableColumn column : columns)
+        {
+            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
+            {
+                importList.add("java.util.Date");
+                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
+            }
+            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
+            {
+                importList.add("java.math.BigDecimal");
+            }
+        }
+        return importList;
+    }
+
+    /**
+     * 获取权限前缀
+     *
+     * @param moduleName 模块名称
+     * @param businessName 业务名称
+     * @return 返回权限前缀
+     */
+    public static String getPermissionPrefix(String moduleName, String businessName)
+    {
+        return StringUtils.format("{}:{}", moduleName, businessName);
+    }
+
+    /**
+     * 获取上级菜单ID字段
+     *
+     * @param paramsObj 生成其他选项
+     * @return 上级菜单ID字段
+     */
+    public static String getParentMenuId(JSONObject paramsObj)
+    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
+        {
+            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+        }
+        return DEFAULT_PARENT_MENU_ID;
+    }
+
+    /**
+     * 获取树编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树编码
+     */
+    public static String getTreecode(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_CODE))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树父编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树父编码
+     */
+    public static String getTreeParentCode(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树名称
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树名称
+     */
+    public static String getTreeName(JSONObject paramsObj)
+    {
+        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        {
+            return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取需要在哪一列上面显示展开按钮
+     *
+     * @param genTable 业务表对象
+     * @return 展开按钮列序号
+     */
+    public static int getExpandColumn(GenTable genTable)
+    {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+        int num = 0;
+        for (GenTableColumn column : genTable.getColumns())
+        {
+            if (column.isList())
+            {
+                num++;
+                String columnName = column.getColumnName();
+                if (columnName.equals(treeName))
+                {
+                    break;
+                }
+            }
+        }
+        return num;
+    }
+}
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
new file mode 100644
index 0000000..89e75bd
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -0,0 +1,10 @@
+# 代码生成
+gen: 
+  # 作者
+  author: yinzhiying
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: com.ruoyi.segchk
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: sys_
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
new file mode 100644
index 0000000..5fa790f
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -0,0 +1,127 @@
+<?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.generator.mapper.GenTableColumnMapper">
+    
+    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableColumnVo">
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    </sql>
+	
+    <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
+        <include refid="selectGenTableColumnVo"/>
+        where table_id = #{tableId}
+        order by sort
+    </select>
+    
+    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
+    
+    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+        insert into gen_table_column (
+			<if test="tableId != null and tableId != ''">table_id,</if>
+			<if test="columnName != null and columnName != ''">column_name,</if>
+			<if test="columnComment != null and columnComment != ''">column_comment,</if>
+			<if test="columnType != null and columnType != ''">column_type,</if>
+			<if test="javaType != null and javaType != ''">java_type,</if>
+			<if test="javaField != null  and javaField != ''">java_field,</if>
+			<if test="isPk != null and isPk != ''">is_pk,</if>
+			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+			<if test="isRequired != null and isRequired != ''">is_required,</if>
+			<if test="isInsert != null and isInsert != ''">is_insert,</if>
+			<if test="isEdit != null and isEdit != ''">is_edit,</if>
+			<if test="isList != null and isList != ''">is_list,</if>
+			<if test="isQuery != null and isQuery != ''">is_query,</if>
+			<if test="queryType != null and queryType != ''">query_type,</if>
+			<if test="htmlType != null and htmlType != ''">html_type,</if>
+			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="sort != null">sort,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableId != null and tableId != ''">#{tableId},</if>
+			<if test="columnName != null and columnName != ''">#{columnName},</if>
+			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+			<if test="columnType != null and columnType != ''">#{columnType},</if>
+			<if test="javaType != null and javaType != ''">#{javaType},</if>
+			<if test="javaField != null and javaField != ''">#{javaField},</if>
+			<if test="isPk != null and isPk != ''">#{isPk},</if>
+			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+			<if test="isList != null and isList != ''">#{isList},</if>
+			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+			<if test="queryType != null and queryType != ''">#{queryType},</if>
+			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="sort != null">#{sort},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+	 
+    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+        update gen_table_column
+        <set>
+            column_comment = #{columnComment},
+            java_type = #{javaType},
+            java_field = #{javaField},
+            is_insert = #{isInsert},
+            is_edit = #{isEdit},
+            is_list = #{isList},
+            is_query = #{isQuery},
+            is_required = #{isRequired},
+            query_type = #{queryType},
+            html_type = #{htmlType},
+            dict_type = #{dictType},
+            sort = #{sort},
+            update_by = #{updateBy},
+            update_time = sysdate()
+        </set>
+        where column_id = #{columnId}
+    </update>
+
+    <delete id="deleteGenTableColumnByIds" parameterType="Long">
+        delete from gen_table_column where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteGenTableColumns">
+        delete from gen_table_column where column_id in 
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.columnId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
new file mode 100644
index 0000000..3162379
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -0,0 +1,201 @@
+<?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.generator.mapper.GenTableMapper">
+
+	<resultMap type="GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"          />
+		<result property="tableName"      column="table_name"        />
+		<result property="tableComment"   column="table_comment"     />
+		<result property="subTableName"   column="sub_table_name"    />
+		<result property="subTableFkName" column="sub_table_fk_name" />
+		<result property="className"      column="class_name"        />
+		<result property="tplCategory"    column="tpl_category"      />
+		<result property="packageName"    column="package_name"      />
+		<result property="moduleName"     column="module_name"       />
+		<result property="businessName"   column="business_name"     />
+		<result property="functionName"   column="function_name"     />
+		<result property="functionAuthor" column="function_author"   />
+		<result property="genType"        column="gen_type"          />
+		<result property="genPath"        column="gen_path"          />
+		<result property="options"        column="options"           />
+		<result property="createBy"       column="create_by"         />
+		<result property="createTime"     column="create_time"       />
+		<result property="updateBy"       column="update_by"         />
+		<result property="updateTime"     column="update_time"       />
+		<result property="remark"         column="remark"            />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
+	
+	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	
+	<sql id="selectGenTableVo">
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+    </sql>
+    
+    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
+		<include refid="selectGenTableVo"/>
+		<where>
+			<if test="tableName != null and tableName != ''">
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+			</if>
+			<if test="tableComment != null and tableComment != ''">
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+	</select>
+
+	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_schema = (select database())
+		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+		AND table_name NOT IN (select table_name from gen_table)
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+	</select>
+	
+	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		and table_name in
+	    <foreach collection="array" item="name" open="(" separator="," close=")">
+ 			#{name}
+        </foreach> 
+	</select>
+	
+	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+		select table_name, table_comment, create_time, update_time from information_schema.tables
+		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		and table_name = #{tableName}
+	</select>
+	
+	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_id = #{tableId} order by c.sort
+	</select>
+	
+	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		where t.table_name = #{tableName} order by c.sort
+	</select>
+	
+	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
+			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		FROM gen_table t
+			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+		order by c.sort
+	</select>
+	
+	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        insert into gen_table (
+			<if test="tableName != null">table_name,</if>
+			<if test="tableComment != null and tableComment != ''">table_comment,</if>
+			<if test="className != null and className != ''">class_name,</if>
+			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+			<if test="packageName != null and packageName != ''">package_name,</if>
+			<if test="moduleName != null and moduleName != ''">module_name,</if>
+			<if test="businessName != null and businessName != ''">business_name,</if>
+			<if test="functionName != null and functionName != ''">function_name,</if>
+			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+			<if test="genType != null and genType != ''">gen_type,</if>
+			<if test="genPath != null and genPath != ''">gen_path,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+			create_time
+         )values(
+			<if test="tableName != null">#{tableName},</if>
+			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+			<if test="className != null and className != ''">#{className},</if>
+			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+			<if test="packageName != null and packageName != ''">#{packageName},</if>
+			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+			<if test="businessName != null and businessName != ''">#{businessName},</if>
+			<if test="functionName != null and functionName != ''">#{functionName},</if>
+			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+			<if test="genType != null and genType != ''">#{genType},</if>
+			<if test="genPath != null and genPath != ''">#{genPath},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			sysdate()
+         )
+    </insert>
+    
+    <update id="updateGenTable" parameterType="GenTable">
+        update gen_table
+        <set>
+            <if test="tableName != null">table_name = #{tableName},</if>
+            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
+            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
+            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
+            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
+            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
+            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
+            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
+            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
+            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
+            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
+            <if test="options != null and options != ''">options = #{options},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where table_id = #{tableId}
+    </update>
+    
+    <delete id="deleteGenTableByIds" parameterType="Long">
+        delete from gen_table where table_id in 
+        <foreach collection="array" item="tableId" open="(" separator="," close=")">
+            #{tableId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
new file mode 100644
index 0000000..56ff5e6
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -0,0 +1,114 @@
+package ${packageName}.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+#elseif($table.tree)
+#end
+
+/**
+ * ${functionName}Controller
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@RestController
+@RequestMapping("/${moduleName}/${businessName}")
+public class ${ClassName}Controller extends BaseController
+{
+    @Autowired
+    private I${ClassName}Service ${className}Service;
+
+    /**
+     * 查询${functionName}列表
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+    @GetMapping("/list")
+#if($table.crud || $table.sub)
+    public TableDataInfo list(${ClassName} ${className})
+    {
+        startPage();
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return getDataTable(list);
+    }
+#elseif($table.tree)
+    public AjaxResult list(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        return AjaxResult.success(list);
+    }
+#end
+
+    /**
+     * 导出${functionName}列表
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        return util.exportExcel(list, "${functionName}数据");
+    }
+
+    /**
+     * 获取${functionName}详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+    @GetMapping(value = "/{${pkColumn.javaField}}")
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+    }
+
+    /**
+     * 新增${functionName}
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ${ClassName} ${className})
+    {
+        return toAjax(${className}Service.insert${ClassName}(${className}));
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ${ClassName} ${className})
+    {
+        return toAjax(${className}Service.update${ClassName}(${className}));
+    }
+
+    /**
+     * 删除${functionName}
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{${pkColumn.javaField}s}")
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    {
+        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+    }
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
new file mode 100644
index 0000000..bd51c17
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -0,0 +1,105 @@
+package ${packageName}.domain;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
+
+/**
+ * ${functionName}对象 ${tableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+#if($table.crud || $table.sub)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
+public class ${ClassName} extends ${Entity}
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#if($table.sub)
+    /** $table.subTable.functionName信息 */
+    private List<${subClassName}> ${subclassName}List;
+
+#end
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+#if($table.sub)
+    public List<${subClassName}> get${subClassName}List()
+    {
+        return ${subclassName}List;
+    }
+
+    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+    {
+        this.${subclassName}List = ${subclassName}List;
+    }
+
+#end
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+#if($table.sub)
+            .append("${subclassName}List", get${subClassName}List())
+#end
+            .toString();
+    }
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
new file mode 100644
index 0000000..42d015d
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
@@ -0,0 +1,91 @@
+package ${packageName}.mapper;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+#if($table.sub)
+import ${packageName}.domain.${subClassName};
+#end
+
+/**
+ * ${functionName}Mapper接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface ${ClassName}Mapper 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 删除${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+#if($table.sub)
+
+    /**
+     * 批量删除${subTable.functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${subClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    
+    /**
+     * 批量新增${subTable.functionName}
+     * 
+     * @param ${subclassName}List ${subTable.functionName}列表
+     * @return 结果
+     */
+    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    
+
+    /**
+     * 通过${functionName}主键删除${subTable.functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}ID
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+#end
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
new file mode 100644
index 0000000..264882b
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -0,0 +1,61 @@
+package ${packageName}.service;
+
+import java.util.List;
+import ${packageName}.domain.${ClassName};
+
+/**
+ * ${functionName}Service接口
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface I${ClassName}Service 
+{
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int insert${ClassName}(${ClassName} ${className});
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    public int update${ClassName}(${ClassName} ${className});
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
new file mode 100644
index 0000000..75105ce
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -0,0 +1,166 @@
+package ${packageName}.service.impl;
+
+import java.util.List;
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
+import com.ruoyi.common.utils.DateUtils;
+#break
+#end
+#end
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+#if($table.sub)
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import ${packageName}.domain.${subClassName};
+#end
+import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+
+/**
+ * ${functionName}Service业务层处理
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Service
+public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+{
+    @Autowired
+    private ${ClassName}Mapper ${className}Mapper;
+
+    /**
+     * 查询${functionName}
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+
+    /**
+     * 查询${functionName}列表
+     * 
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
+    @Override
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
+    {
+        return ${className}Mapper.select${ClassName}List(${className});
+    }
+
+    /**
+     * 新增${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int insert${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'createTime')
+        ${className}.setCreateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        int rows = ${className}Mapper.insert${ClassName}(${className});
+        insert${subClassName}(${className});
+        return rows;
+#else
+        return ${className}Mapper.insert${ClassName}(${className});
+#end
+    }
+
+    /**
+     * 修改${functionName}
+     * 
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int update${ClassName}(${ClassName} ${className})
+    {
+#foreach ($column in $columns)
+#if($column.javaField == 'updateTime')
+        ${className}.setUpdateTime(DateUtils.getNowDate());
+#end
+#end
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+#end
+        return ${className}Mapper.update${ClassName}(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     * 
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @return 结果
+     */
+#if($table.sub)
+    @Transactional
+#end
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
+    }
+
+    /**
+     * 删除${functionName}信息
+     * 
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    @Override
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+#end
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+    }
+#if($table.sub)
+
+    /**
+     * 新增${subTable.functionName}信息
+     * 
+     * @param ${className} ${functionName}对象
+     */
+    public void insert${subClassName}(${ClassName} ${className})
+    {
+        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        if (StringUtils.isNotNull(${subclassName}List))
+        {
+            List<${subClassName}> list = new ArrayList<${subClassName}>();
+            for (${subClassName} ${subclassName} : ${subclassName}List)
+            {
+                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+                list.add(${subclassName});
+            }
+            if (list.size() > 0)
+            {
+                ${className}Mapper.batch${subClassName}(list);
+            }
+        }
+    }
+#end
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm
new file mode 100644
index 0000000..a3f53eb
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm
@@ -0,0 +1,76 @@
+package ${packageName}.domain;
+
+#foreach ($import in $subImportList)
+import ${import};
+#end
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * ${subTable.functionName}对象 ${subTableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public class ${subClassName} extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $subTable.columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+            .toString();
+    }
+}
diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-generator/src/main/resources/vm/js/api.js.vm
new file mode 100644
index 0000000..296d41a
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/js/api.js.vm
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询${functionName}列表
+export function list${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询${functionName}详细
+export function get${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'get'
+  })
+}
+
+// 新增${functionName}
+export function add${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改${functionName}
+export function update${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除${functionName}
+export function del${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'delete'
+  })
+}
+
+// 导出${functionName}
+export function export${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm
new file mode 100644
index 0000000..0575583
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm
@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
new file mode 100644
index 0000000..dc1fb2b
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -0,0 +1,503 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option
+            v-for="dict in ${column.javaField}Options"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="${businessName}List"
+      row-key="${treeCode}"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
+#elseif($column.list && "" != $javaField)
+#if(${foreach.index} == 1)
+      <el-table-column label="${comment}" prop="${javaField}" />
+#else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if("" != $treeParentCode && $column.javaField == $treeParentCode)
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <imageUpload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <fileUpload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              :label="dict.dictValue">
+              {{dict.dictLabel}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable size="small"
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "${BusinessName}",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+      // ${functionName}树选项
+      ${businessName}Options: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+#foreach ($column in $columns)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if(${column.dictType} != '')
+      // $comment字典
+      ${column.javaField}Options: [],
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+#foreach ($column in $columns)
+#if(${column.dictType} != '')
+    this.getDicts("${column.dictType}").then(response => {
+      this.${column.javaField}Options = response.data;
+    });
+#end
+#end
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        this.loading = false;
+      });
+    },
+    /** 转换${functionName}数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.${treeCode},
+        label: node.${treeName},
+        children: node.children
+      };
+    },
+	/** 查询${functionName}下拉树结构 */
+    getTreeselect() {
+      list${BusinessName}().then(response => {
+        this.${businessName}Options = [];
+        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        this.${businessName}Options.push(data);
+      });
+    },
+#foreach ($column in $columns)
+#if(${column.dictType} != '')
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    // $comment字典翻译
+    ${column.javaField}Format(row, column) {
+      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
+    },
+#end
+#end
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
+
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($velocityCount != $columns.size()),#end
+
+#else
+        $column.javaField: null#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.${treeCode}) {
+        this.form.${treeParentCode} = row.${treeCode};
+      } else {
+        this.form.${treeParentCode} = 0;
+      }
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.${treeParentCode} = row.${treeCode};
+      }
+      get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return del${BusinessName}(row.${pkColumn.javaField});
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
new file mode 100644
index 0000000..5a3394b
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -0,0 +1,607 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-input
+          v-model="queryParams.${column.javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option
+            v-for="dict in ${column.javaField}Options"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+      <el-form-item label="${comment}" prop="${column.javaField}">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.${column.javaField}"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      <el-form-item label="${comment}">
+        <el-date-picker
+          v-model="daterange${AttrName}"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+#end
+#end
+#end
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#elseif($column.list && $column.htmlType == "datetime")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+#elseif($column.list && "" != $column.dictType)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
+#elseif($column.list && "" != $javaField)
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+#end
+#end
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}">
+          <imageUpload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}">
+          <fileUpload v-model="form.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
+            ></el-option>
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              :label="dict.dictValue">
+              {{dict.dictLabel}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${field}Options"
+              :key="dict.dictValue"
+              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable size="small"
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+#end
+#if($table.sub)
+        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+          <el-table-column label="$comment" prop="${javaField}">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+            </template>
+          </el-table-column>
+#end
+#end
+        </el-table>
+#end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
+
+export default {
+  name: "${BusinessName}",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+#if($table.sub)
+      // 子表选中数据
+      checked${subClassName}: [],
+#end
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // ${functionName}表格数据
+      ${businessName}List: [],
+#if($table.sub)
+      // ${subTable.functionName}表格数据
+      ${subclassName}List: [],
+#end
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+#foreach ($column in $columns)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if(${column.dictType} != '')
+      // $comment字典
+      ${column.javaField}Options: [],
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      // $comment时间范围
+      daterange${AttrName}: [],
+#end
+#end
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+#foreach ($column in $columns)
+#if($column.query)
+        $column.javaField: null#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+#foreach ($column in $columns)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        $column.javaField: [
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+        ]#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      }
+    };
+  },
+  created() {
+    this.getList();
+#foreach ($column in $columns)
+#if(${column.dictType} != '')
+    this.getDicts("${column.dictType}").then(response => {
+      this.${column.javaField}Options = response.data;
+    });
+#end
+#end
+  },
+  methods: {
+    /** 查询${functionName}列表 */
+    getList() {
+      this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+      this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      }
+#end
+#end
+      list${BusinessName}(this.queryParams).then(response => {
+        this.${businessName}List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+#foreach ($column in $columns)
+#if(${column.dictType} != '')
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+    // $comment字典翻译
+    ${column.javaField}Format(row, column) {
+      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
+    },
+#end
+#end
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+#foreach ($column in $columns)
+#if($column.htmlType == "radio")
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
+
+#elseif($column.htmlType == "checkbox")
+        $column.javaField: []#if($velocityCount != $columns.size()),#end
+
+#else
+        $column.javaField: null#if($velocityCount != $columns.size()),#end
+
+#end
+#end
+      };
+#if($table.sub)
+      this.${subclassName}List = [];
+#end
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      this.daterange${AttrName} = [];
+#end
+#end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.${pkColumn.javaField})
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加${functionName}";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+      get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
+#if($table.sub)
+        this.${subclassName}List = response.data.${subclassName}List;
+#end
+        this.open = true;
+        this.title = "修改${functionName}";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.#[[$]]#refs["form"].validate(valid => {
+        if (valid) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+#if($table.sub)
+          this.form.${subclassName}List = this.${subclassName}List;
+#end
+          if (this.form.${pkColumn.javaField} != null) {
+            update${BusinessName}(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            add${BusinessName}(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
+      this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return del${BusinessName}(${pkColumn.javaField}s);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+#if($table.sub)
+	/** ${subTable.functionName}序号 */
+    row${subClassName}Index({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** ${subTable.functionName}添加按钮操作 */
+    handleAdd${subClassName}() {
+      let obj = {};
+#foreach($column in $subTable.columns)
+#if($column.pk || $column.javaField == ${subTableFkclassName})
+#elseif($column.list && "" != $javaField)
+      obj.$column.javaField = "";
+#end
+#end
+      this.${subclassName}List.push(obj);
+    },
+    /** ${subTable.functionName}删除按钮操作 */
+    handleDelete${subClassName}() {
+      if (this.checked${subClassName}.length == 0) {
+        this.msgError("请先选择要删除的${subTable.functionName}数据");
+      } else {
+        const ${subclassName}List = this.${subclassName}List;
+        const checked${subClassName} = this.checked${subClassName};
+        this.${subclassName}List = ${subclassName}List.filter(function(item) {
+          return checked${subClassName}.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handle${subClassName}SelectionChange(selection) {
+      this.checked${subClassName} = selection.map(item => item.index)
+    },
+#end
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有${functionName}数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return export${BusinessName}(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
new file mode 100644
index 0000000..0895aee
--- /dev/null
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -0,0 +1,135 @@
+<?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="${packageName}.mapper.${ClassName}Mapper">
+    
+    <resultMap type="${ClassName}" id="${ClassName}Result">
+#foreach ($column in $columns)
+        <result property="${column.javaField}"    column="${column.columnName}"    />
+#end
+    </resultMap>
+#if($table.sub)
+
+    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+    </resultMap>
+
+    <resultMap type="${subClassName}" id="${subClassName}Result">
+#foreach ($column in $subTable.columns)
+        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
+#end
+    </resultMap>
+#end
+
+    <sql id="select${ClassName}Vo">
+        select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName}
+    </sql>
+
+    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+        <include refid="select${ClassName}Vo"/>
+        <where>  
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+#if($column.queryType == "EQ")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
+#elseif($queryType == "NE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
+#elseif($queryType == "GT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
+#elseif($queryType == "GTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
+#elseif($queryType == "LT")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
+#elseif($queryType == "LTE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
+#elseif($queryType == "LIKE")
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
+#elseif($queryType == "BETWEEN")
+            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
+#end
+#end
+#end
+        </where>
+    </select>
+    
+    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+#if($table.crud || $table.tree)
+        <include refid="select${ClassName}Vo"/>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+#elseif($table.sub)
+        select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end,
+           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
+
+        from ${tableName} a
+        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
+        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#end
+    </select>
+        
+    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+        insert into ${tableName}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
+#end
+#end
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
+#end
+#end
+         </trim>
+    </insert>
+
+    <update id="update${ClassName}" parameterType="${ClassName}">
+        update ${tableName}
+        <trim prefix="SET" suffixOverrides=",">
+#foreach($column in $columns)
+#if($column.columnName != $pkColumn.columnName)
+            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
+#end
+#end
+        </trim>
+        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </update>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+    </delete>
+
+    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+        delete from ${tableName} where ${pkColumn.columnName} in 
+        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
+            #{${pkColumn.javaField}}
+        </foreach>
+    </delete>
+#if($table.sub)
+    
+    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
+        delete from ${subTableName} where ${subTableFkName} in 
+        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+            #{${subTableFkclassName}}
+        </foreach>
+    </delete>
+
+    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
+        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+    </delete>
+
+    <insert id="batch${subClassName}">
+        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($velocityCount != $subTable.columns.size()),#end#end) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($velocityCount != $subTable.columns.size()),#end#end)
+        </foreach>
+    </insert>
+#end
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
new file mode 100644
index 0000000..d7167ed
--- /dev/null
+++ b/ruoyi-quartz/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-quartz</artifactId>
+
+    <description>
+        quartz定时任务
+    </description>
+
+    <dependencies>
+
+        <!-- 定时任务 -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.mchange</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
new file mode 100644
index 0000000..58c69bc
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
@@ -0,0 +1,57 @@
+package com.ruoyi.quartz.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+import javax.sql.DataSource;
+import java.util.Properties;
+
+/**
+ * 定时任务配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class ScheduleConfig
+{
+    @Bean
+    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
+    {
+        SchedulerFactoryBean factory = new SchedulerFactoryBean();
+        factory.setDataSource(dataSource);
+
+        // quartz参数
+        Properties prop = new Properties();
+        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
+        prop.put("org.quartz.scheduler.instanceId", "AUTO");
+        // 线程池配置
+        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
+        prop.put("org.quartz.threadPool.threadCount", "20");
+        prop.put("org.quartz.threadPool.threadPriority", "5");
+        // JobStore配置
+        prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
+        // 集群配置
+        prop.put("org.quartz.jobStore.isClustered", "true");
+        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
+        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
+        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
+
+        // sqlserver 启用
+        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
+        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
+        factory.setQuartzProperties(prop);
+
+        factory.setSchedulerName("RuoyiScheduler");
+        // 延时启动
+        factory.setStartupDelay(1);
+        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
+        // 可选，QuartzScheduler
+        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
+        factory.setOverwriteExistingJobs(true);
+        // 设置自动启动，默认为true
+        factory.setAutoStartup(true);
+
+        return factory;
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
new file mode 100644
index 0000000..b03ceb8
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -0,0 +1,167 @@
+package com.ruoyi.quartz.controller;
+
+import java.util.List;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.service.ISysJobService;
+import com.ruoyi.quartz.util.CronUtils;
+
+/**
+ * 调度任务信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/job")
+public class SysJobController extends BaseController
+{
+    @Autowired
+    private ISysJobService jobService;
+
+    /**
+     * 查询定时任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysJob sysJob)
+    {
+        startPage();
+        List<SysJob> list = jobService.selectJobList(sysJob);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出定时任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+    @Log(title = "定时任务", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysJob sysJob)
+    {
+        List<SysJob> list = jobService.selectJobList(sysJob);
+        ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
+        return util.exportExcel(list, "定时任务");
+    }
+
+    /**
+     * 获取定时任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    @GetMapping(value = "/{jobId}")
+    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
+    {
+        return AjaxResult.success(jobService.selectJobById(jobId));
+    }
+
+    /**
+     * 新增定时任务
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:add')")
+    @Log(title = "定时任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
+    {
+        if (!CronUtils.isValid(job.getCronExpression()))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap://'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+        {
+            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");
+        }
+        job.setCreateBy(getUsername());
+        return toAjax(jobService.insertJob(job));
+    }
+
+    /**
+     * 修改定时任务
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+    {
+        if (!CronUtils.isValid(job.getCronExpression()))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");
+        }
+        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap://'调用");
+        }
+        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+        {
+            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");
+        }
+        job.setUpdateBy(getUsername());
+        return toAjax(jobService.updateJob(job));
+    }
+
+    /**
+     * 定时任务状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
+    {
+        SysJob newJob = jobService.selectJobById(job.getJobId());
+        newJob.setStatus(job.getStatus());
+        return toAjax(jobService.changeStatus(newJob));
+    }
+
+    /**
+     * 定时任务立即执行一次
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/run")
+    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
+    {
+        jobService.run(job);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除定时任务
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    @Log(title = "定时任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{jobIds}")
+    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+    {
+        jobService.deleteJobByIds(jobIds);
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
new file mode 100644
index 0000000..b1f8204
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -0,0 +1,90 @@
+package com.ruoyi.quartz.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.service.ISysJobLogService;
+
+/**
+ * 调度日志操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/jobLog")
+public class SysJobLogController extends BaseController
+{
+    @Autowired
+    private ISysJobLogService jobLogService;
+
+    /**
+     * 查询定时任务调度日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysJobLog sysJobLog)
+    {
+        startPage();
+        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出定时任务调度日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+    @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysJobLog sysJobLog)
+    {
+        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
+        return util.exportExcel(list, "调度日志");
+    }
+    
+    /**
+     * 根据调度编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long jobLogId)
+    {
+        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
+    }
+
+
+    /**
+     * 删除定时任务调度日志
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{jobLogIds}")
+    public AjaxResult remove(@PathVariable Long[] jobLogIds)
+    {
+        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
+    }
+
+    /**
+     * 清空定时任务调度日志
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        jobLogService.cleanJobLog();
+        return AjaxResult.success();
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
new file mode 100644
index 0000000..1f49695
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -0,0 +1,171 @@
+package com.ruoyi.quartz.domain;
+
+import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.quartz.util.CronUtils;
+
+/**
+ * 定时任务调度表 sys_job
+ * 
+ * @author ruoyi
+ */
+public class SysJob extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 任务ID */
+    @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    private Long jobId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 任务组名 */
+    @Excel(name = "任务组名")
+    private String jobGroup;
+
+    /** 调用目标字符串 */
+    @Excel(name = "调用目标字符串")
+    private String invokeTarget;
+
+    /** cron执行表达式 */
+    @Excel(name = "执行表达式 ")
+    private String cronExpression;
+
+    /** cron计划策略 */
+    @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
+    private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
+
+    /** 是否并发执行（0允许 1禁止） */
+    @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
+    private String concurrent;
+
+    /** 任务状态（0正常 1暂停） */
+    @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
+    private String status;
+
+    public Long getJobId()
+    {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId)
+    {
+        this.jobId = jobId;
+    }
+
+    @NotBlank(message = "任务名称不能为空")
+    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
+    public String getJobName()
+    {
+        return jobName;
+    }
+
+    public void setJobName(String jobName)
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobGroup()
+    {
+        return jobGroup;
+    }
+
+    public void setJobGroup(String jobGroup)
+    {
+        this.jobGroup = jobGroup;
+    }
+
+    @NotBlank(message = "调用目标字符串不能为空")
+    @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
+    public String getInvokeTarget()
+    {
+        return invokeTarget;
+    }
+
+    public void setInvokeTarget(String invokeTarget)
+    {
+        this.invokeTarget = invokeTarget;
+    }
+
+    @NotBlank(message = "Cron执行表达式不能为空")
+    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
+    public String getCronExpression()
+    {
+        return cronExpression;
+    }
+
+    public void setCronExpression(String cronExpression)
+    {
+        this.cronExpression = cronExpression;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getNextValidTime()
+    {
+        if (StringUtils.isNotEmpty(cronExpression))
+        {
+            return CronUtils.getNextExecution(cronExpression);
+        }
+        return null;
+    }
+
+    public String getMisfirePolicy()
+    {
+        return misfirePolicy;
+    }
+
+    public void setMisfirePolicy(String misfirePolicy)
+    {
+        this.misfirePolicy = misfirePolicy;
+    }
+
+    public String getConcurrent()
+    {
+        return concurrent;
+    }
+
+    public void setConcurrent(String concurrent)
+    {
+        this.concurrent = concurrent;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("cronExpression", getCronExpression())
+            .append("nextValidTime", getNextValidTime())
+            .append("misfirePolicy", getMisfirePolicy())
+            .append("concurrent", getConcurrent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
new file mode 100644
index 0000000..121c035
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
@@ -0,0 +1,155 @@
+package com.ruoyi.quartz.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 定时任务调度日志表 sys_job_log
+ * 
+ * @author ruoyi
+ */
+public class SysJobLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "日志序号")
+    private Long jobLogId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 任务组名 */
+    @Excel(name = "任务组名")
+    private String jobGroup;
+
+    /** 调用目标字符串 */
+    @Excel(name = "调用目标字符串")
+    private String invokeTarget;
+
+    /** 日志信息 */
+    @Excel(name = "日志信息")
+    private String jobMessage;
+
+    /** 执行状态（0正常 1失败） */
+    @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
+    private String status;
+
+    /** 异常信息 */
+    @Excel(name = "异常信息")
+    private String exceptionInfo;
+
+    /** 开始时间 */
+    private Date startTime;
+
+    /** 停止时间 */
+    private Date stopTime;
+
+    public Long getJobLogId()
+    {
+        return jobLogId;
+    }
+
+    public void setJobLogId(Long jobLogId)
+    {
+        this.jobLogId = jobLogId;
+    }
+
+    public String getJobName()
+    {
+        return jobName;
+    }
+
+    public void setJobName(String jobName)
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobGroup()
+    {
+        return jobGroup;
+    }
+
+    public void setJobGroup(String jobGroup)
+    {
+        this.jobGroup = jobGroup;
+    }
+
+    public String getInvokeTarget()
+    {
+        return invokeTarget;
+    }
+
+    public void setInvokeTarget(String invokeTarget)
+    {
+        this.invokeTarget = invokeTarget;
+    }
+
+    public String getJobMessage()
+    {
+        return jobMessage;
+    }
+
+    public void setJobMessage(String jobMessage)
+    {
+        this.jobMessage = jobMessage;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getExceptionInfo()
+    {
+        return exceptionInfo;
+    }
+
+    public void setExceptionInfo(String exceptionInfo)
+    {
+        this.exceptionInfo = exceptionInfo;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+    
+    public Date getStopTime()
+    {
+        return stopTime;
+    }
+
+    public void setStopTime(Date stopTime)
+    {
+        this.stopTime = stopTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobLogId", getJobLogId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("jobMessage", getJobMessage())
+            .append("status", getStatus())
+            .append("exceptionInfo", getExceptionInfo())
+            .append("startTime", getStartTime())
+            .append("stopTime", getStopTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
new file mode 100644
index 0000000..727d916
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
@@ -0,0 +1,64 @@
+package com.ruoyi.quartz.mapper;
+
+import java.util.List;
+import com.ruoyi.quartz.domain.SysJobLog;
+
+/**
+ * 调度任务日志信息 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysJobLogMapper
+{
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+
+    /**
+     * 查询所有调度任务日志
+     *
+     * @return 调度任务日志列表
+     */
+    public List<SysJobLog> selectJobLogAll();
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    public SysJobLog selectJobLogById(Long jobLogId);
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     * @return 结果
+     */
+    public int insertJobLog(SysJobLog jobLog);
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJobLogByIds(Long[] logIds);
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     * @return 结果
+     */
+    public int deleteJobLogById(Long jobId);
+
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
new file mode 100644
index 0000000..20f45db
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.quartz.mapper;
+
+import java.util.List;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 调度任务信息 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysJobMapper
+{
+    /**
+     * 查询调度任务日志集合
+     * 
+     * @param job 调度信息
+     * @return 操作日志集合
+     */
+    public List<SysJob> selectJobList(SysJob job);
+
+    /**
+     * 查询所有调度任务
+     * 
+     * @return 调度任务列表
+     */
+    public List<SysJob> selectJobAll();
+
+    /**
+     * 通过调度ID查询调度任务信息
+     * 
+     * @param jobId 调度ID
+     * @return 角色对象信息
+     */
+    public SysJob selectJobById(Long jobId);
+
+    /**
+     * 通过调度ID删除调度任务信息
+     * 
+     * @param jobId 调度ID
+     * @return 结果
+     */
+    public int deleteJobById(Long jobId);
+
+    /**
+     * 批量删除调度任务信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteJobByIds(Long[] ids);
+
+    /**
+     * 修改调度任务信息
+     * 
+     * @param job 调度任务信息
+     * @return 结果
+     */
+    public int updateJob(SysJob job);
+
+    /**
+     * 新增调度任务信息
+     * 
+     * @param job 调度任务信息
+     * @return 结果
+     */
+    public int insertJob(SysJob job);
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
new file mode 100644
index 0000000..8546792
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.quartz.service;
+
+import java.util.List;
+import com.ruoyi.quartz.domain.SysJobLog;
+
+/**
+ * 定时任务调度日志信息信息 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysJobLogService
+{
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    public SysJobLog selectJobLogById(Long jobLogId);
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     */
+    public void addJobLog(SysJobLog jobLog);
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的日志ID
+     * @return 结果
+     */
+    public int deleteJobLogByIds(Long[] logIds);
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     * @return 结果
+     */
+    public int deleteJobLogById(Long jobId);
+
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
new file mode 100644
index 0000000..6d62661
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
@@ -0,0 +1,102 @@
+package com.ruoyi.quartz.service;
+
+import java.util.List;
+import org.quartz.SchedulerException;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 定时任务调度信息信息 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysJobService
+{
+    /**
+     * 获取quartz调度器的计划任务
+     * 
+     * @param job 调度信息
+     * @return 调度任务集合
+     */
+    public List<SysJob> selectJobList(SysJob job);
+
+    /**
+     * 通过调度任务ID查询调度信息
+     * 
+     * @param jobId 调度任务ID
+     * @return 调度任务对象信息
+     */
+    public SysJob selectJobById(Long jobId);
+
+    /**
+     * 暂停任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int pauseJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 恢复任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int resumeJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 删除任务后，所对应的trigger也将被删除
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int deleteJob(SysJob job) throws SchedulerException;
+
+    /**
+     * 批量删除调度信息
+     * 
+     * @param jobIds 需要删除的任务ID
+     * @return 结果
+     */
+    public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
+
+    /**
+     * 任务调度状态修改
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int changeStatus(SysJob job) throws SchedulerException;
+
+    /**
+     * 立即运行任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public void run(SysJob job) throws SchedulerException;
+
+    /**
+     * 新增任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int insertJob(SysJob job) throws SchedulerException, TaskException;
+
+    /**
+     * 更新任务
+     * 
+     * @param job 调度信息
+     * @return 结果
+     */
+    public int updateJob(SysJob job) throws SchedulerException, TaskException;
+
+    /**
+     * 校验cron表达式是否有效
+     * 
+     * @param cronExpression 表达式
+     * @return 结果
+     */
+    public boolean checkCronExpressionIsValid(String cronExpression);
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
new file mode 100644
index 0000000..812eed7
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
@@ -0,0 +1,87 @@
+package com.ruoyi.quartz.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.mapper.SysJobLogMapper;
+import com.ruoyi.quartz.service.ISysJobLogService;
+
+/**
+ * 定时任务调度日志信息 服务层
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysJobLogServiceImpl implements ISysJobLogService
+{
+    @Autowired
+    private SysJobLogMapper jobLogMapper;
+
+    /**
+     * 获取quartz调度器日志的计划任务
+     * 
+     * @param jobLog 调度日志信息
+     * @return 调度任务日志集合
+     */
+    @Override
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
+    {
+        return jobLogMapper.selectJobLogList(jobLog);
+    }
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     * 
+     * @param jobLogId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    @Override
+    public SysJobLog selectJobLogById(Long jobLogId)
+    {
+        return jobLogMapper.selectJobLogById(jobLogId);
+    }
+
+    /**
+     * 新增任务日志
+     * 
+     * @param jobLog 调度日志信息
+     */
+    @Override
+    public void addJobLog(SysJobLog jobLog)
+    {
+        jobLogMapper.insertJobLog(jobLog);
+    }
+
+    /**
+     * 批量删除调度日志信息
+     * 
+     * @param logIds 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteJobLogByIds(Long[] logIds)
+    {
+        return jobLogMapper.deleteJobLogByIds(logIds);
+    }
+
+    /**
+     * 删除任务日志
+     * 
+     * @param jobId 调度日志ID
+     */
+    @Override
+    public int deleteJobLogById(Long jobId)
+    {
+        return jobLogMapper.deleteJobLogById(jobId);
+    }
+
+    /**
+     * 清空任务日志
+     */
+    @Override
+    public void cleanJobLog()
+    {
+        jobLogMapper.cleanJobLog();
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
new file mode 100644
index 0000000..57a5243
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
@@ -0,0 +1,254 @@
+package com.ruoyi.quartz.service.impl;
+
+import java.util.List;
+import javax.annotation.PostConstruct;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.mapper.SysJobMapper;
+import com.ruoyi.quartz.service.ISysJobService;
+import com.ruoyi.quartz.util.CronUtils;
+import com.ruoyi.quartz.util.ScheduleUtils;
+
+/**
+ * 定时任务调度信息 服务层
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysJobServiceImpl implements ISysJobService
+{
+    @Autowired
+    private Scheduler scheduler;
+
+    @Autowired
+    private SysJobMapper jobMapper;
+
+    /**
+     * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
+     */
+    @PostConstruct
+    public void init() throws SchedulerException, TaskException
+    {
+        scheduler.clear();
+        List<SysJob> jobList = jobMapper.selectJobAll();
+        for (SysJob job : jobList)
+        {
+            ScheduleUtils.createScheduleJob(scheduler, job);
+        }
+    }
+
+    /**
+     * 获取quartz调度器的计划任务列表
+     * 
+     * @param job 调度信息
+     * @return
+     */
+    @Override
+    public List<SysJob> selectJobList(SysJob job)
+    {
+        return jobMapper.selectJobList(job);
+    }
+
+    /**
+     * 通过调度任务ID查询调度信息
+     * 
+     * @param jobId 调度任务ID
+     * @return 调度任务对象信息
+     */
+    @Override
+    public SysJob selectJobById(Long jobId)
+    {
+        return jobMapper.selectJobById(jobId);
+    }
+
+    /**
+     * 暂停任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public int pauseJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 恢复任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public int resumeJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 删除任务后，所对应的trigger也将被删除
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public int deleteJob(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        int rows = jobMapper.deleteJobById(jobId);
+        if (rows > 0)
+        {
+            scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        return rows;
+    }
+
+    /**
+     * 批量删除调度信息
+     * 
+     * @param jobIds 需要删除的任务ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void deleteJobByIds(Long[] jobIds) throws SchedulerException
+    {
+        for (Long jobId : jobIds)
+        {
+            SysJob job = jobMapper.selectJobById(jobId);
+            deleteJob(job);
+        }
+    }
+
+    /**
+     * 任务调度状态修改
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public int changeStatus(SysJob job) throws SchedulerException
+    {
+        int rows = 0;
+        String status = job.getStatus();
+        if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
+        {
+            rows = resumeJob(job);
+        }
+        else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
+        {
+            rows = pauseJob(job);
+        }
+        return rows;
+    }
+
+    /**
+     * 立即运行任务
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public void run(SysJob job) throws SchedulerException
+    {
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        SysJob properties = selectJobById(job.getJobId());
+        // 参数
+        JobDataMap dataMap = new JobDataMap();
+        dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
+        scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap);
+    }
+
+    /**
+     * 新增任务
+     * 
+     * @param job 调度信息 调度信息
+     */
+    @Override
+    @Transactional
+    public int insertJob(SysJob job) throws SchedulerException, TaskException
+    {
+        job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
+        int rows = jobMapper.insertJob(job);
+        if (rows > 0)
+        {
+            ScheduleUtils.createScheduleJob(scheduler, job);
+        }
+        return rows;
+    }
+
+    /**
+     * 更新任务的时间表达式
+     * 
+     * @param job 调度信息
+     */
+    @Override
+    @Transactional
+    public int updateJob(SysJob job) throws SchedulerException, TaskException
+    {
+        SysJob properties = selectJobById(job.getJobId());
+        int rows = jobMapper.updateJob(job);
+        if (rows > 0)
+        {
+            updateSchedulerJob(job, properties.getJobGroup());
+        }
+        return rows;
+    }
+
+    /**
+     * 更新任务
+     * 
+     * @param job 任务对象
+     * @param jobGroup 任务组名
+     */
+    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
+    {
+        Long jobId = job.getJobId();
+        // 判断是否存在
+        JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
+        if (scheduler.checkExists(jobKey))
+        {
+            // 防止创建时存在数据问题 先移除，然后在执行创建操作
+            scheduler.deleteJob(jobKey);
+        }
+        ScheduleUtils.createScheduleJob(scheduler, job);
+    }
+
+    /**
+     * 校验cron表达式是否有效
+     * 
+     * @param cronExpression 表达式
+     * @return 结果
+     */
+    @Override
+    public boolean checkCronExpressionIsValid(String cronExpression)
+    {
+        return CronUtils.isValid(cronExpression);
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
new file mode 100644
index 0000000..853243b
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -0,0 +1,28 @@
+package com.ruoyi.quartz.task;
+
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 定时任务调度测试
+ * 
+ * @author ruoyi
+ */
+@Component("ryTask")
+public class RyTask
+{
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
+    {
+        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
+    }
+
+    public void ryParams(String params)
+    {
+        System.out.println("执行有参方法：" + params);
+    }
+
+    public void ryNoParams()
+    {
+        System.out.println("执行无参方法");
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SegchkTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SegchkTask.java
new file mode 100644
index 0000000..97177ad
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SegchkTask.java
@@ -0,0 +1,28 @@
+package com.ruoyi.quartz.task;
+
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时任务调度测试
+ * 
+ * @author ruoyi
+ */
+@Component("SegchkTask")
+public class SegchkTask
+{
+    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
+    {
+        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
+    }
+
+    public void ryParams(String params)
+    {
+        System.out.println("执行有参方法：" + params);
+    }
+
+    public void ryNoParams()
+    {
+        System.out.println("执行无参方法");
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
new file mode 100644
index 0000000..731a5eb
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
@@ -0,0 +1,107 @@
+package com.ruoyi.quartz.util;
+
+import java.util.Date;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.utils.ExceptionUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.service.ISysJobLogService;
+
+/**
+ * 抽象quartz调用
+ *
+ * @author ruoyi
+ */
+public abstract class AbstractQuartzJob implements Job
+{
+    private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
+
+    /**
+     * 线程本地变量
+     */
+    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException
+    {
+        SysJob sysJob = new SysJob();
+        BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
+        try
+        {
+            before(context, sysJob);
+            if (sysJob != null)
+            {
+                doExecute(context, sysJob);
+            }
+            after(context, sysJob, null);
+        }
+        catch (Exception e)
+        {
+            log.error("任务执行异常  - ：", e);
+            after(context, sysJob, e);
+        }
+    }
+
+    /**
+     * 执行前
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     */
+    protected void before(JobExecutionContext context, SysJob sysJob)
+    {
+        threadLocal.set(new Date());
+    }
+
+    /**
+     * 执行后
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     */
+    protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
+    {
+        Date startTime = threadLocal.get();
+        threadLocal.remove();
+
+        final SysJobLog sysJobLog = new SysJobLog();
+        sysJobLog.setJobName(sysJob.getJobName());
+        sysJobLog.setJobGroup(sysJob.getJobGroup());
+        sysJobLog.setInvokeTarget(sysJob.getInvokeTarget());
+        sysJobLog.setStartTime(startTime);
+        sysJobLog.setStopTime(new Date());
+        long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
+        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
+        if (e != null)
+        {
+            sysJobLog.setStatus(Constants.FAIL);
+            String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
+            sysJobLog.setExceptionInfo(errorMsg);
+        }
+        else
+        {
+            sysJobLog.setStatus(Constants.SUCCESS);
+        }
+
+        // 写入数据库当中
+        SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
+    }
+
+    /**
+     * 执行方法，由子类重载
+     *
+     * @param context 工作执行上下文对象
+     * @param sysJob 系统计划任务
+     * @throws Exception 执行过程中的异常
+     */
+    protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
new file mode 100644
index 0000000..dd53839
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
@@ -0,0 +1,63 @@
+package com.ruoyi.quartz.util;
+
+import java.text.ParseException;
+import java.util.Date;
+import org.quartz.CronExpression;
+
+/**
+ * cron表达式工具类
+ * 
+ * @author ruoyi
+ *
+ */
+public class CronUtils
+{
+    /**
+     * 返回一个布尔值代表一个给定的Cron表达式的有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return boolean 表达式是否有效
+     */
+    public static boolean isValid(String cronExpression)
+    {
+        return CronExpression.isValidExpression(cronExpression);
+    }
+
+    /**
+     * 返回一个字符串值,表示该消息无效Cron表达式给出有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return String 无效时返回表达式错误描述,如果有效返回null
+     */
+    public static String getInvalidMessage(String cronExpression)
+    {
+        try
+        {
+            new CronExpression(cronExpression);
+            return null;
+        }
+        catch (ParseException pe)
+        {
+            return pe.getMessage();
+        }
+    }
+
+    /**
+     * 返回下一个执行时间根据给定的Cron表达式
+     *
+     * @param cronExpression Cron表达式
+     * @return Date 下次Cron表达式执行时间
+     */
+    public static Date getNextExecution(String cronExpression)
+    {
+        try
+        {
+            CronExpression cron = new CronExpression(cronExpression);
+            return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
+        }
+        catch (ParseException e)
+        {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
new file mode 100644
index 0000000..40a19bd
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
@@ -0,0 +1,182 @@
+package com.ruoyi.quartz.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.List;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 任务执行工具
+ *
+ * @author ruoyi
+ */
+public class JobInvokeUtil
+{
+    /**
+     * 执行方法
+     *
+     * @param sysJob 系统任务
+     */
+    public static void invokeMethod(SysJob sysJob) throws Exception
+    {
+        String invokeTarget = sysJob.getInvokeTarget();
+        String beanName = getBeanName(invokeTarget);
+        String methodName = getMethodName(invokeTarget);
+        List<Object[]> methodParams = getMethodParams(invokeTarget);
+
+        if (!isValidClassName(beanName))
+        {
+            Object bean = SpringUtils.getBean(beanName);
+            invokeMethod(bean, methodName, methodParams);
+        }
+        else
+        {
+            Object bean = Class.forName(beanName).newInstance();
+            invokeMethod(bean, methodName, methodParams);
+        }
+    }
+
+    /**
+     * 调用任务方法
+     *
+     * @param bean 目标对象
+     * @param methodName 方法名称
+     * @param methodParams 方法参数
+     */
+    private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
+            throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException
+    {
+        if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
+        {
+            Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
+            method.invoke(bean, getMethodParamsValue(methodParams));
+        }
+        else
+        {
+            Method method = bean.getClass().getDeclaredMethod(methodName);
+            method.invoke(bean);
+        }
+    }
+
+    /**
+     * 校验是否为为class包名
+     * 
+     * @param str 名称
+     * @return true是 false否
+     */
+    public static boolean isValidClassName(String invokeTarget)
+    {
+        return StringUtils.countMatches(invokeTarget, ".") > 1;
+    }
+
+    /**
+     * 获取bean名称
+     * 
+     * @param invokeTarget 目标字符串
+     * @return bean名称
+     */
+    public static String getBeanName(String invokeTarget)
+    {
+        String beanName = StringUtils.substringBefore(invokeTarget, "(");
+        return StringUtils.substringBeforeLast(beanName, ".");
+    }
+
+    /**
+     * 获取bean方法
+     * 
+     * @param invokeTarget 目标字符串
+     * @return method方法
+     */
+    public static String getMethodName(String invokeTarget)
+    {
+        String methodName = StringUtils.substringBefore(invokeTarget, "(");
+        return StringUtils.substringAfterLast(methodName, ".");
+    }
+
+    /**
+     * 获取method方法参数相关列表
+     * 
+     * @param invokeTarget 目标字符串
+     * @return method方法相关参数列表
+     */
+    public static List<Object[]> getMethodParams(String invokeTarget)
+    {
+        String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
+        if (StringUtils.isEmpty(methodStr))
+        {
+            return null;
+        }
+        String[] methodParams = methodStr.split(",");
+        List<Object[]> classs = new LinkedList<>();
+        for (int i = 0; i < methodParams.length; i++)
+        {
+            String str = StringUtils.trimToEmpty(methodParams[i]);
+            // String字符串类型，包含'
+            if (StringUtils.contains(str, "'"))
+            {
+                classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class });
+            }
+            // boolean布尔类型，等于true或者false
+            else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false"))
+            {
+                classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
+            }
+            // long长整形，包含L
+            else if (StringUtils.containsIgnoreCase(str, "L"))
+            {
+                classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class });
+            }
+            // double浮点类型，包含D
+            else if (StringUtils.containsIgnoreCase(str, "D"))
+            {
+                classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class });
+            }
+            // 其他类型归类为整形
+            else
+            {
+                classs.add(new Object[] { Integer.valueOf(str), Integer.class });
+            }
+        }
+        return classs;
+    }
+
+    /**
+     * 获取参数类型
+     * 
+     * @param methodParams 参数相关列表
+     * @return 参数类型列表
+     */
+    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
+    {
+        Class<?>[] classs = new Class<?>[methodParams.size()];
+        int index = 0;
+        for (Object[] os : methodParams)
+        {
+            classs[index] = (Class<?>) os[1];
+            index++;
+        }
+        return classs;
+    }
+
+    /**
+     * 获取参数值
+     * 
+     * @param methodParams 参数相关列表
+     * @return 参数值列表
+     */
+    public static Object[] getMethodParamsValue(List<Object[]> methodParams)
+    {
+        Object[] classs = new Object[methodParams.size()];
+        int index = 0;
+        for (Object[] os : methodParams)
+        {
+            classs[index] = (Object) os[0];
+            index++;
+        }
+        return classs;
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
new file mode 100644
index 0000000..5e13558
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
@@ -0,0 +1,21 @@
+package com.ruoyi.quartz.util;
+
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 定时任务处理（禁止并发执行）
+ * 
+ * @author ruoyi
+ *
+ */
+@DisallowConcurrentExecution
+public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
+{
+    @Override
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    {
+        JobInvokeUtil.invokeMethod(sysJob);
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
new file mode 100644
index 0000000..e975326
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
@@ -0,0 +1,19 @@
+package com.ruoyi.quartz.util;
+
+import org.quartz.JobExecutionContext;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 定时任务处理（允许并发执行）
+ * 
+ * @author ruoyi
+ *
+ */
+public class QuartzJobExecution extends AbstractQuartzJob
+{
+    @Override
+    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    {
+        JobInvokeUtil.invokeMethod(sysJob);
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
new file mode 100644
index 0000000..7f4213f
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
@@ -0,0 +1,113 @@
+package com.ruoyi.quartz.util;
+
+import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.exception.job.TaskException.Code;
+import com.ruoyi.quartz.domain.SysJob;
+
+/**
+ * 定时任务工具类
+ * 
+ * @author ruoyi
+ *
+ */
+public class ScheduleUtils
+{
+    /**
+     * 得到quartz任务类
+     *
+     * @param sysJob 执行计划
+     * @return 具体执行任务类
+     */
+    private static Class<? extends Job> getQuartzJobClass(SysJob sysJob)
+    {
+        boolean isConcurrent = "0".equals(sysJob.getConcurrent());
+        return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
+    }
+
+    /**
+     * 构建任务触发对象
+     */
+    public static TriggerKey getTriggerKey(Long jobId, String jobGroup)
+    {
+        return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
+    }
+
+    /**
+     * 构建任务键对象
+     */
+    public static JobKey getJobKey(Long jobId, String jobGroup)
+    {
+        return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
+    }
+
+    /**
+     * 创建定时任务
+     */
+    public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException
+    {
+        Class<? extends Job> jobClass = getQuartzJobClass(job);
+        // 构建job信息
+        Long jobId = job.getJobId();
+        String jobGroup = job.getJobGroup();
+        JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build();
+
+        // 表达式调度构建器
+        CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
+        cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder);
+
+        // 按新的cronExpression表达式构建一个新的trigger
+        CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup))
+                .withSchedule(cronScheduleBuilder).build();
+
+        // 放入参数，运行时的方法可以获取
+        jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
+
+        // 判断是否存在
+        if (scheduler.checkExists(getJobKey(jobId, jobGroup)))
+        {
+            // 防止创建时存在数据问题 先移除，然后在执行创建操作
+            scheduler.deleteJob(getJobKey(jobId, jobGroup));
+        }
+
+        scheduler.scheduleJob(jobDetail, trigger);
+
+        // 暂停任务
+        if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
+        {
+            scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+    }
+
+    /**
+     * 设置定时任务策略
+     */
+    public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb)
+            throws TaskException
+    {
+        switch (job.getMisfirePolicy())
+        {
+            case ScheduleConstants.MISFIRE_DEFAULT:
+                return cb;
+            case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
+                return cb.withMisfireHandlingInstructionIgnoreMisfires();
+            case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED:
+                return cb.withMisfireHandlingInstructionFireAndProceed();
+            case ScheduleConstants.MISFIRE_DO_NOTHING:
+                return cb.withMisfireHandlingInstructionDoNothing();
+            default:
+                throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()
+                        + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
+        }
+    }
+}
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
new file mode 100644
index 0000000..e608e42
--- /dev/null
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -0,0 +1,93 @@
+<?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.quartz.mapper.SysJobLogMapper">
+
+	<resultMap type="SysJobLog" id="SysJobLogResult">
+		<id     property="jobLogId"       column="job_log_id"      />
+		<result property="jobName"        column="job_name"        />
+		<result property="jobGroup"       column="job_group"       />
+		<result property="invokeTarget"   column="invoke_target"   />
+		<result property="jobMessage"     column="job_message"     />
+		<result property="status"         column="status"          />
+		<result property="exceptionInfo"  column="exception_info"  />
+		<result property="createTime"     column="create_time"     />
+	</resultMap>
+	
+	<sql id="selectJobLogVo">
+        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
+		from sys_job_log
+    </sql>
+	
+	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+		<where>
+			<if test="jobName != null and jobName != ''">
+				AND job_name like concat('%', #{jobName}, '%')
+			</if>
+			<if test="jobGroup != null and jobGroup != ''">
+				AND job_group = #{jobGroup}
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="invokeTarget != null and invokeTarget != ''">
+				AND invoke_target like concat('%', #{invokeTarget}, '%')
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+	</select>
+	
+	<select id="selectJobLogAll" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+	</select>
+	
+	<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
+		<include refid="selectJobLogVo"/>
+		where job_log_id = #{jobLogId}
+	</select>
+	
+	<delete id="deleteJobLogById" parameterType="Long">
+ 		delete from sys_job_log where job_log_id = #{jobLogId}
+ 	</delete>
+ 	
+ 	<delete id="deleteJobLogByIds" parameterType="Long">
+ 		delete from sys_job_log where job_log_id in
+ 		<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
+ 			#{jobLogId}
+        </foreach> 
+ 	</delete>
+ 	
+ 	<update id="cleanJobLog">
+        truncate table sys_job_log
+    </update>
+ 	
+ 	<insert id="insertJobLog" parameterType="SysJobLog">
+ 		insert into sys_job_log(
+ 			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
+ 			<if test="jobName != null and jobName != ''">job_name,</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
+ 			<if test="jobMessage != null and jobMessage != ''">job_message,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
+ 			create_time
+ 		)values(
+ 			<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
+ 			<if test="jobName != null and jobName != ''">#{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
+ 			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
+ 			sysdate()
+ 		)
+	</insert>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
new file mode 100644
index 0000000..5605c44
--- /dev/null
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -0,0 +1,111 @@
+<?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.quartz.mapper.SysJobMapper">
+
+	<resultMap type="SysJob" id="SysJobResult">
+		<id     property="jobId"          column="job_id"          />
+		<result property="jobName"        column="job_name"        />
+		<result property="jobGroup"       column="job_group"       />
+		<result property="invokeTarget"   column="invoke_target"   />
+		<result property="cronExpression" column="cron_expression" />
+		<result property="misfirePolicy"  column="misfire_policy"  />
+		<result property="concurrent"     column="concurrent"      />
+		<result property="status"         column="status"          />
+		<result property="createBy"       column="create_by"       />
+		<result property="createTime"     column="create_time"     />
+		<result property="updateBy"       column="update_by"       />
+		<result property="updateTime"     column="update_time"     />
+		<result property="remark"         column="remark"          />
+	</resultMap>
+	
+	<sql id="selectJobVo">
+        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
+		from sys_job
+    </sql>
+	
+	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+		<where>
+			<if test="jobName != null and jobName != ''">
+				AND job_name like concat('%', #{jobName}, '%')
+			</if>
+			<if test="jobGroup != null and jobGroup != ''">
+				AND job_group = #{jobGroup}
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="invokeTarget != null and invokeTarget != ''">
+				AND invoke_target like concat('%', #{invokeTarget}, '%')
+			</if>
+		</where>
+	</select>
+	
+	<select id="selectJobAll" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+	</select>
+	
+	<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
+		<include refid="selectJobVo"/>
+		where job_id = #{jobId}
+	</select>
+	
+	<delete id="deleteJobById" parameterType="Long">
+ 		delete from sys_job where job_id = #{jobId}
+ 	</delete>
+ 	
+ 	<delete id="deleteJobByIds" parameterType="Long">
+ 		delete from sys_job where job_id in
+ 		<foreach collection="array" item="jobId" open="(" separator="," close=")">
+ 			#{jobId}
+        </foreach> 
+ 	</delete>
+ 	
+ 	<update id="updateJob" parameterType="SysJob">
+ 		update sys_job
+ 		<set>
+ 			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
+ 			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
+ 			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
+ 			<if test="status !=null">status = #{status},</if>
+ 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where job_id = #{jobId}
+	</update>
+ 	
+ 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+ 		insert into sys_job(
+ 			<if test="jobId != null and jobId != 0">job_id,</if>
+ 			<if test="jobName != null and jobName != ''">job_name,</if>
+ 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
+ 			<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
+ 			<if test="concurrent != null and concurrent != ''">concurrent,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="jobId != null and jobId != 0">#{jobId},</if>
+ 			<if test="jobName != null and jobName != ''">#{jobName},</if>
+ 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
+ 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
+ 			<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
+ 			<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
+ 			<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-segchk-web/pom.xml b/ruoyi-segchk-web/pom.xml
new file mode 100644
index 0000000..3261d3c
--- /dev/null
+++ b/ruoyi-segchk-web/pom.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-segchk-web</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger2-->
+        <!--<dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>-->
+
+        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <!--<dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>-->
+
+        <!--<dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>-->
+
+        <!-- swagger2-UI-->
+        <!--<dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>-->
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-segchk</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+<!--        <resources>-->
+<!--        <resource>-->
+<!--            <directory>src/main/java</directory>-->
+<!--            <includes>-->
+<!--                <include>**/*.properties</include>-->
+<!--                <include>**/*.xml</include>-->
+<!--            </includes>-->
+<!--            &lt;!&ndash;是否替换资源中的属性&ndash;&gt;-->
+<!--            <filtering>false</filtering>-->
+<!--        </resource>-->
+<!--        <resource>-->
+<!--            <directory>src/main/resources</directory>-->
+<!--            <includes>-->
+<!--                <include>**/*.properties</include>-->
+<!--                <include>**/*.xml</include>-->
+<!--                <include>**/*.yml</include>-->
+<!--                <include>**/Dockerfile</include>-->
+<!--                <include>**/*.xlsx</include>-->
+<!--                <include>**/*.jpg</include>-->
+<!--                <include>**/*.png</include>-->
+<!--            </includes>-->
+<!--            &lt;!&ndash;是否替换资源中的属性&ndash;&gt;-->
+<!--            <filtering>false</filtering>-->
+<!--        </resource>-->
+<!--        </resources>-->
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/docker/Dockerfile b/ruoyi-segchk-web/src/main/docker/Dockerfile
new file mode 100644
index 0000000..184bcc2
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/docker/Dockerfile
@@ -0,0 +1,4 @@
+FROM openjdk:8-jre
+VOLUME /tmp
+ADD lecshop_web_applets-3.0.0-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java","-Duser.timezone=GMT+08","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar","--spring.profiles.active=prod"]
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/AppletsAppApplication.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/AppletsAppApplication.java
new file mode 100644
index 0000000..a92a839
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/AppletsAppApplication.java
@@ -0,0 +1,83 @@
+package com.ruoyi;
+
+
+import com.ruoyi.util.QrCodeController;
+import com.ruoyi.common.utils.SnowflakeIdWorker;
+import com.ruoyi.util.RedisCacheErrorHandler;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cache.interceptor.CacheErrorHandler;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Created by 魔金商城 on 2019/5/1.
+ * 小程序app后端启动类
+ */
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@EnableTransactionManagement
+public class AppletsAppApplication {
+
+    public static void main(String[] args)  throws UnknownHostException {
+        System.out.println("start-------------");
+        // SpringApplication.run(MallPortalApplication.class, args);
+        ConfigurableApplicationContext application = SpringApplication.run(AppletsAppApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+
+        System.out.println("\n----------------------------------------------------------\n\t" +
+                "Application mallplus-Boot is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port  + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port  + "/\n\t" +
+                "swagger-ui: \thttp://" + ip + ":" + port  + "/swagger-ui.html\n\t" +
+                "https://gitee.com/zscat/mallplus/wikis/pages/preview?sort_id=2168368&doc_id=326093"+
+                "-----------------页面请部署 mallplus-admin-web-----------------------------------------");
+    }
+    /**
+     * redis 异常处理
+     */
+    @Bean
+    public CacheErrorHandler errorHandler() {
+        return new RedisCacheErrorHandler();
+    }
+
+    /**
+     * 序列号生成器
+     */
+    @Bean
+    public SnowflakeIdWorker snowflakeIdWorker() {
+        SnowflakeIdWorker snowflakeIdWorker = new SnowflakeIdWorker(0, 1);
+        return snowflakeIdWorker;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        final CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true); // 允许cookies跨域
+        config.addAllowedOrigin("*");// #允许向该服务器提交请求的URI，*表示全部允许，在SpringMVC中，如果设成*，会自动转成当前请求头中的Origin
+        config.addAllowedHeader("*");// #允许访问的头信息,*表示全部
+        config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了
+        config.addAllowedMethod("OPTIONS");// 允许提交请求的方法，*表示全部允许
+        config.addAllowedMethod("HEAD");
+        config.addAllowedMethod("GET");// 允许Get的请求方法
+        config.addAllowedMethod("PUT");
+        config.addAllowedMethod("POST");
+        config.addAllowedMethod("DELETE");
+        config.addAllowedMethod("PATCH");
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
+
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/AppletsLoginUtils.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/AppletsLoginUtils.java
new file mode 100644
index 0000000..4b2bbfd
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/AppletsLoginUtils.java
@@ -0,0 +1,97 @@
+package com.ruoyi.appletsutil;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.interceptor.AuthorityInterceptor;
+import com.ruoyi.util.Claims;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * 小程序登录工具类
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class AppletsLoginUtils {
+    private static AppletsLoginUtils ourInstance = new AppletsLoginUtils();
+
+    private static final Logger log = LoggerFactory.getLogger(AppletsLoginUtils.class);
+
+    private AppletsLoginUtils() {
+    }
+
+    public static AppletsLoginUtils getInstance() {
+        return ourInstance;
+    }
+
+    /**
+     * 获得用户id
+     *
+     * @return 返回用户id
+     */
+    public long getCustomerId(HttpServletRequest request) {
+        long customerId = 0;
+        if (!ObjectUtils.isEmpty(getClaims(getToken(request)))) {
+            customerId = getClaims(getToken(request)).getUserId();
+        }
+        return customerId;
+    }
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+        log.debug("request.header--->{}", request.getHeaderNames().toString());
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        return authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+    }
+    /**
+     * 获取openId
+     *
+     * @return 返回openId
+     */
+    public String getOpenId(HttpServletRequest request) {
+        return ((Claims) request.getAttribute("claims")).getOpenId();
+    }
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+        String claims = SpringUtils.getBean(RedisCache.class).getCacheObject(token);
+        return StringUtils.isEmpty(claims) ? null : JSONObject.parseObject(claims, Claims.class);
+    }
+    /**
+     * 获取unionId
+     *
+     * @return 返回unionId
+     */
+    public String getUnionId(HttpServletRequest request) {
+        return ((Claims) request.getAttribute("claims")).getUnionId();
+    }
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @return 小程序凭证实体
+     */
+    public Claims getClaims(HttpServletRequest request) {
+        return ((Claims) request.getAttribute("claims"));
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/BaseResponse.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/BaseResponse.java
new file mode 100644
index 0000000..1976a13
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/BaseResponse.java
@@ -0,0 +1,56 @@
+package com.ruoyi.appletsutil;
+
+
+import com.ruoyi.util.md5.MessageSourceUtil;
+
+import java.io.Serializable;
+
+/**
+ * 基础返回
+ * Created by 魔金商城 on 17/7/10.
+ */
+public class BaseResponse implements Serializable {
+
+    /**
+     * 结果码
+     */
+    private String code;
+    /**
+     * 消息内容
+     */
+    private String message;
+
+    public BaseResponse(String code) {
+        this.code = code;
+        this.message = MessageSourceUtil.getMessage(code);
+    }
+
+    public BaseResponse(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static BaseResponse SUCCESSFUL() {
+        return new BaseResponse(ResultCode.SUCCESSFUL);
+    }
+
+    public static BaseResponse FAILED() {
+        return new BaseResponse(ResultCode.FAILED);
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ErrorController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ErrorController.java
new file mode 100644
index 0000000..fa84563
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ErrorController.java
@@ -0,0 +1,39 @@
+package com.ruoyi.appletsutil;
+
+
+import com.ruoyi.common.annotation.UnAuth;
+import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * Created by 魔金商城 on 2019/5/25.
+ * 错误控制器
+ */
+@RestController
+public class ErrorController extends AbstractErrorController {
+
+    /**
+     * 错误地址
+     */
+    private static final String ERROR_PATH = "/error";
+
+    public ErrorController(ErrorAttributes errorAttributes) {
+        super(errorAttributes);
+    }
+
+    @Override
+    public String getErrorPath() {
+        return ERROR_PATH;
+    }
+
+    @RequestMapping(ERROR_PATH)
+    @UnAuth
+    public Map<String, Object> handleError(HttpServletRequest request) {
+        return getErrorAttributes(request, true);
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/GlobalWebExceptionHandler.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/GlobalWebExceptionHandler.java
new file mode 100644
index 0000000..723c041
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/GlobalWebExceptionHandler.java
@@ -0,0 +1,59 @@
+package com.ruoyi.appletsutil;
+
+import com.ruoyi.common.exception.ServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by 魔金商城 on 17/7/10.
+ * 全局异常
+ */
+@ControllerAdvice
+public class GlobalWebExceptionHandler {
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(GlobalWebExceptionHandler.class);
+
+    /**
+     * 未认证异常（有可能是未关联用户 也有可能是微信未授权根据返回码判断）
+     */
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(UnAuthorizedException.class)
+    @ResponseBody
+    public BaseResponse signatureExceptionHandler(HttpServletRequest request, UnAuthorizedException ex) {
+        logger.error("do [{}] on [{}] failed. exMsg:{}", request.getMethod(), request.getRequestURL(),
+                ex.getLocalizedMessage());
+        logger.error("queryString:{}, parameterMap: {}", request.getQueryString(), request.getParameterMap(), ex);
+
+        return new BaseResponse(ex.getErrorCode(), ex.getLocalizedMessage());
+    }
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(value = ServiceException.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ResponseBody
+    public BaseResponse serviceExceptionHandler(HttpServletRequest request, ServiceException ex) throws Exception {
+        if (AnnotationUtils.findAnnotation(ex.getClass(), ResponseStatus.class) != null)
+            throw ex;
+
+        logger.error("do [{}] on [{}] failed. exMsg:{}", request.getMethod(), request.getRequestURL(),
+                ex.getLocalizedMessage());
+        if (logger.isDebugEnabled()) {
+            logger.error("queryString:{}, parameterMap: {}", request.getQueryString(), request.getParameterMap(), ex);
+        }
+
+        return new BaseResponse(ex.getMessage(), ex.getLocalizedMessage());
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ResultCode.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ResultCode.java
new file mode 100644
index 0000000..9855a31
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/ResultCode.java
@@ -0,0 +1,34 @@
+package com.ruoyi.appletsutil;
+
+/**
+ * Created by 魔金商城 on 17/7/10.
+ * 结果返回吗
+ */
+public interface ResultCode {
+
+    /**
+     * 操作成功；
+     */
+    String SUCCESSFUL = "R-00000";
+
+    /**
+     * 操作失败；
+     */
+    String FAILED = "R-00001";
+
+    /**
+     * 微信未授权
+     */
+    String WX_NOT_AUTHORIZED = "R-00002";
+
+    /**
+     * 微信未关联用户
+     */
+    String WX_NOT_LINKD = "R-00003";
+
+    /**
+     * 小程序账号已绑定错误
+     */
+    String WX_ALREADY_BIND_ERROR = "R-00004";
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/UnAuthorizedException.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/UnAuthorizedException.java
new file mode 100644
index 0000000..15b2018
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/appletsutil/UnAuthorizedException.java
@@ -0,0 +1,33 @@
+package com.ruoyi.appletsutil;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.util.md5.MessageSourceUtil;
+
+/**
+ * Created by 魔金商城 on 2018/6/13.
+ * 微信小程序未授权异常
+ */
+public class UnAuthorizedException extends ServiceException {
+
+    /**
+     * 错误code
+     */
+    private String errorCode;
+
+    public UnAuthorizedException(String errorCode) {
+        this(errorCode, MessageSourceUtil.getMessage(errorCode));
+    }
+
+    public UnAuthorizedException(String errorCode, String message) {
+        super(message == null ? errorCode : message);
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/config/SecurityConfig.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/config/SecurityConfig.java
new file mode 100644
index 0000000..92fb81e
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/config/SecurityConfig.java
@@ -0,0 +1,94 @@
+package com.ruoyi.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+/**
+ * spring security配置
+ *
+ * @author ruoyi
+ */
+@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+
+    /**
+     * 解决 无法直接注入 AuthenticationManager
+     *
+     * @return
+     * @throws Exception
+     */
+    @Bean
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
+
+    /**
+     * anyRequest          |   匹配所有请求路径
+     * access              |   SpringEl表达式结果为true时可以访问
+     * anonymous           |   匿名可以访问
+     * denyAll             |   用户不能访问
+     * fullyAuthenticated  |   用户完全认证可以访问（非remember-me下自动登录）
+     * hasAnyAuthority     |   如果有参数，参数表示权限，则其中任何一个权限可以访问
+     * hasAnyRole          |   如果有参数，参数表示角色，则其中任何一个角色可以访问
+     *
+     * @ss.hasPermi |   如果有参数，参数表示权限，则其权限可以访问
+     * hasIpAddress        |   如果有参数，参数表示IP地址，如果用户IP和参数匹配，则可以访问
+     * hasRole             |   如果有参数，参数表示角色，则其角色可以访问
+     * permitAll           |   用户可以任意访问
+     * rememberMe          |   允许通过remember-me登录的用户访问
+     * authenticated       |   用户登录后可访问
+     */
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity
+                // CRSF禁用，因为不使用session
+                .csrf().disable()
+
+                // 基于token，所以不需要session
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
+                // 过滤请求
+                .authorizeRequests()
+                // 对于登录login 验证码captchaImage 允许匿名访问
+                .antMatchers("/login", "/captchaImage", "/baseinfoset","/infoset/**","/aliyun/oss/**").anonymous()
+                .antMatchers(
+                        HttpMethod.GET,
+                        "/*.html",
+                        "/**/*.html",
+                        "/**/*.css",
+                        "/**/*.js"
+                ).permitAll()
+                .antMatchers("/**/**").anonymous()
+                .antMatchers("/common/download**").anonymous()
+                .antMatchers("/common/download/resource**").anonymous()
+                .antMatchers("/swagger-ui.html").anonymous()
+                .antMatchers("/swagger-resources/**").anonymous()
+                .antMatchers("/webjars/**").anonymous()
+                .antMatchers("/*/api-docs").anonymous()
+                .antMatchers("/druid/**").anonymous()
+                // 除上面外的所有请求全部需要鉴权认证
+                .anyRequest().authenticated()
+                .and()
+                .headers().frameOptions().disable();
+
+    }
+
+
+    /**
+     * 强散列哈希加密实现
+     */
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/config/WebConfigurer.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/config/WebConfigurer.java
new file mode 100644
index 0000000..f85642c
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/config/WebConfigurer.java
@@ -0,0 +1,26 @@
+package com.ruoyi.config;
+
+import com.ruoyi.interceptor.AuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Created by 魔金商城 on 2019/5/13.
+ * 拦截器配置
+ */
+@Configuration
+public class WebConfigurer implements WebMvcConfigurer {
+
+    /**
+     * 注入登录拦截器
+     */
+    @Autowired
+    private AuthorityInterceptor authorityInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(authorityInterceptor).excludePathPatterns("/**/**", "/v2/**", "/swagger-ui.html", "/webjars/**", "/swagger-resources/**");
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/interceptor/AuthorityInterceptor.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/interceptor/AuthorityInterceptor.java
new file mode 100644
index 0000000..ca4d164
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/interceptor/AuthorityInterceptor.java
@@ -0,0 +1,170 @@
+package com.ruoyi.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.appletsutil.AppletsLoginUtils;
+import com.ruoyi.util.Claims;
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import com.ruoyi.member.service.WeChatCustomerLinkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * Created by 魔金商城 on 2018/6/13.
+ * 访问拦截器
+ */
+@Component
+public class AuthorityInterceptor extends HandlerInterceptorAdapter {
+
+    private static final Logger log = LoggerFactory.getLogger(AuthorityInterceptor.class);
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    /**
+     * 注入微信用户关联服务
+     */
+    @Autowired
+    @Lazy
+    private WeChatCustomerLinkService weChatCustomerLinkService;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String requestType = ((HttpServletRequest) request).getMethod();
+        String fullUrl = ((HttpServletRequest) request).getRequestURL().toString();
+        log.debug("fullUrl--->{}", fullUrl);
+        int startIntercept = fullUrl.replace("//", "a").indexOf("/") + 1;
+        String interfaceName = fullUrl.substring(startIntercept, fullUrl.length());
+        if (!"OPTIONS".equals(requestType) && !interfaceName.contains("webjars")
+                && !interfaceName.contains("api-docs")) {
+            log.info(formMapKey(AppletsLoginUtils.getInstance().getCustomerId(request), fullUrl, requestType,
+                    IpUtils.getIpAddr((HttpServletRequest) request), null, null)
+                    + ",\"cost\":\"");
+        }
+
+        // 如果不需要拦截 则直接返回
+        if (!isNeedFilter(handler)) {
+            log.debug("Donot need  authority.....");
+            return true;
+        }
+
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer ")) {
+            log.info("AuthorityInterceptor preHandle fail....");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+
+        // 获得凭证
+        Claims claims = getAppletsClaimsFromRedis(authHeader.substring(7));
+
+        // 没有凭证 直接返回
+        if (Objects.isNull(claims)) {
+            log.info("AuthorityInterceptor preHandle fail....");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+
+        // 校验有没有uid  如果没有uid  则直接返回
+        if (!claims.hasCustomerId()) {
+            log.error("applets has not authorized");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+
+        // 如果没有会员id  则从数据库查询 是否有会员id
+        /*if (!claims.hasCustomerId()) {
+            // 小程序没有关联用户则提示用户去关联用户
+            WeChatCustomerLink weChatCustomerLink = queryWeChatCustomerLinkByUnionId(claims.getUnionId());
+            if (Objects.isNull(weChatCustomerLink)) {
+                log.error("applets has not linked member....");
+                throw new UnAuthorizedException(ResultCode.WX_NOT_LINKD);
+            } else {
+                log.info("applets has unionId and has member....");
+                // 将凭证信息返回redis
+                putClaimsToRedis(weChatCustomerLink, claims, authHeader.substring(7));
+                //如果没有小程序的openId,则更新关联信息
+                if (!weChatCustomerLink.hasAppletOpenId()) {
+                    weChatCustomerLink.setAppletOpenId(claims.getOpenId());
+                    weChatCustomerLinkService.updateWeChatCustomerLink(weChatCustomerLink);
+                }
+            }
+        }*/
+
+        request.setAttribute("claims", claims);
+
+        return true;
+    }
+
+    private String formMapKey(Object userId, String mothedName, String requestType,
+                              String ip, String params, String token) {
+        return "\"time\"" + ":\"" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").format(new Date())
+                + "\",\"name\"" + ":\"" + mothedName + "\",\"uid\":\"" + userId
+                + "\",\"type\":\"" + requestType + "\",\"ip\":\"" + ip
+                + "\",\"token\":\"" + token + "\",\"params\":\"" + params + "\"";
+    }
+    /**
+     * 将凭证放入redis
+     *
+     * @param weChatCustomerLink 会员和小程序的绑定关系
+     * @param claims             凭证
+     * @param token              token
+     */
+    /*private void putClaimsToRedis(WeChatCustomerLink weChatCustomerLink, Claims claims, String token) {
+        claims.setUserId(weChatCustomerLink.);
+        redisService.putToRedis(token, JSON.toJSONString(claims));
+    }*/
+
+    /**
+     * 根据unionId查询会员和小程序的绑定关系
+     *
+     * @param unionId 小程序唯一id
+     * @return 返回会员和小程序的绑定关系
+     */
+    private WeChatCustomerLink queryWeChatCustomerLinkByUnionId(String unionId) {
+        return weChatCustomerLinkService.queryWeChatCustomerLinkByUnionId(unionId);
+    }
+
+
+    /**
+     * 根据token从redis 获取uid和customerId
+     *
+     * @param token token
+     * @return 返回uid和customerId
+     */
+    private Claims getAppletsClaimsFromRedis(String token) {
+        String claims = redisService.getCacheObject(token);
+        return StringUtils.isEmpty(claims) ? null : JSONObject.parseObject(redisService.getCacheObject(token), Claims.class);
+    }
+
+
+    /**
+     * 判断是否需要拦截
+     */
+    private boolean isNeedFilter(Object handler) {
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            return handlerMethod.getMethod().getAnnotation(UnAuth.class) == null;
+        }
+        return false;
+    }
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/login/OssController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/login/OssController.java
new file mode 100644
index 0000000..e3044a3
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/login/OssController.java
@@ -0,0 +1,128 @@
+package com.ruoyi.login;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.setting.bean.OssSetting;
+import com.ruoyi.setting.bean.UploadData;
+import com.ruoyi.setting.service.OssService;
+import com.ruoyi.util.CommonConstant;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * Oss相关操作接口
+ * https://github.com/shenzhuan/mallplus on 2018/4/26.
+ */
+@RestController
+@Api(tags = "OssController", description = "Oss管理")
+@RequestMapping("/aliyun/oss")
+public class OssController {
+    @Resource
+    private OssService ossService;
+
+
+    /**
+     * 上传图片
+     *
+     * @param name 上传文件的name 默认为image
+     * @param type 上传文件的类型 默认为图片 0 图片 1 视频
+     * @return 返回图片在腾讯云的地址
+     * @throws Exception
+     */
+    @PostMapping("uploadToQqOSSYun")
+    @ApiOperation(value = "上传图片", notes = "上传图片（不需要认证）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "name", value = "上传文件的name 默认为image"),
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "type", value = "上传文件的类型 默认为图片 0 图片 1 视频"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "返回图片在腾讯云的地址", response = String.class)
+    })
+    public AjaxResult uploadToQqOSSYun(@RequestParam("file") MultipartFile multipartFile,MultipartHttpServletRequest request, String name, String type) throws Exception {
+        if (StringUtils.isEmpty(name)) {
+            name = "image";
+        }
+
+        // 默认上传图片
+        if (StringUtils.isEmpty(type)) {
+            type = CommonConstant.UPLOAD_PIC;
+        }
+        if (Objects.isNull(multipartFile)) {
+            return AjaxResult.error();
+        }
+        return AjaxResult.success(ossService.uploadToQqOss(Arrays.asList(UploadData.build(multipartFile.getInputStream(), multipartFile.getBytes(), multipartFile.getOriginalFilename(), type, multipartFile))).stream().findFirst().orElse(""));
+    }
+
+    /**
+     * 上传图片
+     *
+     * @param name 上传文件的name 默认为image
+     * @param type 上传文件的类型 默认为图片 0 图片 1 视频
+     * @return 返回图片在阿里云的地址
+     * @throws Exception
+     */
+    @PostMapping("uploadToAliOss")
+    @ApiOperation(value = "上传图片", notes = "上传图片（不需要认证）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "name", value = "上传文件的name 默认为image"),
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "type", value = "上传文件的类型 默认为图片 0 图片 1 视频"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "返回图片在阿里云的地址", response = String.class)
+    })
+    public AjaxResult uploadToOSSYun(@RequestParam("file") MultipartFile multipartFile, String name, String type) throws Exception {
+        if (StringUtils.isEmpty(name)) {
+            name = "image";
+        }
+
+        // 默认上传图片
+        if (StringUtils.isEmpty(type)) {
+            type = CommonConstant.UPLOAD_PIC;
+        }
+
+        if (Objects.isNull(multipartFile)) {
+            return AjaxResult.error();
+        }
+        return AjaxResult.success(ossService.uploadToOss(Arrays.asList(UploadData.build(multipartFile.getInputStream(), multipartFile.getBytes(), multipartFile.getOriginalFilename(), type, multipartFile))).stream().findFirst().orElse(""));
+    }
+
+
+    /**
+     * 查询云存储设置
+     *
+     * @return 云存储设置信息
+     */
+    @GetMapping("/oss")
+    @PreAuthorize("@ss.hasPermi('setting:ossSetting:list')")
+    @ApiOperation(value = "查询阿里云存储设置", notes = "查询阿里云存储设置（需要认证）")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "又拍云设置信息", response = OssSetting.class)
+    })
+    public OssSetting queryUpYunSet() {
+        return ossService.queryOssSetting();
+    }
+
+    /**
+     * 修改又拍云设置
+     *
+     * @param ossSetting 又拍云设置信息
+     * @return 成功1 否则失败
+     */
+    @PutMapping("/oss")
+    @ApiOperation(value = "修改阿里云存储设置", notes = "修改阿里云存储设置（需要认证）")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "成功1 否则失败", response = Integer.class)
+    })
+    public int updateOss(@RequestBody OssSetting ossSetting) {
+        return ossService.updateOss(ossSetting);
+    }
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/login/SegChkLoginController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/login/SegChkLoginController.java
new file mode 100644
index 0000000..08215ba
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/login/SegChkLoginController.java
@@ -0,0 +1,759 @@
+package com.ruoyi.login;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.segchk.domain.SegchkUserWebReq;
+import com.ruoyi.util.*;
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.SnowflakeIdWorker;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.member.service.*;
+import com.ruoyi.member.vo.BindParams;
+import com.ruoyi.setting.bean.WechatPaySet;
+import com.ruoyi.setting.service.ILsPaySettingService;
+import com.ruoyi.util.bean.SegUserProfile;
+import com.ruoyi.util.bean.UserInfoProfile;
+import io.swagger.annotations.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 登录控制器
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+@Controller
+@Api(description = "登录接口")
+//@RequestMapping("/default/login")
+public class SegChkLoginController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SegChkLoginController.class);
+    /**
+     * 注入微信小程序登录服务
+     */
+//    @Autowired
+//    private WeChatAppletLoginService weChatAppletLoginService;
+
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    /**
+     * jwt密钥
+     */
+    @Value("${token.secret}")
+    private String jwtSecretKey;
+
+//    登录超时时长，单位天，-1永久有效
+    @Value("${yzytest.login.loginexpire:#{1}}")
+    private Integer loginexpire;
+
+    /**
+     * 注入登录处理service
+     */
+    @Resource(name = "loginService")
+    private LoginService loginService;
+
+    /**
+     * 注入注册服务
+     */
+    @Autowired
+    private RegisterService registerService;
+
+    /**
+     * 注入注册聚合服务
+     */
+    @Autowired
+    private RegisterServiceApi registerServiceApi;
+
+    /**
+     * 注入微信用户关联服务
+     */
+    @Autowired
+    private WeChatCustomerLinkService weChatCustomerLinkService;
+    /**
+     * 注入随机数生成器
+     */
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+    /**
+     * 注入支付设置服务
+     */
+    @Autowired
+    private ILsPaySettingService paySetService;
+    /**
+     * 会员登录
+     *
+     *
+     * @return -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+     */
+    @PostMapping("/login")
+    @UnAuth
+    @ResponseBody
+    @ApiOperation(value = "会员登录", notes = "会员登录（不需要认证）")
+    public AjaxResult login(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request) {
+        Long userId = 0L;
+        if(!ObjectUtils.isEmpty(segchkUserWebReq) && "999999".equals(segchkUserWebReq.getRemark())){
+            return loginService.login(segchkUserWebReq);
+        }
+//        Object cacheObject = redisService.getCacheObject(String.format("%s", "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUipPTc5ILMnJT8"));
+//        logger.warn(ObjectUtils.nullSafeToString(cacheObject));
+        try {
+            if (ObjectUtils.isEmpty(getClaims(getToken(request)))) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                userId = getClaims(getToken(request)).getUserId();
+                return AjaxResult.error(300, "请先登录注册");
+            }
+        }
+        catch (Exception e){
+            return AjaxResult.error(300, "请先登录注册");
+        }
+
+        Claims claims = getClaims(getToken(request));
+        SegchkUserWebReq segchkUserWebReq1 = new SegchkUserWebReq();
+        segchkUserWebReq1.setUserId(claims.getUserId());
+        segchkUserWebReq1.setProviderId(claims.getProviderId());
+        segchkUserWebReq1.setUserLevel(claims.getUserLevel());
+
+        AjaxResult login = loginService.login(segchkUserWebReq1);
+        login.put("token", getToken(request));
+
+        return login;
+    }
+
+    /**
+     * 发送短信验证码
+     * r
+     *
+     * @param mobile 手机号码
+     * @return 0 成功 1 失败 -1 手机号码已经存在
+     */
+    @UnAuth
+    @RequestMapping(value = "/sendmobilecode")
+    @ResponseBody
+    @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "mobile", value = "手机号码"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "0 成功 1 失败 -1 手机号码已经存在", response = Integer.class)
+    })
+    public AjaxResult sendSmsCode(String mobile) {
+//        发送短信验证码
+        logger.debug("sendmobilecode ---> phone:{}", mobile);
+        int ret = registerService.sendRegisterSmsCodeFortest(mobile, code -> redisService.setCacheObject(String.format("%s_%s", CommonConstant.APPLET_REGISTER_CODE_KEY, mobile), code, 5, TimeUnit.MINUTES));
+
+        if(ret != 0 ){
+            return AjaxResult.error("500", "验证码发送失败，请稍后重试");
+        }
+        return AjaxResult.success("验证码发送成功");
+
+    }
+
+    /**
+     * 发送短信验证码测试
+     * r
+     *
+     * @param mobile 手机号码
+     * @return 0 成功 1 失败 -1 手机号码已经存在
+     */
+    @UnAuth
+    @RequestMapping(value = "/sendmobilecodetest")
+    @ResponseBody
+    @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "mobile", value = "手机号码"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "0 成功 1 失败 -1 手机号码已经存在", response = Integer.class)
+    })
+    public AjaxResult sendmobilecodetest(String mobile) {
+//        发送短信验证码
+        logger.debug("sendmobilecode ---> phone:{}", mobile);
+        int ret = registerService.sendRegisterSmsCodeFortest(mobile, code -> redisService.setCacheObject(String.format("%s_%s", CommonConstant.SMS_TEST_KEY, mobile), code, 5, TimeUnit.MINUTES));
+
+        if(ret != 0 ){
+            return AjaxResult.error("500", "验证码发送失败，请稍后重试");
+        }
+        return AjaxResult.success("验证码发送成功");
+
+    }
+
+    /**
+     * 用户注册
+     *
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0  -3 手机号码已存在 -10 推荐人不存在
+     */
+    @UnAuth
+    @RequestMapping("/register")
+    @ResponseBody
+    @ApiOperation(value = "用户注册", notes = "用户注册（不需要认证）", httpMethod = "POST")
+
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "-1 手机验证码错误 -2 参数错误 0 失败  成功>0  -3 手机号码已存在 -10 推荐人不存在", response = Integer.class)
+    })
+    public AjaxResult register(@RequestBody SegChkLoginController.RegisterData registerData) {
+        AjaxResult res = null;
+        logger.debug("register with---{}", registerData.toString());
+        try {
+            res = registerServiceApi.registerCustomer(registerData.getMobile(), registerData.getCode()
+                    , redisService.getCacheObject(String.format("%s_%s", CommonConstant.APPLET_REGISTER_CODE_KEY, registerData.getMobile())), registerData.getRecommendId(), registerData.getRecommendLevel(), registerData.getProviderId(), registerData.getRemark());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return res;
+        }
+//        如果返回结果中不存在token，说明没有进行微信绑定
+        return res;
+    }
+
+    @UnAuth
+    @ResponseBody
+    @RequestMapping("/bindaccount")
+    @ApiOperation(value = "小程序获取登录信息", notes = "小程序获取登录信息（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "code", value = "用户登录凭证"),
+    })
+    public AjaxResult bindaccount(@RequestBody BindParams bindParams , HttpServletRequest request) {
+        logger.debug("bindaccount with: {}", bindParams.toString());
+        WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        WechatSetting wechatSetting = new WechatSetting();
+        if(!StringUtils.isEmpty(bindParams.getRemark())){
+            wechatSetting.setType(999999);
+        }
+        wechatSetting.setAppId(wechatAppletPaySet.getAppId());
+//        wechatSetting.setAppId(appId);
+        wechatSetting.setAppSecret(wechatAppletPaySet.getAppSecret());
+//        wechatSetting.setAppSecret(appSecrt);
+        if (!wechatSetting.checkAppletOAuthParams()) {
+//            log.error("getLoginInfo fail:checkAppletOAuthParams fail");
+            return AjaxResult.error("getLoginInfo fail:checkAppletOAuthParams fail");
+        }
+
+        WeChatAppletLoginResponse weChatAppletLoginResponse = WeChatAppletUtils.getLoginInfo(bindParams.getCode(), wechatSetting);
+        if (Objects.isNull(weChatAppletLoginResponse)) {
+//            log.error("getLoginInfo fail: getLoginInfo fail");
+            return AjaxResult.error("获取微信信息失败，请联系客服人员");
+        }
+        Claims claims = null;
+        try {
+            claims = getClaims(getToken(request));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            claims = null;
+        }
+        SegchkUserWechat segchkUserWechat = new SegchkUserWechat();
+        segchkUserWechat.setUserId(Long.valueOf(bindParams.getUserId()));
+        segchkUserWechat.setOpenid(weChatAppletLoginResponse.getOpenid());
+        segchkUserWechat.setUnionId(weChatAppletLoginResponse.getUnionid());
+        segchkUserWechat.setProviderId(Long.valueOf(bindParams.getProviderId()));
+        segchkUserWechat.setNickName(bindParams.getNickName());
+
+        segchkUserWechat.setIconUrl(bindParams.getAvatar());
+//        将用户与微信openid绑定
+        int ret = weChatCustomerLinkService.addSegchkUserWechat(segchkUserWechat, bindParams.getUserLevel());
+        if(ret < 1){
+            return AjaxResult.error(500, "微信绑定失败!");
+        }
+//        产生token
+        String token = registerServiceApi.createToke(CommonConstant.APPLET_LOGIN_KEY, Long.valueOf(bindParams.getUserId()), Long.valueOf(bindParams.getProviderId()), Integer.valueOf(bindParams.getUserLevel()));
+//        String token = snowflakeIdWorker.nextId()+"";
+        if(claims == null) {
+            claims = new Claims();
+            claims.setUserId(Long.valueOf(bindParams.getUserId()));
+            claims.setOpenId(weChatAppletLoginResponse.getOpenid());
+            claims.setProviderId(Long.valueOf(bindParams.getProviderId()));
+            claims.setUserLevel(Integer.valueOf(bindParams.getUserLevel()));
+        }
+//            将用户的token进行缓存
+        if(loginexpire == -1) {
+            redisService.setCacheObject(token, claims);
+        }
+        else{
+            redisService.setCacheObject(token, claims, loginexpire, TimeUnit.HOURS);
+        }
+        StringBuilder sb = new StringBuilder(CommonConstant.APPLET_BIND_OPENID).append("-").append(token);
+        redisService.setCacheObject(sb.toString(), segchkUserWechat, 7200, TimeUnit.SECONDS);
+
+
+//        测试，解析getuserprofile返回结果
+
+        try {
+            if(!ObjectUtils.isEmpty(bindParams.getProfileRes())) {
+                SegUserProfile segUserProfile = JSON.parseObject(bindParams.getProfileRes(), SegUserProfile.class);
+                logger.info("getUserProfile info is: ({})", segUserProfile.toString());
+                UserInfoProfile userInfoProfile = JSON.parseObject(segUserProfile.getUserInfo(), UserInfoProfile.class);
+                logger.info("getUserInfo from userProfile is: ({})", userInfoProfile.toString());
+                String decryptres = WeChatAppletUtils.getUserInfoFromUserProfile(weChatAppletLoginResponse.getSession_key(), segUserProfile);
+                logger.debug("getUserProfile decrypt res: ({})", decryptres);
+            }
+        } catch (Exception e){
+            logger.error("getUserProfile wrong! {}", e.getMessage());
+            e.printStackTrace();
+        }
+
+        return AjaxResult.success("绑定成功", token);
+    }
+
+    /**
+     * 用户注册实体
+     */
+    @ApiModel(description = "用户注册实体")
+    private static class RegisterData extends BaseEntity {
+
+        /**
+         * 手机号码
+         */
+        @ApiModelProperty(value = "手机号码")
+        private String mobile;
+
+
+        /**
+         * 手机验证码
+         */
+        @ApiModelProperty(value = "手机验证码")
+        private String code;
+
+        /**
+         * 推荐码
+         */
+        @ApiModelProperty(value = "推荐码")
+        private String recommendId;
+
+        /**
+         * 推荐码
+         */
+        @ApiModelProperty(value = "推荐人角色")
+        private String recommendLevel;
+
+        /** 运营商id，全局唯一 */
+        @Excel(name = "运营商id，全局唯一")
+        private String providerId;
+
+        /**
+         * 授权code
+         */
+        @ApiModelProperty(value = "授权code")
+        private String wechatCode;
+
+        public String getMobile() {
+            return mobile;
+        }
+
+        public void setMobile(String mobile) {
+            this.mobile = mobile;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getRecommendId() {
+            return recommendId;
+        }
+
+        public void setRecommendId(String recommendId) {
+            this.recommendId = recommendId;
+        }
+
+        public String getRecommendLevel() {
+            return recommendLevel;
+        }
+
+        public void setRecommendLevel(String recommendLevel) {
+            this.recommendLevel = recommendLevel;
+        }
+
+        public String getProviderId() {
+            return providerId;
+        }
+
+        public void setProviderId(String providerId) {
+            this.providerId = providerId;
+        }
+
+        public String getWechatCode() {
+            return wechatCode;
+        }
+
+        public void setWechatCode(String wechatCode) {
+            this.wechatCode = wechatCode;
+        }
+
+        @Override
+        public String toString() {
+            return "RegisterData{" +
+                    "mobile='" + mobile + '\'' +
+                    ", code='" + code + '\'' +
+                    ", recommendId='" + recommendId + '\'' +
+                    ", recommendLevel='" + recommendLevel + '\'' +
+                    ", providerId='" + providerId + '\'' +
+                    ", wechatCode='" + wechatCode + '\'' +
+                    '}';
+        }
+    }
+
+    /**
+     * 注册登录
+     *
+     * @param loginParams 登录参数
+     * @return -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+     */
+    /*@PostMapping("/logout")
+    @UnAuth
+    @ResponseBody
+    @ApiOperation(value = "会员登录", notes = "会员登录（不需要认证）")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "result: -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误  token:放登录成功后的token", response = Map.class)
+    })
+    public AjaxResult logout(@RequestBody LoginParams loginParams, HttpServletRequest request)*/
+
+    /**
+     * 会员登录
+     *
+     * @param loginParams 登录参数
+     * @return -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+     */
+    /*@PostMapping("/logout")
+    @UnAuth
+    @ResponseBody
+    @ApiOperation(value = "会员登录", notes = "会员登录（不需要认证）")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "result: -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误  token:放登录成功后的token", response = Map.class)
+    })
+    public AjaxResult logout(@RequestBody LoginParams loginParams, HttpServletRequest request) {
+        AppletLoginRedisParamResponse appletLoginRedisParamResponse = JSON.parseObject(redisService.getValue(getToken(request)),AppletLoginRedisParamResponse.class) ;
+        redisService.deleteObject(getToken(request));
+       // redisService.deleteObject(appletLoginRedisParamResponse.);
+        return AjaxResult.success();
+    }*/
+    /**
+     * 小程序获取登录信息
+     *
+     * @param  用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 api，使用 code 换取 openid 和 session_key 等信息
+     * @return 登录信息
+     */
+    /*@UnAuth
+    @ResponseBody
+    @RequestMapping("/getOpenId")
+    @ApiOperation(value = "小程序获取登录信息", notes = "小程序获取登录信息（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "code", value = "用户登录凭证"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "登录信息", response = AppletLoginInfo.class)
+    })
+    public AjaxResult getOpenId(@RequestBody  AppletLoginRedisParamResponse appletLoginRedisParamResponse , HttpServletRequest request) {
+
+        WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        WechatSetting wechatSetting = new WechatSetting();
+        wechatSetting.setAppId(wechatAppletPaySet.getAppId());
+        wechatSetting.setAppSecret(wechatAppletPaySet.getAppSecret());
+        if (!wechatSetting.checkAppletOAuthParams()) {
+            log.error("getLoginInfo fail:checkAppletOAuthParams fail");
+            return AjaxResult.error("getLoginInfo fail:checkAppletOAuthParams fail");
+        }
+        WeChatAppletLoginResponse weChatAppletLoginResponse = WeChatAppletUtils.getLoginInfo(appletLoginRedisParamResponse.getCode(), wechatSetting);
+        if (Objects.isNull(weChatAppletLoginResponse)) {
+            log.error("getLoginInfo fail: getLoginInfo fail");
+            return AjaxResult.error("getLoginInfo fail: getLoginInfo fail");
+        }
+       UmsMember member = new UmsMember();
+        member.setAppletOpenId(weChatAppletLoginResponse.getOpenid());
+        long customerId = 0;
+        if (!ObjectUtils.isEmpty(getClaims(getToken(request)))) {
+            customerId = getClaims(getToken(request)).getCustomerId();
+        }
+        member.setId(customerId);
+        return AjaxResult.success(memberService.updateUmsMember(member));
+    }*/
+    /**
+     * 小程序获取登录信息
+     *
+     * @param  用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 api，使用 code 换取 openid 和 session_key 等信息
+     * @return 登录信息
+     */
+    /*@UnAuth
+    @ResponseBody
+    @RequestMapping("/mpWechatLogin")
+    @ApiOperation(value = "小程序获取登录信息", notes = "小程序获取登录信息（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "code", value = "用户登录凭证"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "登录信息", response = AppletLoginInfo.class)
+    })
+    public AjaxResult mpWechatLogin(@RequestBody  AppletLoginRedisParamResponse appletLoginRedisParamResponse , HttpServletRequest request) {
+        final StringBuilder sb = new StringBuilder();
+        Map<String, Object> res = new HashMap<>();
+        String token = snowflakeIdWorker.nextId() + "";
+        appletLoginRedisParamResponse.setToken(token);
+        WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        WechatSetting wechatSetting = new WechatSetting();
+        wechatSetting.setAppId(wechatAppletPaySet.getAppId());
+        wechatSetting.setAppSecret(wechatAppletPaySet.getAppSecret());
+        if (!wechatSetting.checkAppletOAuthParams()) {
+            log.error("getLoginInfo fail:checkAppletOAuthParams fail");
+            return AjaxResult.error("getLoginInfo fail:checkAppletOAuthParams fail");
+        }
+        WeChatAppletLoginResponse weChatAppletLoginResponse = WeChatAppletUtils.getLoginInfo(appletLoginRedisParamResponse.getCode(), wechatSetting);
+        if (Objects.isNull(weChatAppletLoginResponse)) {
+            log.error("getLoginInfo fail: getLoginInfo fail");
+            return AjaxResult.error("getLoginInfo fail: getLoginInfo fail");
+        }
+        appletLoginRedisParamResponse.setSessionKey(weChatAppletLoginResponse.getSession_key());
+        appletLoginRedisParamResponse.setOpenId(weChatAppletLoginResponse.getOpenid());
+        UmsMember member =memberService.queryCustomerByappletOpenId(weChatAppletLoginResponse.getOpenid());
+        if (member!=null){
+            appletLoginRedisParamResponse.setCustomerId(member.getId());
+            appletLoginRedisParamResponse.setToken(sb.toString());
+            redisService.putToRedis(sb.toString(), JSON.toJSONString(appletLoginRedisParamResponse));
+         //   redisService.putToRedis(loginParams.getMobile(), sb.toString());
+            res.put("access_token", sb.toString());
+            res.put("refresh_token", sb.toString());
+            res.put("member", member);
+        }else {
+            member = new UmsMember();
+            member.setSource("5");
+            member.setMobile("123456789");
+            member.setAppletOpenId(weChatAppletLoginResponse.getOpenid());
+            member.setPassword("123456");
+            memberService.addCustomer(member);
+            redisService.putToRedis(sb.toString(), JSON.toJSONString(appletLoginRedisParamResponse));
+            //   redisService.putToRedis(loginParams.getMobile(), sb.toString());
+            res.put("access_token", sb.toString());
+            res.put("refresh_token", sb.toString());
+            res.put("member", member);
+        }
+        return AjaxResult.success(res);
+
+    }*/
+    /**
+     * 小程序获取登录信息
+     *
+     * @param code 用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 api，使用 code 换取 openid 和 session_key 等信息
+     * @return 登录信息
+     */
+    /*@UnAuth
+    @ResponseBody
+    @RequestMapping("/getlogininfo")
+    @ApiOperation(value = "小程序获取登录信息", notes = "小程序获取登录信息（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "code", value = "用户登录凭证"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "登录信息", response = AppletLoginInfo.class)
+    })
+    public AppletLoginInfo getLoginInfo(String code, HttpServletRequest request) {
+        String unionId = null;
+        if (!StringUtils.isEmpty(getToken(request))) {
+            unionId = Objects.isNull(getClaims(getToken(request))) ? null : getClaims(getToken(request)).getUnionId();
+            redisService.delValue(getToken(request));
+        }
+        return weChatAppletLoginService.getLoginInfo(code, unionId, appletLoginRedisParamResponse -> {
+            redisService.putToRedis(appletLoginRedisParamResponse.getToken(), JSON.toJSONString(appletLoginRedisParamResponse));
+            if (appletLoginRedisParamResponse.hasUnionId()) {
+                redisService.putToRedis(appletLoginRedisParamResponse.getUnionId(), appletLoginRedisParamResponse.getToken());
+            }
+        });
+    }*/
+
+    /**
+     * 处理用户信息
+     *
+     * @param weChatAppletUserInfo 小程序用户信息实体
+     * @return 登录信息
+     */
+    /*@UnAuth
+    @ResponseBody
+    @RequestMapping("/dealuserinfo")
+    @ApiOperation(value = "处理用户信息", notes = "处理用户信息（不需要认证）", httpMethod = "POST")
+    public AppletLoginInfo dealUserInfo(WeChatAppletUserInfo weChatAppletUserInfo, HttpServletRequest request) {
+        String token = getToken(request);
+        Claims claims = getClaims(token);
+        return weChatAppletLoginService.dealUserInfo(weChatAppletUserInfo, claims.getOpenId(), claims.getSessionKey(), appletLoginRedisParamResponse -> afterDealUserInfo(claims, appletLoginRedisParamResponse, token));
+    }*/
+
+    /**
+     * 绑定账号
+     *
+     * @param loginParams 登录参数
+     */
+    /*@RequestMapping("/bindaccount")
+    @ResponseBody
+    @UnAuth
+    @ApiOperation(value = "绑定账号", notes = "绑定账号（不需要认证）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "username", value = "用户名"),
+            @ApiImplicitParam(paramType = "form", dataType = "string", name = "password", value = "密码"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "返回码  -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误", response = Integer.class)
+    })
+    public AjaxResult bindAccount(@ApiIgnore LoginParams loginParams, HttpServletRequest request) {
+        //回调
+        loginParams.setConsumer(customer ->
+                alterLoginSuccess(customer.getId(), request)
+        );
+        return AjaxResult.success(loginService.login(loginParams));
+    }*/
+
+
+    /**
+     * 解绑账号
+     *
+     * @return 1成功
+     */
+    /*@RequestMapping("/unbindaccount")
+    @ResponseBody
+    @ApiOperation(value = "解绑账号", notes = "解绑账号（需要认证）", httpMethod = "POST")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "1成功", response = Integer.class)
+    })
+    public int unbindAccount(HttpServletRequest request) {
+        weChatAppletLoginService.unbindAccount(AppletsLoginUtils.getInstance().getCustomerId(request), AppletsLoginUtils.getInstance().getUnionId(request));
+        Claims claims = AppletsLoginUtils.getInstance().getClaims(request);
+        claims.setCustomerId(CommonConstant.NO_CUSTOMER_ID);
+        redisService.putToRedis(getToken(request), JSONObject.toJSONString(claims));
+        return 1;
+    }*/
+
+
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            logger.info("getClaims fail :Authorization fail ");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        String token = authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+//        logger.warn("get toke info from {}---{}({})", authHeader, token, token.length());
+        return token;
+    }
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+
+        Object claims = redisService.getCacheObject(token);
+        logger.debug("getClaims---token:{} Claims:{}", token, claims);
+        return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
+    }
+
+    private SegchkUserWechat getSegchkUserWechat(String token) {
+        StringBuilder sb = new StringBuilder(CommonConstant.APPLET_BIND_OPENID).append("-").append(token);
+        Object segchkUserWechat = redisService.getCacheObject(sb.toString());
+
+        return ObjectUtils.isEmpty(segchkUserWechat) ? null : (SegchkUserWechat) segchkUserWechat;
+    }
+
+    /**
+     * 处理小程序凭证信息
+     *
+     * @param claims                        小程序凭证实体
+     * @param appletLoginRedisParamResponse 小程序redis参数返回实体
+     * @param token                         token
+     */
+    /*private void afterDealUserInfo(Claims claims, AppletLoginRedisParamResponse appletLoginRedisParamResponse, String token) {
+        if (Objects.nonNull(appletLoginRedisParamResponse)) {
+            claims.setCustomerId(appletLoginRedisParamResponse.getCustomerId());
+            claims.setUnionId(appletLoginRedisParamResponse.getUnionId());
+            redisService.putToRedis(token, JSON.toJSONString(claims));
+            if (appletLoginRedisParamResponse.hasUnionId()) {
+                redisService.putToRedis(appletLoginRedisParamResponse.getUnionId(), token);
+            }
+        } else {
+            log.error("afterDealUserInfo fail:appletLoginRedisParamResponse is null");
+        }
+    }*/
+
+    /**
+     * 登录成功后处理的事
+     *
+     * @param customerId 用户id
+     */
+    /*private void alterLoginSuccess(long customerId, HttpServletRequest request) {
+        if (!ObjectUtils.isEmpty(customerId)) {
+            Claims claims = getClaims(getToken(request));
+            // 校验有没有uid  如果没有uid  则直接返回
+            if (!claims.hasUnionId()) {
+                log.error("applets has not authorized");
+                throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+            }
+            //绑定账号
+            try {
+                weChatAppletLoginService.bindAccount(claims.getOpenId(), claims.getUnionId(), customerId);
+            } catch (ServiceException e) {
+                throw e;
+            } catch (Exception e) {
+                //捕获异常，可能已经绑定过账号
+                WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByUnionId(claims.getUnionId());
+                if (Objects.nonNull(weChatCustomerLink)) {
+                    customerId = weChatCustomerLink.getCustomerId();
+                } else {
+                    customerId = CommonConstant.NO_CUSTOMER_ID;
+                }
+            }
+            if (customerId == CommonConstant.NO_CUSTOMER_ID) {
+                claims.setCustomerId(customerId);
+                redisService.putToRedis(getToken(request), JSONObject.toJSONString(claims));
+            }
+        }
+    }*/
+
+    /**
+     * token测试方法
+     *
+     * @param token token
+     */
+    @UnAuth
+    @ResponseBody
+    @RequestMapping("/tokentest")
+    @ApiOperation(value = "处理用户信息", notes = "处理用户信息（不需要认证）", httpMethod = "GET")
+    public AjaxResult token_test(@RequestBody String token, HttpServletRequest request) {
+        Object cacheObject = redisService.getCacheObject(token);
+        logger.warn("get token: {} for value: {}", token, cacheObject);
+        logger.warn("tokentest get claim: {}", getClaims(token).toString());
+        return AjaxResult.success(cacheObject);
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultIndexController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultIndexController.java
new file mode 100644
index 0000000..f7e68cb
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultIndexController.java
@@ -0,0 +1,511 @@
+package com.ruoyi.segchk;
+
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.ISegchkStoreIndexService;
+import com.ruoyi.util.Claims;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+
+import static com.ruoyi.common.core.domain.AjaxResult.CODE_TAG;
+import static com.ruoyi.common.core.domain.AjaxResult.DATA_TAG;
+
+/**
+ * seg首页推荐商户Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/default/index")
+@Api("商城开放接口")
+public class SegchkDefaultIndexController extends BaseController
+{
+//    private static final Logger logger = LoggerFactory.getLogger(SegchkDefaultIndexController.class);
+
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+
+    @Value("${segchk.share.title:#{卡乐分享}}")
+    private String shareTitle;
+
+    @Value("${segchk.share.desc:#{卡乐无限享受}}")
+    private String shareDesc;
+
+    @Value("${segchk.recommendstore.distince:#{null}}")
+    private BigDecimal recomDist;
+
+    @Value("${segchk.startid:#{null}}")
+    private Integer startid;
+
+    @Value("${segchk.default_district:#{110100}}")
+    private Long defaultDistrict;
+    /**
+     * 根据用户当前所在地市行政id，返回运营商id   尹志颖
+     * {
+     *   "adcode": 110000
+     * }
+     */
+    @UnAuth
+    @GetMapping("/getProviderByadcode")
+    @ApiOperation(value = "查询运营商id", notes = "根据用户当前位置所在行政区代码或用户选择的行政区代码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "Long", name = "adcode", value = "行政区代码"),
+    })
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "拼团促销图片信息", response = Long.class)
+    })
+    public AjaxResult get_provider_byadcode(Long adcode)
+    {
+        logger.debug("get_provider_byadcode with: {}", adcode);
+        AjaxResult ajax = new AjaxResult();
+        HashMap<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("districtId", adcode);
+        paramsMap.put("defaultDistrict", defaultDistrict);
+        HashMap<String, Object> provider = segchkStoreIndexService.getProvider(paramsMap);
+        ajax.put(CODE_TAG, 200);
+        PrvoiderDistrict prvoiderDistrict = new PrvoiderDistrict();
+        prvoiderDistrict.setProvFlag((Integer) provider.get("provFlag"));
+        prvoiderDistrict.setProviderId((Long) provider.get("providerId"));
+        prvoiderDistrict.setPhoneNo((String) provider.get("phoneNo"));
+        prvoiderDistrict.setWechatId((String) provider.get("wechatId"));
+        if(prvoiderDistrict.getProvFlag() == 1){
+//            说明返回默认地区运营商
+            prvoiderDistrict.setDistName(String.valueOf(provider.get("provName")));
+        }
+        ajax.put(DATA_TAG, prvoiderDistrict);
+        logger.debug("getProviderByadcode res --- {}", ajax.toString());
+        return ajax;
+    }
+
+    /**
+     * 搜索商户，根据名称，标签，充值卡等   尹志颖
+     * {
+     *   {
+     *   "providerId": 0,*
+     *   "sortType": 0,*
+     *   "storeId": 0,
+     *   "storeName": "demoData",*
+     *   "lableId": 0,
+     *   "lableName": "demoData",*
+     *   "typeId": 0,
+     *   "userLon": 114.123456,*
+     *   "userLat": 43.123456*
+     * }
+     * }
+     */
+    @UnAuth
+    @RequestMapping(value = "/StoreSearch",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "搜索商户", notes = "搜索商户（不需要认证）", httpMethod = "POST")
+    public TableDataInfo store_search(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
+    {
+        logger.debug("store_search with: {}", segchkStoreWebReq.toString());
+        startPage();
+        segchkStoreWebReq.setUserDist(recomDist);
+        List<SegchkStoreIndexWebResp> list = segchkStoreIndexService.selectSegchkStoreSearch(segchkStoreWebReq);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询seg标签列表   尹志颖
+     * {
+     *   "providerId": 4
+     * }
+     */
+    @UnAuth
+    @GetMapping("/lableListByProvider")
+    @ResponseBody
+    public TableDataInfo lable_list_by_provider(Long providerId)
+    {
+        logger.debug("lableListByProvider with: {}", providerId);
+        startPage();
+        List<SegchkRecommenderStoreLableWeb> list = segchkStoreIndexService.selectSegchkRecommendLableList(providerId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询seg标签列表   尹志颖
+     * {
+     *   "providerId": 4
+     * }
+     */
+    @UnAuth
+    @GetMapping("/lableListByProviderAll")
+    @ResponseBody
+    public TableDataInfo lable_list_by_provider_all(Long providerId)
+    {
+        logger.debug("lableListByProviderAll with: {}", providerId);
+        startPage();
+        List<SegchkRecommenderStoreLableWeb> list = segchkStoreIndexService.selectSegchkLableList(providerId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据运营商id查询seg首页推荐商户列表   尹志颖
+     * {
+     *   "providerId": 4,
+     *   "sortType": 1,
+     *   "userLon": 114.123456,
+     *   "userLat": 43.123456
+     * }
+     */
+    @UnAuth
+    @RequestMapping(value = "/listByProvider",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "根据运营商id查询seg首页推荐商户列表", notes = "不需要鉴权")
+    public TableDataInfo list_by_provider(@RequestBody SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq)
+    {
+        segchkRecommenderStoreWebReq.setUserDist(recomDist);
+        logger.debug("list_by_provider with: {}", segchkRecommenderStoreWebReq.toString());
+        startPage();
+        List<SegchkRecommenderStoreWebResp> list = segchkStoreIndexService.selectSegchkRecommenderStoreListByProvider(segchkRecommenderStoreWebReq);
+        System.out.println(list.size());
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 根据标签id，搜索商户列表   尹志颖
+     * {
+     *   "providerId": 2,
+     *   "sortType": 0,
+     *   "lableId": 1,
+     *   "typeId": 2,
+     *   "cardId": 2, 可选项，当用户在商户列表中，点选某个具体会员卡时才有效
+     *   "userLon": 116.25849,
+     *   "userLat": 39.684333
+     * }
+     */
+    @UnAuth
+    @PostMapping("/listByProviderwithLable")
+    @ResponseBody
+    @ApiOperation(value = "根据标签id，搜索商户列表", notes = "不需要鉴权")
+    public TableDataInfo list_by_providerwith_lable(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
+    {
+
+        logger.debug("list_by_providerwith_lable with: {}", segchkStoreWebReq.toString());
+        startPage();
+        segchkStoreWebReq.setUserDist(recomDist);
+        List<SegchkStoreIndexWebResp> list = segchkStoreIndexService.selectSegchkStoreList(segchkStoreWebReq);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据运营商id,返回轮播图列表   尹志颖
+     * {
+     *   "providerId": 3
+     * }
+     */
+    @UnAuth
+    @PostMapping("/getBannersByProvider")
+    @ResponseBody
+    @ApiOperation(value = "根据运营商id,返回轮播图列表", notes = "不需要鉴权")
+    public TableDataInfo get_banners_by_provider(Long providerId)
+    {
+        logger.debug("get_banners_by_provider with: {}", providerId);
+//        AjaxResult ajax = new AjaxResult();
+        startPage();
+        List<SegchkCarouseMgt> segchkCarouseMgtList = segchkStoreIndexService.getBanners(providerId);
+//        ajax.put(CODE_TAG, 200);
+//        ajax.put(DATA_TAG, segchkCarouseMgtList);
+        return getDataTable(segchkCarouseMgtList);
+//        return ajax;
+    }
+
+
+    /**
+     * 根据运营商，商户id，查询商户详情   尹志颖
+     * {
+     *   "providerId": 4,
+     *   "storeId": 124
+     * }
+     */
+    @UnAuth
+    @PostMapping("/storeDetails")
+    @ResponseBody
+    @ApiOperation(value = "根据运营商，商户id，查询商户详情", notes = "不需要鉴权")
+    public AjaxResult store_details(@RequestBody SegchkStoreWebReq segchkStoreWebReq, String recommenderId, String recommenderLevel, HttpServletRequest request)
+    {
+        logger.debug("store_details with: {}---{}---{}", segchkStoreWebReq.toString(), recommenderId, recommenderLevel);
+//        startPage();
+        SegchkStoreBasicInfoWebResp segchkStoreBasicInfoWebResp = segchkStoreIndexService.selectSegchkStoreDetails(segchkStoreWebReq);
+        try {
+            Claims claims = getClaims(getToken(request));
+            if (!ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+//            userId = getClaims(getToken(request)).getUserId();
+                segchkStoreBasicInfoWebResp.setIsCollect(segchkStoreIndexService.isCollectByUser(segchkStoreWebReq.getProviderId(), Long.valueOf(segchkStoreWebReq.getStoreId()), getClaims(getToken(request)).getUserId()));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("storeDetails without user");
+        }
+
+        AjaxResult ajax = AjaxResult.success("获取成功", segchkStoreBasicInfoWebResp);
+        if(!StringUtils.isEmpty(recommenderId) && !StringUtils.isEmpty(recommenderLevel)){
+            logger.debug("store_details recommender with: {}---{}", recommenderId, recommenderLevel);
+            int ret = segchkStoreIndexService.recommenderIsExit(recommenderId, recommenderLevel, segchkStoreWebReq.getProviderId().toString());
+            if(ret > 1){
+                ajax.put("recommenderId", recommenderId);
+                ajax.put("recommenderLevel", recommenderLevel);
+            }
+            logger.warn("store_details the recommender: ({}{}) is {} {} curprov({})", recommenderId, recommenderLevel, ret < 1 ? "not exit" : "exit", ret == 1 ? "with same provider" : "different with provider");
+        }
+        return ajax;
+    }
+
+    /**
+     * 查询seg商户评价列表   尹志颖
+     */
+    @UnAuth
+    @PostMapping("/storeCommentList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg商户评价列表", notes = "不需要鉴权")
+    public TableDataInfo store_comment_list(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
+    {
+        logger.debug("store_comment_list with: {}", segchkStoreWebReq.toString());
+        startPage();
+        List<SegchkServiceCommentWebResp> segchkServiceCommentWebRespList = segchkStoreIndexService.selectSegchkStoreComments(segchkStoreWebReq);
+        return getDataTable(segchkServiceCommentWebRespList);
+    }
+
+    /**
+     * 查询seg商户评价列表   尹志颖
+     */
+    @UnAuth
+    @PostMapping("/shareInfo")
+    @ResponseBody
+    @ApiOperation(value = "查询seg商户评价列表", notes = "不需要鉴权")
+    public AjaxResult share_info(String page, String storeId, String providerId, String remark, HttpServletRequest request)
+    {
+        logger.debug("shareInfo page: {}", page);
+        ShareInfo shareInfo = new ShareInfo();
+        shareInfo.setTitle(shareTitle);
+        shareInfo.setDesc(shareDesc);
+        StringBuilder sb = new StringBuilder(page);
+        if(!StringUtils.isEmpty(remark)){
+            shareInfo.setPage(sb.append("?remark=").append(remark).toString());
+        }
+        else {
+            Claims claims = null;
+            try {
+                claims = getClaims(getToken(request));
+                sb.append("?&recC=").append(claims.getUserId())
+                        .append("&recV=").append(claims.getUserLevel())
+                        .append("&prov=").append(claims.getProviderId())
+                        .append((StringUtils.isEmpty(storeId) ? "" : "&store=" + storeId));
+                shareInfo.setPage(sb.toString());
+            } catch (Exception e) {
+                e.printStackTrace();
+                sb.append("?")
+                        .append((StringUtils.isEmpty(storeId) ? "" : "&store=" + storeId))
+                        .append((StringUtils.isEmpty(providerId) ? "" : "&prov=" + providerId));
+            }
+        }
+        logger.debug("shareInfo res: {}", shareInfo.toString());
+        return AjaxResult.success(shareInfo);
+    }
+
+    /**
+     * 查询客服   尹志颖
+     */
+    @UnAuth
+    @PostMapping("/customService")
+    @ResponseBody
+    @ApiOperation(value = "查询客服", notes = "不需要鉴权")
+    public AjaxResult custom_service(Long providerId, HttpServletRequest request)
+    {
+        logger.debug("customService with: {}", providerId);
+        HashMap<String, Object> provider = segchkStoreIndexService.getCustomService(providerId);
+        CustomService customService = new CustomService();
+        customService.setPhoneNo((String)provider.get("phoneNo"));
+        customService.setWechatId((String)provider.get("wechatId"));
+        logger.debug("customService res: {}", customService.toString());
+        return AjaxResult.success(customService);
+    }
+
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+
+        Object claims = redisService.getCacheObject(token);
+        logger.debug("getClaims---token:{} Claims:{}", token, claims);
+        return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
+    }
+
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            logger.info("getClaims fail :Authorization fail ");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        return authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+    }
+
+
+    private class ShareInfo extends BaseEntity {
+        private String title;
+        private String desc;
+        private String page;
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+
+        public String getPage() {
+            return page;
+        }
+
+        public void setPage(String page) {
+            this.page = page;
+        }
+
+        @Override
+        public String toString() {
+            return "ShareInfo{" +
+                    "title='" + title + '\'' +
+                    ", desc='" + desc + '\'' +
+                    ", page='" + page + '\'' +
+                    '}';
+        }
+    }
+
+    private class PrvoiderDistrict extends BaseEntity {
+        private Integer provFlag;
+        private Long providerId;
+        private String distName;
+        private String wechatId;
+        private String phoneNo;
+
+        public Integer getProvFlag() {
+            return provFlag;
+        }
+
+        public void setProvFlag(Integer provFlag) {
+            this.provFlag = provFlag;
+        }
+
+        public Long getProviderId() {
+            return providerId;
+        }
+
+        public void setProviderId(Long providerId) {
+            this.providerId = providerId;
+        }
+
+        public String getDistName() {
+
+            return distName;
+        }
+
+        public void setDistName(String distName) {
+            this.distName = distName;
+        }
+
+        public String getWechatId() {
+            return wechatId;
+        }
+
+        public void setWechatId(String wechatId) {
+            this.wechatId = wechatId;
+        }
+
+        public String getPhoneNo() {
+            return phoneNo;
+        }
+
+        public void setPhoneNo(String phoneNo) {
+            this.phoneNo = phoneNo;
+        }
+
+        @Override
+        public String toString() {
+            return "PrvoiderDistrict{" +
+                    "provFlag=" + provFlag +
+                    ", providerId=" + providerId +
+                    ", distName='" + distName + '\'' +
+                    ", wechatId='" + wechatId + '\'' +
+                    ", phoneNo='" + phoneNo + '\'' +
+                    '}';
+        }
+    }
+
+    private class CustomService extends BaseEntity {
+        private String phoneNo;
+        private String wechatId;
+
+        public String getPhoneNo() {
+            return phoneNo;
+        }
+
+        public void setPhoneNo(String phoneNo) {
+            this.phoneNo = phoneNo;
+        }
+
+        public String getWechatId() {
+            return wechatId;
+        }
+
+        public void setWechatId(String wechatId) {
+            this.wechatId = wechatId;
+        }
+
+        @Override
+        public String toString() {
+            return "CustomService{" +
+                    "phoneNo='" + phoneNo + '\'' +
+                    ", wechatId='" + wechatId + '\'' +
+                    '}';
+        }
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultProviderController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultProviderController.java
new file mode 100644
index 0000000..cdcd67a
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultProviderController.java
@@ -0,0 +1,207 @@
+package com.ruoyi.segchk;
+
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.login.SegChkLoginController;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.util.Claims;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * seg首页推荐商户Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/default/provider")
+@Api("运营商小程序接口")
+public class SegchkDefaultProviderController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+    @Autowired
+    private RedisCache redisService;
+
+
+    //    登录超时时长，单位天，-1永久有效
+    @Value("${yzytest.login.loginexpire:#{1}}")
+    private Integer loginexpire;
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+    /**
+     * 查询seg用户中心信息  尹志颖
+     * {
+     *   "userId": 240,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 2//* 0运营商，1商户，2用户
+     * }
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:provider_info:query')")
+    @PostMapping("/storeUserInfo")
+    @ResponseBody
+    @ApiOperation(value = "查询seg运营商中心信息", notes = "需要鉴权")
+    public AjaxResult storeUserInfo(SegchkUserWebReq segchkUserWebReq)
+    {
+//        startPage();
+        AjaxResult ajax = new AjaxResult();
+
+        ajax.put("code", 200);
+
+        SegchkUserWebResp segchkUserWebResp = segchkUserWebReq.getUserLevel() == 2 ?
+                segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq)
+                : (segchkUserWebReq.getUserLevel() == 1 ?
+                segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq) : segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq));
+        ajax.put("value", segchkUserWebResp);
+        return ajax;
+    }
+
+
+    /**
+     * 根据运营商id，角色等级，返回运营商下所有核消统计或售卡统计   尹志颖
+     * {
+     *   "providerId": 4,//*
+     *   "staticMonth": "10",,//测试
+     *   "srcFlag": 0//*0核消汇总1售卡汇总
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:provider_service_sale:list')")
+    @PostMapping("/providerServiceAndSaleList")
+    @ResponseBody
+    @ApiOperation(value = "根据运营商id，角色等级，返回运营商下所有核消统计或售卡统计", notes = "需要鉴权")
+    public TableDataInfo providerServiceAndSaleList(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
+        }
+        logger.debug("providerServiceAndSaleList with: {}", segchkServiceAndSaleWebReq.toString());
+        startPage();
+        List<SegchkServiceAndSaleWebResp> segchkServiceAndSaleWebRespList = segchkProviderIndexService.selectProviderServiceAndSaleList(segchkServiceAndSaleWebReq);
+        return getDataTable(segchkServiceAndSaleWebRespList);
+    }
+
+    /**
+     * 根据运营商id，角色等级，返回运营商下核消统计或售卡统计   尹志颖
+     * {
+     *   "providerId": 4,//*
+     *   "staticMonth": "2021-06-01",//*
+     *   "srcFlag": 0//*0核消详情1售卡详情
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:provider_service_sale:query')")
+    @PostMapping("/providerServiceAndSaleDetails")
+    @ResponseBody
+    @ApiOperation(value = "根据运营商id，角色等级，返回运营商下核消统计或售卡统计", notes = "需要鉴权")
+    public TableDataInfo providerServiceAndSaleDetails(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
+        }
+        logger.warn("providerServiceAndSaleDetails with: {}", segchkServiceAndSaleWebReq.toString());
+        startPage();
+        List<SegchkServiceAndSaleDetailWebResp> segchkServiceAndSaleDetailWebRespList = segchkProviderIndexService.selectProviderServiceAndSaleDetails(segchkServiceAndSaleWebReq);
+        return getDataTable(segchkServiceAndSaleDetailWebRespList);
+    }
+
+
+    //    返回注册登录提示
+    private AjaxResult LoginRequireAjax() {
+        return AjaxResult.error(300, "请先登录注册");
+    }
+
+    private TableDataInfo LoginRequireTableInfo() {
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setCode(300);
+        tableDataInfo.setMsg("请先登录注册");
+        return tableDataInfo;
+    }
+
+    //    获取登录信息
+    private Claims getLoing(HttpServletRequest request){
+        String token = null;
+        try {
+            token = getToken(request);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+        Claims claims = getClaims(token);
+        if(!ObjectUtils.isEmpty(claims)){
+            if(loginexpire == -1){
+                redisService.setCacheObject(token, claims);
+            }
+            else {
+                redisService.setCacheObject(token, claims, loginexpire, TimeUnit.DAYS);
+            }
+        }
+        return claims;
+    }
+
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            logger.info("getClaims fail :Authorization fail ");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        String token = authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+//        logger.warn("get toke info from {}---{}({})", authHeader, token, token.length());
+        return token;
+    }
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+
+        Object claims = redisService.getCacheObject(token);
+        logger.debug("getClaims---token:{} Claims:{}", token, claims);
+        return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultStoreController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultStoreController.java
new file mode 100644
index 0000000..76240bd
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultStoreController.java
@@ -0,0 +1,589 @@
+package com.ruoyi.segchk;
+
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.util.Claims;
+import com.ruoyi.util.CommonConstant;
+import com.ruoyi.util.QRCodeUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import static com.ruoyi.common.core.domain.AjaxResult.*;
+
+/**
+ * seg首页推荐商户Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/default/store")
+@Api("商家小程序接口")
+public class SegchkDefaultStoreController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    //    核消二维码保存路径
+    @Value("${segchk.store_qr_path:#{null}}")
+    private String qrPath;
+
+    //    核消二维码背景图片
+    @Value("${segchk.store_poster_path:#{null}}")
+    private String posterPath;
+
+    @Value("${segchk.storeurl:#{null}}")
+    private String SEGCHK_ST_URL;
+
+
+    @Value("${segchk.sto_height:#{200}}")
+    private Integer stoHeight;
+
+    @Value("${segchk.sto_weight:#{200}}")
+    private Integer stoWeight;
+
+    //    登录超时时长，单位天，-1永久有效
+    @Value("${yzytest.login.loginexpire:#{1}}")
+    private Integer loginexpire;
+
+//    如果是一张新会员卡，在第一次核消是是否给商家返利
+    @Value("${segchk.servicecheck.storereward.enable:false}")
+    private Boolean stoRewardWithChk;
+
+    /**
+     * 查询seg用户中心信息  尹志颖
+     * {
+     *   "userId": 240,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 2//* 0运营商，1商户，2用户
+     * }
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:store_info:query')")
+    @PostMapping("/storeUserInfo")
+    @ResponseBody
+    @ApiOperation(value = "查询seg商家中心信息", notes = "需要鉴权")
+    public AjaxResult store_user_info(SegchkUserWebReq segchkUserWebReq)
+    {
+//        startPage();
+        AjaxResult ajax = new AjaxResult();
+
+        ajax.put("code", 200);
+
+        SegchkUserWebResp segchkUserWebResp = segchkUserWebReq.getUserLevel() == 2 ?
+                segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq)
+                : (segchkUserWebReq.getUserLevel() == 1 ?
+                segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq) : segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq));
+        ajax.put("value", segchkUserWebResp);
+        return ajax;
+//        return getDataTable(segchkServiceCommentWebRespList);
+    }
+
+
+
+    /**
+     * 根据商家id，运营商id，角色等级，返回核消统计或售卡统计   尹志颖
+     * {
+     *   "providerId": 4,//*
+     *   "storeId": 123,//*
+     *   "staticMonth": "6",//查询最近几个月汇总
+     *   "userLevel": 1,//测试
+     *   "srcFlag": 0//*0核消汇总1售卡汇总
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:store_service_sale:list')")
+    @PostMapping("/storeServiceAndSaleList")
+    @ResponseBody
+    @ApiOperation(value = "根据商家id，运营商id，角色等级，返回核消统计或售卡统计", notes = "需要鉴权")
+    public TableDataInfo store_service_and_sale_list(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
+            segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("store_service_and_sale_list with: {}", segchkServiceAndSaleWebReq.toString());
+        startPage();
+        List<SegchkServiceAndSaleWebResp> segchkServiceAndSaleWebRespList = segchkStoreIndexService.selectStoreServiceAndSaleList(segchkServiceAndSaleWebReq);
+        return getDataTable(segchkServiceAndSaleWebRespList);
+    }
+
+    /**
+     * 根据商家id，运营商id，角色等级，返回核消统计或售卡统计   尹志颖
+     * {
+     *   "providerId": 4,
+     *   "storeId": 123,
+     *   "staticMonth": "2021-06-01",
+     *   "srcFlag": 0
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:store_service_sale:query')")
+    @PostMapping("/storeServiceAndSaleDetails")
+    @ResponseBody
+    @ApiOperation(value = "根据商家id，运营商id，角色等级，返回核消统计或售卡统计", notes = "需要鉴权")
+    public TableDataInfo store_service_and_sale_details(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
+            segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("store_service_and_sale_details with: {}", segchkServiceAndSaleWebReq.toString());
+        startPage();
+        List<SegchkServiceAndSaleDetailWebResp> segchkServiceAndSaleDetailWebRespList = segchkStoreIndexService.selectStoreServiceAndSaleDetails(segchkServiceAndSaleWebReq);
+        return getDataTable(segchkServiceAndSaleDetailWebRespList);
+    }
+
+
+    /**
+     * 根据商家id，运营商id，返回针对该商家的预约列表   尹志颖
+     * {
+     *   "providerId": 4,//*
+     *   "storeId": 123,//*
+     *   "staticMonth": "60"//测试
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:store_likego:list')")
+    @PostMapping("/storeUserLikeGoList")
+    @ResponseBody
+    @ApiOperation(value = "根据商家id，运营商id，返回针对该商家的预约列表", notes = "需要鉴权")
+    public TableDataInfo store_user_like_go_list(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
+            segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("store_user_like_go_list with: {}", segchkServiceAndSaleWebReq.toString());
+        startPage();
+        List<SegchkUserLikeGoWebResp> segchkUserLikeGoWebRespList = segchkStoreIndexService.selectStoreUserLikeGoList(segchkServiceAndSaleWebReq);
+        return getDataTable(segchkUserLikeGoWebRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg商户提现列表   尹志颖
+     * {
+     *   "userId": 84,//*
+     *   "phoneNo": "demoData",//测试
+     *   "providerId": 3//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:store_cash:list')")
+    @PostMapping("/storeCashList")
+    @ResponseBody
+    @ApiOperation(value = "根据用户id，运营商id，查询seg商户提现列表", notes = "需要鉴权")
+    public TableDataInfo store_cash_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("store_cash_list with: {}", segchkUserWebReq.toString());
+        startPage();
+        List<SegchkUserCashWebResp> segchkUserWebSCRespList = segchkStoreIndexService.selectStoreCashList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据二维码参数，解析出预约卡信息及商家id，进行对比确认，如果不可核 消返回失败原因，如果成功返回成功信息
+     * {
+     *   "likegoId": 0,//*二维码中携带
+     *   "storeId": "demoData"//*提交请求时携带
+     * }
+     */
+    @RepeatSubmit
+    @ApiOperation(value = "商家核消操作", notes = "需要鉴权")
+//    @PreAuthorize("@ss.hasPermi('segchk:store_check:update')")
+    @PostMapping( "/ServiceCheckTest")
+    @ResponseBody
+    @Transactional(propagation = Propagation.REQUIRED)
+    public AjaxResult service_check_test(Long likegoId, String storeId, String remark, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(remark)){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            if(!storeId.equals(String.valueOf(claims.getUserId()))){
+                logger.warn("ServiceCheckTest---storeid: {} is not then token: {}", storeId, claims);
+                return AjaxResult.error(300, "请先登录注册");
+            }
+        }
+        AjaxResult ajax = new AjaxResult();
+        logger.debug("ServiceCheckTest with: {}---{}---{}", likegoId.toString(), storeId, remark);
+        SegchkServiceOrderChkTestResp segchkServiceOrderChkTestResp = segchkUserIndexService.selectUserOrderPredInfo(likegoId);
+        segchkServiceOrderChkTestResp.setLikegoId(likegoId);
+        logger.debug("ServiceCheckTest check with: {}", segchkServiceOrderChkTestResp.toString());
+        if(segchkServiceOrderChkTestResp.getStoreId()!= Long.parseLong(storeId)){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "预约单商家非本店商家！");
+        }
+        else if(segchkServiceOrderChkTestResp.getMgtState() != 0){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, segchkServiceOrderChkTestResp.getMgtState() == 1 ? "该预约单所用卡已失效" : "该预约单所用卡已使用");
+        }
+        else if(segchkServiceOrderChkTestResp.getIsExpire() == 1){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "该预约单所用卡已失效");
+        }
+        else if(segchkServiceOrderChkTestResp.getCardStatus() != 0){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "该预约单所用卡已失效");
+        }
+        else if(segchkServiceOrderChkTestResp.getTotalCount() == 0){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "本店已不支持该类型卡");
+        }
+        else if(segchkServiceOrderChkTestResp.getHasLeftCount() <= 0){
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "该预约单在本店已无可用权益次数");
+        }
+        else if(segchkServiceOrderChkTestResp.getCanFree() == 1){
+            int ret = segchkUserIndexService.OrderCheckTransaction(segchkServiceOrderChkTestResp, likegoId, stoRewardWithChk);
+            ajax.put(CODE_TAG, "200");
+
+            segchkServiceOrderChkTestResp.setSegchkRecommenderStoreLableWebList(null);
+            ajax.put(DATA_TAG, segchkServiceOrderChkTestResp);
+
+            StringBuilder sb = new StringBuilder(CommonConstant.APPLET_SERVICE_CHK).append(":").append(storeId).append("-").append(segchkServiceOrderChkTestResp.getUserId());
+            logger.debug("ServiceCheckTest will store likego : {}:{}", sb.toString(), likegoId);
+            redisService.setCacheObject(sb.toString(), likegoId, 5, TimeUnit.MINUTES);
+        }
+        else {
+            int ret = segchkUserIndexService.OrderCheckTransaction(segchkServiceOrderChkTestResp, likegoId, stoRewardWithChk);
+
+            if(ret != 3){
+                ajax.put(CODE_TAG, "500");
+                ajax.put(MSG_TAG, "核消失败");
+            }
+            else{
+                ajax.put(CODE_TAG, "200");
+                ajax.put(MSG_TAG, "核消成功");
+                List<SegchkRecommenderStoreLableWeb> lables = segchkServiceOrderChkTestResp.getSegchkRecommenderStoreLableWebList();
+                SegchkRecommenderStoreLableWeb lable = new SegchkRecommenderStoreLableWeb();
+                lable.setLableId(0);
+                lable.setLableTypeId(1);
+                lable.setLableName("本店尊享");
+                lables.add(lable);
+                segchkServiceOrderChkTestResp.setSegchkRecommenderStoreLableWebList(lables);
+                ajax.put(DATA_TAG, segchkServiceOrderChkTestResp);
+                StringBuilder sb = new StringBuilder(CommonConstant.APPLET_SERVICE_CHK).append(":").append(storeId).append("-").append(segchkServiceOrderChkTestResp.getUserId());
+                logger.debug("ServiceCheckTest will store likego : {}:{}", sb.toString(), likegoId);
+                redisService.setCacheObject(sb.toString(), likegoId, 5, TimeUnit.MINUTES);
+            }
+        }
+        return ajax;
+    }
+
+    @PostMapping("giveFreeCard")
+    @ResponseBody
+    @ApiOperation(value = "商家赠卡接口", notes = "需要鉴权")
+    public AjaxResult giveFreeCard(@RequestBody StoreSelfCard storeSelfCard, HttpServletRequest request)
+    {
+        logger.debug("giveFreeCard with --- {}", storeSelfCard.toString());
+        SegchkStoreSelfMgt segchkStoreSelfMgt = new SegchkStoreSelfMgt();
+        segchkStoreSelfMgt.setStoreId(storeSelfCard.getStoreId());
+        if(StringUtils.isEmpty(storeSelfCard.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkStoreSelfMgt.setProviderId(claims.getProviderId());
+            segchkStoreSelfMgt.setStoreId(claims.getUserId());
+        }
+        StringBuilder sb = new StringBuilder(CommonConstant.APPLET_SERVICE_CHK).append(":").append(segchkStoreSelfMgt.getStoreId()).append("-").append(storeSelfCard.getUserId());
+        Long likegoId = redisService.getCacheObject(sb.toString());
+        if(likegoId == null){
+            logger.warn("giveFreeCard cannot get likegoId from redis for ({}:{})", segchkStoreSelfMgt.getStoreId(), storeSelfCard.getUserId());
+            return AjaxResult.error(500, "赠卡失败");
+        }
+        Long cardId = segchkStoreIndexService.getVipCardFromLikego(likegoId);
+        segchkStoreSelfMgt.setCardId(cardId);
+        segchkStoreSelfMgt.setUserId(storeSelfCard.getUserId());
+        segchkStoreSelfMgt.setTypeId(storeSelfCard.getTypeId());
+        segchkStoreSelfMgt.setFreeCount(storeSelfCard.getTotalCount());
+        segchkStoreSelfMgt.setLableId(storeSelfCard.getTypeId() == 2 ? storeSelfCard.getLableId() : 0L);
+        segchkStoreSelfMgt.setFreeName(storeSelfCard.getTypeId() == 2 ? null : "赠卡");
+        segchkStoreSelfMgt.setFreeContent(storeSelfCard.getFreeContent());
+        segchkStoreSelfMgt.setLeftCount(storeSelfCard.getTotalCount());
+        logger.debug("giveFreeCard with --- {}", segchkStoreSelfMgt.toString());
+        Integer ret = segchkStoreIndexService.addStoreSelfCard(segchkStoreSelfMgt);
+        if(ret == 0){
+            logger.error("giveFreeCard failed with --- {}", segchkStoreSelfMgt.toString());
+        }
+        redisService.deleteObject(sb.toString());
+        return ret > 0 ? AjaxResult.success("赠卡成功") : AjaxResult.error(500, "赠卡失败");
+    }
+    /**
+     * 提现结果回调接口，接口微信的支付结果，更新充值结果, ret 0成功，其他失败 未测试
+     * {
+     *   "chargeId": "45435",
+     *   "userLevel": "1/2/0",
+     *   "ret": 1
+     * }
+     */
+//    @Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
+    @PostMapping("/userCashResult")
+    @ResponseBody
+    @ApiOperation(value = "提现结果回调接口", notes = "需要鉴权")
+    public void userCashResult(String chargeId, int userLevel, int ret)
+    {
+        if(userLevel == 1) {
+            segchkStoreIndexService.cashRet(chargeId, ret);
+        }
+        else if(userLevel == 2){
+            segchkUserIndexService.cashRet(chargeId, ret);
+        }
+    }
+
+
+    /**
+     * 根据信息，生成商户推广二维码  尹志颖
+     * {
+     *   "userId": 234,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 0//测试用
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_likego:list')")
+    @UnAuth
+    @GetMapping("/storeShareQr")
+    @ResponseBody
+    @ApiOperation(value = "商户推广二维码", notes = "需要鉴权")
+    public AjaxResult store_share_qr(String storeId, String providerId, String remark, Integer qrw, Integer qrh, HttpServletRequest request, HttpServletResponse response)
+    {
+        if(StringUtils.isEmpty(remark)){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            storeId = String.valueOf(claims.getUserId());
+            providerId = String.valueOf(claims.getProviderId());
+        }
+        String urlstr = String.format(SEGCHK_ST_URL, storeId, "1") + (StringUtils.isEmpty(remark) ? "" : "&remark=" + remark);
+        logger.debug("storeShareQr with: prov:{}---store:{}---url:{}", storeId, providerId, urlstr);
+        createQRImg(response, urlstr, storeId, providerId, (ObjectUtils.isEmpty(qrw) ? stoWeight : qrw), (ObjectUtils.isEmpty(qrh) ? stoHeight : qrh));
+        return AjaxResult.success("生成成功");
+    }
+
+    @UnAuth
+    @GetMapping("/storerecommend")
+    @ResponseBody
+    @ApiOperation(value = "商户推广二维码", notes = "需要鉴权")
+    public AjaxResult storerecommend(String recC, String recV, String prov, HttpServletRequest request, HttpServletResponse response)
+    {
+
+        StoreRecommend storeRecommend = new StoreRecommend();
+        storeRecommend.setProviderId(prov);
+        storeRecommend.setRecommendId(recC);
+        storeRecommend.setRecommendLevel(recV);
+        logger.debug("storerecommend res: {}", storeRecommend.toString());
+        return AjaxResult.success("生成成功", storeRecommend);
+    }
+
+
+
+    //    返回注册登录提示
+    private AjaxResult LoginRequireAjax() {
+        return AjaxResult.error(300, "请先登录注册");
+    }
+
+    private TableDataInfo LoginRequireTableInfo() {
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setCode(300);
+        tableDataInfo.setMsg("请先登录注册");
+        return tableDataInfo;
+    }
+
+    //    获取登录信息
+    private Claims getLoing(HttpServletRequest request){
+        String token = null;
+        try {
+            token = getToken(request);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+        Claims claims = getClaims(token);
+        if(!ObjectUtils.isEmpty(claims)){
+            if(loginexpire == -1){
+                redisService.setCacheObject(token, claims);
+            }
+            else {
+                redisService.setCacheObject(token, claims, loginexpire, TimeUnit.HOURS);
+            }
+        }
+        return claims;
+    }
+
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+
+        Object claims = redisService.getCacheObject(token);
+        logger.debug("getClaims---token:{} Claims:{}", token, claims);
+        return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
+    }
+
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            logger.info("getClaims fail :Authorization fail ");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        return authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+    }
+
+    /**
+     * 创建二维码图片
+     *
+     * @param url    链接地址
+     * @param width  宽
+     * @param height 高
+     */
+    private void createQRImg(HttpServletResponse response, String url, String storeId, String providerId, Integer width, Integer height) {
+        logger.debug("createQRImg with: {}---w:{}---h:{}", url, width, height);
+        OutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            StringBuilder qrsb = new StringBuilder(qrPath);
+            qrsb.append(File.separator).append(providerId).append("_").append(storeId).append("qr.jpg");
+            QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, qrsb.toString(), posterPath);
+            logger.debug("createQRImg qrPath: {}, posterPath: {}", qrPath, posterPath);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    private class StoreRecommend extends BaseEntity {
+        private String recommendId;
+        private String recommendLevel;
+        private String providerId;
+
+        public String getRecommendId() {
+            return recommendId;
+        }
+
+        public void setRecommendId(String recommendId) {
+            this.recommendId = recommendId;
+        }
+
+        public String getRecommendLevel() {
+            return recommendLevel;
+        }
+
+        public void setRecommendLevel(String recommendLevel) {
+            this.recommendLevel = recommendLevel;
+        }
+
+        public String getProviderId() {
+            return providerId;
+        }
+
+        public void setProviderId(String providerId) {
+            this.providerId = providerId;
+        }
+
+        @Override
+        public String toString() {
+            return "StoreRecommend{" +
+                    "recommendId='" + recommendId + '\'' +
+                    ", recommendLevel='" + recommendLevel + '\'' +
+                    ", providerId='" + providerId + '\'' +
+                    '}';
+        }
+    }
+
+
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultUserController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultUserController.java
new file mode 100644
index 0000000..c65e830
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultUserController.java
@@ -0,0 +1,1111 @@
+package com.ruoyi.segchk;
+
+import com.ruoyi.appletsutil.ResultCode;
+import com.ruoyi.appletsutil.UnAuthorizedException;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.member.service.WeChatCustomerLinkService;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.setting.bean.WechatPaySet;
+import com.ruoyi.setting.service.ILsPaySettingService;
+import com.ruoyi.util.*;
+import com.ruoyi.util.bean.PrepayResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import static com.ruoyi.common.core.domain.AjaxResult.*;
+import static com.ruoyi.common.utils.ip.IpUtils.getIpAddr;
+
+/**
+ * seg首页推荐商户Controller
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@RestController
+@RequestMapping("/default/user")
+@Api("用户小程序接口")
+public class SegchkDefaultUserController extends BaseController
+{
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+    @Autowired
+    private ISegchkUserCollectService segchkUserCollectService;
+
+    @Autowired
+    private ISegchkUserLikegoService segchkUserLikegoService;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+
+    @Autowired
+    private ISegchkUserChargeService segchkUserChargeService;
+
+    /**
+     * 注入支付设置服务
+     */
+    @Autowired
+    private ILsPaySettingService paySetService;
+
+    /**
+     * 注入微信用户关联服务
+     */
+    @Autowired
+    private WeChatCustomerLinkService weChatCustomerLinkService;
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+
+    //    核消二维码保存路径
+    @Value("${segchk.check_qr_path:#{null}}")
+    private String qrPath;
+
+    //    核消二维码背景图片
+    @Value("${segchk.check_poster_path:#{null}}")
+    private String posterPath;
+
+    @Value("${segchk.chkurl:#{null}}")
+    private String SEGCHK_SC_URL;
+
+    @Value("${segchk.chk_height:#{200}}")
+    private Integer chkHeight;
+
+    @Value("${segchk.chk_weight:#{200}}")
+    private Integer chkWeight;
+
+    //    登录超时时长，单位天，-1永久有效
+    @Value("${yzytest.login.loginexpire:#{1}}")
+    private Integer loginexpire;
+    /**
+     * 新增保存seg用户收藏记录
+     * {
+     *   "collectType": "1",//*
+     *   "providerId": 0,//*
+     *   "userId": 0,//*
+     *   "storeId": 0,//*
+     *   "modTime": "2021-08-16 13:43:43",
+     *   "mgtState": 0//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_collect:add')")
+    @UnAuth
+//    @Log(title = "seg用户收藏记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit
+    @PostMapping("/addUserCollect")
+    @ResponseBody
+    @ApiOperation(value = "添加seg用户收藏记录", notes = "需要鉴权")
+    public AjaxResult add_user_collect(@RequestBody SegchkUserCollect segchkUserCollect, HttpServletRequest request)
+    {
+        if(!StringUtils.isEmpty(segchkUserCollect.getRemark())){
+//            测试
+            if(!segchkUserCollect.isValid()){
+                return AjaxResult.error("400", "请求信息异常");
+            }
+            logger.debug("add_user_collect with: {}", segchkUserCollect.toString());
+            return toAjax(segchkUserCollectService.insertSegchkUserCollect(segchkUserCollect));
+        }
+
+        Claims claims = getLoing(request);
+        if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+            return LoginRequireAjax();
+        }
+        if (claims.getUserLevel() != 2){
+            return AjaxResult.error(400, "非会员用户不可以收藏");
+        }
+        segchkUserCollect.setUserId(claims.getUserId());
+        segchkUserCollect.setProviderId(claims.getProviderId());
+        logger.debug("add_user_collect with: {}", segchkUserCollect.toString());
+        return toAjax(segchkUserCollectService.insertSegchkUserCollect(segchkUserCollect));
+    }
+
+
+    /**
+     * 删除seg用户收藏记录
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_collect:remove')")
+    @UnAuth
+//    @Log(title = "删除seg用户收藏记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/removeUserCollect")
+    @ResponseBody
+    @ApiOperation(value = "删除seg用户收藏记录", notes = "需要鉴权")
+    public AjaxResult removeUserCollect(@RequestBody RemoveIds removeIds, HttpServletRequest request)
+    {
+        Claims claims = getLoing(request);
+        if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+            return LoginRequireAjax();
+        }
+        logger.debug("removeUserCollect with: {}", removeIds.toString());
+        return toAjax(segchkUserCollectService.deleteSegchkUserCollectByIds(removeIds.getIds()));
+    }
+
+    /**
+     * 根据运营商id，用户id，商户id，查询该用户在该商户可使用的会员卡或优惠券   尹志颖
+     * {
+     *   "providerId": 4,
+     *   "storeId": 128,
+     *   "userId": 245
+     * }
+     */
+    @UnAuth
+//    @Log(title = "查询该用户在该商户可使用的会员卡或优惠券", businessType = BusinessType.GENCODE)
+    @PostMapping("/userOrderPredList")
+    @ResponseBody
+    public TableDataInfo UserOrderPredList(@RequestBody SegchkServiceOrderWebReq segchkServiceOrderWebReq, HttpServletRequest request)
+    {
+        startPage();
+        if(!StringUtils.isEmpty(segchkServiceOrderWebReq.getRemark())){
+            List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexService.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
+            return getDataTable(segchkServiceOrderWebReqList);
+        }
+        Claims claims = getLoing(request);
+        if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+            return LoginRequireTableInfo();
+        }
+        segchkServiceOrderWebReq.setUserId(claims.getUserId());
+        List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexService.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
+//        boolean anyMatch = segchkServiceOrderWebReqList.parallelStream().anyMatch(v -> v.getTypeId() == 0);
+        return getDataTable(segchkServiceOrderWebReqList);
+    }
+
+    /**
+     * 新增保存seg用户想去记录
+     * {
+     *   "providerId": 4,//*
+     *   "userId": 231,//*
+     *   "storeId": 128,//*
+     *   "cardId": 230,//*
+     *   "cardType": 0 //* 0充值卡2优惠券1赠卡
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_likego:add')")
+    @UnAuth
+//    @Log(title = "seg用户想去记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit
+    @PostMapping("/addOrderUserLikego")
+    @ResponseBody
+    @ApiOperation(value = "添加seg用户想去记录", notes = "需要鉴权")
+    public AjaxResult add_order_user_likego(@RequestBody SegchkUserLikego segchkUserLikego, HttpServletRequest request)
+    {
+        Long userId = 0L;
+
+        if(StringUtils.isEmpty(segchkUserLikego.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            if(claims.getUserLevel() != 2){
+                return AjaxResult.error(400, "未会员用户不允许预约！");
+            }
+            segchkUserLikego.setUserId(claims.getUserId());
+            segchkUserLikego.setProviderId(claims.getProviderId());
+        }
+        logger.debug("add_order_user_likego with: {}", segchkUserLikego.toString());
+        return toAjax(segchkUserLikegoService.insertSegchkUserLikego(segchkUserLikego));
+    }
+
+
+    /**
+     * 根据预约id，返回预约单二维码  尹志颖
+     * {
+     *   "userId": 234,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 0//测试用
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_likego:list')")
+    @UnAuth
+    @PostMapping("/userLikeGoQr")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户预约单列表", notes = "需要鉴权")
+    public AjaxResult user_like_go_qr(String likegoId, String remark, Integer qrw, Integer qrh, HttpServletRequest request, HttpServletResponse response)
+    {
+        SegchkUserLikego segchkUserLikego = new SegchkUserLikego();
+        segchkUserLikego.setLikegoId(Long.valueOf(likegoId));
+        if(StringUtils.isEmpty(remark)){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkUserLikego.setUserId(claims.getUserId());
+            segchkUserLikego.setProviderId(claims.getProviderId());
+        }
+        startPage();
+        logger.debug("userLikeGoQr with: {}", segchkUserLikego.toString());
+        SegchkUserLikego segchkUserLikego1 = segchkUserIndexService.selectUserLikeGo(segchkUserLikego);
+        createQRImg(response, String.format(SEGCHK_SC_URL, likegoId, segchkUserLikego1.getStoreId()) + (StringUtils.isEmpty(remark) ? "" : "&remark=" + remark), (ObjectUtils.isEmpty(qrw) ? chkWeight : qrw), (ObjectUtils.isEmpty(qrh) ? chkHeight : qrh));
+        return AjaxResult.success("生成成功");
+    }
+
+    /**
+     * 查询seg用户中心信息  尹志颖
+     * {
+     *   "userId": 240,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 2//* 0运营商，1商户，2用户
+     * }
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_info:query')")
+    @UnAuth
+    @PostMapping("/storeUserInfo")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户中心信息", notes = "需要鉴权")
+    public AjaxResult store_user_info(SegchkUserWebReq segchkUserWebReq)
+    {
+//        startPage();
+        AjaxResult ajax = new AjaxResult();
+
+        ajax.put("code", 200);
+
+        SegchkUserWebResp segchkUserWebResp = segchkUserWebReq.getUserLevel() == 2 ?
+                segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq)
+                : (segchkUserWebReq.getUserLevel() == 1 ?
+                segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq) : segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq));
+        ajax.put("value", segchkUserWebResp);
+        return ajax;
+//        return getDataTable(segchkServiceCommentWebRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户核消列表   尹志颖
+     * {
+     *   "userId": 245,//*
+     *   "providerId": 4//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_check:list')")
+    @UnAuth
+    @PostMapping("/storeServiceCheckList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户核消列表", notes = "需要鉴权")
+    public TableDataInfo store_service_check_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        startPage();
+        logger.debug("store_service_check_list with: {}", segchkUserWebReq.toString());
+        List<SegchkUserWebSCResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserServiceCHKList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户可用会员卡列表或者优惠券列表   尹志颖
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_card:list')")
+    @UnAuth
+    @PostMapping("/userCardList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户可用会员卡列表或者优惠券列表", notes = "需要鉴权")
+    public TableDataInfo user_card_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        startPage();
+        logger.debug("user_card_list with: {}", segchkUserWebReq.toString());
+        List<SegchkUserWebCardResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCardList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户收藏列表   尹志颖
+     * {
+     *   "userId": 439,//*
+     *   "providerId": 4//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_collect:list')")
+    @UnAuth
+    @PostMapping("/userCollectList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户收藏列表", notes = "需要鉴权")
+    public TableDataInfo user_collect_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        startPage();
+        logger.debug("user_collect_list with: {}", segchkUserWebReq.toString());
+        List<SegchkUserCollectWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCollectList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户预约单列表   尹志颖
+     * {
+     *   "userId": 234,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 0//测试用
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_likego:list')")
+    @UnAuth
+    @PostMapping("/userLikeGOList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户预约单列表", notes = "需要鉴权")
+    public TableDataInfo userLikeGOList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        startPage();
+        logger.debug("userLikeGOList with: {}", segchkUserWebReq.toString());
+        List<SegchkUserLikeGoWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserLikGoList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 删除seg用户想去记录
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_likego:remove')")
+//    @Log(title = "seg用户想去记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/removeOrderUserLikego")
+    @ResponseBody
+    @ApiOperation(value = "删除seg用户想去记录", notes = "需要鉴权")
+    public AjaxResult removeOrderUserLikego(@RequestBody RemoveIds removeIds, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(removeIds.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            removeIds.setUserId(claims.getUserId());
+        }
+        logger.debug("removeOrderUserLikego with: {}", removeIds.toString());
+        return toAjax(segchkUserLikegoService.deleteSegchkUserLikegoByLikegoIds(Convert.toLongArray(removeIds.getIds())));
+    }
+
+    /**
+     * seg服务评价查询
+     * {
+     *   "commentId": 3//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_comment:query')")
+//    @Log(title = "seg服务评价查看", businessType = BusinessType.OTHER)
+    @PostMapping( "/getComment")
+    @ResponseBody
+    @ApiOperation(value = "seg服务评价查询", notes = "需要鉴权")
+    public AjaxResult get_comment(@RequestBody SegchkServiceCommentUserReq segchkServiceCommentUserReq, HttpServletRequest request)
+    {
+        if(StringUtils.isEmpty(segchkServiceCommentUserReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+        }
+        logger.debug("get_comment with: {}", segchkServiceCommentUserReq.toString());
+        AjaxResult ajax = new AjaxResult();
+        SegchkServiceComment segchkServiceComment = segchkUserIndexService.selectSegchkServiceComment(segchkServiceCommentUserReq);
+        if(segchkServiceComment == null){
+            ajax.put(CODE_TAG, "300");
+            ajax.put(MSG_TAG, "未查到相关评价");
+        }
+        else{
+            ajax.put(CODE_TAG, "200");
+            ajax.put(DATA_TAG, segchkServiceComment);
+        }
+        return ajax;
+    }
+
+
+    /**
+     * seg服务评价提交
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_comment:add')")
+//    @Log(title = "seg服务评价提交", businessType = BusinessType.INSERT)
+    @PostMapping( "/addComment")
+    @ResponseBody
+    @ApiOperation(value = "seg服务评价提交", notes = "需要鉴权")
+    public AjaxResult addComment(@RequestBody SegchkServiceCommentUserReq segchkServiceCommentUserReq, HttpServletRequest request)
+    {
+        if(StringUtils.isEmpty(segchkServiceCommentUserReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            if (claims.getUserLevel() != 2){
+                return AjaxResult.error(400, "非会员用户不允许提交评价");
+            }
+        }
+        logger.debug("addComment with: {}", segchkServiceCommentUserReq.toString());
+        return toAjax(segchkUserIndexService.insertSegchkServiceComment(segchkServiceCommentUserReq));
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户充值列表   尹志颖
+     * {
+     *   "userId": 34,//*
+     *   "providerId": 2//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_charge:list')")
+    @PostMapping("/userChargeList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户充值列表", notes = "需要鉴权")
+    public TableDataInfo userChargeList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("userChargeList with: {}", segchkUserWebReq.toString());
+        startPage();
+        List<SegchkUserChargeWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserChargeList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，查询seg用户提现列表   尹志颖
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_cash:list')")
+    @PostMapping("/userCashList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户提现列表", notes = "需要鉴权")
+    public TableDataInfo userCashList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("userCashList with: {}", segchkUserWebReq.toString());
+        startPage();
+        List<SegchkUserCashWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCashList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 根据用户id，运营商id，角色等级查询seg用户消息列表   尹志颖
+     * {
+     *   "userId": 392,//*
+     *   "providerId": 4,//*
+     *   "userLevel": 2,//*
+     *   "phoneNo": 1//测试
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_msg:list')")
+    @PostMapping("/userMsgList")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户消息列表", notes = "需要鉴权")
+    public TableDataInfo userMsgList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireTableInfo();
+            }
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+        }
+        logger.debug("userMsgList with: {}", segchkUserWebReq.toString());
+        startPage();
+        List<SegchkMsgWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserMsgList(segchkUserWebReq);
+        return getDataTable(segchkUserWebSCRespList);
+    }
+
+
+    /**
+     * 用户进入余额充值页面时，根据用户id，运营商id查询可充值 的卡
+     * {
+     *   "userId": 465,
+     *   "providerId": 4
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_charge:add')")
+    @PostMapping( "/userChargePre")
+    @ResponseBody
+    @ApiOperation(value = "查询seg用户可充值列表", notes = "需要鉴权")
+    public AjaxResult userChargePre(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            if(!claims.getProviderId().equals(segchkUserWebReq.getProviderId())){
+                logger.warn("userChargePre can not charg for user({}), because login prov({}) is not register prov({})", claims.getUserId(), segchkUserWebReq.getProviderId(), claims.getProviderId());
+                return AjaxResult.error(400, "用户在漫游地区充值!");
+            }
+            segchkUserWebReq.setUserLevel(claims.getUserLevel());
+            segchkUserWebReq.setUserId(claims.getUserId());
+            segchkUserWebReq.setProviderId(claims.getProviderId());
+
+        }
+        logger.debug("userChargePre with: {}", segchkUserWebReq.toString());
+        List<SegchkUserChargeCard> segchkUserChargeCards = segchkUserIndexService.SegchkUserChargePre(segchkUserWebReq);
+        AjaxResult ajax = new AjaxResult();
+
+        if(segchkUserChargeCards == null){
+            ajax.put(CODE_TAG, "400");
+        }
+        else{
+            ajax.put(CODE_TAG, "200");
+            ajax.put(DATA_TAG, segchkUserChargeCards);
+        }
+        return ajax;
+    }
+
+    /**
+     * 用户进入余额充值页面时，根据用户id，运营商id查询可充值的卡,生成充值记录 未测试
+     * {
+     *   "userId": 465,
+     *   "charge": 299.0,
+     *   "accountUsed": 10.0,
+     *   "cardTypeId": 1,
+     *   "providerId": 4
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_charge:pre')")
+    @RepeatSubmit
+    @PostMapping( "/userChargeReq")
+    @ResponseBody
+    @ApiOperation(value = "seg用户可充值", notes = "需要鉴权")
+    public AjaxResult userChargeReq(@RequestBody SegchkUserCharge segchkUserCharge, HttpServletRequest request)
+    {
+        Claims claims = getLoing(request);
+        if(StringUtils.isEmpty(segchkUserCharge.getRemark())){
+//            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkUserCharge.setUserId(claims.getUserId());
+            segchkUserCharge.setProviderId(claims.getProviderId());
+        }
+        else {
+            claims = new Claims();
+            claims.setUserId(segchkUserCharge.getUserId());
+            claims.setUserLevel(2);
+            claims.setProviderId(segchkUserCharge.getProviderId());
+        }
+        logger.debug("userChargeReq with: {}", segchkUserCharge.toString());
+        int ret_flag = 0;//未完成，1成功，2失败
+        AjaxResult ajax = new AjaxResult();
+        if(segchkUserCharge.getAccountUsed() != null && segchkUserCharge.getAccountUsed().compareTo(new BigDecimal(0.0)) == 1) {
+//            用户选择使用余额买卡
+            BigDecimal user_account = segchkUserIndexService.getAccount(segchkUserCharge);
+            if(user_account == null || user_account.compareTo(segchkUserCharge.getAccountUsed()) == -1){
+//                用户余额不足
+                ajax.put(CODE_TAG, "500");
+                ajax.put(MSG_TAG, "余额不足!");
+                return ajax;
+            }
+            if(user_account.compareTo(segchkUserCharge.getCharge()) > -1){
+//                用户余额大于充值额度，用户可以直接使用
+                segchkUserCharge.setAccountUsed(segchkUserCharge.getCharge());
+                segchkUserCharge.setCharge(new BigDecimal(0.0));
+                ret_flag = 1;
+                logger.warn("userChargeReq useraccount({}) is big than charge({}) ", user_account, segchkUserCharge.getCharge());
+            }
+            else {
+//                用户余额小于充值金额
+                segchkUserCharge.setAccountUsed(user_account);
+                segchkUserCharge.setCharge(segchkUserCharge.getCharge().subtract(user_account));
+            }
+
+        }
+        segchkUserCharge.setRetFlag(ret_flag);
+//        生成充值订单
+        int ret = segchkUserIndexService.insertSegchkUserCharge(segchkUserCharge);
+        if(ret < 1){
+//            生成失败。返回提示
+            ajax.put(CODE_TAG, "500");
+            ajax.put(MSG_TAG, "充值失败!");
+        }
+        else{
+//            生成订单成功
+            SegchkUserWechat segchkUserWechat = null;
+            if(!StringUtils.isEmpty(segchkUserCharge.getCharge())){
+//                如果待生成订单需要用户调起支付时
+
+                segchkUserWechat = getSegchkUserWechat(request, segchkUserCharge.getSearchValue(), claims);
+
+                if(ObjectUtils.isEmpty(segchkUserWechat)){
+                    return AjaxResult.error(500, "微信绑定失败!");
+                }
+            }
+            if(ret_flag == 1){
+                return AjaxResult.error(201, "充值成功");
+            }
+            String ipAddr = getIpAddr(request);
+            CommonResponse<PrepayResult> prepayResultCommonResponse = segchkUserIndexService.wechatAppletPay(
+                    segchkUserCharge.getChargeId().toString()
+                    , segchkUserCharge.getUserId()
+                    , segchkUserCharge.getProviderId()
+                    , (StringUtils.isEmpty(ipAddr) ? ipAddr : ipAddr.split(",")[0].trim()), 2);
+            switch (prepayResultCommonResponse.getFlag()){
+                case -1: return AjaxResult.error(500, "用户不存在");
+                case -5: return AjaxResult.error(500, "微信生成订单出错");
+                case -7: return AjaxResult.error(500, "没有设置网站地址");
+                case -8: return AjaxResult.error(500, "缺少配置");
+                case -10: return AjaxResult.error(500, "没有绑定微信");
+                case 1: {
+                    /*WechatApletPrepayResult wechatApletPrepayResult = new WechatApletPrepayResult();
+                    wechatApletPrepayResult.setAppId(prepayResultCommonResponse.getData().getAppid());
+                    wechatApletPrepayResult.setPaySign(prepayResultCommonResponse.getData().getPay_sign());
+                    wechatApletPrepayResult.setPackage_(prepayResultCommonResponse.getData().getPackage_());
+                    wechatApletPrepayResult.setNonceStr(prepayResultCommonResponse.getData().getNonce_str());
+                    wechatApletPrepayResult.setTimeStamp(prepayResultCommonResponse.getData().getTime_stamp());*/
+
+                    return AjaxResult.success("充值成功", prepayResultCommonResponse);
+                }
+                default: return AjaxResult.error(600, "未知错误");
+            }
+//            ajax.put(CODE_TAG, "200");
+//            ajax.put(MSG_TAG, "充值成功!");
+//            ajax.put(DATA_TAG, prepayResultCommonResponse);
+        }
+        return ajax;
+    }
+
+    /**
+     * 充值结果回调接口，接口微信的支付结果，更新充值结果, ret 0成功，其他失败
+     * {
+     *   "chargeId": "demoData",//*
+     *   "ret": 0//*0成功，其他失败
+     * }
+     */
+//    @Log(title = "seg用户充值结果回调", businessType = BusinessType.UPDATE)
+    @PostMapping( "/userChargeResult")
+    @ResponseBody
+    @ApiOperation(value = "seg用户充值结果回调", notes = "需要鉴权")
+    public void userChargeResult(String chargeId, int ret, HttpServletRequest request)
+    {
+
+        segchkUserIndexService.chargeRet(chargeId, ret);
+    }
+
+    /**
+     * 微信支付回调
+     */
+    @RequestMapping("/wechatnotify")
+    @UnAuth
+    @ApiIgnore
+    public void weChatNotify(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        if (segchkUserIndexService.weChatAppletNotify(request.getInputStream()) > 0) {
+            sendMessage(response, WechatUtils.SUCCESS_RETURN);
+        }
+    }
+
+    /**
+     * 用户点击提现时的反应 未测试
+     * {
+     *   "userId": 459,
+     *   "cash": 5.6,
+     *   "providerId": 4,
+     *   "userLevel": 2
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_cash:add')")
+    @PostMapping( "/userCashReq")
+    @ResponseBody
+    @ApiOperation(value = "seg用户提现请求", notes = "需要鉴权")
+    public AjaxResult userCashReq(@RequestBody SegchkUserCashOpsReq segchkUserCashOpsReq, HttpServletRequest request)
+    {
+        Claims claims = getLoing(request);
+        if(StringUtils.isEmpty(segchkUserCashOpsReq.getRemark())){
+
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkUserCashOpsReq.setUserId(claims.getUserId());
+            segchkUserCashOpsReq.setProviderId(claims.getProviderId());
+            segchkUserCashOpsReq.setUserLevel(claims.getUserLevel());
+        }
+        else {
+            claims = new Claims();
+            claims.setUserLevel(segchkUserCashOpsReq.getUserLevel());
+            claims.setUserId(segchkUserCashOpsReq.getUserId());
+            claims.setProviderId(segchkUserCashOpsReq.getProviderId());
+        }
+        logger.debug("userCashReq with: {}", segchkUserCashOpsReq.toString());
+        AjaxResult ajax = new AjaxResult();
+        if(segchkUserCashOpsReq.getUserLevel() == 0){
+            return AjaxResult.error(301, "运营商无法线上提现");
+        }
+        SegchkUserWechat segchkUserWechat = null;
+        segchkUserWechat = getSegchkUserWechat(request, segchkUserCashOpsReq.getSearchValue(), claims);
+
+        if(ObjectUtils.isEmpty(segchkUserWechat)){
+            return AjaxResult.error(500, "微信绑定失败!");
+        }
+//        segchkUserCashOpsReq.setUserLevel(2);
+        segchkUserCashOpsReq.setSearchValue(segchkUserWechat.getOpenid());
+        String ipAddr = getIpAddr(request);
+        int ret = segchkUserIndexService.getAccountForCash(segchkUserCashOpsReq, (StringUtils.isEmpty(ipAddr) ? ipAddr : ipAddr.split(",")[0].trim()));
+        switch (ret){
+            case -1: return AjaxResult.error(401, "无余额信息");
+            case -2: return AjaxResult.error(402, "无余额信息");
+            case -3: return AjaxResult.error(403, "提现受限");
+            case -4: return AjaxResult.error(404, "余额不足");
+            case -5:
+            case -8:
+            case -11:
+            case -12:
+            case -9: return AjaxResult.error(405, "提现异常，请联系平台客服");
+            case -10: return AjaxResult.error(410, "微信未绑定");
+            case 1: {
+                return AjaxResult.error(200, "提现成功");
+            }
+            default: ajax.put(CODE_TAG, "500");ajax.put(MSG_TAG, "未知错误");break;
+        }
+        return ajax;
+    }
+
+    /**
+     * 设置用户信息 未测试
+     * {
+     *   "userId": 43,//*
+     *   "passwd": "sfsdfds",//*
+     *   "providerId": 2,//*
+     *   "userLevel": 2//*
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_set:add')")
+//    @Log(title = "seg设置用户信息", businessType = BusinessType.UPDATE)
+    @PostMapping( "/SetInfo")
+    @ResponseBody
+    @ApiOperation(value = "seg设置用户信息", notes = "需要鉴权")
+    public AjaxResult SetInfo(@RequestBody SegchkUserSetInfoReq segchkUserSetInfoReq, HttpServletRequest request)
+    {
+
+        if(StringUtils.isEmpty(segchkUserSetInfoReq.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkUserSetInfoReq.setUserId(claims.getUserId());
+            segchkUserSetInfoReq.setProviderId(claims.getProviderId());
+            segchkUserSetInfoReq.setUserLevel(claims.getUserLevel());
+        }
+        logger.debug("SetInfo with: {}", segchkUserSetInfoReq.toString());
+        int ret = 0;
+        if(segchkUserSetInfoReq.getUserLevel() == 2) {
+            ret = segchkUserIndexService.updateUserInfo(segchkUserSetInfoReq);
+        }
+        else if(segchkUserSetInfoReq.getUserLevel() == 1){
+            ret = segchkStoreIndexService.updateUserInfo(segchkUserSetInfoReq);
+        }
+        return toAjax(ret);
+    }
+
+
+    /**
+     * seg设置用户实名信息 未测试
+     * {
+     *   "userName": "demoData",
+     *   "userId": 0,
+     *   "providerId": 0,
+     *   "IDcard": "demoData",
+     *   "card1": "demoData",
+     *   "card2": "demoData"
+     * }
+     */
+//    @PreAuthorize("@ss.hasPermi('segchk:user_certicify:add')")
+//    @Log(title = "seg设置用户实名信息", businessType = BusinessType.UPDATE)
+    @PostMapping( "/userCerticify")
+    @ResponseBody
+    @ApiOperation(value = "seg设置用户实名信息", notes = "需要鉴权")
+    public AjaxResult user_certicify(@RequestBody SegchkUserCertificationInfo segchkUserCertificationInfo, HttpServletRequest request)
+    {
+        int ret = 0;
+
+        if(StringUtils.isEmpty(segchkUserCertificationInfo.getRemark())){
+            Claims claims = getLoing(request);
+            if (ObjectUtils.isEmpty(claims)) {
+//            如果用户未登录，则要求用户使用手机号登录注册
+                return LoginRequireAjax();
+            }
+            segchkUserCertificationInfo.setUserId(claims.getUserId());
+            segchkUserCertificationInfo.setProviderId(claims.getProviderId());
+//            segchkUserCertificationInfo.setUserLevel(claims.getUserLevel());
+        }
+        logger.debug("user_certicify with: {}", segchkUserCertificationInfo.toString());
+        ret = segchkUserIndexService.userCerticify(segchkUserCertificationInfo);
+        return toAjax(ret);
+    }
+
+
+    /**
+     * 提现结果回调接口，接口微信的支付结果，更新充值结果, ret 0成功，其他失败
+     * {
+     *   "chargeId": "45435",
+     *   "userLevel": "1/2/0",
+     *   "ret": 1
+     * }
+     */
+//    @Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
+    @PostMapping( "/userCashResult")
+    @ResponseBody
+    @ApiOperation(value = "seg提现结果回调", notes = "需要鉴权")
+    public void userCashResult(String chargeId, int userLevel, int ret, HttpServletRequest request)
+    {
+        if(userLevel == 1) {
+            segchkStoreIndexService.cashRet(chargeId, ret);
+        }
+        else if(userLevel == 2){
+            segchkUserIndexService.cashRet(chargeId, ret);
+        }
+    }
+
+//    返回注册登录提示
+    private AjaxResult LoginRequireAjax() {
+        return AjaxResult.error(300, "请先登录注册");
+    }
+
+    private TableDataInfo LoginRequireTableInfo() {
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setCode(300);
+        tableDataInfo.setMsg("请先登录注册");
+        return tableDataInfo;
+    }
+
+//    获取登录信息
+    private Claims getLoing(HttpServletRequest request){
+        String token = null;
+        try {
+            token = getToken(request);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+        Claims claims = getClaims(token);
+        if(!ObjectUtils.isEmpty(claims)){
+            if(loginexpire == -1){
+                redisService.setCacheObject(token, claims);
+            }
+            else {
+                redisService.setCacheObject(token, claims, loginexpire, TimeUnit.HOURS);
+            }
+        }
+        return claims;
+    }
+
+    /**
+     * 获取小程序凭证实体
+     *
+     * @param token token
+     * @return 小程序凭证实体
+     */
+    private Claims getClaims(String token) {
+
+        Object claims = redisService.getCacheObject(token);
+        logger.debug("getClaims---token:{} Claims:{}", token, claims);
+        return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
+    }
+
+    private SegchkUserWechat getSegchkUserWechat(HttpServletRequest request, String code, Claims claims) {
+        String token = getToken(request);
+        StringBuilder sb = new StringBuilder(CommonConstant.APPLET_BIND_OPENID).append("-").append(token);
+//        SegchkUserWechat segchkUserWechat = redisService.getCacheObject(sb.toString());
+        SegchkUserWechat segchkUserWechat = weChatCustomerLinkService.getSegchkUserWechat(claims, sb.toString());
+//        暂时未解决重复获取openid问题
+//        segchkUserWechat = null;
+        if(ObjectUtils.isEmpty(segchkUserWechat) || ObjectUtils.isEmpty(segchkUserWechat.getOpenid())){
+//            redis没有用户微信openid时，重新获取
+            segchkUserWechat = new SegchkUserWechat();
+            WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+            WechatSetting wechatSetting = new WechatSetting();
+            wechatSetting.setAppId(wechatAppletPaySet.getAppId());
+            wechatSetting.setAppSecret(wechatAppletPaySet.getAppSecret());
+            if (!wechatSetting.checkAppletOAuthParams()) {
+                logger.error("getLoginInfo fail:checkAppletOAuthParams fail");
+                return null;
+            }
+            WeChatAppletLoginResponse weChatAppletLoginResponse = WeChatAppletUtils.getLoginInfo(code, wechatSetting);
+            if (Objects.isNull(weChatAppletLoginResponse)) {
+                logger.error("getLoginInfo fail: getLoginInfo fail");
+                return null;
+            }
+            segchkUserWechat.setOpenid(weChatAppletLoginResponse.getOpenid());
+            segchkUserWechat.setUnionId(weChatAppletLoginResponse.getUnionid());
+//            redisService.setCacheObject(sb.toString(), segchkUserWechat, 7200, TimeUnit.SECONDS);
+            segchkUserWechat.setUserId(claims.getUserId());
+            segchkUserWechat.setProviderId(claims.getProviderId());
+            int ret = weChatCustomerLinkService.addSegchkUserWechat(segchkUserWechat, String.valueOf(claims.getUserLevel()), sb.toString());
+            if(ret < 1){
+                logger.error("addSegchkUserWechat failed with ({}) --- ({})", segchkUserWechat.toString(), claims);
+            }
+            logger.debug("getSegchkUserWechat update user wechat with ({})---({})", segchkUserWechat.toString(), claims);
+        }
+        logger.debug("getSegchkUserWechat get res ({})", ObjectUtils.isEmpty(segchkUserWechat) ? null : segchkUserWechat.toString());
+        return ObjectUtils.isEmpty(segchkUserWechat) ? null : (SegchkUserWechat) segchkUserWechat;
+
+
+    }
+    /**
+     * 获取token
+     *
+     * @param request request
+     * @return token
+     */
+    private String getToken(HttpServletRequest request) {
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
+            logger.info("getClaims fail :Authorization fail ");
+            throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
+        }
+        return authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
+    }
+
+    /**
+     * 回传信息
+     *
+     * @param message 信息
+     */
+    private void sendMessage(HttpServletResponse response, String message) {
+        logger.debug("sendMessage with: {}", message);
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println(message);
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            out.close();
+        }
+
+    }
+
+    private static class RemoveIds extends BaseEntity {
+        private Long userId;
+        private String ids;
+
+        public Long getUserId() {
+            return userId;
+        }
+
+        public void setUserId(Long userId) {
+            this.userId = userId;
+        }
+
+        public String getIds() {
+            return ids;
+        }
+
+        public void setIds(String ids) {
+            this.ids = ids;
+        }
+    }
+
+    /**
+     * 创建二维码图片
+     *
+     * @param url    链接地址
+     * @param width  宽
+     * @param height 高
+     */
+    private void createQRImg(HttpServletResponse response, String url, Integer width, Integer height) {
+        logger.debug("createQRImg with: {}---w:{}---h:{}", url, width, height);
+        OutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, qrPath, posterPath);
+            logger.debug("createQRImg qrPath: {}, posterPath: {}", qrPath, posterPath);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/util/CommonController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/CommonController.java
new file mode 100644
index 0000000..21fe1d9
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/CommonController.java
@@ -0,0 +1,158 @@
+package com.ruoyi.util;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 通用请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/default/common")
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求
+     */
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        if(file == null) {
+            log.warn("upload file is null!!!");
+            return AjaxResult.error(500, "文件为空！");
+        }
+        try
+        {
+            log.debug("upload with: {}", file.getOriginalFilename());
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 上传用户身份证照片
+     */
+    @PostMapping("/user_cert")
+    public AjaxResult userCert(MultipartFile file) throws Exception
+    {
+        if(file == null) {
+            log.warn("upload file is null!!!");
+            return AjaxResult.error(500, "文件为空！");
+        }
+        try
+        {
+            log.debug("upload userCert with: {}", file.getOriginalFilename());
+            // 上传文件路径
+            String filePath = RuoYiConfig.getProfile() + "/user_cert";
+            // 上传并返回新文件名称
+
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/util/HtmlController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/HtmlController.java
new file mode 100644
index 0000000..38d0773
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/HtmlController.java
@@ -0,0 +1,90 @@
+package com.ruoyi.util;
+
+
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.segchk.service.ISegchkSystemSettingService;
+import com.ruoyi.setting.service.BaseInfoSetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by 魔金商城 on 17/7/14.
+ * 生成html的控制器
+ */
+@Api(description = "生成html接口")
+@Controller
+@RequestMapping("/default/html")
+public class HtmlController {
+
+
+    /**
+     * 协议模版
+     */
+    private static final String PROTOCOL_TEMPLATE = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title></title><style>p { line-height:1.4!important } h3,h4,h5 { font-size:16px!important }</style></head><body>template</body></html>";
+
+
+    /**
+     * 注入基本信息服务接口
+     */
+//    @Autowired
+//    private BaseInfoSetService baseInfoSetService;
+
+    @Autowired
+    private ISegchkSystemSettingService segchkSystemSettingService;
+
+    /**
+     * 获取注册协议
+     *
+     * @throws Exception 异常
+     */
+    @ApiOperation(value = "获取注册协议", notes = "获取注册协议（不需要认证）")
+    @RequestMapping(value = "/registerProtocol", method = RequestMethod.GET)
+    @UnAuth
+    public void register_protocol(HttpServletResponse response) throws Exception {
+        response.setContentType("text/html; charset=UTF-8");
+        response.getWriter().print(createHtml(PROTOCOL_TEMPLATE, segchkSystemSettingService.queryBaseInfoSet().getSiteRegisterProtocol()));
+    }
+
+    /**
+     * 获取隐私协议
+     *
+     * @throws Exception 异常
+     */
+    @ApiOperation(value = "获取隐私协议", notes = "获取隐私协议（不需要认证）")
+    @RequestMapping(value = "/userPrivacyAgreement", method = RequestMethod.GET)
+    @UnAuth
+    public void user_privacy_agreement(HttpServletResponse response) throws Exception {
+        response.setContentType("text/html; charset=UTF-8");
+        response.getWriter().print(createHtml(PROTOCOL_TEMPLATE, segchkSystemSettingService.queryBaseInfoSet().getUserPrivacyAgreement()));
+    }
+
+
+    /**
+     * 获取会员服务协议
+     *
+     * @throws Exception 异常
+     */
+    @ApiOperation(value = "获取会员服务协议", notes = "获取会员服务协议（不需要认证）")
+    @RequestMapping(value = "/vipServiceAgreement", method = RequestMethod.GET)
+    @UnAuth
+    public void vip_service_agreement(HttpServletResponse response) throws Exception {
+        response.setContentType("text/html; charset=UTF-8");
+        response.getWriter().print(createHtml(PROTOCOL_TEMPLATE, segchkSystemSettingService.queryBaseInfoSet().getVipServiceAgreement()));
+    }
+
+    /**
+     * 生成html
+     *
+     * @param html 要替换的内容
+     * @return 返回html
+     */
+    private String createHtml(String template, String html) {
+        return template.replaceAll("template", html);
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/util/IndexController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/IndexController.java
new file mode 100644
index 0000000..dcb9fa9
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/IndexController.java
@@ -0,0 +1,33 @@
+package com.ruoyi.util;
+
+import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class IndexController extends BaseController {
+
+    @Value("${segchk.wxchecktxt:#{null}}")
+    private String wxchecktxt;
+
+    @RequestMapping("PwPaX4PqzG.txt")
+    public String wxPrivateKey(){
+        //直接返回你下载的授权文件里的内容就好
+        logger.debug("wxPrivateKey with: {}", wxchecktxt);
+        return wxchecktxt;
+    }
+
+    @RequestMapping("/default/PwPaX4PqzG.txt")
+    public String defaultwxPrivateKey(){
+        //直接返回你下载的授权文件里的内容就好
+        logger.debug("wxPrivateKey with: {}", wxchecktxt);
+        return wxchecktxt;
+    }
+
+    @GetMapping("getWxAccessToken")
+    public String getWxAccessToken(){
+        return null;
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/java/com/ruoyi/util/QrCodeController.java b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/QrCodeController.java
new file mode 100644
index 0000000..528ce25
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/java/com/ruoyi/util/QrCodeController.java
@@ -0,0 +1,118 @@
+package com.ruoyi.util;
+
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.UnAuth;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.login.SegChkLoginController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * 二维码控制器
+ *
+ * @author 魔金商城 created on 2020/6/23
+ */
+@Controller
+@Api(description = "二维码接口")
+public class QrCodeController {
+
+    private static final Logger logger = LoggerFactory.getLogger(QrCodeController.class);
+
+    @Value("${segchk.qr_path}")
+    private String qrPath;
+
+    @Value("${segchk.poster_path}")
+    private String posterPath;
+
+    /**
+     * 创建二维码图片
+     *
+     * @param url 地址
+     * @param w   宽
+     * @param h   高
+     */
+    @RepeatSubmit
+    @RequestMapping("/createqrcode")
+    @ResponseBody
+    @UnAuth
+    @ApiIgnore
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "url", value = "地址"),
+            @ApiImplicitParam(paramType = "form", dataType = "Integer", name = "w", value = "宽"),
+            @ApiImplicitParam(paramType = "form", dataType = "Integer", name = "h", value = "高"),
+    })
+    public AjaxResult createQrCode(HttpServletResponse response, String url, Integer w, Integer h) {
+        createQRImg(response, url, w, h);
+        return AjaxResult.error(500,"ok");
+    }
+
+
+    @PostMapping("qRCode")
+    public void qRCode(HttpServletResponse response, String savePath) {
+
+        try {
+            PosterUtils.createPoster("标题", "recm=1&recV=2", "100.0", null, qrPath, savePath, "/pages/dfsdf");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取生成海报的图片路径
+//        qRCodeNew(storeId, response);
+    }
+
+    /*private void qRCodeNew(String storeId, HttpServletResponse response) {
+        OutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            QRCodeUtils.qRCode(storeId, "jpg", qrPath, posterPath, outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }*/
+
+    /**
+     * 创建二维码图片
+     *
+     * @param url    链接地址
+     * @param width  宽
+     * @param height 高
+     */
+    private void createQRImg(HttpServletResponse response, String url, Integer width, Integer height) {
+        OutputStream outputStream = null;
+        try {
+            logger.debug("createQRImg qrPath: {}, posterPath: {}", qrPath, posterPath);
+            outputStream = response.getOutputStream();
+            QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, qrPath, posterPath);
+
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+}
diff --git a/ruoyi-segchk-web/src/main/resources/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/application-dev.yml b/ruoyi-segchk-web/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..7288d34
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/application-dev.yml
@@ -0,0 +1,156 @@
+# 项目相关配置 商城端
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.0.0
+  # 版权年份
+  copyrightYear: 2019
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
+  #，Linux配置 /root/yzychk_vue/uploadPath）
+  profile: F:\ideaproj\RuoYi-Vue\uploadPath\applet
+  # 获取ip地址开关
+  addressEnabled: false
+
+server:
+  # 服务器的HTTP端口，默认为 8091  测试 9092
+  port: 8091
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+
+# 数据源配置
+spring:
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://192.168.2.30:8306/segchksaas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: kaletest_yinzy
+        password: XMG2-Rel.2
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username:
+        login-password:
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 192.168.2.40
+    # 端口，默认为6379
+    port: 63795
+    # 数据库索引
+    database: 3
+    # 密码
+    password: seg_123456
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+yzytest:
+  login:
+    smshost: http://api.ksd106.com:8088/SMSSend.aspx
+    smssign:
+    smstest: true
+    smsplatid: 3
+#    登录超时时长，单位天, -1永久有效
+    loginexpire: 8
+
+segchk:
+  #  提现额度
+  cash:
+    #    商户提现额度
+    store_threshold: 300.0
+    #    用户提现额度
+    user_threshold: 10.0
+    sandbox: 1
+  default_district: 140100
+  recommendstore:
+    distince: 50
+  qr_path: C:\Users\Public\Desktop\dome.jpg
+  poster_path: F:\ideaproj\RuoYi-Vue\ruoyi-segchk\src\main\resources\templates\posters\bg.jpg
+#  核消二维码保存路径，测试使用。正常不打开
+  check_qr_path: C:\Users\Public\Desktop\checkqr.jpg
+#  核消二维码背景路径，可有，可无
+#  check_poster_path: F:\ideaproj\RuoYi-Vue\ruoyi-segchk\src\main\resources\templates\posters\bg.jpg
+
+  chkurl: '127.0.0.1:8091/default/store/ServiceCheckTest?likegoId=%s&storeId=%s'
+  chk_height: 350
+  chk_weight: 350
+  wxchecktxt: 1bc40f067f30d2f520200d504238a620
+
+  share:
+    title: 卡乐分享
+    desc: 卡乐svip无限享受
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/application-prod.yml b/ruoyi-segchk-web/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..84ca494
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/application-prod.yml
@@ -0,0 +1,159 @@
+# 项目相关配置 商城端
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.0.0
+  # 版权年份
+  copyrightYear: 2019
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
+  #，Linux配置 /root/yzychk_vue/uploadPath）
+  profile: /home/seg_yinzy/data/applet
+  # 获取ip地址开关
+  addressEnabled: false
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为 8091  测试 9092
+  port: 9092
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://192.168.2.30:8306/segchksaas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: segchksaas
+        password: 2wsx@WSX
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username:
+        login-password:
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+    # redis 配置
+  redis:
+    # 地址
+    host: 192.168.2.40
+    # 端口，默认为6379
+    port: 63795
+    # 数据库索引
+    database: 2
+    # 密码
+    password: seg_123456
+    # 连接超时时间
+    timeout: 1000
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 8
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 2
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 300
+
+
+yzytest:
+  login:
+    smshost: http://api.ksd106.com:8088/SMSSend.aspx
+    smssign:
+    smstest: false
+    smsplatid: 3
+    #    登录超时时长，单位天, -1永久有效
+    loginexpire: 8
+
+segchk:
+  #  提现额度
+  cash:
+    #    商户提现额度
+    store_threshold: 300.0
+    #    用户提现额度
+    user_threshold: 10.0
+    sandbox: 1
+  default_district: 410100
+  recommendstore:
+    distince: 50
+  qr_path: /home/seg_yinzy/data/applet/poster/dome.jpg
+  poster_path: /home/seg_yinzy/data/applet/poster/bg1.jpg
+  #  核消二维码保存路径，测试使用。正常不打开
+  check_qr_path: /home/seg_yinzy/data/applet/poster/checkqr.jpg
+  #  核消二维码背景路径，可有，可无
+  #  check_poster_path: /home/segchk/data/resources/check/poster/bg1.jpg
+
+
+  chkurl: '/default/store/ServiceCheckTest?likegoId=%s&storeId=%s'
+  chk_height: 400
+  chk_weight: 400
+
+
+
+  #  商户推广二维码
+  store_qr_path: /home/seg_yinzy/data/applet/poster/storeqr
+  #  商户推广二维码背景路径，可有，可无
+  store_poster_path: /home/seg_yinzy/data/applet/poster/bg1.jpg
+
+  sto_height: 350
+  sto_weight: 350
+  storeurl: 'https://kale.segsvip.com/prod-wechat/default/store/storerecommend?recC=%s&recV=%s'
+  wxchecktxt: 1bc40f067f30d2f520200d504238a620
+
+  share:
+    title: 卡乐分享
+    desc: 卡乐svip无限享受
diff --git a/ruoyi-segchk-web/src/main/resources/application-test.yml b/ruoyi-segchk-web/src/main/resources/application-test.yml
new file mode 100644
index 0000000..da8389c
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/application-test.yml
@@ -0,0 +1,158 @@
+# 项目相关配置 商城端
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.0.0
+  # 版权年份
+  copyrightYear: 2019
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
+  #，Linux配置 /root/yzychk_vue/uploadPath）
+  profile: /home/seg_yinzy/data/applet
+  # 获取ip地址开关
+  addressEnabled: false
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为 8091  测试 9092
+  port: 9192
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://192.168.2.30:8306/kaletest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: segchksaas
+        password: 2wsx@WSX
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username:
+        login-password:
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+    # redis 配置
+  redis:
+    # 地址
+    host: 192.168.2.40
+    # 端口，默认为6379
+    port: 63795
+    # 数据库索引
+    database: 2
+    # 密码
+    password: seg_123456
+    # 连接超时时间
+    timeout: 1000
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 8
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 2
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 300
+
+
+yzytest:
+  login:
+    smshost: http://api.ksd106.com:8088/SMSSend.aspx
+    smssign:
+    smstest: true
+    smsplatid: 3
+#    登录超时时长，单位天, -1永久有效
+    loginexpire: 8
+
+segchk:
+#  提现额度
+  cash:
+#    商户提现额度
+    store_threshold: 300.0
+#    用户提现额度
+    user_threshold: 10.0
+  default_district: 410100
+  recommendstore:
+    distince: 50
+  qr_path: /home/seg_yinzy/data/applet/poster/dome.jpg
+  poster_path: /home/seg_yinzy/data/applet/poster/bg1.jpg
+  #  核消二维码保存路径，测试使用。正常不打开
+  check_qr_path: /home/seg_yinzy/data/applet/poster/checkqr.jpg
+  #  核消二维码背景路径，可有，可无
+#  check_poster_path: /home/segchk/data/resources/check/poster/bg1.jpg
+
+
+  chkurl: '/default/store/ServiceCheckTest?likegoId=%s&storeId=%s'
+  chk_height: 400
+  chk_weight: 400
+
+
+
+  #  商户推广二维码
+  store_qr_path: /home/seg_yinzy/data/applet/poster/storeqr
+  #  商户推广二维码背景路径，可有，可无
+  store_poster_path: /home/seg_yinzy/data/applet/poster/bg1.jpg
+
+  sto_height: 350
+  sto_weight: 350
+  storeurl: 'https://kaletest.segsvip.com/prod-wechat/default/store/storerecommend?recC=%s&recV=%s'
+  wxchecktxt: 1bc40f067f30d2f520200d504238a620
+
+  share:
+    title: 卡乐分享
+    desc: 卡乐svip无限享受
diff --git a/ruoyi-segchk-web/src/main/resources/application-uat.yml b/ruoyi-segchk-web/src/main/resources/application-uat.yml
new file mode 100644
index 0000000..46af5b0
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/application-uat.yml
@@ -0,0 +1,71 @@
+#配置数据源
+spring:
+  datasource:
+    druid:
+      master:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.jdbc.Driver
+        url: jdbc:mysql://172.22.4.2:3306/wsfmall_uat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
+        username: root
+        password: oywkpjEi9MW4NL9mR88YTydj9wHE5E
+        # 初始化连接大小
+        initial-size: 5
+        # 最小空闲连接数
+        min-idle: 5
+        max-active: 20
+        max-wait: 30000
+        # 可关闭的空闲连接间隔时间
+        time-between-eviction-runs-millis: 60000
+        # 配置连接在池中的最小生存时间
+        min-evictable-idle-time-millis: 300000
+        validation-query: select '1' from dual
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        pool-prepared-statements: true
+        max-open-prepared-statements: 20
+        max-pool-prepared-statement-per-connection-size: 20
+      slave1:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.jdbc.Driver
+        url: jdbc:mysql://172.22.4.2:3306/wsfmall_uat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
+        username: root
+        password: oywkpjEi9MW4NL9mR88YTydj9wHE5E
+        # 初始化连接大小
+        initial-size: 5
+        # 最小空闲连接数
+        min-idle: 5
+        max-active: 20
+        max-wait: 30000
+        # 可关闭的空闲连接间隔时间
+        time-between-eviction-runs-millis: 60000
+        # 配置连接在池中的最小生存时间
+        min-evictable-idle-time-millis: 300000
+        validation-query: select '1' from dual
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        pool-prepared-statements: true
+        max-open-prepared-statements: 20
+        max-pool-prepared-statement-per-connection-size: 20
+  redis:
+    host: 172.22.0.4
+    port: 6379
+    timeout: 100
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 2
+        max-wait: 300
+    password: sfakjfiju99jjf87LJSDDU8
+  data:
+    elasticsearch:
+      cluster-nodes: 172.22.0.4:9300
+  messages:
+    basename: messages/messages
+  servlet:
+    multipart:
+      max-file-size: 15MB
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/application.yml b/ruoyi-segchk-web/src/main/resources/application.yml
new file mode 100644
index 0000000..50dc9d1
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/application.yml
@@ -0,0 +1,121 @@
+# 项目相关配置 商城端
+#ruoyi:
+#  # 名称
+#  name: RuoYi
+#  # 版本
+#  version: 3.0.0
+#  # 版权年份
+#  copyrightYear: 2019
+#  # 实例演示开关
+#  demoEnabled: true
+#  # 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
+#  #，Linux配置 /root/yzychk_vue/uploadPath）
+#  profile: F:\ideaproj\RuoYi-Vue\uploadPath
+#  # 获取ip地址开关
+#  addressEnabled: false
+
+# 开发环境配置
+#server:
+#  # 服务器的HTTP端口，默认为 8091  测试 9092
+#  port: 8091
+#  servlet:
+#    # 应用的访问路径
+#    context-path: /
+#  tomcat:
+#    # tomcat的URI编码
+#    uri-encoding: UTF-8
+#    # tomcat最大线程数，默认为200
+#    max-threads: 800
+#    # Tomcat启动初始化的线程数，默认值25
+#    min-spare-threads: 30
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: warn
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: kaleprod
+#  # 文件上传
+#  servlet:
+#    multipart:
+#      # 单个文件大小
+#      max-file-size:  10MB
+#      # 设置总上传的文件大小
+#      max-request-size:  20MB
+#  # 服务模块
+#  devtools:
+#    restart:
+#      # 热部署开关
+#      enabled: true
+#  # redis 配置
+#  redis:
+#    # 地址
+#    host: 10.1.192.113
+#    # 端口，默认为6379
+#    port: 63795
+#    # 数据库索引
+#    database: 0
+#    # 密码
+#    password: retinabd@2020
+#    # 连接超时时间
+#    timeout: 10s
+#    lettuce:
+#      pool:
+#        # 连接池中的最小空闲连接
+#        min-idle: 0
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池的最大数据库连接数
+#        max-active: 8
+#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1ms
+
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 3000
+
+# MyBatis配置
+mybatis:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice/*
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
diff --git a/ruoyi-segchk-web/src/main/resources/http-client.private.env.json b/ruoyi-segchk-web/src/main/resources/http-client.private.env.json
new file mode 100644
index 0000000..542be06
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/http-client.private.env.json
@@ -0,0 +1,60 @@
+{
+  "dev": {
+    "name": "value",
+    "host": "http://localhost:8091",
+    "bindtoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0tDCwtLDQUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVhNTC4taAAAAAP__.diChD7JjY3y8SBNTBE8ACoNWWIuz-r-mHESPfL73eZI",
+    "bindtoken1": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzYyNDQwNDLVUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVmNzI9NaAAAAAP__.Y5uJzL55q9baNor4ScWmVg9UZyfHkTxZ0Oz79guiXXg",
+//    "token2": "APPLET_LOGIN_KEY_885553054366171136abcdefghijklmnopqrstuvwxyz",
+    "token3": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUipPTc5ILMnJT8_MU9JRykwsUbIyNDM2NDQ3sDAx0VEqLU4t8kxRsjLWUSooyi_LTIFwjSAyPqllqTlgXmpFAUyjCRDUAgAAAP__.5qRMCYs8YUoFJdSo_XSZiGlqJ13LGa20qJAT8GoiMHg",
+    "providertoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0MjC1MDTWUSotTi3yTFGyMtJRKijKL8tMgXNBMj6pZak5SlYGOkqpFQUwjZYmhsa1AAAAAP__.DkyBrM5f7G0eLi7DnYpgAqGTYnLaWRrpD3xemTa1s3k",
+    "store_search":
+    {
+      "providerId": 2,
+      "sortType": 0,
+      "storeName": "99",
+      "lableName": "99",
+      "typeId": 1,
+      "userLon": 114.123456,
+      "userLat": 43.123456
+    }
+  },
+  "prod-test": {
+    "name": "value",
+    "host": "https://kaletest.segsvip.com/prod-wechat",
+    "bindtoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0tDCwtLDQUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVhNTC4taAAAAAP__.diChD7JjY3y8SBNTBE8ACoNWWIuz-r-mHESPfL73eZI",
+    "bindtoken1": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzYyNDQwNDLVUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVmNzI9NaAAAAAP__.Y5uJzL55q9baNor4ScWmVg9UZyfHkTxZ0Oz79guiXXg",
+//    "token2": "APPLET_LOGIN_KEY_885553054366171136abcdefghijklmnopqrstuvwxyz",
+    "token3": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUipPTc5ILMnJT8_MU9JRykwsUbIyNDM2NDQ3sDAx0VEqLU4t8kxRsjLWUSooyi_LTIFwjSAyPqllqTlgXmpFAUyjCRDUAgAAAP__.5qRMCYs8YUoFJdSo_XSZiGlqJ13LGa20qJAT8GoiMHg",
+    "providertoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0MjC1MDTWUSotTi3yTFGyMtJRKijKL8tMgXNBMj6pZak5SlYGOkqpFQUwjZYmhsa1AAAAAP__.DkyBrM5f7G0eLi7DnYpgAqGTYnLaWRrpD3xemTa1s3k",
+    "store_search":
+    {
+      "providerId": 2,
+      "sortType": 0,
+      "storeName": "99",
+      "lableName": "99",
+      "typeId": 1,
+      "userLon": 114.123456,
+      "userLat": 43.123456
+    }
+  },
+  "prod": {
+    "name": "value",
+    "host": "https://kale.segsvip.com/prod-wechat",
+    "hostbak": "https://kale.segsvip.com/prod-api",
+    "bindtoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0tDCwtLDQUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVhNTC4taAAAAAP__.diChD7JjY3y8SBNTBE8ACoNWWIuz-r-mHESPfL73eZI",
+    "bindtoken1": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzYyNDQwNDLVUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVmNzI9NaAAAAAP__.Y5uJzL55q9baNor4ScWmVg9UZyfHkTxZ0Oz79guiXXg",
+    //    "token2": "APPLET_LOGIN_KEY_885553054366171136abcdefghijklmnopqrstuvwxyz",
+    "token3": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUipPTc5ILMnJT8_MU9JRykwsUbIyNDM2NDQ3sDAx0VEqLU4t8kxRsjLWUSooyi_LTIFwjSAyPqllqTlgXmpFAUyjCRDUAgAAAP__.5qRMCYs8YUoFJdSo_XSZiGlqJ13LGa20qJAT8GoiMHg",
+    "providertoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0MjC1MDTWUSotTi3yTFGyMtJRKijKL8tMgXNBMj6pZak5SlYGOkqpFQUwjZYmhsa1AAAAAP__.DkyBrM5f7G0eLi7DnYpgAqGTYnLaWRrpD3xemTa1s3k",
+    "store_search":
+    {
+      "providerId": 2,
+      "sortType": 0,
+      "storeName": "99",
+      "lableName": "99",
+      "typeId": 1,
+      "userLon": 114.123456,
+      "userLat": 43.123456
+    }
+  }
+}
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/logback-spring.xml b/ruoyi-segchk-web/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..a3cd82a
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/logback-spring.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <!-- 应用名称-->
+    <property name="appName" value="web"/>
+    <!-- 日志的存放目录-->
+    <property name="log.path" value="/root/yzychk_vue/logs" />
+    <!-- debug-->
+    <property name="DEBUG_LOG_FILE_NAME_PATTERN" value="logs/${appName}/debug.%d{yyyy-MM-dd}.%i.log"/>
+    <property name="INFO_LOG_FILE_NAME_PATTERN" value="logs/${appName}/all.%d{yyyy-MM-dd}.%i.log"/>
+    <property name="WARN_LOG_FILE_NAME_PATTERN" value="logs/${appName}/warn.%d{yyyy-MM-dd}.%i.log"/>
+    <property name="ERROR_LOG_FILE_NAME_PATTERN" value="logs/${appName}/error.%d{yyyy-MM-dd}.%i.log"/>
+    <!-- 日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%c){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <property name="FILE_LOG_PATTERN"
+              value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %c : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <!--输出到控制台-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+
+
+    <!--输出到INFO文件-->
+    <appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${INFO_LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <!-- 日志保留天数 -->
+            <maxHistory>14</maxHistory>
+            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
+            <totalSizeCap>30GB</totalSizeCap>
+            <!-- 每个日志文件的最大值 -->
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+
+    <!--输出到ERROR文件-->
+    <appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${ERROR_LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <!-- 日志保留天数 -->
+            <maxHistory>30</maxHistory>
+            <!-- 日志文件上限大小，达到指定大小后删除旧的日志文件 -->
+            <totalSizeCap>1GB</totalSizeCap>
+            <!-- 每个日志文件的最大值 -->
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <!-- 此日志文件只记录error级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>error</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- region 根据不同的环境设置不同的日志输出级别 -->
+    <springProfile name="default,local,dev">
+        <root level="info">
+            <appender-ref ref="console"/>
+        </root>
+        <logger name="com.lecshop" level="debug"/>
+    </springProfile>
+
+    <springProfile name="prod,dev,test,uat">
+        <root level="info">
+            <appender-ref ref="console"/>
+            <appender-ref ref="info_file"/>
+            <appender-ref ref="error_file"/>
+        </root>
+        <logger name="com.lecshop" level="debug"/>
+    </springProfile>
+    <!-- endregion -->
+
+</configuration>
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/messages/messages.properties b/ruoyi-segchk-web/src/main/resources/messages/messages.properties
new file mode 100644
index 0000000..e9a2292
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/messages/messages.properties
@@ -0,0 +1,6 @@
+####################################
+##       \u7ED3\u679C\u7801\u4FE1\u606F\u5B9A\u4E49             ##
+#####################################
+R-00002=\u5C0F\u7A0B\u5E8F\u672A\u6388\u6743
+R-00003=\u5C0F\u7A0B\u5E8F\u672A\u548C\u7528\u6237\u7ED1\u5B9A
+R-00004=\u7528\u6237\u7ED1\u5B9A\u5931\u8D25\uFF0C\u5DF2\u7ED1\u5B9A\u5176\u4ED6\u8D26\u6237
diff --git a/ruoyi-segchk-web/src/main/resources/messages/messages_en_US.properties b/ruoyi-segchk-web/src/main/resources/messages/messages_en_US.properties
new file mode 100644
index 0000000..2d0dda9
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/messages/messages_en_US.properties
@@ -0,0 +1,5 @@
+####################################
+##       \u7ED3\u679C\u7801\u4FE1\u606F\u5B9A\u4E49             ##
+#####################################
+R-00002=\u5C0F\u7A0B\u5E8F\u672A\u6388\u6743
+R-00003=\u5C0F\u7A0B\u5E8F\u672A\u548C\u7528\u6237\u7ED1\u5B9A
diff --git a/ruoyi-segchk-web/src/main/resources/messages/messages_zh_CN.properties b/ruoyi-segchk-web/src/main/resources/messages/messages_zh_CN.properties
new file mode 100644
index 0000000..2d0dda9
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/messages/messages_zh_CN.properties
@@ -0,0 +1,5 @@
+####################################
+##       \u7ED3\u679C\u7801\u4FE1\u606F\u5B9A\u4E49             ##
+#####################################
+R-00002=\u5C0F\u7A0B\u5E8F\u672A\u6388\u6743
+R-00003=\u5C0F\u7A0B\u5E8F\u672A\u548C\u7528\u6237\u7ED1\u5B9A
diff --git a/ruoyi-segchk-web/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-segchk-web/src/main/resources/mybatis/mybatis-config.xml
new file mode 100644
index 0000000..5500599
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/mybatis/mybatis-config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+
+    <settings>
+        <setting name="cacheEnabled" value="true"/>  <!-- 全局映射器启用缓存 -->
+        <setting name="useGeneratedKeys" value="true"/>  <!-- 允许 JDBC 支持自动生成主键 -->
+        <setting name="defaultExecutorType" value="REUSE"/> <!-- 配置默认的执行器 -->
+        <setting name="logImpl" value="SLF4J"/> <!-- 指定 MyBatis 所用日志的具体实现 -->
+        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
+    </settings>
+
+</configuration>
diff --git a/ruoyi-segchk-web/src/main/resources/static/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/common/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/common/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/common/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/index/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/index/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/index/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/provider/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/provider/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/provider/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/store/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/store/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/store/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/default/user/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/default/user/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/default/user/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/static/img/bg.jpg b/ruoyi-segchk-web/src/main/resources/static/img/bg.jpg
new file mode 100644
index 0000000..aaadb86
Binary files /dev/null and b/ruoyi-segchk-web/src/main/resources/static/img/bg.jpg differ
diff --git a/ruoyi-segchk-web/src/main/resources/static/img/checkret1.png b/ruoyi-segchk-web/src/main/resources/static/img/checkret1.png
new file mode 100644
index 0000000..25569f3
Binary files /dev/null and b/ruoyi-segchk-web/src/main/resources/static/img/checkret1.png differ
diff --git a/ruoyi-segchk-web/src/main/resources/static/wxpk/PwPaX4PqzG.txt b/ruoyi-segchk-web/src/main/resources/static/wxpk/PwPaX4PqzG.txt
new file mode 100644
index 0000000..436687d
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/static/wxpk/PwPaX4PqzG.txt
@@ -0,0 +1 @@
+1bc40f067f30d2f520200d504238a620
\ No newline at end of file
diff --git a/ruoyi-segchk-web/src/main/resources/templates/posters/bg.jpg b/ruoyi-segchk-web/src/main/resources/templates/posters/bg.jpg
new file mode 100644
index 0000000..aaadb86
Binary files /dev/null and b/ruoyi-segchk-web/src/main/resources/templates/posters/bg.jpg differ
diff --git a/ruoyi-segchk-web/src/main/resources/templates/posters/checkret1.png b/ruoyi-segchk-web/src/main/resources/templates/posters/checkret1.png
new file mode 100644
index 0000000..25569f3
Binary files /dev/null and b/ruoyi-segchk-web/src/main/resources/templates/posters/checkret1.png differ
diff --git a/ruoyi-segchk-web/src/main/resources/test.http b/ruoyi-segchk-web/src/main/resources/test.http
new file mode 100644
index 0000000..d506744
--- /dev/null
+++ b/ruoyi-segchk-web/src/main/resources/test.http
@@ -0,0 +1,998 @@
+PUT http://{{hostbak}}/system/user/resetadminself
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+###
+POST http://{{host}}/default/index/customService?providerId=2
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+###
+GET http://{{host}}/default/html/vipServiceAgreement
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+###
+GET http://{{host}}/default/html/userPrivacyAgreement
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+###
+GET http://{{host}}/default/html/registerProtocol
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+###
+POST {{host}}/default/index/shareInfo
+Accept: */*
+Cache-Control: no-ca
+Content-Type: application/x-www-form-urlencoded
+
+page=sss/sddd&remark=999999
+
+###
+POST {{host}}/qRCode
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/x-www-form-urlencoded
+
+savePath=C:\Users\Administrator\Pictures\test\test.jpg
+
+###
+### 测试图片上传
+POST {{host}}//default/common/upload
+Accept: */*
+Cache-Control: no-cache
+Content-Type: multipart/form-data; charset=UTF-8; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="file"; filename="checkqr.jpg"
+
+< C:\Users\Public\Desktop/checkqr.jpg
+--WebAppBoundary--
+
+###
+POST {{host}}/default/user/userLikeGoQr
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/x-www-form-urlencoded
+
+likegoId=4&remark=999999&qrw=300&qrh=500
+
+###
+POST http://api.ksd106.com:8088/SMSSend.aspx
+Content-Type: application/x-www-form-urlencoded
+
+Account=KSD8141161&Password=123456a&Mobile=18515184399&Content=测试验证码短信【河北赛格】&Extnum=&Time=*
+
+###
+POST https://segchksaas.xyz//querybaseinfoset
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{}
+
+###
+GET https://api.weixin.qq.com/sns/jscode2session?appid=wx2ce4e2083b3a871a&secret=adc865e9ab24ab23b534f9ca5c0960b3&js_code=053okall2BHyK74GMcol2S8Exc0okaln&grant_type=authorization_code
+Accept: */*
+
+###
+GET {{host}}//createqrcode?url="http://yxr8cu.natappfree.cc//tokentest?dfasdf=1+werwer=1231"&w=300&h=300
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+
+###
+############### 商家接口测试 ####################
+
+### 商家核消操作
+POST {{host}}//default/store/giveFreeCard
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 243,
+  "cardId": 242,
+  "lableId": 10,
+  "storeId": 144,
+  "typeId": 2,
+  "totalCount": 10,
+  "freeContent": "demoData",
+  "remark": "demoData"
+}
+
+### 商家核消操作
+POST {{host}}//default/store/ServiceCheckTest?likegoId=16877&storeId=128&remark=999999
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+
+### 根据用户id，运营商id，查询seg商户提现列表
+POST {{host}}//default/store/storeCashList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 84,
+  "phoneNo": "demoData",
+  "providerId": 3,
+  "remark": "999999"
+}
+
+###
+POST {{host}}/default/store/storeUserLikeGoList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "providerId": 4,
+  "storeId": 123,
+  "staticMonth": "180",
+  "remark": "999999"
+}
+
+###
+POST {{host}}//default/store/storeServiceAndSaleDetails
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "providerId": 4,
+  "storeId": 123,
+  "staticMonth": "2021-06-01",
+  "srcFlag": 0,
+  "remark": "999999"
+}
+
+### 根据商家id，运营商id，角色等级，返回核消统计或售卡统计
+POST {{host}}//default/store/storeServiceAndSaleList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "providerId": 4,
+  "storeId": 123,
+  "staticMonth": "6",
+  "srcFlag": 0,
+  "remark": "999999"
+}
+############### END ####################
+
+
+
+############### 用户接口测试 ####################
+###
+POST {{host}}//default/user/userCashReq
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken1}}
+
+{
+  "userId": 503,
+  "cash": 5,
+  "providerId": 2,
+  "userLevel": 2,
+  "remark": "999999"
+}
+
+###
+POST {{host}}//default/user/userChargeResult?chargeId=45459&ret=0
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken1}}
+
+
+### 用户充值操作
+#返回结果
+#{
+#  "msg": "充值成功",
+#  "code": 200,
+#  "data": {
+#    "flag": 1,
+#    "data": {
+#      "return_code": "SUCCESS",
+#      "return_msg": "OK",
+#      "appid": "wx2ce4e2083b3a871a",
+#      "mch_id": "1614166120",
+#      "nonce_str": "wknhqpLNvr4F6CLI",
+#      "sign": "2519A7C975E5F38B95D0EE453C1A11D2",
+#      "result_code": "SUCCESS",
+#      "err_code": null,
+#      "err_code_des": null,
+#      "trade_type": "JSAPI",
+#      "prepay_id": "wx201612191353691146536bf76294620000",
+#      "code_url": null,
+#      "mweb_url": null,
+#      "time_stamp": "1632125538",
+#      "package_": "prepay_id=wx201612191353691146536bf76294620000",
+#      "sign_type": "MD5",
+#      "pay_sign": "087F0D138F3970B5228A3456E1A5496E"
+#    }
+#  }
+#}
+POST {{host}}//default/user/userChargeReq
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken1}}
+
+{
+  "userId": 503,
+  "charge": 9.9,
+  "cardTypeId": 0,
+  "providerId": 2,
+  "remark": 999
+}
+
+
+### 用户充值请求
+POST {{host}}//default/user/userChargePre
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken1}}
+
+{
+  "userId": 465,
+  "providerId": 4,
+  "userLevel": 2
+}
+
+### 查询seg用户消息列表
+POST {{host}}//default/user/userMsgList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 392,
+  "providerId": 4,
+  "userLevel": 2,
+  "remark": "999999",
+  "phoneNo": 1
+}
+
+### 查询seg用户提现列表
+POST {{host}}//default/user/userCashList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 34,
+  "providerId": 2,
+  "remark": "999999"
+}
+
+### 查询seg用户充值列表
+POST {{host}}//default/user/userChargeList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 34,
+  "providerId": 2,
+  "remark": "999999"
+}
+
+### seg服务评价提交
+POST {{host}}//default/user/addComment
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "starLevel": 4.5,
+  "contentText": "测试评价9343",
+  "chkServiceId": 9343
+}
+
+### seg服务评价查询
+POST {{host}}//default/user/getComment
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "commentId": 3
+}
+
+### 删除seg用户想去记录
+POST {{host}}//default/user/removeOrderUserLikego
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 245,
+  "ids": "16733"
+}
+
+### 查询seg用户收藏列表
+POST {{host}}//default/user/userLikeGOList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 245,
+  "providerId": 4,
+  "remark": "999999"
+}
+
+### 查询seg用户收藏列表 "remark": "999999"测试标识
+#{
+#  "total": 48,//用户收藏列表数量
+#  "rows": [
+#    {
+#      "collectId": 2002,//收藏id
+#      "providerId": 4,//运营商id
+#      "storeId": 134,//商家id，跳转商家详情使用
+#      "storeName": "4商家名称018",//商家名称，展示使用
+#      "storeIcon": "http://10.1.192.113:60902/profile/upload/2021/07/02/706f0a58-6031-4523-abbd-dc5dd823278c.jpg",//图标，展示使用
+#      "serviceState": 0,//在线送达
+#      "storeLon": 116.4980500000,//商家位置，导航时使用
+#      "storeLat": 39.8831020000,//商家位置，导航时使用
+#      "chkCount": 280,//核消数量
+#      "starAvg": 2.71,//综合评价，展示使用
+#      "modTime": "2021-07-16",//收藏时间，展示使用
+#      "segchkRecommenderStoreLableWebList": [//商家标签列表
+#        {
+#          "lableId": 0,//标签id
+#          "lableTypeId": 0,//一级标签id
+#          "lableName": "99",//标签名称，展示使用
+#        },
+#        {
+#          "lableId": 0,
+#          "lableTypeId": 1,
+#          "lableName": "美食",
+#        },
+#        ...
+#      ]
+#    },
+#    ...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/user/userCollectList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 439,
+  "providerId": 4,
+  "remark": "999999"
+}
+
+###
+### 查询seg用户可用会员卡列表或者优惠券列表  "userLevel": 0（查会员卡）,1（查优惠券），"remark": "999999"测试标识
+#结果说明
+#{
+#  "total": 3,//优惠券数量
+#  "rows": [
+#    {
+#      "cardName": "赠卡",//优惠券名称，展示使用
+#      "storeName": "4商家名称028",//归属商家名称，展示使用
+#      "leftCount": 49,//剩余次数，展示使用
+#      "effectiveTime": "2021-07-13",//有效期，展示使用
+#      "typeFlag": 1,//
+#      "cardStatus": "过期"//状态
+#    },
+#    ...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+#
+#{
+#  "total": 1,//卡包数量
+#  "rows": [
+#    {
+#      "cardName": "299",//会员卡名称，展示使用
+#      "storeName": null,//商家名称，展示使用，查询优惠券时有效
+#      "useCount": 31,//已使用权益次数，展示使用
+#      "leftCount": 69,//剩余权益次数，展示使用
+#      "effectiveTime": "2021-09-15",//有效期，展示使用
+#      "typeFlag": 0,//卡券标识,0会员卡，1券（或赠卡）
+#      "cardStatus": "可用"//会员卡状态。是否可用，展示使用
+#    }
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/user/userCardList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 241,
+  "providerId": 4,
+  "userLevel": 0,
+  "remark": "999999"
+}
+
+###
+### 查询seg用户核消列表
+#结果说明
+#{
+#  "total": 38,//用户核消列表数量
+#  "rows": [//用户核消列表
+#    {
+#      "providerId": 4,//运营商id
+#      "cardId": 244,//卡号或券号
+#      "storeId": 119,//商家id
+#      "cardTypeId": 0,//
+#      "userId": 245,//用户id
+#      "modTime": "2021-07-12",//核消时间，展示使用
+#      "chkServiceId": 11168,//核消id
+#      "commentId": 0,//评价id，0表示未评价，其他表示已评，展示使用
+#      "cardTypeName": "99",//卡券名称，展示使用
+#      "storeName": "4商家名称003",//商家名称，展示使用
+#      "chkSource": 0//
+#    },
+#	...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/user/storeServiceCheckList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 245,
+  "providerId": 4,
+  "remark": "999999"
+}
+
+###
+### 添加seg用户想去记录
+POST {{host}}//default/user/addOrderUserLikego
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "providerId": 4,
+  "userId": 245,
+  "storeId": 128,
+  "cardId": 244,
+  "cardType": 0,
+  "remark": "999999"
+}
+
+###
+### 查询该用户在该商户可使用的会员卡或优惠券，remark为测试标识
+#返回结果
+#{
+#  "total": 3,//可用卡券列表数量
+#  "rows": [//可用卡券列表
+#    {
+#      "providerId": 4,//运营商id
+#      "storeId": 128,//商家id
+#      "userId": 245,//用户id
+#      "cardId": 244,//卡号或券号
+#      "lableId": 0,//子标签id
+#      "typeId": 0,//一级标签id
+#      "cardName": "99会员卡"//预约下拉中展示使用
+#    },
+#    ...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+### 查询该用户在该商户可使用的会员卡或优惠券，remark为测试标识
+POST {{host}}//default/user/userOrderPredList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "providerId": 11,
+  "storeId": 196,
+  "userId": 768,
+  "remark": "999999"
+}
+
+###
+
+### 根据收藏id，删除收藏列表 ids：要删除的收藏列表id，删除多个时，使用逗号拼接
+POST {{host}}//default/user/removeUserCollect
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 0,
+  "ids": "23432,456"
+}
+
+###
+### seg用户收藏记录
+POST {{host}}//default/user/addUserCollect
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "collectType": "1",
+  "providerId": 2,
+  "userId": 8,
+  "storeId": 13,
+  "mgtState": 0,
+  "remark": "999999"
+}
+
+############### END ####################
+
+
+
+############### 运营商接口测试 ####################
+
+### 根据运营商id，返回运营商下核消统计或售卡统计详情
+#无token时返回
+#{
+#  "total": 0,
+#  "rows": null,
+#  "code": 300,
+#  "msg": "请先登录注册"
+#}
+#token用户信息不一致返回
+#{
+#  "total": 0,
+#  "rows": null,
+#  "code": 301,
+#  "msg": "用户信息异常"
+#}
+#{
+#  "total": 106,//该月份的统计
+#  "rows": [
+#    {
+#      "cardName": "99",//卡券名称，展示使用
+#      "storeName": "2商家名称001",//商家名称，展示使用
+#      "staticCount": 24//统计值
+#    },
+#	...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/provider/providerServiceAndSaleDetails
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{providertoken}}
+
+{
+  "providerId": 2,
+  "staticMonth": "2021-06-01",
+  "srcFlag": 0
+}
+
+###
+### 根据运营商id，返回运营商下所有核消统计或售卡统计
+#返回结果说明
+#{//无token时
+#  "total": 0,
+#  "rows": null,
+#  "code": 300,
+#  "msg": "请先登录注册"
+#}
+#{//token与用户标识不一致时
+#  "total": 0,
+#  "rows": null,
+#  "code": 301,
+#  "msg": "用户信息异常"
+#}
+#查询成功
+#{
+#  "total": 7,//统计月数
+#  "rows": [
+#    {
+#      "staticMonth": "202107",//具体月份，展示使用
+#      "queryMon": "2021-07-01",//具体月份，详情查询时使用
+#      "staticCount": 1062//统计值，展示使用
+#    },
+#    ...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/provider/providerServiceAndSaleList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{providertoken}}
+
+{
+  "providerId": 3,
+  "staticMonth": "10",
+  "srcFlag": 1
+}
+
+###
+GET {{host}}/register
+Accept: application/json
+Content-Type: application/json
+
+{
+  "mobile": "13000000001",
+  "code": "1234",
+  "providerId": "2"
+}
+
+### 无token登录 Authorization: Bearer {{providertoken}}使用token登录
+POST {{host}}/login
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{providertoken}}
+
+{
+  "userId": 9,
+  "providerId": 2,
+  "userLevel": 1,
+  "cardID": "11111",
+  "remark": "999999"
+}
+
+### 商家评价列表
+#返回结果说明
+#"{
+#  ""total"": 151,//该商家的评价列表
+#  ""rows"": [
+#    {
+#      ""storeId"": 130,//商家id
+#      ""starLevel"": 4,//星级评价，展示使用
+#      ""contentText"": ""content004542"",//评价内容
+#      ""modTime"": ""2021-07-05"",//评价时间，展示使用
+#      ""cardName"": ""299"",//卡券名称，展示使用
+#      ""userName"": ""nick_name40221""//用户名称，展示使用
+#    },
+#    ...
+#  ],
+#  ""code"": 200,
+#  ""msg"": ""查询成功""
+#}"
+POST {{host}}//default/index/storeCommentList
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 4,
+  "storeId": 130
+}
+
+
+
+############### END ####################
+
+
+############### 小程序展示接口测试 ####################
+
+
+###
+### 根据运营商，商户id，查询商户详情  增加后拼接参数意味着是二维码分享?recommenderId=124&recommenderLevel=1
+#返回结果说明
+#{
+#  "msg": "获取成功",//
+#  "recommenderId": "124",//推荐人id，只在在url后面带有该参数时才会返回该值
+#  "code": 200,
+#  "data": {
+#    "providerId": 4,//运营商id
+#    "storeId": 124,//商家id
+#    "storeName": "4商家名称008",//商家名称，展示使用
+#    "storePhone": "13000004008",//商家电话，展示联系时使用
+#    "serviceState": "0",//商家在线状态
+#    "salerId": 1,//对应销售id
+#    "storeAddr": "4商家名称008商家地址'",//商家地址，展示导航时使用
+#    "storeLon": 116.6160200000,//商家位置，导航时使用
+#    "storeLat": 39.8341900000,//商家位置，导航时使用
+#    "onService": "2商家名称001商家地址",//商家营业信息，展示使用
+#    "detail": "<p><b>详情1</b></p><p>dsfasdfsadfasdf</p><p><img src=\"http://localhost:9092/profile/upload/2021/07/12/81464a1c-c6c3-4265-bd06-fb8f84339eb3.jpg\" style=\"width: 50%;\"></p><p>fsadfsadfdsafsd</p><p>adsfsadfsaf</p><p><b>详情2</b></p><p>sdafasdfsd</p><p><img src=\"http://localhost:9092/profile/upload/2021/07/12/3b86450f-2038-43a8-accc-49ca76a6d87b.jpg\" style=\"width: 50%;\"><br><br></p>",//商家详情内容，展示使用
+#    "storeCarousel1": "http://10.1.192.113:60902/profile/upload/2021/07/02/fefc46d3-dc55-4c45-af07-f21377386ba9.jpg",//商家轮播图，展示使用
+#    "storeCarousel2": "http://10.1.192.113:60902/profile/upload/2021/07/02/ccc51e2e-036b-4d13-9028-adbe7bbfe176.jpg",//商家轮播图，展示使用
+#    "storeCarousel3": "http://10.1.192.113:60902/profile/upload/2021/07/02/648f3997-bebf-4e27-8264-b6a2795c6b89.jpg",//商家轮播图，展示使用
+#    "storeCarousel4": "http://10.1.192.113:60902/profile/upload/2021/07/02/61127f59-dd36-43ff-827b-baae7a0ea883.jpg",//商家轮播图，展示使用
+#    "storeCarousel5": "http://10.1.192.113:60902/profile/upload/2021/07/02/cea01831-ab52-46ec-b8ce-dc9d64bdec6c.jpg",//商家轮播图，展示使用
+#    "storeCarousel6": "http://10.1.192.113:60902/profile/upload/2021/07/02/09216bac-25fa-4112-a122-ccf140158b2d.jpg",//商家轮播图，展示使用
+#    "chkCount": 262,//商家核消记录数
+#    "starAvg": 2.90,//商家综合评价，展示使用
+#    "segchkRecommenderStoreLableWebList": [//商家标签
+#      {
+#        "lableSortId": 2,//标签id
+#        "lableTypeId": 2,//一级标签id
+#        "lableName": "团购",//标签名称，展示使用
+#      },
+#      ...
+#    ]
+#  },
+#  "recommenderLevel": "1"//推荐人角色，只在在url后面带有该参数时才会返回该值
+#}
+POST {{host}}//default/index/storeDetails?recommenderId=124&recommenderLevel=1
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 4,
+  "storeId": 124
+}
+
+###
+### 根据运营商id,返回轮播图列表
+#返回结果
+#{
+#  "total": 6,//该运营商轮播图数量
+#  "rows": [
+#    {
+#      "providerId": 2,//运营商id，跳转商家详情使用
+#      "storeId": 3,//商家id，跳转商家详情使用
+#      "storeCarousel": "http://10.1.192.113:60902/profile/upload/2021/07/05/606861e9-02d2-4c66-8e44-31a20ba4112d.jpg",//商家首页轮播图，展示使用
+#      "sortId": 0,//轮播图顺序
+#    },
+#    ...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/index/getBannersByProvider
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 3
+}
+
+###
+### 根据标签id,会员卡类型id，搜索商户列表
+#
+#
+
+#{
+#  "providerId": 2,
+#  "sortType": 1,
+#  "lableId": 2,
+#  "typeId": 2,
+#  "cardId": 1,
+#  "userLon": 116.25849,
+#  "userLat": 39.684333
+#}
+POST {{host}}//default/index/listByProviderwithLable
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 2,
+  "sortType": 1,
+  "userLon": 116.25849,
+  "userLat": 39.684333
+}
+
+###
+### 根据运营商id查询seg首页推荐商户列表
+POST {{host}}//default/index/listByProvider
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 2,
+  "sortType": 3,
+  "userLon": 116.25849,
+  "userLat": 39.684333
+}
+
+###
+### 搜索商户名称，根据名称，标签，充值卡等
+#请求参数
+#{
+#  "providerId": 2, //*运营商id
+#  "sortType": 0, // 排序方式  0,默认排序，1热度，2评价，3距离
+#  "storeName": "99", //*商家名称（即搜索内容）
+#  "lableName": "99", //*标签名称（即搜索内容）
+#  "userLon": 114.123456, //用户位置
+#  "userLat": 43.123456 //用户位置
+#}
+#返回结果
+#{
+#  "total": 51,搜索的商家数量
+#  "rows": [
+#    {
+#      "providerId": 2,运营商id
+#      "storeId": 3,商家id，用于进行商家详情查询使用
+#      "storeName": "2商家名称001", 商家名称，展示使用
+#      "serviceState": "0",服务状态，在线
+#      "storeSort": 3,商家展示顺序
+#      "storeIcon": "http://10.1.192.113:60902/profile/upload/2021/07/02/706f0a58-6031-4523-abbd-dc5dd823278c.jpg", 商家小图片，列表模式时使用
+#      "storeGificon": "http://10.1.192.113:60902/profile/upload/2021/07/02/e4c00b15-84f7-491d-bb34-bf5253f7f6b7.jpg", 商家大图片，大图模式时使用
+#      "storeLon": 116.2667540000, 商家位置
+#      "storeLat": 39.6789740000,
+#      "userDist": 0, 用户距离，展示使用
+#      "chkCount": 89, 热度，展示使用
+#      "starAvg": 3.16, 综合评价，展示使用
+#      "salerId": 3, 销售id
+#      "lables": [ 商家支持的标签列表
+#        {
+#          "lableId": 0, 标签id
+#          "lableTypeId": 2, 一级标签id
+#          "lableName": "团购", 标签名称，展示使用
+#        },
+#        ...
+#      ]
+#    },
+#	...
+#  ],
+#  "code": 200,
+#  "msg": "查询成功"
+#}
+POST {{host}}//default/index/StoreSearch
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+{
+  "providerId": 2,
+  "sortType": 0,
+  "lableId": 4,
+  "typeId": 1,
+  "storeName": "百元尊享",
+  "lableName": "百元尊享",
+  "userLon": 114.123456,
+  "userLat": 43.123456
+}
+
+###查询seg标签列表
+###返回值说明
+#"{
+#  ""total"": 7,首页标签区域运营商的标签列表，超过8个时最后一个标签为更多
+#  ""rows"": [
+#    {
+#      ""lableId"": 0, 子标签id，查询使用
+#      ""lableSortId"": 0, 标签显示顺序，一级标签下的显示顺序
+#      ""lableTypeId"": 0,  一级标签id，查询使用
+#      ""lableName"": ""9块9"",  标签名称，展示使用
+#      ""lablePic"": ""http://10.1.192.113:60902/profile/upload/2021/07/05/4f8fb474-97d9-4547-afca-47a2ca1d5180.jpg"" 标签图标，展示使用
+#    },
+# ...
+#  ],
+#  ""code"": 200,
+#  ""msg"": ""查询成功""
+#}"
+GET {{host}}//default/index/lableListByProvider?providerId=2
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+
+###
+### 根据用户当前所在地市行政id，返回运营商id   尹志颖
+### 返回值说明 {
+#  "code": 200,
+#  data": {
+#    "provFlag": 1,  0说明用户所选或所在的地区已开放服务，1说明用户所在或所选地区未开放服务，提供的运营商为默认运营商
+#    "providerId": 3
+#  }
+#}
+GET {{host}}//default/index/getProviderByadcode?adcode=150100
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
+
+
+###
+### 测试微信账号绑定
+GET {{host}}//bindaccount
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{token1}}
+
+{
+  "userId": "503",
+  "providerId": "2",
+  "userLevel": "2",
+  "code": "0312qnFa1cUYQB0X05Ja151Isp12qnFw"
+}
+
+### 测试token取值
+GET {{host}}/tokentest
+Accept: application/json
+Content-Type: application/json
+
+{{bindtoken1}}
+
+### 用户利用token进行登录
+POST {{host}}/login
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+Authorization: Bearer {{bindtoken}}
+
+{
+  "userId": 3,
+  "providerId": 2,
+  "userLevel": 2,
+  "cardID": "11111"
+}
+
+### 已有用户的登录注册标识
+GET {{host}}/register
+Accept: application/json
+Content-Type: application/json
+
+{
+  "mobile": "13000020002",
+  "code": "1234",
+  "providerId": "2",
+  "remark": "999999"
+}
+
+> {% client.global.set("token2", response.body.data.token); %}
+
+### 进行新用户注册  remark测试标识
+GET {{host}}/register
+Accept: application/json
+Content-Type: application/json
+
+{
+  "mobile": "99999999999",
+  "code": "1234",
+  "recommendId": "5",
+  "recommendLevel": "1",
+  "providerId": "2",
+  "remark": "999999"
+}
+
+> {% client.global.set("token1", response.body.data.token); %}
+
+### 发送短信验证码
+POST {{host}}/sendmobilecode?mobile=99999999999
+Accept: */*
+Cache-Control: no-cache
+Content-Type: application/json
+
diff --git a/ruoyi-segchk/pom.xml b/ruoyi-segchk/pom.xml
new file mode 100644
index 0000000..eebdb48
--- /dev/null
+++ b/ruoyi-segchk/pom.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-segchk</artifactId>
+
+    <properties>
+        <alipay.version>4.8.10.ALL</alipay.version>
+    </properties>
+    <description>
+        system系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- 生成二维码的jar -->
+        <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>${alipay.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+        <!--dom4j -->
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <!--腾讯云短信-->
+        <dependency>
+            <groupId>com.github.qcloudsms</groupId>
+            <artifactId>qcloudsms</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.0.6</version> <!-- 注：如提示报错，先升级基础包版，无法解决可联系技术支持 -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <!--腾讯云OSS-->
+        <dependency>
+            <groupId>com.qcloud</groupId>
+            <artifactId>cos_api</artifactId>
+            <version>5.6.8</version>
+        </dependency>
+        <!-- 阿里云OSS -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+
+        <!--<dependency>
+            <groupId>com.segchkwx.pay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.1</version>
+            <scope>system</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
+            <systemPath>${project.basedir}/../libs/wxpay-sdk-0.0.1.jar</systemPath>
+        </dependency>-->
+        <dependency>
+            <groupId>com.weixin.pay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 通用工具-->
+        <!--<dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+            <version>3.0-rc5</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMember.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMember.java
new file mode 100644
index 0000000..ea6ef55
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMember.java
@@ -0,0 +1,891 @@
+package com.ruoyi.member.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.util.ShareCodeUtils;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 会员对象 ums_member
+ *
+ * @author 魔金商城
+ * @date 2020-07-25
+ */
+public class UmsMember extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 用户名
+     */
+    @Excel(name = "用户名")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @Excel(name = "用户密码")
+    private String password;
+
+    /**
+     * 昵称
+     */
+    @Excel(name = "昵称")
+    private String nickname;
+
+    /**
+     * 头像地址
+     */
+    @Excel(name = "头像地址")
+    private String image;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名")
+    private String relename;
+
+    /**
+     * 身份证
+     */
+    @Excel(name = "身份证")
+    private String cardid;
+
+    /**
+     * 性别  0 保密 1男 2女 默认0
+     */
+    @Excel(name = "性别  0 保密 1男 2女 默认0")
+    private String gender;
+
+    /**
+     * 生日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 月收入  0 无收入 1 2000以下 2 2000-3999 3 4000-59994 6000－7999  5 8000以上
+     */
+    @Excel(name = "月收入  0 无收入 1 2000以下 2 2000-3999 3 4000-5999 4 6000－7999  5 8000以上")
+    private String monthlyIncome;
+
+    /**
+     * 婚姻状况  0 保密 1未婚 2 已婚 默认0 保姆
+     */
+    @Excel(name = "婚姻状况  0 保密 1未婚 2 已婚 默认0 保姆")
+    private String marriageStatus;
+
+    /**
+     * 手机号码
+     */
+    @Excel(name = "手机号码")
+    private String mobile;
+
+    /**
+     * 邮箱地址
+     */
+    @Excel(name = "邮箱地址")
+    private String email;
+
+    /**
+     * 更改中的邮箱（绑定新邮箱使用）
+     */
+    @Excel(name = "更改中的邮箱", readConverterExp = "绑=定新邮箱使用")
+    private String modifiedEmail;
+
+    /**
+     * 校验码（绑定新邮箱时使用）
+     */
+    @Excel(name = "校验码", readConverterExp = "绑=定新邮箱时使用")
+    private String checkCode;
+
+    /**
+     * 省
+     */
+    @Excel(name = "省")
+    private Long province;
+
+    /**
+     * 市
+     */
+    @Excel(name = "市")
+    private Long city;
+
+    /**
+     * 区
+     */
+    @Excel(name = "区")
+    private Long county;
+
+    /**
+     * 详细地址
+     */
+    @Excel(name = "详细地址")
+    private String detailaddress;
+
+    /**
+     * 兴趣爱好
+     */
+    @Excel(name = "兴趣爱好")
+    private String interest;
+
+    /**
+     * 店铺id  平台的为0  默认为平台
+     */
+    @Excel(name = "店铺id  平台的为0  默认为平台")
+    private Long storeId;
+
+    /**
+     * 1 普通用户 2 商家店铺用户 3 店铺员工
+     */
+    @Excel(name = "1 普通用户 2 商家店铺用户 3 店铺员工")
+    private String type;
+
+    private String appletOpenId;
+
+    private String appOpenId;
+
+    private String h5OpenId;
+    /**
+     * 总的消费金额
+     */
+    @Excel(name = "总的消费金额")
+    private BigDecimal consumptionAmount;
+
+    /**
+     * 预存款支付密码
+     */
+    @Excel(name = "预存款支付密码")
+    private String paypassword;
+
+    /**
+     * 用户注册来源 1 pc  2app  3 手机h5 4 管理员后台新增 5applet
+     */
+    @Excel(name = "用户注册来源 1 pc  2app  3 手机h5 4 管理员后台新增 ")
+    private String source;
+
+    /**
+     * 用户状态 1 正常 2 冻结  3 未启用 默认1
+     */
+    @Excel(name = "用户状态 1 正常 2 冻结  3 未启用 默认1 ")
+    private String status;
+
+    /**
+     * 会员签到次数
+     */
+    @Excel(name = "会员签到次数")
+    private int signNum;
+
+    /**
+     * 手机是否验证  0 否 1 验证 默认0
+     */
+    @Excel(name = "手机是否验证  0 否 1 验证 默认0 ")
+    private String isMobileVerification;
+
+    /**
+     * 邮箱是否验证   0 否 1 验证  默认0
+     */
+    @Excel(name = "邮箱是否验证   0 否 1 验证  默认0  ")
+    private String isEmailVerification;
+
+    /**
+     * 错误登录的次数
+     */
+    @Excel(name = "错误登录的次数")
+    private int loginErrorCount;
+
+    /**
+     * 删除标记 0 未删除 1删除 默认0
+     */
+    private int delFlag;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+
+    /**
+     * 锁定时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "锁定时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDateTime lockTime;
+
+    /**
+     * 最近登陆时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最近登陆时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastLoginTime;
+
+    /**
+     * 推荐人的会员id  如果没有 则为-1  默认为-1
+     */
+    @Excel(name = "推荐人的会员id  如果没有 则为-1  默认为-1")
+    private Long recommended = -1L;
+
+    /**
+     * 二级推荐人的会员id （上级的上级） 如果没有 则为-1  默认为-1
+     */
+    @Excel(name = "二级推荐人的会员id ", readConverterExp = "上=级的上级")
+    private Long sRecommended = -1L;
+
+    /**
+     * 会员自己的推荐码
+     */
+    @Excel(name = "会员自己的推荐码")
+    private String selfRecommendCode;
+
+    /**
+     * 会员的佣金
+     */
+    @Excel(name = "会员的佣金")
+    private BigDecimal commission;
+
+    /**
+     * 会员所属的店铺id
+     */
+    @Excel(name = "会员所属的店铺id")
+    private Long beloneStoreId;
+    /**
+     * 用户积分
+     */
+    @ApiModelProperty(value = "用户积分")
+    private int customerPoint;
+    private int subSpreadCustomerCount;
+    /**
+     * 推荐人code 如果为空 则说明没有推荐人
+     */
+    private String recommondCode;
+    /**
+     * 自动注册渠道类型
+     */
+    @ApiModelProperty(value = "自动注册渠道类型")
+    private String channelType;
+    private UmsMemberLevel customerLevel;
+
+    private BigDecimal allPredeposit;
+
+    /**
+     * 构造app用户注册对象
+     *
+     * @param mobile        手机号码
+     * @param password      密码
+     * @param recommondCode 推荐吗
+     * @return 返回app用户注册对象
+     */
+    public static UmsMember buildAppRegisterCustomer(String mobile, String password, String recommondCode) {
+        UmsMember customer = new UmsMember();
+        customer.username = mobile;
+        customer.password = password;
+        customer.mobile = mobile;
+        customer.type = "1";
+        customer.source = "2";
+        customer.isMobileVerification = "1";
+
+        customer.recommondCode = recommondCode;
+        return customer;
+    }
+
+    /**
+     * 构造h5用户注册对象
+     *
+     * @param mobile        手机号码
+     * @param recommondCode 推荐吗
+     * @return 返回app用户注册对象
+     */
+    public static UmsMember buildH5RegisterCustomer(String mobile, String recommondCode) {
+        UmsMember customer = new UmsMember();
+        customer.username = mobile;
+        customer.password = "123456";
+        customer.mobile = mobile;
+        customer.type = "1";
+        customer.source = "3";
+        customer.isMobileVerification = "1";
+
+        customer.recommondCode = recommondCode;
+        return customer;
+    }
+
+    /**
+     * 构造代客下单自动注册对象
+     *
+     * @param mobile 手机号码
+     * @return 返回代客下单自动注册对象
+     */
+    public static UmsMember buildStoreShoppingRegisterCustomer(String mobile, long beloneStoreId) {
+        UmsMember customer = new UmsMember();
+        customer.username = mobile;
+        customer.password = "123456";
+        customer.mobile = mobile;
+        customer.type = "1";
+        customer.source = "4";
+        customer.status = "1";
+        customer.storeId = 0L;
+        customer.isMobileVerification = "1";
+        customer.beloneStoreId = beloneStoreId;
+        return customer;
+
+    }
+
+    public int getSubSpreadCustomerCount() {
+        return subSpreadCustomerCount;
+    }
+
+    public void setSubSpreadCustomerCount(int subSpreadCustomerCount) {
+        this.subSpreadCustomerCount = subSpreadCustomerCount;
+    }
+
+    public String getRecommondCode() {
+        return recommondCode;
+    }
+
+    public void setRecommondCode(String recommondCode) {
+        this.recommondCode = recommondCode;
+    }
+
+    public UmsMemberLevel getCustomerLevel() {
+        return customerLevel;
+    }
+
+    public void setCustomerLevel(UmsMemberLevel customerLevel) {
+        this.customerLevel = customerLevel;
+    }
+
+    /**
+     * 设置下级分销会员数量
+     *
+     * @param subSpreadCustomerCount 下级分销会员数量
+     * @return 返回当前对象
+     */
+    public UmsMember addSubSpreadCustomerCount(int subSpreadCustomerCount) {
+        this.subSpreadCustomerCount = subSpreadCustomerCount;
+        return this;
+    }
+
+    /**
+     * 设置自己的推荐吗
+     *
+     * @return 返回当前对象
+     */
+    public UmsMember addSelfRecommondCode() {
+        this.selfRecommendCode = ShareCodeUtils.toSerialCode(Long.parseLong(this.mobile));
+        return this;
+    }
+
+    /**
+     * 判断是否有推荐人  有返回true  没有返回false
+     *
+     * @return 有返回true  没有返回false
+     */
+    @JsonIgnore
+    public boolean hasRecommonded() {
+        return !StringUtils.isEmpty(this.recommondCode) || this.recommended != -1;
+    }
+
+    /**
+     * 后端添加用户设置默认值
+     *
+     * @return 返回用户信息
+     */
+    public UmsMember setDefaultValuesForAdminAdd() {
+        this.storeId = 0L;
+        this.type = "1";
+        this.source = "4";
+        this.status = "1";
+        this.isMobileVerification = "1";
+        if (!StringUtils.isEmpty(this.email)) {
+            this.isEmailVerification = "1";
+        }
+
+        this.beloneStoreId = 0L;
+        return this;
+    }
+
+    /**
+     * 设置归属门店id
+     *
+     * @param beloneStoreId 归属门店id
+     * @return 返回用户信息
+     */
+    public UmsMember setBelongStoreIdForStore(long beloneStoreId) {
+        this.beloneStoreId = beloneStoreId;
+        return this;
+    }
+
+    /**
+     * 清除用户密码
+     */
+    public UmsMember clearPassword() {
+        this.password = "**********";
+        if (!StringUtils.isEmpty(this.paypassword)) {
+            this.paypassword = "**********";
+        }
+        return this;
+    }
+
+    /**
+     * 获取会员对象
+     *
+     * @param customerId 会员id
+     * @return 会员对象
+     */
+    public UmsMember setCustomerId(long customerId) {
+        this.id = customerId;
+        return this;
+    }
+
+    /**
+     * 获得会员的会员等级id
+     *
+     * @return 返回会员的会员等级id
+     */
+    @JsonIgnore
+    public long getCustomerLevelId() {
+        return Objects.isNull(this.customerLevel) ? -1 : this.customerLevel.getId();
+    }
+
+    /**
+     * 获得会员等级名称
+     *
+     * @return 返回会员等级名称
+     */
+    @JsonIgnore
+    public String getCustomerLevelName() {
+        return Objects.isNull(this.customerLevel) ? "" : this.customerLevel.getName();
+    }
+
+    /**
+     * 检查更改金额
+     *
+     * @param money 更改金额
+     * @return true 可以更改 false 更改后总金额小于0，不可以更改
+     */
+    public boolean checkConsumptionAmount(BigDecimal money) {
+        if (money.intValue() >= 0) {
+            return true;
+        }
+        if (money.abs().compareTo(this.consumptionAmount) > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 检查更改佣金金额
+     *
+     * @param money 更改佣金金额
+     * @return true 可以更改 false 更改后总金额小于0，不可以更改
+     */
+    public boolean checkCommission(BigDecimal money) {
+        if (money.intValue() >= 0) {
+            return true;
+        }
+        if (money.abs().compareTo(this.commission) > 0) {
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     * 为用户添加用户名
+     *
+     * @param username
+     * @return
+     */
+    public UmsMember addUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    public String getRelename() {
+        return relename;
+    }
+
+    public void setRelename(String relename) {
+        this.relename = relename;
+    }
+
+    public String getCardid() {
+        return cardid;
+    }
+
+    public void setCardid(String cardid) {
+        this.cardid = cardid;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getMonthlyIncome() {
+        return monthlyIncome;
+    }
+
+    public void setMonthlyIncome(String monthlyIncome) {
+        this.monthlyIncome = monthlyIncome;
+    }
+
+    public String getMarriageStatus() {
+        return marriageStatus;
+    }
+
+    public void setMarriageStatus(String marriageStatus) {
+        this.marriageStatus = marriageStatus;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getModifiedEmail() {
+        return modifiedEmail;
+    }
+
+    public void setModifiedEmail(String modifiedEmail) {
+        this.modifiedEmail = modifiedEmail;
+    }
+
+    public String getCheckCode() {
+        return checkCode;
+    }
+
+    public void setCheckCode(String checkCode) {
+        this.checkCode = checkCode;
+    }
+
+    public Long getProvince() {
+        return province;
+    }
+
+    public void setProvince(Long province) {
+        this.province = province;
+    }
+
+    public Long getCity() {
+        return city;
+    }
+
+    public void setCity(Long city) {
+        this.city = city;
+    }
+
+    public Long getCounty() {
+        return county;
+    }
+
+    public void setCounty(Long county) {
+        this.county = county;
+    }
+
+    public String getDetailaddress() {
+        return detailaddress;
+    }
+
+    public void setDetailaddress(String detailaddress) {
+        this.detailaddress = detailaddress;
+    }
+
+    public String getInterest() {
+        return interest;
+    }
+
+    public void setInterest(String interest) {
+        this.interest = interest;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAppletOpenId() {
+        return appletOpenId;
+    }
+
+    public void setAppletOpenId(String appletOpenId) {
+        this.appletOpenId = appletOpenId;
+    }
+
+    public String getAppOpenId() {
+        return appOpenId;
+    }
+
+    public void setAppOpenId(String appOpenId) {
+        this.appOpenId = appOpenId;
+    }
+
+    public String getH5OpenId() {
+        return h5OpenId;
+    }
+
+    public void setH5OpenId(String h5OpenId) {
+        this.h5OpenId = h5OpenId;
+    }
+
+    public BigDecimal getConsumptionAmount() {
+        return consumptionAmount;
+    }
+
+    public void setConsumptionAmount(BigDecimal consumptionAmount) {
+        this.consumptionAmount = consumptionAmount;
+    }
+
+    public String getPaypassword() {
+        return paypassword;
+    }
+
+    public void setPaypassword(String paypassword) {
+        this.paypassword = paypassword;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public int getSignNum() {
+        return signNum;
+    }
+
+    public void setSignNum(int signNum) {
+        this.signNum = signNum;
+    }
+
+    public String getIsMobileVerification() {
+        return isMobileVerification;
+    }
+
+    public void setIsMobileVerification(String isMobileVerification) {
+        this.isMobileVerification = isMobileVerification;
+    }
+
+    public String getIsEmailVerification() {
+        return isEmailVerification;
+    }
+
+    public void setIsEmailVerification(String isEmailVerification) {
+        this.isEmailVerification = isEmailVerification;
+    }
+
+    public int getLoginErrorCount() {
+        return loginErrorCount;
+    }
+
+    public void setLoginErrorCount(int loginErrorCount) {
+        this.loginErrorCount = loginErrorCount;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    public LocalDateTime getLockTime() {
+        return lockTime;
+    }
+
+    public void setLockTime(LocalDateTime lockTime) {
+        this.lockTime = lockTime;
+    }
+
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    public Long getRecommended() {
+        return recommended;
+    }
+
+    public void setRecommended(Long recommended) {
+        this.recommended = recommended;
+    }
+
+    public Long getsRecommended() {
+        return sRecommended;
+    }
+
+    public void setsRecommended(Long sRecommended) {
+        this.sRecommended = sRecommended;
+    }
+
+    public String getSelfRecommendCode() {
+        return selfRecommendCode;
+    }
+
+    public void setSelfRecommendCode(String selfRecommendCode) {
+        this.selfRecommendCode = selfRecommendCode;
+    }
+
+    public BigDecimal getCommission() {
+        return commission;
+    }
+
+    public void setCommission(BigDecimal commission) {
+        this.commission = commission;
+    }
+
+    public Long getBeloneStoreId() {
+        return beloneStoreId;
+    }
+
+    public void setBeloneStoreId(Long beloneStoreId) {
+        this.beloneStoreId = beloneStoreId;
+    }
+
+    public int getCustomerPoint() {
+        return customerPoint;
+    }
+
+    public void setCustomerPoint(int customerPoint) {
+        this.customerPoint = customerPoint;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+    }
+
+    public BigDecimal getAllPredeposit() {
+        return allPredeposit;
+    }
+
+    public void setAllPredeposit(BigDecimal allPredeposit) {
+        this.allPredeposit = allPredeposit;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMemberLevel.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMemberLevel.java
new file mode 100644
index 0000000..3af9e36
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/domain/UmsMemberLevel.java
@@ -0,0 +1,206 @@
+package com.ruoyi.member.domain;
+
+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.math.BigDecimal;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 会员等级对象 ums_member_level
+ *
+ * @author 魔金商城
+ * @date 2020-07-25
+ */
+public class UmsMemberLevel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 会员等级名称
+     */
+    @Excel(name = "会员等级名称")
+    private String name;
+
+    /**
+     * 消费小值（包含该值）
+     */
+    @Excel(name = "消费小值", readConverterExp = "包=含该值")
+    private Long minMoney;
+
+    /**
+     * 消费金额最大值 不包含该值
+     */
+    @Excel(name = "消费金额最大值 不包含该值")
+    private Long maxMoney;
+
+    /**
+     * 会员折扣
+     */
+    @Excel(name = "会员折扣")
+    private BigDecimal discount;
+
+    /**
+     * 删除标记 0 未删除 1删除 默认0
+     */
+    private int delFlag;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+
+    /**
+     * 构造未知等级实体
+     *
+     * @return 返回未知等级实体
+     */
+    public static UmsMemberLevel buildNoLevel() {
+        UmsMemberLevel customerLevel = new UmsMemberLevel();
+        customerLevel.name = "非会员";
+        return customerLevel;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getMinMoney() {
+        return minMoney;
+    }
+
+    public void setMinMoney(Long minMoney) {
+        this.minMoney = minMoney;
+    }
+
+    public Long getMaxMoney() {
+        return maxMoney;
+    }
+
+    public void setMaxMoney(Long maxMoney) {
+        this.maxMoney = maxMoney;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(BigDecimal discount) {
+        this.discount = discount;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    /**
+     * 根据传入的金额判断  是否是当前等级
+     *
+     * @param money 传入金金额
+     * @return 判断规则 [0,100)  前闭后开   包含0  不包含100
+     */
+    public boolean isCurrentLevl(BigDecimal money) {
+        if (Objects.isNull(money)) {
+            return false;
+        }
+        return money.intValue() >= this.minMoney && money.intValue() < this.maxMoney;
+    }
+
+    /**
+     * 判断传入的会员等级消费金额和当前的会员等级消费金额是否有交集
+     *
+     * @param customerLevel 会员等级
+     * @return 有返回true  没有返回false 传入的值为空  返回false
+     */
+    public boolean hasIntersection(UmsMemberLevel customerLevel) {
+        if (Objects.isNull(customerLevel)) {
+            return false;
+        }
+
+        // 如果传入的最小值比当前的最大值要大于等于 则肯定没有交集
+        if (customerLevel.minMoney >= this.maxMoney) {
+            return false;
+        }
+        if (customerLevel.minMoney >= customerLevel.maxMoney) {
+            return true;
+        }
+        // 如果传入的最小值在当前会员等级最大值和最小值之间(不包含最大值 包含最小值) 则肯定会有交集
+        if (customerLevel.minMoney >= this.minMoney && customerLevel.minMoney < this.maxMoney) {
+            return true;
+        }
+
+        // 如果传入的最小值在比当前的最小值还小 则看传入的最大值
+        if (customerLevel.minMoney < this.minMoney) {
+            if (customerLevel.maxMoney <= this.minMoney) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("minMoney", getMinMoney())
+                .append("maxMoney", getMaxMoney())
+                .append("discount", getDiscount())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .append("modifyTime", getModifyTime())
+                .append("delTime", getDelTime())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/mapper/WeChatCustomerLinkMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/mapper/WeChatCustomerLinkMapper.java
new file mode 100644
index 0000000..b8b8090
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/mapper/WeChatCustomerLinkMapper.java
@@ -0,0 +1,65 @@
+package com.ruoyi.member.mapper;
+
+
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 微信用户关联数据库接口
+ */
+@Repository
+public interface WeChatCustomerLinkMapper {
+
+    /**
+     * 根据openId查询关联实体
+     *
+     * @param openId 微信用户唯一标识
+     */
+
+    WeChatCustomerLink queryWeChatCustomerLinkByOpenId(String openId);
+
+
+    /**
+     * 根据customerId查询关联实体
+     *
+     * @param customerId 用户id
+     */
+
+    WeChatCustomerLink queryWeChatCustomerLinkByCustomerId(long customerId);
+
+    /**
+     * 根据unionId查询关联实体
+     *
+     * @param unionId 微信联合登录id
+     */
+
+    WeChatCustomerLink queryWeChatCustomerLinkByUnionId(String unionId);
+
+    /**
+     * 增加关联
+     *
+     * @param weChatCustomerLink 关联实体
+     * @return 1:成功
+     */
+
+    int addWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink);
+
+    /**
+     * 删除关联
+     *
+     * @param customerId 用户id
+     * @return 1:成功
+     */
+
+    int deleteWeChatCustomerLink(long customerId);
+
+    /**
+     * 更新微信用户关联
+     *
+     * @param weChatCustomerLink 微信用户关联实体
+     * @return 1成功 否则失败
+     */
+
+    int updateWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink);
+}
+
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/LoginService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/LoginService.java
new file mode 100644
index 0000000..7e71349
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/LoginService.java
@@ -0,0 +1,21 @@
+package com.ruoyi.member.service;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.segchk.domain.SegchkUserWebReq;
+
+/**
+ * Created by 魔金商城 on 17/7/17.
+ * 登录接口
+ */
+public interface LoginService {
+
+
+    /**
+     * segchk前端登录 (app,pc,mobile)
+     *
+     * @param segchkUserWebReq 登入参数
+     * @return 返回码  -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+     */
+    AjaxResult login(SegchkUserWebReq segchkUserWebReq);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RechargeService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RechargeService.java
new file mode 100644
index 0000000..36f5547
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RechargeService.java
@@ -0,0 +1,36 @@
+package com.ruoyi.member.service;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+
+import java.math.BigDecimal;
+
+/**
+ * 充值服务
+ */
+public interface RechargeService {
+
+    /**
+     * 支付宝pc支付
+     *
+     * @param money      充值金额
+     * @param customerId 用户id
+     * @param type       支付类型 1:订单支付 2:预存款充值
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -2:生成充值记录出错 -5:支付宝生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用  1 成功
+     */
+    AjaxResult aliPagePay(String transCode, BigDecimal money, int payType, long customerId, int type);
+
+    /**
+     * 微信扫码支付
+     *
+     * @param money      充值金额
+     * @param customerId 用户id
+     * @param ip         请求真实ip
+     * @param type       支付类型 1:订单支付 2:预存款充值
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -2:生成充值记录出错 -5:微信生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用 1 成功
+     */
+    AjaxResult wechatQRPay(String transCode, BigDecimal money, int payType, long customerId, String ip, int type);
+
+
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterService.java
new file mode 100644
index 0000000..7cb153d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterService.java
@@ -0,0 +1,68 @@
+package com.ruoyi.member.service;
+
+import java.util.function.Consumer;
+
+/**
+ * Created by 魔金商城 on 17/11/18.
+ * 注册服务接口
+ */
+public interface RegisterService {
+
+    /**
+     * 发送注册短信验证码
+     *
+     * @param mobile   手机号码
+     * @param consumer 回调接口
+     * @return 0 成功 1 失败 -1 手机号码已经存在
+     */
+    int sendRegisterSmsCode(String mobile, Consumer<String> consumer);
+    /**
+     * 发送注册短信验证码
+     *
+     * @param mobile   手机号码
+     * @param consumer 回调接口
+     * @return 0 成功 1 失败 -1 手机号码已经存在
+     */
+    int sendRegisterSmsCodeFortest(String mobile, Consumer<String> consumer);
+
+    /**
+     * 发送注册短信验证码（PC端用，带有图片验证码）
+     *
+     * @param mobile     手机号码
+     * @param kaptcha    用户输入的图片验证码
+     * @param oldKaptcha redis中的图片验证码
+     * @param consumer   回调接口
+     * @return 0 成功 1 失败 -4 手机号码已经存在 -1 图片验证码失效或不存在 -2 图片验证码为空 -3 图片证码不正确
+     */
+    int sendRegisterSmsCodeForPc(String mobile, String kaptcha, String oldKaptcha, Consumer<String> consumer);
+
+    /**
+     * 用户注册
+     *
+     * @param mobile        手机号码
+     * @param password      密码
+     * @param code          用户输入的手机验证码
+     * @param originCode    生成的手机验证码
+     * @param recommondCode 推荐吗
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+    int registerCustomer(String mobile, String password, String code, String originCode, String recommondCode);
+
+    /**
+     * 免密用户自动注册
+     *
+     * @param phoneNo 手机号码
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+    Long unAuthRegister(String phoneNo, String channelType);
+
+    /**
+     * 校验验证码
+     *
+     * @param kaptcha          验证码
+     * @param kaptchaInSession session中的验证码
+     * @return -1 验证码失效或不存在 -2 验证码为空 -3验证码不正确  1 成功
+     */
+    int checkKaptcha(String kaptcha, String kaptchaInSession);
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterServiceApi.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterServiceApi.java
new file mode 100644
index 0000000..47da24f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterServiceApi.java
@@ -0,0 +1,38 @@
+package com.ruoyi.member.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+
+/**
+ * 注册服务聚合接口
+ */
+public interface RegisterServiceApi {
+
+    /**
+     * 用户注册
+     *
+     * @param mobile        手机号码
+     * @param password      密码
+     * @param code          用户输入的手机验证码
+     * @param originCode    生成的手机验证码
+     * @param recommondCode 推荐吗
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+//    int registerCustomer(String mobile, String password, String code, String originCode, String recommondCode);
+
+
+    /**
+     * 用户注册
+     *
+     * @param mobile        手机号码
+     * @param code          用户输入的手机验证码
+     * @param originCode    生成的手机验证码
+     * @param recommondId 推荐吗
+     * @param recommondLevel 推荐角色
+     * @param providerId
+     * @param remark
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+    AjaxResult registerCustomer(String mobile, String code, String originCode, String recommondId, String recommondLevel, String providerId, String remark);
+
+    String createToke(String subject, Long userId, Long providerId, Integer userLevel);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/SmsService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/SmsService.java
new file mode 100644
index 0000000..cae1b2e
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/SmsService.java
@@ -0,0 +1,71 @@
+package com.ruoyi.member.service;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by 魔金商城 on 17/11/18.
+ * 短信验证码服务接口
+ */
+public interface SmsService {
+
+    /**
+     * 发送短信
+     *
+     * @param phone   手机号码
+     * @param content 发送内容
+     * @return 成功返回0 失败返回1
+     */
+    int sendSms(String phone, String content);
+
+    /**
+     * 发送核销码短信
+     *
+     * @param phone        手机号码
+     * @param code         订单号
+     * @param writeOffCode 核销码
+     * @param storeName    店铺名称
+     * @return 成功返回0 失败返回1
+     */
+    int sendWiteOffCodeSms(String phone, String code, String writeOffCode, String storeName);
+
+    /**
+     * 发送虚拟商品订单核销码短信
+     *
+     * @param phone        手机号码
+     * @param code         订单号
+     * @param writeOffCode 核销码
+     * @param storeName    店铺名称
+     * @return 成功返回0 失败返回1
+     */
+    int sendVirtualOrderWiteOffCodeSms(String phone, String code, String writeOffCode, String storeName);
+
+
+    /**
+     * 发送社区团购审核结果通知短信
+     *
+     * @param phone      手机号码
+     * @param submittime 通过时间
+     * @return 成功返回0 失败返回1
+     */
+    int sendAuditTemplateOffCodeSms(String phone, String submittime);
+
+    /**
+     * 发送社区团购结算短信
+     *
+     * @param communityName 社区团购名称
+     * @param price         佣金
+     * @param phone         手机号码
+     * @return 成功发挥0 失败返回1
+     */
+    int sendCommunityBuySettlementSms(String phone, String communityName, BigDecimal price);
+
+    /**
+     * 社区团购提现申请打款通知
+     *
+     * @param phone      手机号码
+     * @param submittime 打款时间
+     * @param price      金额
+     * @return 成功返回0 失败返回1
+     */
+    int sendCommunityBuyWitudrawSms(String phone, String submittime, BigDecimal price);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatAppletLoginService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatAppletLoginService.java
new file mode 100644
index 0000000..f7307e7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatAppletLoginService.java
@@ -0,0 +1,66 @@
+package com.ruoyi.member.service;
+
+
+import com.ruoyi.member.vo.AppletLoginInfo;
+import com.ruoyi.member.vo.AppletLoginRedisParamResponse;
+import com.ruoyi.util.WeChatAppletUserInfo;
+
+import java.util.function.Consumer;
+
+/**
+ * 微信小程序登录服务
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public interface WeChatAppletLoginService {
+
+    /**
+     * 小程序获取登录信息
+     *
+     * @param code           用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 api，使用 code 换取 openid 和 session_key 等信息
+     * @param unionId        联合登录id
+     * @param claimsConsumer 回调
+     * @return 登录信息
+     */
+    AppletLoginInfo getLoginInfo(String code, String unionId, Consumer<AppletLoginRedisParamResponse> claimsConsumer);
+
+    /**
+     * 处理小程序用户信息
+     *
+     * @param weChatAppletUserInfo 小程序用户信息实体
+     * @param openId               微信用户标识
+     * @param sessionKey           小程序sessionKey
+     * @param claimsConsumer       回调
+     * @return 登录信息
+     */
+    AppletLoginInfo dealUserInfo(WeChatAppletUserInfo weChatAppletUserInfo, String openId, String sessionKey, Consumer<AppletLoginRedisParamResponse> claimsConsumer);
+
+
+    /**
+     * 检验用户是否已绑定
+     *
+     * @param userName 用户名
+     * @return -9已经绑定过 1:没有绑定
+     */
+    int checkCustomerBind(String userName);
+
+    /**
+     * 绑定账号
+     *
+     * @param openId     微信用户唯一标识
+     * @param unionId    微信联合登录id
+     * @param customerId 用户id
+     * @return 1:成功
+     */
+    int bindAccount(String openId, String unionId, long customerId);
+
+    /**
+     * 解绑账号
+     *
+     * @param customerId 用户id
+     * @param unionId    联合登录id,用于redis缓存
+     * @return 1:成功
+     */
+    int unbindAccount(long customerId, String unionId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatCustomerLinkService.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatCustomerLinkService.java
new file mode 100644
index 0000000..848c3ab
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/WeChatCustomerLinkService.java
@@ -0,0 +1,86 @@
+package com.ruoyi.member.service;
+
+
+import com.ruoyi.common.utils.RedisCahceKey;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import com.ruoyi.util.Claims;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 微信用户关联服务接口
+ */
+@Repository
+public interface WeChatCustomerLinkService {
+
+    /**
+     * 增加关联
+     *
+     * @param weChatCustomerLink 关联实体
+     * @return 1:成功
+     */
+    int addWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink);
+
+    /**
+     * 根据openId查询关联实体
+     *
+     * @param openId 微信用户唯一标识
+     */
+    WeChatCustomerLink queryWeChatCustomerLinkByOpenId(String openId);
+
+
+    /**
+     * 根据用户id查询关联实体
+     *
+     * @param customerId 用户id
+     */
+    WeChatCustomerLink queryWeChatCustomerLinkByCustomerId(long customerId);
+
+    /**
+     * 根据用户名查询关联实体
+     *
+     * @param userName 用户名
+     */
+    WeChatCustomerLink queryWeChatCustomerLinkByUserName(String userName);
+
+    /**
+     * 根据unionId查询关联实体
+     *
+     * @param unionId 微信联合登录id
+     */
+    WeChatCustomerLink queryWeChatCustomerLinkByUnionId(String unionId);
+
+
+    /**
+     * 解绑账号
+     *
+     * @param customerId 用户id
+     * @param unionId    联合登录id,redis缓存使用
+     * @return 1:成功
+     */
+    int unbindWeChatCustomerLink(long customerId, String unionId);
+
+
+    /**
+     * 更新微信用户关联
+     *
+     * @param weChatCustomerLink 微信用户关联实体
+     * @return 1成功 否则失败
+     */
+    int updateWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink);
+
+    /**
+     * 更新微信用户关联
+     *
+     * @param segchkUserWechat 微信用户关联实体
+     * @param userLevel
+     * @return 1成功 否则失败
+     */
+    int addSegchkUserWechat(SegchkUserWechat segchkUserWechat, String userLevel);
+
+    int addSegchkUserWechat(SegchkUserWechat segchkUserWechat, String userLevel, String token);
+
+    public SegchkUserWechat getSegchkUserWechat(Claims claims, String token);
+}
+
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/BindNewEmailServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/BindNewEmailServiceImpl.java
new file mode 100644
index 0000000..e69de29
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/LoginServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/LoginServiceImpl.java
new file mode 100644
index 0000000..41dd100
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/LoginServiceImpl.java
@@ -0,0 +1,223 @@
+package com.ruoyi.member.service.impl;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.member.service.LoginService;
+import com.ruoyi.member.service.RegisterService;
+import com.ruoyi.segchk.domain.SegchkUserWebReq;
+import com.ruoyi.segchk.domain.SegchkUserWebResp;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.service.ISegchkProviderIndexService;
+import com.ruoyi.segchk.service.ISegchkStoreIndexService;
+import com.ruoyi.segchk.service.ISegchkUserIndexService;
+import com.ruoyi.util.CommonConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+/**
+ * Created by 魔金商城 on 17/7/17.
+ * 登录服务接口
+ */
+@Service("loginService")
+public class LoginServiceImpl implements LoginService {
+
+    /**
+     * 请求时间戳过期时间5分钟
+     */
+    private static final int REQUEST_TIME_OUT = 1000 * 60 * 5;
+    /**
+     * 注入会员服务接口
+     */
+//    @Autowired
+//    private IUmsMemberService customerService;
+    /**
+     * 注册接口
+     */
+    @Autowired
+    private RegisterService registerService;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    /**
+     * jwt密钥
+     */
+    @Value("${token.secret}")
+    private String jwtSecretKey;
+//    @Autowired
+//    private ITStoreInfoService storeInfoService;
+    /**
+     * 密码工具类
+     */
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+    @Value("${auth.salt:wsfmall}")
+    private String salt;
+
+//    @Override
+    /*public AjaxResult login(LoginParams loginParams) {
+        log.debug("login and loginParams:{}", loginParams);
+
+        if (Objects.isNull(loginParams)) {
+            log.info("login fail due to loginParams is null....");
+            return AjaxResult.error(-6,"loginParams is null");
+        }
+
+        // 验证验证码
+        if (!loginParams.validateCode()) {
+            log.info("login fail due to validateCode fail....");
+            return AjaxResult.error(-6,"validateCode fail");
+        }
+
+
+        // 根据用户名查询出用户信息
+        UmsMember customer = customerService.queryCustomerByName(loginParams.getMobile());
+
+        log.debug("login member:{}", customer);
+
+        // 用户不存在直接返回失败
+        if (Objects.isNull(customer)) {
+            log.info("login fail due to member is not exist....");
+            return AjaxResult.error(-4,"member is not exist");
+        }
+
+        // 登录次数
+        int errorCount = customer.getLoginErrorCount();
+
+        // 判断用户账号是否正常
+        if (!"1".equals(customer.getStatus())) {
+            log.info("login fail due to  member status is error ....");
+            return AjaxResult.error(-2,"账号冻结");
+        }
+
+        //判断用户的账号是否被锁定
+        if (Objects.nonNull(customer.getLockTime())) {
+            if (LocalDateTime.now().isBefore(customer.getLockTime().plus(30, ChronoUnit.MINUTES))) {
+                // 账户被锁定或禁用
+                log.info("login fail due to  member is locked ....");
+                return AjaxResult.error(-3,"账号锁定");
+            } else {
+                // 30分钟后解锁用户
+                customerService.unlockUser(customer.getId());
+                errorCount = 0;
+            }
+        }
+// -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+
+        // 判断用户密码是否正确
+        if (!passwordEncoder.matches(loginParams.getPassword(), customer.getPassword())) {
+            log.info("login fail due to  password is wrong....");
+
+            //增加登录失败的次数
+            customerService.updateLoginErrorCount(customer.getId());
+
+            // 如果登录失败次数>= 6次 则锁定帐户 30分钟内不能登录
+            if (errorCount + 1 >= 6) {
+                customerService.lockUser(customer.getId());
+                return null;
+            } else {
+                return AjaxResult.error(-1,"用户名或密码错误");
+            }
+        }
+        // 清除密码
+        customer.clearPassword();
+
+        // 更新登录时间
+        customerService.updateLoginTime(customer.getId());
+
+        //清除登录错误次数
+        customerService.unlockUser(customer.getId());
+        Map<String, Object> res = new HashMap<>();
+        final StringBuilder sb = new StringBuilder();
+        sb.append(Jwts.builder().setSubject(customer.getUsername())
+                .compressWith(CompressionCodecs.DEFLATE)
+                .signWith(SignatureAlgorithm.HS256, jwtSecretKey)
+                .setIssuedAt(new Date())
+                .claim("userName", customer.getUsername())
+                .claim("nickName", customer.getNickname())
+                .claim("releName", customer.getRelename())
+                .claim("id", customer.getId())
+                .setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.HOURS))) // 有效期1小时
+                .compact());
+        if (customer != null) {
+            AppletLoginRedisParamResponse appletLoginRedisParamResponse = new AppletLoginRedisParamResponse();
+            appletLoginRedisParamResponse.setCustomerId(customer.getId());
+            appletLoginRedisParamResponse.setToken(sb.toString());
+            redisService.putToRedis(sb.toString(), JSON.toJSONString(appletLoginRedisParamResponse),1, TimeUnit.DAYS);
+            redisService.putToRedis(loginParams.getMobile(), sb.toString());
+            res.put("access_token", sb.toString());
+            res.put("refresh_token", sb.toString());
+            res.put("member", customer);
+        }
+
+        log.debug("ok...login success.....");
+
+        return AjaxResult.success(res);
+    }*/
+
+
+    /**
+     * segchk前端登录 (app,pc,mobile)
+     *
+     * @param segchkUserWebReq 登入参数
+     * @return 返回码  -1 用户名或密码错误  -2 账号冻结  -3 账号锁定 1 成功  -4 验证码错误
+     */
+    @Override
+    public AjaxResult login(SegchkUserWebReq segchkUserWebReq) {
+        AjaxResult ajaxResult = null;
+        SegchkUserWebResp segchkUserWebResp = null;
+        switch (segchkUserWebReq.getUserLevel()){
+            case 0: {
+                segchkUserWebResp = segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq);
+                segchkUserWebResp.setUserLevel(0);
+                segchkUserWebResp.setUserId(segchkUserWebReq.getProviderId());
+                break;
+            }
+            case 1: {
+                segchkUserWebResp = segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq);
+                segchkUserWebResp.setUserLevel(1);
+                break;
+            }
+            case 2: {
+                segchkUserWebResp = segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq);
+                segchkUserWebResp.setUserLevel(2);
+                break;
+            }
+            default: return AjaxResult.error("301", "用户身份异常");
+        }
+        try {
+            segchkUserWebResp.setUserName(URLDecoder.decode(segchkUserWebResp.getUserName(), "utf-8"));
+        } catch (UnsupportedEncodingException e) {
+
+            e.printStackTrace();
+        }
+        ajaxResult = AjaxResult.success(segchkUserWebResp);
+
+        return ajaxResult;
+    }
+
+    private SegchkUserWechat getSegchkUserWechat(String token) {
+        StringBuilder sb = new StringBuilder(CommonConstant.APPLET_BIND_OPENID).append("-").append(token);
+        Object segchkUserWechat = redisService.getCacheObject(sb.toString());
+
+        return ObjectUtils.isEmpty(segchkUserWechat) ? null : (SegchkUserWechat) segchkUserWechat;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceApiImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceApiImpl.java
new file mode 100644
index 0000000..f45ac19
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceApiImpl.java
@@ -0,0 +1,238 @@
+package com.ruoyi.member.service.impl;
+
+
+//import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.SnowflakeIdWorker;
+import com.ruoyi.member.service.RegisterService;
+import com.ruoyi.member.service.RegisterServiceApi;
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+import com.ruoyi.segchk.domain.SegchkUserExtInfo;
+import com.ruoyi.segchk.domain.SegchkUserLevelInfo;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.util.Claims;
+import com.ruoyi.util.CommonConstant;
+import io.jsonwebtoken.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 注册服务聚合接口实现
+ */
+@Service
+public class RegisterServiceApiImpl implements RegisterServiceApi {
+
+
+    /**
+     * 日志
+     */
+    private Logger logger = LoggerFactory.getLogger(RegisterServiceApiImpl.class);
+
+
+    /**
+     * jwt密钥
+     */
+    @Value("${token.secret}")
+    private String jwtSecretKey;
+
+
+    //    登录超时时长，单位天，-1永久有效
+    @Value("${yzytest.login.loginexpire:#{1}}")
+    private Integer loginexpire;
+
+    /**
+     * 注入注册服务
+     */
+    @Autowired
+    private RegisterService registerService;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+
+    /**
+     * 用户注册
+     *
+     * @param mobile         手机号码
+     * @param code           用户输入的手机验证码
+     * @param originCode     生成的手机验证码
+     * @param recommondId    推荐吗
+     * @param recommondLevel 推荐角色
+     * @param providerId
+     * @param remark
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+    @Override
+    @Transactional
+    public AjaxResult registerCustomer(String mobile, String code, String originCode, String recommondId, String recommondLevel, String providerId, String remark) {
+
+        if(StringUtils.isEmpty(code)){
+            logger.error("registerCustomer fail due to code is empty...");
+            return AjaxResult.error(500, "验证码为空!");
+        }
+
+        if(StringUtils.isEmpty(mobile)){
+            logger.error("registerCustomer fail due to mobile is empty...");
+            return AjaxResult.error(500, "手机号码为空!");
+        }
+
+        if(StringUtils.isEmpty(providerId)){
+            logger.error("registerCustomer fail due to providerId is empty...");
+            return AjaxResult.error(500, "无法获取您的注册区域!");
+        }
+
+        // 校验验证码是否正确TODO
+        if (!code.equals(originCode)) {
+            logger.error("registerCustomer fail due to code is error with originCode...");
+            return AjaxResult.error(500, "验证码错误!");
+        }
+
+        SegchkUserLevelInfo segchkUserLevelInfo = segchkUserIndexService.selectUserLevelByMobile(mobile);
+        SegchkUserExtInfo segchkUserExtInfo = null;
+
+        if(ObjectUtils.isEmpty(segchkUserLevelInfo)){
+            logger.debug("registerCustomer prov {} mobile: {{}} is a new user with recommender:{}---{}", providerId, mobile, recommondId, recommondLevel);
+            segchkUserLevelInfo = new SegchkUserLevelInfo();
+//            如果用户信息空，则添加新的用户
+//            添加新用户信息
+            SegchkUserBasicInfo segchkUserBasicInfo = new SegchkUserBasicInfo();
+            segchkUserBasicInfo.setPhoneNo(mobile);
+            segchkUserBasicInfo.setCardTypeId(-1L);
+            segchkUserBasicInfo.setHasWechat("0");
+            segchkUserBasicInfo.setProviderId(Long.valueOf(providerId));
+            segchkUserBasicInfo.setUserIcon("");
+            int ret = segchkUserIndexService.addUserBasicInfo(segchkUserBasicInfo);
+            if(ret != 1){
+                logger.error("registerCustomer fail due to register is wrong...");
+                return AjaxResult.error(500, "注册异常，请联系客服!");
+            }
+
+            if(!StringUtils.isEmpty(recommondId) && !StringUtils.isEmpty(recommondLevel)){
+//                如果推荐人，推荐人角色都非空。要检查推荐人是否存在。否则推荐人设置为运营商
+
+                Map<String, Object> parmMap = new HashMap<>();
+                parmMap.put("recommondId", recommondId);
+                parmMap.put("recommondLevel", recommondLevel);
+                parmMap.put("providerId", providerId);
+                ret = segchkUserIndexService.recommenderIsExit(parmMap);
+
+                switch (ret){
+                    case 0:{
+//                        推荐人不存在，归属平台推荐，注册到某一运营商即可
+                        logger.warn("registerCustomer recommender is not exit!!! will be register with platform on provider({})", providerId);
+                        break;
+                    }
+                    case 1: {
+                        logger.debug("registerCustomer recommender is exit!!!");
+                        segchkUserExtInfo = new SegchkUserExtInfo();
+                        segchkUserExtInfo.setProviderId(Long.valueOf(providerId));
+                        segchkUserExtInfo.setRecommendersLevel(recommondLevel);
+                        segchkUserExtInfo.setUserRecommenders(Long.valueOf(recommondId));
+                        segchkUserExtInfo.setUserId(segchkUserBasicInfo.getUserId());
+                        int xxx = segchkUserIndexService.insertUserExtInfo(segchkUserExtInfo);
+                        if(xxx < 1){
+                            logger.error("registerCustomer fail due to recommender binding is wrong...");
+//                return AjaxResult.error(500, "推荐人绑定异常，请联系客服!");
+                        }
+                        break;
+                    }
+                    case 2: {
+                        logger.warn("registerCustomer user is different from recommender, will be register with platform on provider({})", providerId);
+                        break;
+                    }
+                }
+            }
+
+            segchkUserLevelInfo.setProviderId(Long.valueOf(providerId));
+            segchkUserLevelInfo.setUserId(segchkUserBasicInfo.getUserId());
+            segchkUserLevelInfo.setUserLevel(2L);
+        }
+//        如果是已经注册的用户。则直接返回用户信息
+
+        String openId = segchkUserIndexService.getWeChatInfoByUserId(segchkUserLevelInfo);
+        if("999999".equals(remark)){
+            openId = code;
+        }
+        if(openId == null){
+//            说明用户之前没有绑定微信
+            segchkUserLevelInfo.setToken(null);
+        }
+        else {
+            String token = createToken(CommonConstant.APPLET_LOGIN_KEY, segchkUserLevelInfo.getUserId(), segchkUserLevelInfo.getProviderId(), segchkUserLevelInfo.getUserLevel().intValue());
+            segchkUserLevelInfo.setToken(token);
+            Claims claims = new Claims();
+            claims.setUserId(segchkUserLevelInfo.getUserId());
+            claims.setOpenId(openId);
+            claims.setProviderId(segchkUserLevelInfo.getProviderId());
+            claims.setUserLevel(segchkUserLevelInfo.getUserLevel().intValue());
+//            将用户的token进行缓存
+            if(loginexpire == -1) {
+                redisService.setCacheObject(token, claims);
+            }
+            else {
+                redisService.setCacheObject(token, claims, loginexpire, TimeUnit.DAYS);
+            }
+        }
+        logger.debug("registerCustomer res: ---{}---{}", segchkUserLevelInfo.toString(), (ObjectUtils.isEmpty(segchkUserExtInfo) ? null : segchkUserExtInfo.toString()));
+        return AjaxResult.success("注册成功", segchkUserLevelInfo);
+    }
+
+    @Override
+    public String createToke(String subject, Long userId, Long providerId, Integer userLevel) {
+        String token = createToken(subject, userId, providerId, userLevel);
+        return token;
+    }
+
+//    @Override
+//    @Transactional
+//    public int registerCustomer(String mobile, String password, String code, String originCode, String recommondCode) {
+//        logger.debug("registerCustomer and mobile :{} \r\n code:{} \r\n: originCode{} \r\n recommondCode:{}", mobile, code, originCode, recommondCode);
+//        if()
+////        根据手机号查询是否存在用户。可能是用户，商家，运营商。
+//        segchkUserIndexService.getUserLoginInfo();
+//        return res;
+//    }
+
+    private String createToken(String subject, Long userId, Long providerId, int userLevel){
+        final StringBuilder sb = new StringBuilder();
+        sb.append(Jwts.builder().setSubject(subject)
+                .compressWith(CompressionCodecs.DEFLATE)
+                .signWith(SignatureAlgorithm.HS256, jwtSecretKey)
+                .setIssuedAt(new Date())
+                .claim("userId", userId)
+                .claim("providerId", providerId)
+                .claim("userLevel", userLevel)
+                .setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.HOURS))) // 有效期1小时
+                .compact());
+//        sb.append(CommonConstant.APPLET_LOGIN_KEY).append("_").append(snowflakeIdWorker.nextId()).append(jwtSecretKey);
+        return sb.toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceImpl.java
new file mode 100644
index 0000000..c2930f5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceImpl.java
@@ -0,0 +1,221 @@
+package com.ruoyi.member.service.impl;
+
+
+import com.ruoyi.member.service.RegisterService;
+import com.ruoyi.member.service.SmsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * Created by 魔金商城 on 17/11/18.
+ * 注册接口
+ */
+@Service
+public class RegisterServiceImpl implements RegisterService {
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(RegisterServiceImpl.class);
+
+
+    /**
+     * 注入短信接口
+     */
+    @Autowired
+    private SmsService smsService;
+
+
+    /**
+     * 短信测试标志，true/false
+     */
+    @Value("${yzytest.login.smstest}")
+    private Boolean smstest;
+
+    /**
+     * 注入会员服务接口
+     */
+//    @Autowired
+//    private IUmsMemberService customerService;
+
+
+    @Override
+    public int sendRegisterSmsCode(String mobile, Consumer<String> consumer) {
+
+        logger.debug("sendRegisterSmsCode and mobile:{}");
+        // 如果要注册的手机号码存在 则直接返回
+        /*if (customerService.isMobileExist(mobile) != 0) {
+            logger.error("sendRegisterSmsCode fail due to mobile :{} is exist...", mobile);
+            return -1;
+        }*/
+
+        // 生成的6位数数字
+        String code = String.format("%06d", (int) (Math.random() * 1000000));
+
+
+        if(true){
+            code = "1234";
+        }
+        else if (smsService.sendSms(mobile, code) == 1) {
+                // 短信验证码发送失败
+                logger.error("send sms fail....");
+                return 1;
+            }
+        //  发送成功后回调
+        if (Objects.nonNull(consumer)) {
+            consumer.accept(code);
+        }
+
+        return 0;
+    }
+
+    /**
+     * 发送注册短信验证码
+     *
+     * @param mobile   手机号码
+     * @param consumer 回调接口
+     * @return 0 成功 1 失败 -1 手机号码已经存在
+     */
+    @Override
+    public int sendRegisterSmsCodeFortest(String mobile, Consumer<String> consumer) {
+        logger.debug("sendRegisterSmsCodeFortest and mobile:{}");
+        // 如果要注册的手机号码存在 则直接返回
+        /*if (customerService.isMobileExist(mobile) != 0) {
+            logger.error("sendRegisterSmsCode fail due to mobile :{} is exist...", mobile);
+            return -1;
+        }*/
+
+        // 生成的6位数数字
+        String code = String.format("%06d", (int) (Math.random() * 1000000));
+
+        logger.warn("sendRegisterSmsCodeFortest smstest: {}", smstest);
+        if(smstest){
+            code = "1234";
+        }
+        else if (smsService.sendSms(mobile, code) == 1) {
+            // 短信验证码发送失败
+            logger.error("send sms fail....");
+            return 1;
+        }
+        //  发送成功后回调
+        if (Objects.nonNull(consumer)) {
+            consumer.accept(code);
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int sendRegisterSmsCodeForPc(String mobile, String kaptcha, String oldKaptcha, Consumer<String> consumer) {
+
+        logger.debug("sendRegisterSmsCode and mobile:{}");
+
+
+        // 如果要注册的手机号码存在 则直接返回
+        /*if (customerService.isMobileExist(mobile) != 0) {
+            logger.error("sendRegisterSmsCode fail due to mobile :{} is exist...", mobile);
+            return -4;
+        }*/
+
+        int checkKaptchaRes = checkKaptcha(kaptcha, oldKaptcha);
+        if (checkKaptchaRes != 1) {
+            logger.error("sendRegisterSmsCode fail due to kaptcha is error...");
+            return checkKaptchaRes;
+        }
+
+        // 生成的6位数数字
+        String code = String.format("%06d", (int) (Math.random() * 1000000));
+
+        // 短信验证码发送失败
+        if (smsService.sendSms(mobile, code) == 1) {
+            logger.error("send sms fail....");
+            return 1;
+        }
+
+        //  发送成功后回调
+        if (Objects.nonNull(consumer)) {
+            consumer.accept(code);
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int registerCustomer(String mobile, String password, String code, String originCode, String recommondCode) {
+        logger.debug("registerCustomer and mobile :{} \r\n code:{} \r\n: originCode:{} \r\n recommondCode:{}", mobile, code, originCode, recommondCode);
+
+        if (StringUtils.isEmpty(code)) {
+            logger.error("registerCustomer fail due to code is empty...");
+            return -1;
+        }
+
+        if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(password)) {
+            logger.error("registerCustomer fail due to mobile or password is empty...");
+            return -2;
+        }
+
+        // 判断手机号码是否存在
+        /*if (customerService.isMobileExist(mobile) != 0) {
+            logger.error("registerCustomer fail due to mobile is exist");
+            return -3;
+        }*/
+
+        // 校验验证码是否正确TODO
+        if (!code.equals(originCode)) {
+            logger.error("registerCustomer fail due to code is error with originCode...");
+            return -1;
+        }
+
+        // 进行会员注册
+//        return customerService.(UmsMember.buildAppRegisterCustomer(mobile, password, recommondCode));
+        return 1;
+    }
+
+    /**
+     * 免密用户自动注册
+     *
+     * @param phoneNo     手机号码
+     * @param channelType 渠道类型
+     * @return -1 手机验证码错误 -2 参数错误 0 失败  成功>0 -3 手机号码已存在 -10  推荐人不存在
+     */
+    @Override
+    public Long unAuthRegister(String phoneNo, String channelType) {
+        logger.debug("registerCustomer and mobile :{}", phoneNo);
+
+        // 判断手机号码是否存在
+        /*if (customerService.isMobileExist(phoneNo) != 0) {
+            logger.error("registerCustomer fail due to mobile is exist");
+            return -3L;
+        }*/
+//        UmsMember customer = UmsMember.buildH5RegisterCustomer(phoneNo, null);
+//        customer.setChannelType(channelType);
+        // 进行会员注册
+//        return customerService.autoAddCustomer(customer);
+        return 1L;
+    }
+
+    @Override
+    public int checkKaptcha(String kaptcha, String kaptchaInSession) {
+        logger.debug("register checkKaptcha and kaptcha:{}\r\n kaptchaInSession:{}", kaptcha, kaptchaInSession);
+        if (StringUtils.isEmpty(kaptchaInSession)) {
+            logger.error("register checkKaptcha fail:kaptchaInSession is not exist ");
+            return -1;
+        }
+        if (StringUtils.isEmpty(kaptcha)) {
+            logger.error("register checkKaptcha fail:kaptcha is not exist ");
+            return -2;
+        }
+        if (!kaptcha.equals(kaptchaInSession)) {
+            logger.error("register checkKaptcha fail:kaptchaInSession is not equal to kaptcha ");
+            return -3;
+        }
+        return 1;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SendTencentSms.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SendTencentSms.java
new file mode 100644
index 0000000..9663b74
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SendTencentSms.java
@@ -0,0 +1,45 @@
+package com.ruoyi.member.service.impl;
+
+import com.github.qcloudsms.SmsMultiSender;
+import com.github.qcloudsms.SmsResultBase;
+import com.github.qcloudsms.SmsSingleSender;
+import com.ruoyi.setting.domain.LsSmsSetting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Tencent Cloud Sms Sendsms
+ * https://cloud.tencent.com/document/product/382/38778
+ */
+public class SendTencentSms {
+    private static final Logger log = LoggerFactory.getLogger(SendTencentSms.class);
+    /**
+     * 按模板发送短信 支持单发和群发
+     *
+     * @param smsSet 短信配置
+     */
+    public static int sendMessage(LsSmsSetting smsSet, String[] params, String phones) {
+
+        String regex = ";";
+        String[] phoneNumbers = phones.split(regex);
+        SmsResultBase result = null;
+
+        try {
+            log.debug("url:{},phones:{},templateId:{},params:{}", smsSet.getUrl(), phones, smsSet.getTemplateId(), params);
+            // 是否单发
+            if (phoneNumbers.length == 1) {
+                //APPID getInterfaceUrl
+                SmsSingleSender ssender = new SmsSingleSender(Integer.parseInt(smsSet.getUrl()), smsSet.getKey());
+                result = ssender.sendWithParam("86", phoneNumbers[0], Integer.parseInt(smsSet.getTemplateId()), params, smsSet.getSign(), "", "");
+            } else {
+                SmsMultiSender msender = new SmsMultiSender(Integer.parseInt(smsSet.getUrl()), smsSet.getKey());
+                result = msender.sendWithParam("86", phoneNumbers, Integer.parseInt(smsSet.getTemplateId()), params, smsSet.getSign(), "", "");
+            }
+            return 0;
+        } catch (Exception e) {
+            log.error("腾讯云短信发送失败,phoneNumbers={},smsSet={}", phoneNumbers, smsSet, e);
+            return 1;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SmsServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SmsServiceImpl.java
new file mode 100644
index 0000000..5b84835
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SmsServiceImpl.java
@@ -0,0 +1,300 @@
+package com.ruoyi.member.service.impl;
+
+
+import com.ruoyi.member.service.SmsService;
+import com.ruoyi.setting.domain.LsSmsSetting;
+import com.ruoyi.setting.service.ILsSmsSettingService;
+import com.ruoyi.util.SmsUtil;
+import com.ruoyi.util.WechatUtils;
+import com.ruoyi.util.bean.RequestParam;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * Created by 魔金商城 on 17/11/18.
+ * 发送短信接口实现
+ */
+@Service
+public class SmsServiceImpl implements SmsService {
+
+    /**
+     * 团长审批状态
+     */
+    private static final String STATUS = "通过";
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(SmsServiceImpl.class);
+    /**
+     * 注入短信设置服务接口
+     */
+    @Autowired
+    private ILsSmsSettingService smsSetService;
+
+    /**
+     * 短信测试标志，true/false
+     */
+    @Value("${yzytest.login.smsplatid}")
+    private Integer smsplatId;
+
+    @Override
+    public int sendSms(String phone, String content) {
+        int result = 1;
+        logger.debug("sendSms and phone:{} \r\n content:{}", phone, content);
+
+        // SmsSet smsSet = smsSetService.querySmsSet().get(0);
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendSms fail due to smsSet is null...");
+            return result;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            // 阿里云短信
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getTemplateId());
+                requestParam.setTemplateParam("{\"code\":\"" + content + "\"}");
+                result = SmsUtil.newSendSms(requestParam);
+            }
+            else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[1];
+                params[0] = content;
+                result = SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+            else if(smsSet.getId() == smsplatId.longValue() && smsSet.getStatus() && smsSet.getTemplateId().equals("KSD_SMSCODE")){
+//                快速达短信平台发送短信
+                List<NameValuePair> params = new ArrayList<NameValuePair>();
+                params.add(new BasicNameValuePair("Account", smsSet.getKey()));
+                params.add(new BasicNameValuePair("Password", smsSet.getSecret()));
+                params.add(new BasicNameValuePair("Mobile", phone));
+                params.add(new BasicNameValuePair("Content", smsSet.getSign().replace("content", content)));
+                params.add(new BasicNameValuePair("Extnum", null));
+                params.add(new BasicNameValuePair("Time", null));
+                logger.debug("sendsms KSD with: {}", smsSet.toString());
+                String smsRet = executeHttpPost(smsSet.getUrl(), params);
+                if(smsRet.startsWith("SUCCESS")){
+                    result = 0;
+                }
+                else {
+                    logger.error("{} send sms wrong with: {}", smsSet.getTemplateId(), smsRet);
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int sendWiteOffCodeSms(String phone, String code, String writeOffCode, String storeName) {
+        logger.debug("sendWiteOffCodeSms and phone:{} \r\n code:{} \r\n writeOffCode:{} \r\n storeName:{}", phone, code, writeOffCode, storeName);
+
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendWiteOffCodeSms fail due to smsSet is null...");
+            return 0;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getWriteoffTemplateId());
+                requestParam.setSmsParamString("{\"code\":\"" + code + "\",\"product\":\"\",\"storename\":\"" + storeName + "\",\"writeoffcode\":\"" + writeOffCode + "\"}");
+                SmsUtil.newSendSms(requestParam);
+            } else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[3];
+                params[0] = storeName;
+                params[1] = code;
+                params[2] = writeOffCode;
+                SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int sendVirtualOrderWiteOffCodeSms(String phone, String code, String writeOffCode, String storeName) {
+        logger.debug("sendVirtualOrderWiteOffCodeSms  and phone :{} \r\n code:{} \r\n writeOffCode:{} \r\n storeName:{}", phone, code, writeOffCode, storeName);
+
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendVirtualOrderWiteOffCodeSms fail due to smsSet is null...");
+            return 0;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            //阿里云短信
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getVirtualOrderTemplateId());
+                requestParam.setSmsParamString("{\"code\":\"" + code + "\",\"product\":\"\",\"storename\":\"" + storeName + "\",\"writeoffcode\":\"" + writeOffCode + "\"}");
+                SmsUtil.newSendSmsCommon(requestParam);
+            } else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[3];
+                params[0] = storeName;
+                params[1] = code;
+                params[2] = writeOffCode;
+                SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * 发送社区团购审核结果通知短信
+     *
+     * @param phone      手机号码
+     * @param submittime 通过时间
+     * @return 成功返回0 失败返回1
+     */
+    @Override
+    public int sendAuditTemplateOffCodeSms(String phone, String submittime) {
+        logger.debug("sendAuditTemplateOffCodeSms  and phone :{} \r\n submittime:{}", phone, submittime);
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendAuditTemplateOffCodeSms fail due to smsSet is null...");
+            return 0;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            //阿里云短信
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getAuditTemplateId());
+                requestParam.setSmsParamString("{\"submittime\":\"" + submittime + "\",\"product\":\"\",\"status\":\"" + STATUS + "\"}");
+                SmsUtil.newSendSmsCommon(requestParam);
+            } else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[1];
+                params[0] = submittime;
+                SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public int sendCommunityBuySettlementSms(String phone, String communityName, BigDecimal price) {
+
+        logger.debug("sendCommunityBuySettlementSms  and communityName :{} \r\n price:{} \r\n phone:{}", communityName, price, phone);
+
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendCommunityBuySettlementSms fail due to smsSet is null...");
+            return 0;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            //阿里云短信
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getSettlementTemplateId());
+                requestParam.setSmsParamString("{\"communityname\":\"" + communityName + "\",\"product\":\"\",\"price\":\"" + price + "\"}");
+                SmsUtil.newSendSmsCommon(requestParam);
+            } else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[2];
+                params[0] = communityName;
+                params[1] = String.valueOf(price);
+                SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public int sendCommunityBuyWitudrawSms(String phone, String submittime, BigDecimal price) {
+
+
+        logger.debug("sendCommunityBuyWitudrawSms  and phone :{} \r\n submittime:{} \r\n price:{}", phone, submittime, price);
+
+        List<LsSmsSetting> smsSetList = smsSetService.selectLsSmsSettingList(null);
+
+        if (Objects.isNull(smsSetList)) {
+            logger.error("sendCommunityBuyWitudrawSms fail due to smsSet is null...");
+            return 0;
+        }
+        for (LsSmsSetting smsSet : smsSetList) {
+            //阿里云短信
+            if (smsSet.getId() == 1 && smsSet.getStatus()) {
+                RequestParam requestParam = convert(phone, smsSet);
+                requestParam.setTemplateCode(smsSet.getWithdrawTemplateId());
+                requestParam.setSmsParamString("{\"submittime\":\"" + submittime + "\",\"product\":\"\",\"price\":\"" + price + "\"}");
+                SmsUtil.newSendSmsCommon(requestParam);
+            } else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
+                String[] params = new String[2];
+                params[0] = submittime;
+                params[1] = price.toString();
+                SendTencentSms.sendMessage(smsSet, params, phone);
+            }
+        }
+        return 0;
+    }
+
+    private RequestParam convert(String phone, LsSmsSetting smsSet) {
+        RequestParam requestParam = new RequestParam();
+        requestParam.setPhoneNumbers(phone);
+        requestParam.setSignName(smsSet.getSign());
+        requestParam.setInterfaceUrl(smsSet.getUrl());
+        requestParam.setAccessKeyId(smsSet.getKey());
+        requestParam.setAccessKeySecret(smsSet.getSecret());
+        return requestParam;
+    }
+
+    /**
+     * 执行POST方法请求数据
+     *
+     * @param url 请求地址
+     * @param params 请求参数
+     * @return 返回数据
+     */
+    private String executeHttpPost(String url, List<NameValuePair> params) {
+        logger.debug("executeHttpPost and url:{}", url);
+        String result = null;
+        BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+        HttpPost httpRequest = new HttpPost(url);
+
+        try {
+            httpRequest.setEntity(new UrlEncodedFormEntity(params,"UTF-8"));
+            httpRequest.setHeader("Content-type", "application/x-www-form-urlencoded");
+            //使用DefaultHttpClient类的execute方法发送HTTP GET请求，并返回HttpResponse对象。
+            HttpResponse httpResponse = httpClient.execute(httpRequest);//其中HttpGet是HttpUriRequst的子类
+            HttpEntity httpEntity = httpResponse.getEntity();
+            result = EntityUtils.toString(httpEntity, "UTF-8");//取出应答字符串
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatAppletLoginServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatAppletLoginServiceImpl.java
new file mode 100644
index 0000000..a04561e
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatAppletLoginServiceImpl.java
@@ -0,0 +1,179 @@
+package com.ruoyi.member.service.impl;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SnowflakeIdWorker;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import com.ruoyi.util.*;
+import com.ruoyi.member.service.WeChatAppletLoginService;
+import com.ruoyi.member.service.WeChatCustomerLinkService;
+import com.ruoyi.member.vo.AppletLoginInfo;
+import com.ruoyi.member.vo.AppletLoginRedisParamResponse;
+import com.ruoyi.setting.bean.WechatPaySet;
+import com.ruoyi.setting.service.ILsPaySettingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * 微信小程序登录服务实现类
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+@Service
+public class WeChatAppletLoginServiceImpl implements WeChatAppletLoginService {
+    /**
+     * 日志
+     */
+    private Logger log = LoggerFactory.getLogger(WeChatAppletLoginServiceImpl.class);
+    /**
+     * 注入微信用户关联服务
+     */
+    @Autowired
+    private WeChatCustomerLinkService weChatCustomerLinkService;
+
+    /**
+     * 注入随机数生成器
+     */
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+
+    /**
+     * 注入支付设置服务
+     */
+    @Autowired
+    private ILsPaySettingService paySetService;
+
+
+    @Override
+    public AppletLoginInfo getLoginInfo(String code, String unionId, Consumer<AppletLoginRedisParamResponse> claimsConsumer) {
+        log.debug("getLoginInfo and code:{} \r\n unionId:{}", code, unionId);
+        AppletLoginRedisParamResponse appletLoginRedisParamResponse = new AppletLoginRedisParamResponse();
+        String token = snowflakeIdWorker.nextId() + "";
+        appletLoginRedisParamResponse.setToken(token);
+        WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        WechatSetting wechatSetting = new WechatSetting();
+        wechatSetting.setAppId(wechatAppletPaySet.getAppId());
+        wechatSetting.setAppSecret(wechatAppletPaySet.getAppSecret());
+        if (!wechatSetting.checkAppletOAuthParams()) {
+            log.error("getLoginInfo fail:checkAppletOAuthParams fail");
+            return buildNotLinked(claimsConsumer, appletLoginRedisParamResponse, token, null);
+        }
+        WeChatAppletLoginResponse weChatAppletLoginResponse = WeChatAppletUtils.getLoginInfo(code, wechatSetting);
+        if (Objects.isNull(weChatAppletLoginResponse)) {
+            log.error("getLoginInfo fail: getLoginInfo fail");
+            return buildNotLinked(claimsConsumer, appletLoginRedisParamResponse, token, null);
+        }
+        appletLoginRedisParamResponse.setSessionKey(weChatAppletLoginResponse.getSession_key());
+        appletLoginRedisParamResponse.setOpenId(weChatAppletLoginResponse.getOpenid());
+        if (!weChatAppletLoginResponse.hasUnionId()) {
+            weChatAppletLoginResponse.setUnionid(unionId);
+        }
+        if (!weChatAppletLoginResponse.hasUnionId()) {
+            log.info("getLoginInfo: no unionId");
+            return buildNotLinked(claimsConsumer, appletLoginRedisParamResponse, token, null);
+        }
+        appletLoginRedisParamResponse.setUnionId(weChatAppletLoginResponse.getUnionid());
+        WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByUnionId(weChatAppletLoginResponse.getUnionid());
+        if (Objects.isNull(weChatCustomerLink)) {
+            log.info("getLoginInfo: not linked");
+            return buildNotLinked(claimsConsumer, appletLoginRedisParamResponse, token, weChatAppletLoginResponse.getUnionid());
+        }
+        log.info("getLoginInfo:  linked");
+        //如果没有小程序的openId,则更新关联信息
+        if (!weChatCustomerLink.hasAppletOpenId()) {
+            weChatCustomerLink.setAppletOpenId(weChatAppletLoginResponse.getOpenid());
+            weChatCustomerLinkService.updateWeChatCustomerLink(weChatCustomerLink);
+        }
+        appletLoginRedisParamResponse.setCustomerId(weChatCustomerLink.getUserId());
+        claimsConsumer.accept(appletLoginRedisParamResponse);
+        return AppletLoginInfo.buildLinked(token);
+    }
+
+
+    @Override
+    public AppletLoginInfo dealUserInfo(WeChatAppletUserInfo weChatAppletUserInfo, String openId, String sessionKey, Consumer<AppletLoginRedisParamResponse> claimsConsumer) {
+        log.debug("dealUserInfo and weChatAppletUserInfo:{} \r\n sessionKey:{} \r\n openId:{}", weChatAppletUserInfo, sessionKey, openId);
+        String unionId = WeChatAppletUtils.getUnionIdFromUserInfo(sessionKey, weChatAppletUserInfo);
+        if (StringUtils.isEmpty(unionId)) {
+            log.error("dealUserInfo fail : getUnionIdFromUserInfo fail");
+            claimsConsumer.accept(null);
+            return AppletLoginInfo.buildNotLinked();
+        }
+        AppletLoginRedisParamResponse appletLoginRedisParamResponse = new AppletLoginRedisParamResponse();
+        appletLoginRedisParamResponse.setUnionId(unionId);
+        WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByUnionId(unionId);
+        if (Objects.isNull(weChatCustomerLink)) {
+            log.info("dealUserInfo: not linked");
+            claimsConsumer.accept(appletLoginRedisParamResponse);
+            return AppletLoginInfo.buildNotLinked().addUnionId(unionId);
+        }
+        log.info("dealUserInfo:  linked");
+        //如果没有小程序的openId,则更新关联信息
+        if (!weChatCustomerLink.hasAppletOpenId()) {
+            weChatCustomerLink.setAppletOpenId(openId);
+            weChatCustomerLinkService.updateWeChatCustomerLink(weChatCustomerLink);
+        }
+        appletLoginRedisParamResponse.setCustomerId(weChatCustomerLink.getUserId());
+        claimsConsumer.accept(appletLoginRedisParamResponse);
+        return AppletLoginInfo.buildLinked();
+    }
+
+    @Override
+    public int checkCustomerBind(String userName) {
+        log.debug("checkCustomerBind and userName:{} ", userName);
+        WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByUserName(userName);
+        if (!ObjectUtils.isEmpty(weChatCustomerLink) && !StringUtils.isEmpty(weChatCustomerLink.getAppletOpenId())) {
+            log.error("checkCustomerBind fail : bind already");
+            return -9;
+        }
+        return 1;
+    }
+
+    @Override
+    public int bindAccount(String openId, String unionId, long customerId) {
+        log.debug("bindAccount and openId:{} \r\n unionId:{} \r\n customerId:{}", openId, unionId, customerId);
+        WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByCustomerId(customerId);
+        if (!ObjectUtils.isEmpty(weChatCustomerLink) && !weChatCustomerLink.getUnionId().equals(unionId)) {
+            log.error("checkCustomerBind fail : bind already");
+            throw new ServiceException("R-00004");
+        }
+        if (Objects.isNull(weChatCustomerLink)) {
+            weChatCustomerLink = new WeChatCustomerLink();
+        }
+        weChatCustomerLink.setUnionId(unionId);
+        weChatCustomerLink.setAppletOpenId(openId);
+        weChatCustomerLink.setUserId(customerId);
+        //如果数据库中有记录就更新记录
+        if (-1 != weChatCustomerLink.getUserId()) {
+            return weChatCustomerLinkService.updateWeChatCustomerLink(weChatCustomerLink);
+        }
+        //否则新增
+        return weChatCustomerLinkService.addWeChatCustomerLink(weChatCustomerLink);
+    }
+
+    @Override
+    public int unbindAccount(long customerId, String unionId) {
+        log.debug("unbindAccount and customerId:{} \r\n unionId:{}", customerId, unionId);
+        return weChatCustomerLinkService.unbindWeChatCustomerLink(customerId, unionId);
+    }
+
+    /**
+     * 构建未关联返回
+     *
+     * @param claimsConsumer                回调
+     * @param appletLoginRedisParamResponse 小程序redis参数返回实体类
+     * @param token                         token
+     * @return 小程序登录信息
+     */
+    private AppletLoginInfo buildNotLinked(Consumer<AppletLoginRedisParamResponse> claimsConsumer, AppletLoginRedisParamResponse appletLoginRedisParamResponse, String token, String unionId) {
+        claimsConsumer.accept(appletLoginRedisParamResponse);
+        return AppletLoginInfo.buildNotLinked(token).addUnionId(unionId);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatCustomerLinkServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatCustomerLinkServiceImpl.java
new file mode 100644
index 0000000..3699eda
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/WeChatCustomerLinkServiceImpl.java
@@ -0,0 +1,138 @@
+package com.ruoyi.member.service.impl;
+
+
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.service.ISegchkUserIndexService;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import com.ruoyi.member.mapper.WeChatCustomerLinkMapper;
+import com.ruoyi.member.service.WeChatCustomerLinkService;
+import com.ruoyi.common.utils.RedisCahceKey;
+import com.ruoyi.util.Claims;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+/**
+ * 微信用户关联服务实现类
+ */
+@Service
+public class WeChatCustomerLinkServiceImpl implements WeChatCustomerLinkService {
+
+    /**
+     * 日志
+     */
+    private Logger logger = LoggerFactory.getLogger(WeChatCustomerLinkServiceImpl.class);
+    /**
+     * 注入微信用户数据库服务
+     */
+    @Autowired
+    private WeChatCustomerLinkMapper weChatCustomerLinkMapper;
+    /**
+     * 用户数据库服务
+     */
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+
+    /**
+     * 注入用户服务
+     */
+//    @Autowired
+//    private IUmsMemberService customerService;
+
+
+    @CacheEvict(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#weChatCustomerLink.unionId")
+    @Override
+    public int addWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink) {
+        logger.debug("addWeChatCustomerLink and weChatCustomerLink:{}", weChatCustomerLink);
+        return weChatCustomerLinkMapper.addWeChatCustomerLink(weChatCustomerLink);
+    }
+
+    @Override
+    public WeChatCustomerLink queryWeChatCustomerLinkByOpenId(String openId) {
+        logger.debug("queryWeChatCustomerLinkByOpenId and openId:{}", openId);
+        return weChatCustomerLinkMapper.queryWeChatCustomerLinkByOpenId(openId);
+    }
+
+    @Override
+    public WeChatCustomerLink queryWeChatCustomerLinkByCustomerId(long customerId) {
+        logger.debug("queryWeChatCustomerLinkByCustomerId and customerId:{}", customerId);
+        return weChatCustomerLinkMapper.queryWeChatCustomerLinkByCustomerId(customerId);
+    }
+
+    @Override
+    public WeChatCustomerLink queryWeChatCustomerLinkByUserName(String userName) {
+        logger.debug("queryWeChatCustomerLinkByUserName and userName:{}", userName);
+//        UmsMember customer = null;
+//        UmsMember customer = customerService.queryCustomerByNameInWriteDataSource(userName);
+        /*if (ObjectUtils.isEmpty(customer)) {
+            logger.error("queryWeChatCustomerLinkByUserName fail: member is null");
+            return null;
+        }*/
+        return null;
+//        return weChatCustomerLinkMapper.queryWeChatCustomerLinkByCustomerId(customer.getCustomerLevelId());
+    }
+
+    @Cacheable(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#unionId")
+    @Override
+    public WeChatCustomerLink queryWeChatCustomerLinkByUnionId(String unionId) {
+        logger.debug("queryWeChatCustomerLinkByUnionId and unionId:{}", unionId);
+        return weChatCustomerLinkMapper.queryWeChatCustomerLinkByUnionId(unionId);
+    }
+
+    @CacheEvict(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#unionId")
+    @Override
+    public int unbindWeChatCustomerLink(long customerId, String unionId) {
+        logger.debug("unbindWeChatCustomerLink and customerId:{} \r\n unionId:{}", customerId, unionId);
+        return weChatCustomerLinkMapper.deleteWeChatCustomerLink(customerId);
+    }
+
+    @CacheEvict(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#weChatCustomerLink.unionId")
+    @Override
+    public int updateWeChatCustomerLink(WeChatCustomerLink weChatCustomerLink) {
+        logger.debug("updateWeChatCustomerLink andweChatCustomerLink:{}", weChatCustomerLink);
+        return weChatCustomerLinkMapper.updateWeChatCustomerLink(weChatCustomerLink);
+    }
+
+    /**
+     * 更新微信用户关联
+     *
+     * @param segchkUserWechat 微信用户关联实体
+     * @param userLevel
+     * @return 1成功 否则失败
+     */
+    @Override
+    public int addSegchkUserWechat(SegchkUserWechat segchkUserWechat, String userLevel) {
+        return segchkUserIndexService.updateWeChatInfoByUserId(segchkUserWechat, userLevel);
+    }
+
+    /**
+     * 更新微信用户关联
+     *
+     * @param segchkUserWechat 微信用户关联实体
+     * @param userLevel
+     * @return 1成功 否则失败
+     */
+    @CacheEvict(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#token")
+    @Override
+    public int addSegchkUserWechat(SegchkUserWechat segchkUserWechat, String userLevel, String token) {
+        return segchkUserIndexService.updateWeChatInfoByUserId(segchkUserWechat, userLevel);
+    }
+
+    /**
+     * 获取微信用户关联
+     *
+     * @param claims 微信用户关联实体
+     * @param token
+     * @return 1成功 否则失败
+     */
+    @Cacheable(value = RedisCahceKey.WE_CHAT_CUSTOMER_LINK, key = "'WE_CHAT_CUSTOMER_LINK'+#token")
+    @Override
+    public SegchkUserWechat getSegchkUserWechat(Claims claims, String token) {
+        return segchkUserIndexService.queryWeChatInfoByUserId(claims);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginInfo.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginInfo.java
new file mode 100644
index 0000000..f1d795a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginInfo.java
@@ -0,0 +1,129 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * 小程序登录信息
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+@ApiModel(description = "小程序登录信息")
+public class AppletLoginInfo {
+
+    /**
+     * token
+     */
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    /**
+     * 是否关联用户
+     */
+    @ApiModelProperty(value = "是否关联用户")
+    private boolean isLink;
+
+    /**
+     * 是否有unionId
+     */
+    @ApiModelProperty(value = "是否有unionId")
+    private boolean hasUnionId;
+
+
+    /**
+     * 构建已关联用户实体
+     *
+     * @param token token
+     * @return 小程序登录信息实体
+     */
+    public static AppletLoginInfo buildLinked(String token) {
+        AppletLoginInfo appletLoginInfo = new AppletLoginInfo();
+        appletLoginInfo.isLink = true;
+        appletLoginInfo.token = token;
+        appletLoginInfo.hasUnionId = true;
+        return appletLoginInfo;
+    }
+
+    /**
+     * 构建为关联用户实体
+     *
+     * @param token token
+     * @return 小程序登录信息实体
+     */
+    public static AppletLoginInfo buildNotLinked(String token) {
+        AppletLoginInfo appletLoginInfo = new AppletLoginInfo();
+        appletLoginInfo.isLink = false;
+        appletLoginInfo.token = token;
+        return appletLoginInfo;
+    }
+
+
+    /**
+     * 构建已关联用户实体
+     *
+     * @return 小程序登录信息实体
+     */
+    public static AppletLoginInfo buildLinked() {
+        AppletLoginInfo appletLoginInfo = new AppletLoginInfo();
+        appletLoginInfo.isLink = true;
+        appletLoginInfo.hasUnionId = true;
+        return appletLoginInfo;
+    }
+
+    /**
+     * 构建为关联用户实体
+     *
+     * @return 小程序登录信息实体
+     */
+    public static AppletLoginInfo buildNotLinked() {
+        AppletLoginInfo appletLoginInfo = new AppletLoginInfo();
+        appletLoginInfo.isLink = false;
+        return appletLoginInfo;
+    }
+
+    /**
+     * 添加unionId
+     *
+     * @param unionId 联合登录id
+     * @return 当前实体
+     */
+    public AppletLoginInfo addUnionId(String unionId) {
+        hasUnionId = !StringUtils.isEmpty(unionId);
+        return this;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public boolean isLink() {
+        return isLink;
+    }
+
+    public void setLink(boolean link) {
+        isLink = link;
+    }
+
+    public boolean isHasUnionId() {
+        return hasUnionId;
+    }
+
+    public void setHasUnionId(boolean hasUnionId) {
+        this.hasUnionId = hasUnionId;
+    }
+
+    @Override
+    public String toString() {
+        return "AppletLoginInfo{" +
+                "token='" + token + '\'' +
+                ", isLink=" + isLink +
+                ", hasUnionId=" + hasUnionId +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginRedisParamResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginRedisParamResponse.java
new file mode 100644
index 0000000..98f5ac5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/AppletLoginRedisParamResponse.java
@@ -0,0 +1,96 @@
+package com.ruoyi.member.vo;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 小程序redis参数返回实体类
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class AppletLoginRedisParamResponse {
+
+    /**
+     * 小程序sessionKey
+     */
+    private String sessionKey;
+
+    /**
+     * token
+     */
+    private String token;
+
+    /**
+     * 联合登录id
+     */
+    private String unionId;
+
+    /**
+     * 用户id
+     */
+    private long customerId = -1;
+
+    /**
+     * 微信用户标识
+     */
+    private String openId;
+
+    private String code;
+
+    /**
+     * 判断是否有unionId
+     *
+     * @return 有返回true, 否则返回false
+     */
+    public boolean hasUnionId() {
+        return !StringUtils.isEmpty(unionId);
+    }
+
+    public String getSessionKey() {
+        return sessionKey;
+    }
+
+    public void setSessionKey(String sessionKey) {
+        this.sessionKey = sessionKey;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewEmailRequest.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewEmailRequest.java
new file mode 100644
index 0000000..430348b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewEmailRequest.java
@@ -0,0 +1,133 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * 绑定新邮箱实体
+ */
+@ApiModel(description = "绑定新邮箱实体")
+public class BindNewEmailRequest {
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private long customerId;
+
+    /**
+     * 用户手机
+     */
+    @ApiModelProperty(value = "用户手机")
+    private String mobile;
+
+    /**
+     * 新邮箱
+     */
+    @ApiModelProperty(value = "新邮箱")
+    private String email;
+
+    /**
+     * 是否有凭证
+     */
+    @ApiModelProperty(value = "是否有凭证")
+    private String hasCert;
+
+    /**
+     * 校验码
+     */
+    @ApiModelProperty(value = "校验码")
+    private String checkCode;
+
+    /**
+     * 用户输入的图片验证码
+     */
+    @ApiModelProperty(value = "用户输入的图片验证码")
+    private String kaptcha;
+
+    /**
+     * 存在redis中的图片验证码
+     */
+    @ApiModelProperty(value = "存在redis中的图片验证码")
+    private String oldKaptcha;
+
+    /**
+     * 随机数
+     */
+    @ApiModelProperty(value = "随机数")
+    private String uuid;
+
+    /**
+     * 判断是否有凭证
+     *
+     * @return 有返回true
+     */
+    public boolean hasOwnCert() {
+        return !StringUtils.isEmpty(this.hasCert);
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getHasCert() {
+        return hasCert;
+    }
+
+    public void setHasCert(String hasCert) {
+        this.hasCert = hasCert;
+    }
+
+    public String getCheckCode() {
+        return checkCode;
+    }
+
+    public void setCheckCode(String checkCode) {
+        this.checkCode = checkCode;
+    }
+
+    public String getKaptcha() {
+        return kaptcha;
+    }
+
+    public void setKaptcha(String kaptcha) {
+        this.kaptcha = kaptcha;
+    }
+
+    public String getOldKaptcha() {
+        return oldKaptcha;
+    }
+
+    public void setOldKaptcha(String oldKaptcha) {
+        this.oldKaptcha = oldKaptcha;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewMobileRequest.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewMobileRequest.java
new file mode 100644
index 0000000..7d4e57f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindNewMobileRequest.java
@@ -0,0 +1,105 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by 魔金商城 on 17/11/21.
+ * 重新绑定手机号码实体
+ */
+@ApiModel(description = "重新绑定手机号码实体")
+public class BindNewMobileRequest {
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private long customerId;
+
+    /**
+     * 重新绑定的手机号码
+     */
+    @ApiModelProperty(value = "重新绑定的手机号码")
+    private String mobile;
+
+    /**
+     * 用户输入的验证码
+     */
+    @ApiModelProperty(value = "用户输入的验证码")
+    private String code;
+
+    /**
+     * 发送给手机的验证码
+     */
+    @ApiModelProperty(value = "发送给手机的验证码")
+    private String originCode;
+
+    /**
+     * 是否有凭证
+     */
+    @ApiModelProperty(value = "是否有凭证")
+    private String hasCert;
+
+    /**
+     * 判断是否有凭证
+     *
+     * @return 有返回true
+     */
+    public boolean hasOwnCert() {
+        return !StringUtils.isEmpty(this.hasCert);
+    }
+
+    /**
+     * 判断验证码是否正确
+     *
+     * @return 正确返回0
+     */
+    public boolean validateCode() {
+        if (StringUtils.isEmpty(this.code)) {
+            return false;
+        }
+
+        return this.code.equals(this.originCode);
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getOriginCode() {
+        return originCode;
+    }
+
+    public void setOriginCode(String originCode) {
+        this.originCode = originCode;
+    }
+
+    public String getHasCert() {
+        return hasCert;
+    }
+
+    public void setHasCert(String hasCert) {
+        this.hasCert = hasCert;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindParams.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindParams.java
new file mode 100644
index 0000000..a5ec429
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/BindParams.java
@@ -0,0 +1,139 @@
+package com.ruoyi.member.vo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.function.Consumer;
+
+
+/**
+ * 登入参数实体
+ */
+@ApiModel(description = "登入参数实体")
+public class BindParams extends BaseEntity {
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 运营商id
+     */
+    @ApiModelProperty(value = "运营商id")
+    private String providerId;
+
+    /**
+     * 用户角色
+     */
+    @ApiModelProperty(value = "用户角色")
+    private String userLevel;
+
+
+    /**
+     * 授权code
+     */
+    @ApiModelProperty(value = "授权code")
+    private String code;
+
+    /**
+     * 昵称
+     */
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    /**
+     * 头像
+     */
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    /**
+     * getUserProfile返回
+     */
+    @ApiModelProperty(value = "getUserProfile返回")
+    private String profileRes;
+
+
+    /**
+     * 验证验证码 是否正确 （目前都不需要验证码）
+     *
+     * @return 正确返回true  否则返回false
+     */
+    public boolean validateCode() {
+
+        // 目前都不需要验证码
+        return true;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(String providerId) {
+        this.providerId = providerId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(String userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getProfileRes() {
+        return profileRes;
+    }
+
+    public void setProfileRes(String profileRes) {
+        this.profileRes = profileRes;
+    }
+
+    @Override
+    public String toString() {
+        return "BindParams{" +
+                "userId='" + userId + '\'' +
+                ", providerId='" + providerId + '\'' +
+                ", userLevel='" + userLevel + '\'' +
+                ", code='" + code + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", profileRes='" + profileRes + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/CustomerSearchCondition.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/CustomerSearchCondition.java
new file mode 100644
index 0000000..b862df8
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/CustomerSearchCondition.java
@@ -0,0 +1,178 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by 魔金商城 on 17/5/19.
+ * 会员搜索条件
+ */
+@ApiModel(description = "会员搜索条件")
+public class CustomerSearchCondition {
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    /**
+     * 用户的真实姓名
+     */
+    @ApiModelProperty(value = "用户的真实姓名")
+    private String releName;
+
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    /**
+     * 手机是否验证  0 否 1 验证 默认0
+     */
+    @ApiModelProperty(value = "手机是否验证  0 否 1 验证 默认0")
+    private String isMobileVerification;
+
+    /**
+     * 邮箱是否验证   0 否 1 验证 默认0
+     */
+    @ApiModelProperty(value = "邮箱是否验证   0 否 1 验证 默认0")
+    private String isEmailVerification;
+
+    /**
+     * 用户状态 1 正常 2 冻结 默认1
+     */
+    @ApiModelProperty(value = "用户状态 1 正常 2 冻结 默认1")
+    private String status;
+
+
+    /**
+     * 1 普通用户 2 商家店铺用户
+     */
+    @ApiModelProperty(value = "1 普通用户 2 商家店铺用户")
+    private String type;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    /**
+     * 归属门店id
+     */
+    @ApiModelProperty(value = "归属门店id")
+    private long beloneStoreId;
+
+
+    /**
+     * 获得搜索条件
+     *
+     * @return 返回搜索套件
+     */
+    public Map<String, Object> getSearchParams() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("userName", userName);
+        params.put("releName", releName);
+        params.put("mobile", mobile);
+        params.put("email", email);
+        params.put("isMobileVerification", isMobileVerification);
+        params.put("isEmailVerification", isEmailVerification);
+        params.put("status", status);
+        params.put("type", type);
+        params.put("createTime", createTime);
+        params.put("beloneStoreId", beloneStoreId);
+        return params;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getReleName() {
+        return releName;
+    }
+
+    public void setReleName(String releName) {
+        this.releName = releName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getIsMobileVerification() {
+        return isMobileVerification;
+    }
+
+    public void setIsMobileVerification(String isMobileVerification) {
+        this.isMobileVerification = isMobileVerification;
+    }
+
+    public String getIsEmailVerification() {
+        return isEmailVerification;
+    }
+
+    public void setIsEmailVerification(String isEmailVerification) {
+        this.isEmailVerification = isEmailVerification;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getBeloneStoreId() {
+        return beloneStoreId;
+    }
+
+    public void setBeloneStoreId(long beloneStoreId) {
+        this.beloneStoreId = beloneStoreId;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/ForgetPwdRequest.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/ForgetPwdRequest.java
new file mode 100644
index 0000000..2be9550
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/ForgetPwdRequest.java
@@ -0,0 +1,174 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by 魔金商城 on 17/11/22.
+ * 忘记密码请求
+ */
+@ApiModel(description = "忘记密码请求")
+public class ForgetPwdRequest {
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码")
+    private String code;
+
+    /**
+     * 发送给手机的验证码
+     */
+    @ApiModelProperty(value = "发送给手机的验证码")
+    private String originCode;
+
+    /**
+     * 凭证
+     */
+    @ApiModelProperty(value = "凭证")
+    private String certificate;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 随机数
+     */
+    @ApiModelProperty(value = "随机数")
+    private String uuid;
+
+    /**
+     * 请求来自 1：pc
+     */
+    @ApiModelProperty(value = "请求来自 1：pc")
+    private String requestFrom;
+
+    /**
+     * 用户输入的图片验证码
+     */
+    @ApiModelProperty(value = "用户输入的图片验证码")
+    private String kaptcha;
+
+    /**
+     * 存在redis中的图片验证码
+     */
+    @ApiModelProperty(value = "存在redis中的图片验证码")
+    private String oldKaptcha;
+
+    /**
+     * 随机数（pc端图片验证码用）
+     */
+    @ApiModelProperty(value = "随机数（pc端图片验证码用）")
+    private String uuidForPcKaptcha;
+
+    /**
+     * 是否有凭证
+     *
+     * @return 有返回true
+     */
+    public boolean hasCertificate() {
+        return !StringUtils.isEmpty(certificate);
+    }
+
+    /**
+     * 判断验证码是否正确
+     *
+     * @return 正确返回true
+     */
+    public boolean validateCode() {
+        if (StringUtils.isEmpty(this.code)) {
+            return false;
+        }
+        return this.code.equals(this.originCode);
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getOriginCode() {
+        return originCode;
+    }
+
+    public void setOriginCode(String originCode) {
+        this.originCode = originCode;
+    }
+
+    public String getCertificate() {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getRequestFrom() {
+        return requestFrom;
+    }
+
+    public void setRequestFrom(String requestFrom) {
+        this.requestFrom = requestFrom;
+    }
+
+    public String getKaptcha() {
+        return kaptcha;
+    }
+
+    public void setKaptcha(String kaptcha) {
+        this.kaptcha = kaptcha;
+    }
+
+    public String getOldKaptcha() {
+        return oldKaptcha;
+    }
+
+    public void setOldKaptcha(String oldKaptcha) {
+        this.oldKaptcha = oldKaptcha;
+    }
+
+    public String getUuidForPcKaptcha() {
+        return uuidForPcKaptcha;
+    }
+
+    public void setUuidForPcKaptcha(String uuidForPcKaptcha) {
+        this.uuidForPcKaptcha = uuidForPcKaptcha;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/LoginParams.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/LoginParams.java
new file mode 100644
index 0000000..48a9065
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/LoginParams.java
@@ -0,0 +1,113 @@
+package com.ruoyi.member.vo;
+
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.function.Consumer;
+
+
+/**
+ * 登入参数实体
+ */
+@ApiModel(description = "登入参数实体")
+public class LoginParams {
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String mobile;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 回调函数
+     */
+    @ApiModelProperty(value = "回调函数")
+    private Consumer<SegchkUserBasicInfo> consumer;
+
+    /**
+     * 用户输入的验证码
+     */
+    @ApiModelProperty(value = "用户输入的验证码")
+    private String code;
+
+    /**
+     * session中的验证码
+     */
+    @ApiModelProperty(value = "session中的验证码")
+    private String codeInSession;
+
+    /**
+     * 登录来源 0 pc  1 app 2 mobile
+     */
+    private int source;
+
+    public void setFromApp() {
+        this.source = 1;
+    }
+
+    /**
+     * 验证验证码 是否正确 （目前都不需要验证码）
+     *
+     * @return 正确返回true  否则返回false
+     */
+    public boolean validateCode() {
+
+        // 目前都不需要验证码
+        return true;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Consumer<SegchkUserBasicInfo> getConsumer() {
+        return consumer;
+    }
+
+    public void setConsumer(Consumer<SegchkUserBasicInfo> consumer) {
+        this.consumer = consumer;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCodeInSession() {
+        return codeInSession;
+    }
+
+    public void setCodeInSession(String codeInSession) {
+        this.codeInSession = codeInSession;
+    }
+
+    public int getSource() {
+        return source;
+    }
+
+    public void setSource(int source) {
+        this.source = source;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/QueryCriteria.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/QueryCriteria.java
new file mode 100644
index 0000000..370e0d7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/QueryCriteria.java
@@ -0,0 +1,125 @@
+package com.ruoyi.member.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 会员预存款查询条件
+ */
+@ApiModel(description = "会员预存款查询条件")
+public class QueryCriteria {
+
+    /**
+     * 会员id
+     */
+    @ApiModelProperty(value = "会员id")
+    private long customerId;
+
+    private int pageNum =0;
+    /**
+     * 会员名称
+     */
+    @ApiModelProperty(value = "会员名称")
+    private String userName;
+
+    /**
+     * 交易单号
+     */
+    @ApiModelProperty(value = "交易单号")
+    private String transCode;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    /**
+     * 查询类型 1全部 2 收入 3支出 默认全部
+     */
+    @ApiModelProperty(value = "查询类型 1全部 2 收入 3支出 默认全部")
+    private String filterType = "1";
+
+    /**
+     * 获得查询条件
+     *
+     * @return 返回查询条件
+     */
+    public Map<String, Object> getQueryMap() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("customerId", customerId);
+        params.put("userName", userName);
+        params.put("transCode", transCode);
+        params.put("startTime", startTime);
+        params.put("endTime", endTime);
+        params.put("filterType", filterType);
+        params.put("pageNum", pageNum);
+        return params;
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getTransCode() {
+        return transCode;
+    }
+
+    public void setTransCode(String transCode) {
+        this.transCode = transCode;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getFilterType() {
+        return filterType;
+    }
+
+    public void setFilterType(String filterType) {
+        this.filterType = filterType;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UnAuthLoginParams.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UnAuthLoginParams.java
new file mode 100644
index 0000000..3eadbdc
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UnAuthLoginParams.java
@@ -0,0 +1,79 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.function.Consumer;
+
+/**
+ * 免密登入参数实体
+ */
+@ApiModel(description = "免密登入参数实体")
+public class UnAuthLoginParams {
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号")
+    private String phoneNo;
+    /**
+     * 时间戳
+     */
+    @ApiModelProperty(value = "时间戳")
+    private Long timeStamp;
+    /**
+     * 请求签名
+     */
+    @ApiModelProperty(value = "请求签名")
+    private String sign;
+
+    /**
+     * 渠道类型
+     */
+    @ApiModelProperty(value = "渠道类型")
+    private String channelType;
+    /**
+     * 回调函数
+     */
+    private Consumer<Long> consumer;
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public Long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+    }
+
+    public Consumer<Long> getConsumer() {
+        return consumer;
+    }
+
+    public void setConsumer(Consumer<Long> consumer) {
+        this.consumer = consumer;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePayPwdBean.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePayPwdBean.java
new file mode 100644
index 0000000..a995915
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePayPwdBean.java
@@ -0,0 +1,173 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by 魔金商城 on 17/11/20.
+ * 修改支付密码实体
+ */
+@ApiModel(description = "修改支付密码实体")
+public class UpdatePayPwdBean {
+
+    /**
+     * 会员id
+     */
+    @ApiModelProperty(value = "会员id")
+    private long customerId;
+
+    /**
+     * 用户输入的手机验证码
+     */
+    @ApiModelProperty(value = "用户输入的手机验证码")
+    private String code;
+
+    /**
+     * 存起来的手机验证码
+     */
+    @ApiModelProperty(value = "存起来的手机验证码")
+    private String originCode;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+
+    /**
+     * 凭证
+     */
+    @ApiModelProperty(value = "凭证")
+    private String certificate;
+
+    /**
+     * 请求来自 1：pc
+     */
+    @ApiModelProperty(value = "请求来自 1：pc")
+    private String requestFrom;
+
+    /**
+     * 用户输入的图片验证码
+     */
+    @ApiModelProperty(value = "用户输入的图片验证码")
+    private String kaptcha;
+
+    /**
+     * 存在redis中的图片验证码
+     */
+    @ApiModelProperty(value = "存在redis中的图片验证码")
+    private String oldKaptcha;
+
+    /**
+     * 随机数
+     */
+    @ApiModelProperty(value = "随机数")
+    private String uuid;
+
+
+    /**
+     * 是否有凭证
+     *
+     * @return 有返回true
+     */
+    public boolean hasCertificate() {
+        return !StringUtils.isEmpty(certificate);
+    }
+
+    /**
+     * 校验用户输入的验证码是否正确
+     *
+     * @return 正确返回true
+     */
+    public boolean validateCode() {
+        return StringUtils.isEmpty(this.code) ? false : this.code.equals(this.originCode);
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getOriginCode() {
+        return originCode;
+    }
+
+    public void setOriginCode(String originCode) {
+        this.originCode = originCode;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getCertificate() {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getRequestFrom() {
+        return requestFrom;
+    }
+
+    public void setRequestFrom(String requestFrom) {
+        this.requestFrom = requestFrom;
+    }
+
+    public String getKaptcha() {
+        return kaptcha;
+    }
+
+    public void setKaptcha(String kaptcha) {
+        this.kaptcha = kaptcha;
+    }
+
+    public String getOldKaptcha() {
+        return oldKaptcha;
+    }
+
+    public void setOldKaptcha(String oldKaptcha) {
+        this.oldKaptcha = oldKaptcha;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePwdBean.java b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePwdBean.java
new file mode 100644
index 0000000..1d71b98
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/member/vo/UpdatePwdBean.java
@@ -0,0 +1,172 @@
+package com.ruoyi.member.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by 魔金商城 on 17/11/20.
+ * 修改密码实体
+ */
+@ApiModel(description = "修改密码实体")
+public class UpdatePwdBean {
+
+    /**
+     * 会员id
+     */
+    @ApiModelProperty(value = "会员id")
+    private long customerId;
+
+    /**
+     * 用户输入的手机验证码
+     */
+    @ApiModelProperty(value = "用户输入的手机验证码")
+    private String code;
+
+    /**
+     * 存起来的手机验证码
+     */
+    @ApiModelProperty(value = "存起来的手机验证码")
+    private String originCode;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+    /**
+     * 凭证
+     */
+    @ApiModelProperty(value = "凭证")
+    private String certificate;
+
+    /**
+     * 请求来自 1：pc
+     */
+    @ApiModelProperty(value = "请求来自 1：pc")
+    private String requestFrom;
+
+    /**
+     * 用户输入的图片验证码
+     */
+    @ApiModelProperty(value = "用户输入的图片验证码")
+    private String kaptcha;
+
+    /**
+     * 存在redis中的图片验证码
+     */
+    @ApiModelProperty(value = "存在redis中的图片验证码")
+    private String oldKaptcha;
+
+    /**
+     * 随机数
+     */
+    @ApiModelProperty(value = "随机数")
+    private String uuid;
+
+
+    /**
+     * 是否有凭证
+     *
+     * @return 有返回true
+     */
+    public boolean hasCertificate() {
+        return !StringUtils.isEmpty(certificate);
+    }
+
+    /**
+     * 校验用户输入的验证码是否正确
+     *
+     * @return 正确返回true
+     */
+    public boolean validateCode() {
+        return StringUtils.isEmpty(this.code) ? false : this.code.equals(this.originCode);
+    }
+
+    public long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getOriginCode() {
+        return originCode;
+    }
+
+    public void setOriginCode(String originCode) {
+        this.originCode = originCode;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getCertificate() {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getRequestFrom() {
+        return requestFrom;
+    }
+
+    public void setRequestFrom(String requestFrom) {
+        this.requestFrom = requestFrom;
+    }
+
+    public String getKaptcha() {
+        return kaptcha;
+    }
+
+    public void setKaptcha(String kaptcha) {
+        this.kaptcha = kaptcha;
+    }
+
+    public String getOldKaptcha() {
+        return oldKaptcha;
+    }
+
+    public void setOldKaptcha(String oldKaptcha) {
+        this.oldKaptcha = oldKaptcha;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/order/service/impl/PaySupplier.java b/ruoyi-segchk/src/main/java/com/ruoyi/order/service/impl/PaySupplier.java
new file mode 100644
index 0000000..f29d612
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/order/service/impl/PaySupplier.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service.impl;
+
+/**
+ * Created by 魔金商城 on 17/12/22.
+ * 支付接口
+ */
+@FunctionalInterface
+public interface PaySupplier<T, U, D> {
+
+    /**
+     * 获得支付返回的参数结果
+     *
+     * @return 返回支付参数结果
+     */
+    D getPayParams(T t, U u);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/order/vo/OrderItem.java b/ruoyi-segchk/src/main/java/com/ruoyi/order/vo/OrderItem.java
new file mode 100644
index 0000000..4ea62d4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/order/vo/OrderItem.java
@@ -0,0 +1,9 @@
+package com.ruoyi.order.vo;
+
+/**
+ * Created by 魔金商城 on 17/11/13.
+ * 订单枚举
+ */
+public enum OrderItem {
+    LOG, ATTR, SKUS, CANREFUND, CANRETRUN, EXPRESSURL, STORE_INFO, BACK_PROGRESS, CUSTOMER, COMMUNITYHEAD
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java
new file mode 100644
index 0000000..0b221a0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java
@@ -0,0 +1,47 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg充值卡管理对象 segchk_charge_card
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkChargeRet extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 充值id */
+    @Excel(name = "充值id")
+    private Long chargeId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkChargeRet{" +
+                "chargeId=" + chargeId +
+                ", cardId=" + cardId +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeReward.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeReward.java
new file mode 100644
index 0000000..fbc5a50
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkChargeReward.java
@@ -0,0 +1,207 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.util.ObjectUtils;
+
+import java.math.BigDecimal;
+
+public class SegchkChargeReward extends BaseEntity {
+//    会员卡类型id
+    private Integer cardTypeId;
+//    会员卡id
+    private Long cardId;
+//    对应用户id
+    private Long userId;
+//    运营商id
+    private Long providerId;
+//    充值id
+    private Long chargeId;
+//    奖励id
+    private Long rewardId;
+//    使用次数
+    private Long useCount;
+//    在目标商家核消次数
+    private Long chkCount;
+//    充值金额
+    private BigDecimal charge;
+//    余额使用额度
+    private BigDecimal accountUsed;
+//    推荐人id
+    private Long userRecommenders;
+//    推荐人角色
+    private Integer recommendersLevel;
+//    持卡用户充值成功次数
+    private Integer totalChargeCount;
+//    奖励金额
+    private BigDecimal reward;
+
+    public Integer getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(Integer cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public BigDecimal getCharge() {
+        return charge;
+    }
+
+    public void setCharge(BigDecimal charge) {
+        this.charge = charge;
+    }
+
+    public BigDecimal getAccountUsed() {
+        return accountUsed;
+    }
+
+    public void setAccountUsed(BigDecimal accountUsed) {
+        this.accountUsed = accountUsed;
+    }
+
+    public Long getUserRecommenders() {
+        return userRecommenders;
+    }
+
+    public void setUserRecommenders(Long userRecommenders) {
+        this.userRecommenders = userRecommenders;
+    }
+
+    public Integer getRecommendersLevel() {
+        return recommendersLevel;
+    }
+
+    public void setRecommendersLevel(Integer recommendersLevel) {
+        this.recommendersLevel = recommendersLevel;
+    }
+
+    public Integer getTotalChargeCount() {
+        return totalChargeCount;
+    }
+
+    public void setTotalChargeCount(Integer totalChargeCount) {
+        this.totalChargeCount = totalChargeCount;
+    }
+
+    public BigDecimal getReward() {
+        return reward;
+    }
+
+    public void setReward(BigDecimal reward) {
+        this.reward = reward;
+    }
+
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Long getUseCount() {
+        return useCount;
+    }
+
+    public void setUseCount(Long useCount) {
+        this.useCount = useCount;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkChargeReward{" +
+                "cardTypeId=" + cardTypeId +
+                ", cardId=" + cardId +
+                ", userId=" + userId +
+                ", providerId=" + providerId +
+                ", chargeId=" + chargeId +
+                ", rewardId=" + rewardId +
+                ", useCount=" + useCount +
+                ", chkCount=" + chkCount +
+                ", charge=" + charge +
+                ", accountUsed=" + accountUsed +
+                ", userRecommenders=" + userRecommenders +
+                ", recommendersLevel=" + recommendersLevel +
+                ", totalChargeCount=" + totalChargeCount +
+                ", reward=" + reward +
+                '}';
+    }
+
+    public int validateForCheck(Long storeId){
+//        根据核消商家，判断是否可以返利
+        if(ObjectUtils.isEmpty(this.getRecommendersLevel()) || this.getRecommendersLevel() == 2 || this.getRecommendersLevel() == 1){
+//            只要持卡用户推荐人不是平台。就不可以返利
+            return -1;
+        }
+        else if(this.getUseCount() > 1 || this.getChkCount() > 1){
+//            该卡已发生过核消
+            return -2;
+        }
+        else if(ObjectUtils.isEmpty(this.getReward())){
+//            该商家不支持该卡的核消，也不可以返利
+            return -3;
+        }
+        else if(this.getReward().compareTo(new BigDecimal(0.0)) == 0){
+//            该商家不需要返利
+            return -4;
+        }
+        return 0;
+    }
+
+    public void mkReward() {
+        switch (this.getTotalChargeCount()){
+            case 0: break;
+            case 1: {
+                this.setReward(this.getReward().divide(new BigDecimal("2"), 2, BigDecimal.ROUND_HALF_UP));break;
+            }
+            case 2: {
+                this.setReward(this.getReward().divide(new BigDecimal("3"), 2, BigDecimal.ROUND_HALF_UP));break;
+            }
+            default: {
+                this.setReward(new BigDecimal("0.0"));
+                break;
+            }
+
+        }
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java
new file mode 100644
index 0000000..d477638
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java
@@ -0,0 +1,91 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkMsgWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息 */
+    @Excel(name = "消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息")
+    private String msgType;
+
+    /** 消息内容 */
+    @Excel(name = "消息内容")
+    private String msgContent;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String msgTitle;
+
+
+    /** 消息状态，0未发送，1，未读，2已读，3删除 */
+    @Excel(name = "消息状态，0未发送，1，未读，2已读，3删除")
+    private String msgFlag;
+
+    /** 接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date fromTime;
+
+    public String getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(String msgType) {
+        this.msgType = msgType;
+    }
+
+    public String getMsgContent() {
+        return msgContent;
+    }
+
+    public void setMsgContent(String msgContent) {
+        this.msgContent = msgContent;
+    }
+
+    public String getMsgTitle() {
+        return msgTitle;
+    }
+
+    public void setMsgTitle(String msgTitle) {
+        this.msgTitle = msgTitle;
+    }
+
+    public String getMsgFlag() {
+        return msgFlag;
+    }
+
+    public void setMsgFlag(String msgFlag) {
+        this.msgFlag = msgFlag;
+    }
+
+    public Date getFromTime() {
+        return fromTime;
+    }
+
+    public void setFromTime(Date fromTime) {
+        this.fromTime = fromTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkMsgWebResp{" +
+                "msgType='" + msgType + '\'' +
+                ", msgContent='" + msgContent + '\'' +
+                ", msgTitle='" + msgTitle + '\'' +
+                ", msgFlag='" + msgFlag + '\'' +
+                ", fromTime=" + fromTime +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java
new file mode 100644
index 0000000..85d54ab
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java
@@ -0,0 +1,182 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkRecommenderStoreWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商户显示序号 */
+    @Excel(name = "商户显示序号")
+    private Integer storeSort;
+
+    /** 商户列表模式时的图标 */
+    @Excel(name = "商户列表模式时的图标")
+    private String storeIcon;
+
+    /** 商户的大图标 */
+    @Excel(name = "商户的大图标")
+    private String storeGificon;
+
+    /** 商户经度 */
+    @Excel(name = "商户经度")
+    private BigDecimal storeLon;
+
+    /** 商户纬度 */
+    @Excel(name = "商户纬度")
+    private BigDecimal storeLat;
+
+    /** 商户累积核消次数 */
+    @Excel(name = "商户累积核消次数")
+    private Integer chkCount;
+
+    /** 商户平均星评 */
+    @Excel(name = "商户平均星评")
+    private BigDecimal starAvg;
+
+    /** 用户距离 */
+    @Excel(name = "用户距离")
+    private BigDecimal userDist;
+
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> lables;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreSort() {
+        return storeSort;
+    }
+
+    public void setStoreSort(Integer storeSort) {
+        this.storeSort = storeSort;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public String getStoreGificon() {
+        return storeGificon;
+    }
+
+    public void setStoreGificon(String storeGificon) {
+        this.storeGificon = storeGificon;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Integer getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Integer chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getLables() {
+        return lables;
+    }
+
+    public void setLables(List<SegchkRecommenderStoreLableWeb> lables) {
+        this.lables = lables;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkRecommenderStoreWebResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName=" + storeName +
+                ", storeSort=" + storeSort +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", storeGificon='" + storeGificon + '\'' +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", lables=" + lables +
+                ", userDist=" + userDist +
+                '}';
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java
new file mode 100644
index 0000000..4cfe77a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java
@@ -0,0 +1,90 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleDetailWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 会员卡号 */
+    @Excel(name = "会员卡号")
+    private Long cardId;
+
+    /** 卡类型名称 */
+    @Excel(name = "卡类型名称")
+    private String cardName;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 统计结果 */
+    @Excel(name = "统计结果")
+    private Long staticCount;
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Long getStaticCount() {
+        return staticCount;
+    }
+
+    public void setStaticCount(Long staticCount) {
+        this.staticCount = staticCount;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleDetailWebResp{" +
+                "modTime=" + modTime +
+                ", cardId=" + cardId +
+                ", cardName='" + cardName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", staticCount=" + staticCount +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java
new file mode 100644
index 0000000..a1ebce6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java
@@ -0,0 +1,98 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 统计等级，0按月统计，1按月查询统计 */
+    @Excel(name = "统计等级")
+    private Integer staticLevel;
+
+    /** 统计月份，只在staticLevel为1时有效,0时为统计的月数 */
+    @Excel(name = "统计月份")
+    private String staticMonth;
+
+    /** 用户身份，0运营商，1商家 */
+    @Excel(name = "用户身份")
+    private Integer userLevel;
+
+    /** 数据源选择，0核消，1售卡 */
+    @Excel(name = "数据源选择")
+    private Integer srcFlag;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStaticLevel() {
+        return staticLevel;
+    }
+
+    public void setStaticLevel(Integer staticLevel) {
+        this.staticLevel = staticLevel;
+    }
+
+    public String getStaticMonth() {
+        return staticMonth;
+    }
+
+    public void setStaticMonth(String staticMonth) {
+        this.staticMonth = staticMonth;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleWebReq{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", staticLevel='" + staticLevel + '\'' +
+                ", staticMonth='" + staticMonth + '\'' +
+                ", userLevel=" + userLevel +
+                '}';
+    }
+
+    public Integer getSrcFlag() {
+        return srcFlag;
+    }
+
+    public void setSrcFlag(Integer srcFlag) {
+        this.srcFlag = srcFlag;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java
new file mode 100644
index 0000000..245db7b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 统计月份，只在staticLevel为1时有效 */
+    @Excel(name = "统计月份")
+    private String staticMonth;
+
+    /** staticMonth与staticMonth同义，只是为yyyy-mm-01使用查询具备详单时使用 */
+    @Excel(name = "统计月份")
+    private String queryMon;
+
+    /** 统计结果 */
+    @Excel(name = "统计结果")
+    private Long staticCount;
+
+    public String getStaticMonth() {
+        return staticMonth;
+    }
+
+    public void setStaticMonth(String staticMonth) {
+        this.staticMonth = staticMonth;
+    }
+
+    public Long getStaticCount() {
+        return staticCount;
+    }
+
+    public void setStaticCount(Long staticCount) {
+        this.staticCount = staticCount;
+    }
+
+    public String getQueryMon() {
+        return queryMon;
+    }
+
+    public void setQueryMon(String queryMon) {
+        this.queryMon = queryMon;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleWebResp{" +
+                "staticMonth='" + staticMonth + '\'' +
+                ", queryMon='" + queryMon + '\'' +
+                ", staticCount=" + staticCount +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java
new file mode 100644
index 0000000..e3b70a2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java
@@ -0,0 +1,89 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg评价记录对象 SegchkServiceCommentUserReq
+ * 
+ * @author yinzhiying
+ * @date 2021-07-30
+ */
+public class SegchkServiceCommentUserReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 评价id */
+    private Long commentId;
+
+    /** 星级评价 */
+    @Excel(name = "星级评价")
+    private Integer starLevel;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String contentText;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 核消id，全表唯一 */
+    @Excel(name = "核消id，全表唯一")
+    private Long chkServiceId;
+
+    public Long getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Long commentId) {
+        this.commentId = commentId;
+    }
+
+    public Integer getStarLevel() {
+        return starLevel;
+    }
+
+    public void setStarLevel(Integer starLevel) {
+        this.starLevel = starLevel;
+    }
+
+    public String getContentText() {
+        return contentText;
+    }
+
+    public void setContentText(String contentText) {
+        this.contentText = contentText;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getChkServiceId() {
+        return chkServiceId;
+    }
+
+    public void setChkServiceId(Long chkServiceId) {
+        this.chkServiceId = chkServiceId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceCommentUserReq{" +
+                "commentId=" + commentId +
+                ", starLevel=" + starLevel +
+                ", contentText='" + contentText + '\'' +
+                ", modTime=" + modTime +
+                ", chkServiceId=" + chkServiceId +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java
new file mode 100644
index 0000000..6efaa49
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java
@@ -0,0 +1,116 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg评价记录对象 segchk_service_comment
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceCommentWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 星级评价 */
+    @Excel(name = "星级评价")
+    private Integer starLevel;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String contentText;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 充值卡id */
+    @Excel(name = "充值卡名称")
+    private String cardName;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private String userName;
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStarLevel() {
+        return starLevel;
+    }
+
+    public void setStarLevel(Integer starLevel) {
+        this.starLevel = starLevel;
+    }
+
+    public String getContentText() {
+        return contentText;
+    }
+
+    public void setContentText(String contentText) {
+        this.contentText = contentText;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceCommentWebResp{" +
+                "storeId=" + storeId +
+                ", starLevel=" + starLevel +
+                ", contentText='" + contentText + '\'' +
+                ", modTime=" + modTime +
+                ", providerId=" + providerId +
+                ", cardName='" + cardName + '\'' +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java
new file mode 100644
index 0000000..a33f110
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java
@@ -0,0 +1,138 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceOrderChkResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    /** 会员卡或优惠券下的标签id */
+    @Excel(name = "会员卡或优惠券下的标签id")
+    private Integer lableId;
+
+    /** 卡类型 0 会员卡，1赠卡，2优惠券 */
+    @Excel(name = "卡类型")
+    private Integer typeId;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 剩余次数 */
+    @Excel(name = "卡名称")
+    private Integer leftCount;
+
+    /** 是否支持 */
+    @Excel(name = "是否支持")
+    private Integer isSupported;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public Integer getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Integer leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Integer getIsSupported() {
+        return isSupported;
+    }
+
+    public void setIsSupported(Integer isSupported) {
+        this.isSupported = isSupported;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceOrderChkResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", userId=" + userId +
+                ", cardId=" + cardId +
+                ", lableId=" + lableId +
+                ", typeId=" + typeId +
+                ", cardName='" + cardName + '\'' +
+                ", leftCount=" + leftCount +
+                ", isSupported=" + isSupported +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java
new file mode 100644
index 0000000..2f4b25f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java
@@ -0,0 +1,136 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceOrderWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    /** 会员卡或优惠券下的标签id */
+    @Excel(name = "会员卡或优惠券下的标签id")
+    private Integer lableId;
+
+    /** 卡类型 0 会员卡，1赠卡，2优惠券 */
+    @Excel(name = "卡类型")
+    private Integer typeId;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 用户卡片的剩余使用次数 */
+    @Excel(name = "卡剩余次数")
+    private Integer leftCount;
+
+    /** 该商家支持的核销次数 */
+    @Excel(name = "商家支持次数")
+    private Integer stoerChkCount;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceOrderWebReq{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", userId=" + userId +
+                ", cardId=" + cardId +
+                ", lableId=" + lableId +
+                ", typeId=" + typeId +
+                ", cardName='" + cardName + '\'' +
+                '}';
+    }
+
+    public Integer getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Integer leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Integer getStoerChkCount() {
+        return stoerChkCount;
+    }
+
+    public void setStoerChkCount(Integer stoerChkCount) {
+        this.stoerChkCount = stoerChkCount;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfoWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfoWebResp.java
new file mode 100644
index 0000000..5bc83ea
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfoWebResp.java
@@ -0,0 +1,325 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg商家详情页对象 SegchkStoreBasicInfoWebResp
+ * 
+ * @author yinzhiying
+ * @date 2021-07-12
+ */
+public class SegchkStoreBasicInfoWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家电话 */
+    @Excel(name = "商家电话")
+    private String storePhone;
+
+    /** 服务状态，0在线，1下线 */
+    @Excel(name = "服务状态，0在线，1下线")
+    private String serviceState;
+
+    /** 销售id */
+    @Excel(name = "销售id")
+    private Integer salerId;
+
+    /** 商家地址 */
+    @Excel(name = "商家地址")
+    private String storeAddr;
+
+    /** 商家经度 */
+    @Excel(name = "商家经度")
+    private BigDecimal storeLon;
+
+    /** 商家纬度 */
+    @Excel(name = "商家纬度")
+    private BigDecimal storeLat;
+
+    /** 商家运营时间 */
+    @Excel(name = "商家运营时间")
+    private String onService;
+
+    /** 商家描述详情 */
+    @Excel(name = "商家描述详情")
+    private String detail;
+
+    @Excel(name = "商家vr路径")
+    private String storeVR;
+
+    /** 商家轮播图1路径，默认用于首页推荐轮播图 */
+    @Excel(name = "商家轮播图1路径，默认用于首页推荐轮播图")
+    private String storeCarousel1;
+
+    /** 商家轮播图2路径 */
+    @Excel(name = "商家轮播图2路径")
+    private String storeCarousel2;
+
+    /** 商家轮播图3路径 */
+    @Excel(name = "商家轮播图3路径")
+    private String storeCarousel3;
+
+    /** 商家轮播图4路径 */
+    @Excel(name = "商家轮播图4路径")
+    private String storeCarousel4;
+
+    /** 商家轮播图5路径 */
+    @Excel(name = "商家轮播图5路径")
+    private String storeCarousel5;
+
+    /** 商家轮播图6路径 */
+    @Excel(name = "商家轮播图6路径")
+    private String storeCarousel6;
+
+    /** 商户累积核消次数 */
+    @Excel(name = "商户累积核消次数")
+    private Integer chkCount;
+
+    /** 商户平均星评 */
+    @Excel(name = "商户平均星评")
+    private BigDecimal starAvg;
+
+
+    /** 是否被收藏 */
+    @Excel(name = "是否被收藏")
+    private Integer isCollect = 0;
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setStoreName(String storeName) 
+    {
+        this.storeName = storeName;
+    }
+
+    public String getStoreName() 
+    {
+        return storeName;
+    }
+    public void setStorePhone(String storePhone) 
+    {
+        this.storePhone = storePhone;
+    }
+
+    public void setServiceState(String serviceState) 
+    {
+        this.serviceState = serviceState;
+    }
+
+    public String getServiceState() 
+    {
+        return serviceState;
+    }
+    public void setSalerId(Integer salerId) 
+    {
+        this.salerId = salerId;
+    }
+
+    public Integer getSalerId() 
+    {
+        return salerId;
+    }
+
+    public void setStoreAddr(String storeAddr) 
+    {
+        this.storeAddr = storeAddr;
+    }
+
+    public String getStoreAddr() 
+    {
+        return storeAddr;
+    }
+    public void setStoreLon(BigDecimal storeLon) 
+    {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLon() 
+    {
+        return storeLon;
+    }
+    public void setStoreLat(BigDecimal storeLat) 
+    {
+        this.storeLat = storeLat;
+    }
+
+    public BigDecimal getStoreLat() 
+    {
+        return storeLat;
+    }
+    public void setOnService(String onService) 
+    {
+        this.onService = onService;
+    }
+
+    public String getOnService() 
+    {
+        return onService;
+    }
+    public void setDetail(String detail) 
+    {
+        this.detail = detail;
+    }
+
+    public String getDetail() 
+    {
+        return detail;
+    }
+
+    public String getStorePhone() {
+        return storePhone;
+    }
+
+    public String getStoreCarousel1() {
+        return storeCarousel1;
+    }
+
+    public void setStoreCarousel1(String storeCarousel1) {
+        this.storeCarousel1 = storeCarousel1;
+    }
+
+    public String getStoreCarousel2() {
+        return storeCarousel2;
+    }
+
+    public void setStoreCarousel2(String storeCarousel2) {
+        this.storeCarousel2 = storeCarousel2;
+    }
+
+    public String getStoreCarousel3() {
+        return storeCarousel3;
+    }
+
+    public void setStoreCarousel3(String storeCarousel3) {
+        this.storeCarousel3 = storeCarousel3;
+    }
+
+    public String getStoreCarousel4() {
+        return storeCarousel4;
+    }
+
+    public void setStoreCarousel4(String storeCarousel4) {
+        this.storeCarousel4 = storeCarousel4;
+    }
+
+    public String getStoreCarousel5() {
+        return storeCarousel5;
+    }
+
+    public void setStoreCarousel5(String storeCarousel5) {
+        this.storeCarousel5 = storeCarousel5;
+    }
+
+    public String getStoreCarousel6() {
+        return storeCarousel6;
+    }
+
+    public void setStoreCarousel6(String storeCarousel6) {
+        this.storeCarousel6 = storeCarousel6;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    public Integer getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Integer chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public Integer getIsCollect() {
+        return isCollect;
+    }
+
+    public void setIsCollect(Integer isCollect) {
+        this.isCollect = isCollect;
+    }
+
+    public String getStoreVR() {
+        return storeVR;
+    }
+
+    public void setStoreVR(String storeVR) {
+        this.storeVR = storeVR;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("SegchkStoreBasicInfoWebResp{");
+        sb.append("providerId=").append(providerId);
+        sb.append(", storeId=").append(storeId);
+        sb.append(", storeName='").append(storeName).append('\'');
+        sb.append(", storePhone='").append(storePhone).append('\'');
+        sb.append(", serviceState='").append(serviceState).append('\'');
+        sb.append(", salerId=").append(salerId);
+        sb.append(", storeAddr='").append(storeAddr).append('\'');
+        sb.append(", storeLon=").append(storeLon);
+        sb.append(", storeLat=").append(storeLat);
+        sb.append(", onService='").append(onService).append('\'');
+        sb.append(", detail='").append(detail).append('\'');
+        sb.append(", storeVR='").append(storeVR).append('\'');
+        sb.append(", storeCarousel1='").append(storeCarousel1).append('\'');
+        sb.append(", storeCarousel2='").append(storeCarousel2).append('\'');
+        sb.append(", storeCarousel3='").append(storeCarousel3).append('\'');
+        sb.append(", storeCarousel4='").append(storeCarousel4).append('\'');
+        sb.append(", storeCarousel5='").append(storeCarousel5).append('\'');
+        sb.append(", storeCarousel6='").append(storeCarousel6).append('\'');
+        sb.append(", chkCount=").append(chkCount);
+        sb.append(", starAvg=").append(starAvg);
+        sb.append(", isCollect=").append(isCollect);
+        sb.append(", segchkRecommenderStoreLableWebList=").append(segchkRecommenderStoreLableWebList);
+        sb.append('}');
+        return sb.toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java
new file mode 100644
index 0000000..8dd6873
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java
@@ -0,0 +1,209 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkStoreIndexWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家状态 */
+    @Excel(name = "商家状态")
+    private String serviceState;
+
+    /** 商户显示序号 */
+    @Excel(name = "商户显示序号")
+    private Integer storeSort;
+
+    /** 商户列表模式时的图标 */
+    @Excel(name = "商户列表模式时的图标")
+    private String storeIcon;
+
+    /** 商户的大图标 */
+    @Excel(name = "商户的大图标")
+    private String storeGificon;
+
+    /** 商户经度 */
+    @Excel(name = "商户经度")
+    private BigDecimal storeLon;
+
+    /** 商户纬度 */
+    @Excel(name = "商户纬度")
+    private BigDecimal storeLat;
+
+    /** 用户距离 */
+    @Excel(name = "用户距离")
+    private BigDecimal userDist;
+
+    /** 商户累积核消次数 */
+    @Excel(name = "商户累积核消次数")
+    private Integer chkCount;
+
+    /** 商户平均星评 */
+    @Excel(name = "商户平均星评")
+    private BigDecimal starAvg;
+
+    /** 在线状态 */
+    @Excel(name = "对应的销售id")
+    private Integer salerId;
+
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> lables;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreSort() {
+        return storeSort;
+    }
+
+    public void setStoreSort(Integer storeSort) {
+        this.storeSort = storeSort;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public String getStoreGificon() {
+        return storeGificon;
+    }
+
+    public void setStoreGificon(String storeGificon) {
+        this.storeGificon = storeGificon;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Integer getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Integer chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getLables() {
+        return lables;
+    }
+
+    public void setLables(List<SegchkRecommenderStoreLableWeb> lables) {
+        this.lables = lables;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+
+    public String getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(String serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public Integer getSalerId() {
+        return salerId;
+    }
+
+    public void setSalerId(Integer salerId) {
+        this.salerId = salerId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkStoreIndexWebResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", serviceState='" + serviceState + '\'' +
+                ", storeSort=" + storeSort +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", storeGificon='" + storeGificon + '\'' +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", salerId=" + salerId +
+                ", lables=" + lables +
+                ", userDist=" + userDist +
+                '}';
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreVrReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreVrReq.java
new file mode 100644
index 0000000..013c95d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreVrReq.java
@@ -0,0 +1,118 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg 商家vr请求体
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkStoreVrReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** vr标识，全局唯一 */
+    private Long vrId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家ID，全局唯一 */
+    @Excel(name = "商家ID，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String vrUrl;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String thumbPath;
+
+    /** 服务状态，0在线，1下线 */
+    @Excel(name = "服务状态，0在线，1下线")
+    private String serviceState;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("vrId", getVrId())
+                .append("providerId", getProviderId())
+                .append("storeId", getStoreId())
+                .append("vrUrl", getVrUrl())
+                .append("thumbPath", getThumbPath())
+                .append("serviceState", getServiceState())
+                .append("modTime", getModTime())
+                .toString();
+    }
+
+    public Long getVrId() {
+        return vrId;
+    }
+
+    public void setVrId(Long vrId) {
+        this.vrId = vrId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getVrUrl() {
+        return vrUrl;
+    }
+
+    public void setVrUrl(String vrUrl) {
+        this.vrUrl = vrUrl;
+    }
+
+    public String getThumbPath() {
+        return thumbPath;
+    }
+
+    public void setThumbPath(String thumbPath) {
+        this.thumbPath = thumbPath;
+    }
+
+    public String getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(String serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreWebReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreWebReq.java
new file mode 100644
index 0000000..5156fb3
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkStoreWebReq.java
@@ -0,0 +1,179 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkStoreWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 排序类型 */
+    @Excel(name = "排序类型")
+    private Integer sortType;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Integer storeId;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String storeName;
+
+    /** 标签id */
+    @Excel(name = "标签id")
+    private Integer lableId;
+
+    /** 标签名称 */
+    @Excel(name = "标签名称")
+    private String lableName;
+
+    /** 标签类型id */
+    @Excel(name = "标签类型id")
+    private Integer typeId;
+
+    /** 充值卡id */
+    @Excel(name = "充值卡id")
+    private Integer cardId;
+
+    /** 充值卡名称 */
+    @Excel(name = "充值卡名称")
+    private String cardName;
+
+    /** 用户经度 */
+    @Excel(name = "用户经度")
+    private BigDecimal userLon;
+
+    /** 用户纬度 */
+    @Excel(name = "用户纬度")
+    private BigDecimal userLat;
+
+    /** 用户距离 */
+    @Excel(name = "用户距离")
+    private BigDecimal userDist;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Integer getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(Integer sortType) {
+        this.sortType = sortType;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public String getLableName() {
+        return lableName;
+    }
+
+    public void setLableName(String lableName) {
+        this.lableName = lableName;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public Integer getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Integer cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public BigDecimal getUserLon() {
+        return userLon;
+    }
+
+    public void setUserLon(BigDecimal userLon) {
+        this.userLon = userLon;
+    }
+
+    public BigDecimal getUserLat() {
+        return userLat;
+    }
+
+    public void setUserLat(BigDecimal userLat) {
+        this.userLat = userLat;
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkStoreWebReq{" +
+                "providerId=" + providerId +
+                ", sortType=" + sortType +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", lableId=" + lableId +
+                ", lableName='" + lableName + '\'' +
+                ", typeId=" + typeId +
+                ", cardId=" + cardId +
+                ", cardName='" + cardName + '\'' +
+                ", userLon=" + userLon +
+                ", userLat=" + userLat +
+                ", userDist=" + userDist +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java
new file mode 100644
index 0000000..b2c4024
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java
@@ -0,0 +1,76 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户余额信息对象 segchk_user_account
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserAccountCheck extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 余额 */
+    @Excel(name = "余额")
+    private BigDecimal account;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 余额id */
+    @Excel(name = "余额id")
+    private Long accountId;
+
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public BigDecimal getAccount() {
+        return account;
+    }
+
+    public void setAccount(BigDecimal account) {
+        this.account = account;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserAccountCheck{" +
+                "userId=" + userId +
+                ", account=" + account +
+                ", providerId=" + providerId +
+                ", accountId=" + accountId +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java
new file mode 100644
index 0000000..76f541d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java
@@ -0,0 +1,49 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户提现记录对象 segchk_user_cash
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCashOpsResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 提现额 */
+    @Excel(name = "提现额")
+    private BigDecimal account;
+
+    /** 提现id，全表唯一 */
+    @Excel(name = "提现id，全表唯一")
+    private Long cashId;
+
+    public BigDecimal getAccount() {
+        return account;
+    }
+
+    public void setAccount(BigDecimal account) {
+        this.account = account;
+    }
+
+    public Long getCashId() {
+        return cashId;
+    }
+
+    public void setCashId(Long cashId) {
+        this.cashId = cashId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCashOpsResp{" +
+                "account=" + account +
+                ", cashId=" + cashId +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java
new file mode 100644
index 0000000..2390fee
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCashWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal cash;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private String retFlag;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+
+    public BigDecimal getCash() {
+        return cash;
+    }
+
+    public void setCash(BigDecimal cash) {
+        this.cash = cash;
+    }
+
+    public String getRetFlag() {
+        return retFlag;
+    }
+
+    public void setRetFlag(String retFlag) {
+        this.retFlag = retFlag;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCashWebResp{" +
+                "cash=" + cash +
+                ", retFlag='" + retFlag + '\'' +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java
new file mode 100644
index 0000000..b27b0eb
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java
@@ -0,0 +1,153 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户充值可选卡对象 SegchkUserChargeCard
+ * 
+ * @author yinzhiying
+ * @date 2021-07-30
+ */
+public class SegchkUserChargeCard extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long cardTypeId;
+
+    /** 会员卡id */
+    @Excel(name = "会员卡id")
+    private Long cardId;
+
+    /** 会员卡名称 */
+    @Excel(name = "会员卡名称")
+    private String cardTypeName;
+
+    /** 已购买次数 */
+    @Excel(name = "已购买次数")
+    private Integer hadBuy;
+
+    /** 可购买次数 */
+    @Excel(name = "可购买次数")
+    private Integer buyCount;
+
+    /** 会员卡面值 */
+    @Excel(name = "会员卡面值")
+    private BigDecimal cardTypeValue;
+
+    /** 是否可以购买，0可，1有卡正在使用，2购买次数超限 */
+    @Excel(name = "是否可以购买")
+    private Integer canBuy;
+
+    /** 会员卡权益次数 */
+    @Excel(name = "会员卡权益次数")
+    private Integer cardTypeChkcount;
+
+    /** 会员卡有效天数 */
+    @Excel(name = "会员卡有效天数")
+    private Integer effectiveTime;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(Long cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardTypeName() {
+        return cardTypeName;
+    }
+
+    public void setCardTypeName(String cardTypeName) {
+        this.cardTypeName = cardTypeName;
+    }
+
+    public Integer getHadBuy() {
+        return hadBuy;
+    }
+
+    public void setHadBuy(Integer hadBuy) {
+        this.hadBuy = hadBuy;
+    }
+
+    public Integer getBuyCount() {
+        return buyCount;
+    }
+
+    public void setBuyCount(Integer buyCount) {
+        this.buyCount = buyCount;
+    }
+
+    public BigDecimal getCardTypeValue() {
+        return cardTypeValue;
+    }
+
+    public void setCardTypeValue(BigDecimal cardTypeValue) {
+        this.cardTypeValue = cardTypeValue;
+    }
+
+    public Integer getCanBuy() {
+        return canBuy;
+    }
+
+    public void setCanBuy(Integer canBuy) {
+        this.canBuy = canBuy;
+    }
+
+    public Integer getCardTypeChkcount() {
+        return cardTypeChkcount;
+    }
+
+    public void setCardTypeChkcount(Integer cardTypeChkcount) {
+        this.cardTypeChkcount = cardTypeChkcount;
+    }
+
+    public Integer getEffectiveTime() {
+        return effectiveTime;
+    }
+
+    public void setEffectiveTime(Integer effectiveTime) {
+        this.effectiveTime = effectiveTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserChargeCard{" +
+                "providerId=" + providerId +
+                ", cardTypeId=" + cardTypeId +
+                ", cardId=" + cardId +
+                ", cardTypeName='" + cardTypeName + '\'' +
+                ", hadBuy=" + hadBuy +
+                ", buyCount=" + buyCount +
+                ", cardTypeValue=" + cardTypeValue +
+                ", canBuy=" + canBuy +
+                ", cardTypeChkcount=" + cardTypeChkcount +
+                ", effectiveTime=" + effectiveTime +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java
new file mode 100644
index 0000000..201c238
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java
@@ -0,0 +1,78 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserChargeWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal charge;
+
+    /** 奖励类型 */
+    @Excel(name = "奖励类型")
+    private String cardName;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private String retFlag;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+    public BigDecimal getCharge() {
+        return charge;
+    }
+
+    public void setCharge(BigDecimal charge) {
+        this.charge = charge;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getRetFlag() {
+        return retFlag;
+    }
+
+    public void setRetFlag(String retFlag) {
+        this.retFlag = retFlag;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserChargeWebResp{" +
+                "charge=" + charge +
+                ", cardName='" + cardName + '\'' +
+                ", retFlag=" + retFlag +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java
new file mode 100644
index 0000000..259ca96
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java
@@ -0,0 +1,185 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * seg会员卡对象 segchk_user_vip
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCollectWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 收藏id */
+    @Excel(name = "收藏id")
+    private Long collectId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id */
+    @Excel(name = "商家id，全局惟一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家图标 */
+    @Excel(name = "会员卡类型，0--9块9，1---99")
+    private String storeIcon;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long serviceState;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal storeLon;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal storeLat;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long chkCount;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal starAvg;
+
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public Long getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(Long collectId) {
+        this.collectId = collectId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public Long getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(Long serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCollectWebResp{" +
+                "collectId=" + collectId +
+                ", providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", serviceState=" + serviceState +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", modTime=" + modTime +
+                ", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java
new file mode 100644
index 0000000..593df8a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java
@@ -0,0 +1,263 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * seg会员卡对象 segchk_user_vip
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserLikeGoWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 想去id */
+    @Excel(name = "想去id")
+    private Long likegoId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id */
+    @Excel(name = "商家id，全局惟一")
+    private Long storeId;
+
+    /** 会员卡id */
+    @Excel(name = "会员卡id，充值卡或自定义卡")
+    private Long cardId;
+
+    /** 用户id */
+    @Excel(name = "用户id，全局惟一")
+    private Long userId;
+
+    /** 用户手机尾号 */
+    @Excel(name = "用户手机尾号")
+    private String phoneNo;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String nickName;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
+    /** 商家小图标 */
+    @Excel(name = "商家小图标")
+    private String storeIcon;
+
+    /** 商家服务状态，是否在线 */
+    @Excel(name = "商家服务状态")
+    private Long serviceState;
+
+    /** 商家经度 */
+    @Excel(name = "商家经度")
+    private BigDecimal storeLon;
+
+    /** 商家纬度 */
+    @Excel(name = "商家纬度")
+    private BigDecimal storeLat;
+
+    /** 商家累积核次数 */
+    @Excel(name = "商家累积核次数")
+    private Long chkCount;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal starAvg;
+
+
+    /** 预约时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "预约时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public Long getLikegoId() {
+        return likegoId;
+    }
+
+    public void setLikegoId(Long likegoId) {
+        this.likegoId = likegoId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public Long getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(Long serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserLikeGoWebResp{" +
+                "likegoId=" + likegoId +
+                ", providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", cardId=" + cardId +
+                ", userId=" + userId +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", cardName='" + cardName + '\'' +
+                ", qrCode='" + qrCode + '\'' +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", serviceState=" + serviceState +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", modTime=" + modTime +
+                ", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java
new file mode 100644
index 0000000..60658e6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java
@@ -0,0 +1,104 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户修改信息对象 SegchkUserSetInfoReq
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserSetInfoReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 密码 */
+    @Excel(name = "密码")
+    private String passwd;
+
+    /** 密码id，全表唯一 */
+    @Excel(name = "密码id，全表唯一")
+    private Long pwdId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户手机号 */
+    @Excel(name = "用户手机号")
+    private String phoneNo;
+
+    /** 用户等级 */
+    @Excel(name = "用户等级")
+    private Integer userLevel;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPasswd(String passwd) 
+    {
+        this.passwd = passwd;
+    }
+
+    public void setPwdId(Long pwdId) 
+    {
+        this.pwdId = pwdId;
+    }
+
+    public Long getPwdId() 
+    {
+        return pwdId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    public String getPasswd() {
+        return passwd;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserSetInfoReq{" +
+                "userId=" + userId +
+                ", passwd='" + passwd + '\'' +
+                ", pwdId=" + pwdId +
+                ", providerId=" + providerId +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", userLevel=" + userLevel +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebCardResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebCardResp.java
new file mode 100644
index 0000000..5c77742
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebCardResp.java
@@ -0,0 +1,185 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserWebCardResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private String providerId;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 卡提供商（商家名称） */
+    @Excel(name = "卡提供商")
+    private String storeName;
+
+    /** 商家id */
+    @Excel(name = "商家id")
+    private String storeId;
+
+
+    /** 使用次数 */
+    @Excel(name = "使用次数")
+    private Integer useCount;
+
+    /** 剩余次数 */
+    @Excel(name = "剩余次数")
+    private Integer leftCount;
+
+    /** 有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date effectiveTime;
+
+    /** 卡券标识,0会员卡，1券（或赠卡） */
+    @Excel(name = "卡券标识")
+    private Integer typeFlag;
+
+    /** 卡券状态 */
+    @Excel(name = "卡券状态")
+    private String cardStatus;
+
+    /** 卡券说明 */
+    @Excel(name = "卡券说明")
+    private String cardContent;
+
+    /** 卡券说明 */
+    @Excel(name = "卡券说明")
+    private String bgUrl;
+
+    /** 卡券字体颜色 */
+    @Excel(name = "卡券字体颜色")
+    private String contentColor;
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getUseCount() {
+        return useCount;
+    }
+
+    public void setUseCount(Integer useCount) {
+        this.useCount = useCount;
+    }
+
+    public Integer getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Integer leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Date getEffectiveTime() {
+        return effectiveTime;
+    }
+
+    public void setEffectiveTime(Date effectiveTime) {
+        this.effectiveTime = effectiveTime;
+    }
+
+    public Integer getTypeFlag() {
+        return typeFlag;
+    }
+
+    public void setTypeFlag(Integer typeFlag) {
+        this.typeFlag = typeFlag;
+    }
+
+    public String getCardStatus() {
+        return cardStatus;
+    }
+
+    public void setCardStatus(String cardStatus) {
+        this.cardStatus = cardStatus;
+    }
+
+    public String getCardContent() {
+        return cardContent;
+    }
+
+    public void setCardContent(String cardContent) {
+        this.cardContent = cardContent;
+    }
+
+
+
+    public String getBgUrl() {
+        return bgUrl;
+    }
+
+    public void setBgUrl(String bgUrl) {
+        this.bgUrl = bgUrl;
+    }
+
+    public String getContentColor() {
+        return contentColor;
+    }
+
+    public void setContentColor(String contentColor) {
+        this.contentColor = contentColor;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(String providerId) {
+        this.providerId = providerId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserWebCardResp{" +
+                "providerId='" + providerId + '\'' +
+                ", cardName='" + cardName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", storeId='" + storeId + '\'' +
+                ", useCount=" + useCount +
+                ", leftCount=" + leftCount +
+                ", effectiveTime=" + effectiveTime +
+                ", typeFlag=" + typeFlag +
+                ", cardStatus='" + cardStatus + '\'' +
+                ", cardContent='" + cardContent + '\'' +
+                ", bgUrl='" + bgUrl + '\'' +
+                ", contentColor='" + contentColor + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebReq.java
new file mode 100644
index 0000000..0c5c3b2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebReq.java
@@ -0,0 +1,112 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 用户手机号 */
+    @Excel(name = "用户手机号")
+    private String phoneNo;
+
+    /** 微信唯一识别号 */
+    @Excel(name = "微信唯一识别号")
+    private String openid;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户身份，0运营商，1商家，2用户 */
+    @Excel(name = "用户身份")
+    private Integer userLevel;
+
+    /** 身份证号码 */
+    @Excel(name = "身份证号码")
+    private String cardID;
+
+    /** 查询用户卡类型，0会员卡，1优惠券 */
+    @Excel(name = "查询用户卡类型")
+    private Integer cardFlag;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public String getCardID() {
+        return cardID;
+    }
+
+    public void setCardID(String cardID) {
+        this.cardID = cardID;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public Integer getCardFlag() {
+        return cardFlag;
+    }
+
+    public void setCardFlag(Integer cardFlag) {
+        this.cardFlag = cardFlag;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserWebReq{" +
+                "userId=" + userId +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", openid='" + openid + '\'' +
+                ", providerId=" + providerId +
+                ", userLevel=" + userLevel +
+                ", cardID='" + cardID + '\'' +
+                ", cardFlag=" + cardFlag +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebResp.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebResp.java
new file mode 100644
index 0000000..1840d66
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebResp.java
@@ -0,0 +1,307 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 用户角色 */
+    @Excel(name = "用户角色")
+    private Integer userLevel;
+
+    /** 用户手机号 */
+    @Excel(name = "用户手机号")
+    private String phoneNo;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 微信唯一识别号 */
+    @Excel(name = "微信唯一识别号")
+    private String openid;
+
+    /** 注册地区 */
+    @Excel(name = "注册地区")
+    private String districtName;
+
+    /** 推荐人id */
+    @Excel(name = "推荐人id")
+    private String recommenderId;
+
+    /** 推荐人角色 */
+    @Excel(name = "推荐人角色")
+    private String recommenderLevel;
+
+    /** 推荐人名称 */
+    @Excel(name = "推荐人名称")
+    private String recommenderName;
+
+    /** 用户头像 */
+    @Excel(name = "用户头像")
+    private String userIcon;
+
+    /** 是否实名认证 */
+    @Excel(name = "是否实名认证")
+    private Integer iscertified;
+
+    /** 账号余额 */
+    @Excel(name = "账号余额")
+    private BigDecimal account = BigDecimal.valueOf(0.0);
+
+    /** 核消次数 */
+    @Excel(name = "核消次数")
+    private Long chkCount;
+
+    /** 充值次数 */
+    @Excel(name = "充值次数")
+    private Long chargeCount;
+
+    /** 提现次数 */
+    @Excel(name = "提现次数")
+    private Long cashCount;
+
+    /** 未读消息数量 */
+    @Excel(name = "未读消息数量")
+    private Long msgCount;
+
+    /** 可用卡数量 */
+    @Excel(name = "可用卡数量")
+    private Long cardCount;
+
+    /** 优惠券数量 */
+    @Excel(name = "优惠券数量")
+    private Long storeCardCount;
+
+    /** 商家数量 */
+    @Excel(name = "商家数量")
+    private Long storeCount;
+
+    /** 有效预约单数量 */
+    @Excel(name = "预约单数量")
+    private Long likegoCount;
+
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getUserIcon() {
+        return userIcon;
+    }
+
+    public void setUserIcon(String userIcon) {
+        this.userIcon = userIcon;
+    }
+
+    public Integer getIscertified() {
+        return iscertified;
+    }
+
+    public void setIscertified(Integer iscertified) {
+        this.iscertified = iscertified;
+    }
+
+    public BigDecimal getAccount() {
+        return account;
+    }
+
+    public void setAccount(BigDecimal account) {
+        this.account = account;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public Long getChargeCount() {
+        return chargeCount;
+    }
+
+    public void setChargeCount(Long chargeCount) {
+        this.chargeCount = chargeCount;
+    }
+
+    public Long getCashCount() {
+        return cashCount;
+    }
+
+    public void setCashCount(Long cashCount) {
+        this.cashCount = cashCount;
+    }
+
+    public Long getMsgCount() {
+        return msgCount;
+    }
+
+    public void setMsgCount(Long msgCount) {
+        this.msgCount = msgCount;
+    }
+
+    public Long getCardCount() {
+        return cardCount;
+    }
+
+    public void setCardCount(Long cardCount) {
+        this.cardCount = cardCount;
+    }
+
+    public Long getStorecardCount() {
+        return storeCardCount;
+    }
+
+    public void setStorecardCount(Long storecardCount) {
+        this.storeCardCount = storecardCount;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreCardCount() {
+        return storeCardCount;
+    }
+
+    public void setStoreCardCount(Long storeCardCount) {
+        this.storeCardCount = storeCardCount;
+    }
+
+    public Long getStoreCount() {
+        return storeCount;
+    }
+
+    public void setStoreCount(Long storeCount) {
+        this.storeCount = storeCount;
+    }
+
+    public Long getLikegoCount() {
+        return likegoCount;
+    }
+
+    public void setLikegoCount(Long likegoCount) {
+        this.likegoCount = likegoCount;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public String getDistrictName() {
+        return districtName;
+    }
+
+    public void setDistrictName(String districtName) {
+        this.districtName = districtName;
+    }
+
+    public String getRecommenderId() {
+        return recommenderId;
+    }
+
+    public void setRecommenderId(String recommenderId) {
+        this.recommenderId = recommenderId;
+    }
+
+    public String getRecommenderLevel() {
+        return recommenderLevel;
+    }
+
+    public void setRecommenderLevel(String recommenderLevel) {
+        this.recommenderLevel = recommenderLevel;
+    }
+
+    public String getRecommenderName() {
+        return recommenderName;
+    }
+
+    public void setRecommenderName(String recommenderName) {
+        this.recommenderName = recommenderName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserWebResp{" +
+                "providerId=" + providerId +
+                ", userId=" + userId +
+                ", userLevel=" + userLevel +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", userName='" + userName + '\'' +
+                ", openid='" + openid + '\'' +
+                ", districtName='" + districtName + '\'' +
+                ", recommenderId='" + recommenderId + '\'' +
+                ", recommenderLevel='" + recommenderLevel + '\'' +
+                ", recommenderName='" + recommenderName + '\'' +
+                ", userIcon='" + userIcon + '\'' +
+                ", iscertified=" + iscertified +
+                ", account=" + account +
+                ", chkCount=" + chkCount +
+                ", chargeCount=" + chargeCount +
+                ", cashCount=" + cashCount +
+                ", msgCount=" + msgCount +
+                ", cardCount=" + cardCount +
+                ", storeCardCount=" + storeCardCount +
+                ", storeCount=" + storeCount +
+                ", likegoCount=" + likegoCount +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/StoreSelfCard.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/StoreSelfCard.java
new file mode 100644
index 0000000..2c7c288
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/StoreSelfCard.java
@@ -0,0 +1,94 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+public class StoreSelfCard extends BaseEntity {
+
+    private Long likegoId;
+    private Long userId;
+    private Long cardId;
+    private Long lableId;
+    private Long storeId;
+    private Integer typeId;
+    private Integer totalCount;
+    private String freeContent;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public String getFreeContent() {
+        return freeContent;
+    }
+
+    public void setFreeContent(String freeContent) {
+        this.freeContent = freeContent;
+    }
+
+    public Long getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Long lableId) {
+        this.lableId = lableId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+
+    public Long getLikegoId() {
+        return likegoId;
+    }
+
+    public void setLikegoId(Long likegoId) {
+        this.likegoId = likegoId;
+    }
+    @Override
+    public String
+    toString() {
+        return "StoreSelfCard{" +
+                "likegoId=" + likegoId +
+                "userId=" + userId +
+                ", cardId=" + cardId +
+                ", lableId=" + lableId +
+                ", storeId=" + storeId +
+                ", typeId=" + typeId +
+                ", totalCount=" + totalCount +
+                ", freeContent='" + freeContent + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/WeChatCustomerLink.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/WeChatCustomerLink.java
new file mode 100644
index 0000000..8530871
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/WeChatCustomerLink.java
@@ -0,0 +1,128 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.util.CommonConstant;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * 微信用户关联实体类
+ */
+public class WeChatCustomerLink implements Serializable {
+    /**
+     * 主键
+     */
+    private long id = -1;
+    /**
+     * 联合登录id
+     */
+    private String unionId;
+    /**
+     * 微信用户唯一标识
+     */
+    private String openId;
+    /**
+     * 小程序openId
+     */
+    private String appletOpenId;
+    /**
+     * providerId
+     */
+    private String providerId;
+    /**
+     * 用户id
+     */
+    private Long userId = CommonConstant.NO_CUSTOMER_ID;
+
+    public WeChatCustomerLink() {
+    }
+
+    public WeChatCustomerLink(String openId, String unionId) {
+        this.openId = openId;
+        this.unionId = unionId;
+    }
+
+    /**
+     * 是否绑定 绑定返回true
+     */
+    @JsonIgnore
+    public boolean isBind() {
+        return this.userId != CommonConstant.NO_CUSTOMER_ID;
+    }
+
+    /**
+     * 判断是否有openId
+     *
+     * @return 有返回true, 否则返回false
+     */
+    public boolean hasOpenId() {
+        return !StringUtils.isEmpty(openId);
+    }
+
+    /**
+     * 判断是否有小程序openId
+     *
+     * @return 有返回true, 否则返回false
+     */
+    public boolean hasAppletOpenId() {
+        return !StringUtils.isEmpty(appletOpenId);
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getAppletOpenId() {
+        return appletOpenId;
+    }
+
+    public void setAppletOpenId(String appletOpenId) {
+        this.appletOpenId = appletOpenId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public String getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(String providerId) {
+        this.providerId = providerId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return "WeChatCustomerLink{" +
+                "id=" + id +
+                ", unionId='" + unionId + '\'' +
+                ", openId='" + openId + '\'' +
+                ", appletOpenId='" + appletOpenId + '\'' +
+                ", providerId='" + providerId + '\'' +
+                ", userId=" + userId +
+                '}';
+    }
+}
+
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderIndexMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderIndexMapper.java
new file mode 100644
index 0000000..72183f5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderIndexMapper.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.*;
+
+import java.util.List;
+
+/**
+ * seg运营商管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkProviderIndexMapper
+{
+
+    /**
+     * 查询运营商个人中心信息
+     *
+     * @param segchkUserWebReq 查询实体对象
+     * @return 结果
+     */
+    public SegchkUserWebResp selectSegchkProviderWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleWebResp> selectSegchkStoreServiceList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleWebResp> selectSegchkStoreSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectSegchkStoreServiceDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectSegchkStoreSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 返回运营商openid
+     *
+     * @param providerId 运营商id
+     * @return 结果
+     */
+    public String selectProviderOpenIdById(Long providerId);
+
+    public String selectSegchkProviderName(String providerId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreIndexMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreIndexMapper.java
new file mode 100644
index 0000000..44dcfdc
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreIndexMapper.java
@@ -0,0 +1,154 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface SegchkStoreIndexMapper {
+    /**
+     * 以会员卡为主标签，结合其他如关键字标签，优惠券标签显示商家列表
+     * @param segchkStoreWebReq 根据运营商，商户，标签等查询相应的商户列表
+     * @return
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreList(SegchkStoreWebReq segchkStoreWebReq);
+
+    /**
+     * 以会员卡为主标签，结合其他如关键字标签，优惠券标签显示商家列表
+     * @param segchkStoreWebReq 根据运营商，商户，标签等查询相应的商户列表
+     * @return
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreListByOneLable(SegchkStoreWebReq segchkStoreWebReq);
+
+
+    /**
+     * 以会员卡为主标签，结合其他如关键字标签，优惠券标签显示商家列表
+     * @param segchkStoreWebReq 根据运营商，商户，标签等查询相应的商户列表
+     * @return
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreListByAll(SegchkStoreWebReq segchkStoreWebReq);
+
+    /**
+     * 标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkStoreRecommendLableList(Long providerId);
+
+    /**
+     * 标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkStoreLableList(Long providerId);
+
+    /**
+     * 商户查找
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreSearch(SegchkStoreWebReq segchkStoreWebReq);
+
+    public SegchkStoreBasicInfoWebResp selectSegchkStoreDetails(SegchkStoreWebReq segchkStoreWebReq);
+
+    public List<SegchkServiceCommentWebResp> selectSegchkStoreComments(SegchkStoreWebReq segchkStoreWebReq);
+
+
+    /**
+     * 根据商户id，查询商户个人中心信息
+     *
+     * @param segchkUserWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public SegchkUserWebResp selectSegchkStoreWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleWebResp> selectSegchkStoreServiceList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleWebResp> selectSegchkStoreSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectSegchkStoreServiceDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectSegchkStoreSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户提现记录
+     *
+     * @param segchkUserWebReq@return seg首页轮播图管理
+     */
+    public List<SegchkUserCashWebResp> selectStoreCashList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 根据商户id，查询商户的预约列表
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkUserLikeGoWebResp> selectStoreUserLikeGoList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据行政区域id，查询对应运营商id，如果没有，则返回默认运营商id
+     *
+     * @param params 行政区代码,以及默认展示行政地区代码
+     * @return seg首页轮播图管理
+     */
+    public HashMap<String, Object> selectSegchkProviderBycode(Map<String, Object> params);
+
+    public List<SegchkCarouseMgt> selectSegchkCarouseStoreList(SegchkCarouseMgt segchkCarouseMgt);
+
+
+    /**
+     * 根据运营商返回seg首页推荐商户实体列表
+     *
+     * @param segchkRecommenderStoreWebReq seg首页推荐商户运营商id
+     * @return 结果
+     */
+    public List<SegchkRecommenderStoreWebResp> selectSegchkRecommenderStoreListWeb(SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq);
+
+
+    /**
+     * 返回商户openid
+     *
+     * @param storeId 商户id
+     * @return 结果
+     */
+    public WeChatCustomerLink selectStoreOpenIdById(Long storeId);
+
+    public Integer isCollectByUser(Map<String, Object> params);
+
+    public String selectSegchkStoreName(String storeId);
+
+    public int addAccountByReward(SegchkChargeReward segchkChargeReward);
+
+    Long getVipCardFromLikego(Long likegoId);
+
+    public int addCommentAccByComment(Long commentId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkUserIndexMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkUserIndexMapper.java
new file mode 100644
index 0000000..90f09fd
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkUserIndexMapper.java
@@ -0,0 +1,136 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SegchkUserIndexMapper {
+    /**
+     * 查询seg用户基本信息
+     *
+     * @param segchkUserWebReq 前端查询用户中心对象实体
+     * @return seg用户基本信息
+     */
+    public SegchkUserWebResp selectSegchkUserWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户核消列表
+     *
+     * @param segchkUserWebReq 前端查询用户中心对象实体
+     * @return seg用户基本信息
+     */
+    public List<SegchkUserWebSCResp> selectUserServiceCHKList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户会员卡列表
+     *
+     * @param segchkUserWebReq 前端查询用户中心对象实体
+     * @return seg用户基本信息
+     */
+    public List<SegchkUserWebCardResp> selectUserCardList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户赠卡及优惠券列表
+     *
+     * @param segchkUserWebReq 前端查询用户中心对象实体
+     * @return seg用户基本信息
+     */
+    public List<SegchkUserWebCardResp> selectUserPerformanceList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户收藏列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    public List<SegchkUserCollectWebResp> selectUserCollectList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户预约列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    public List<SegchkUserLikeGoWebResp> selectUserLikGoList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户充值列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    public List<SegchkUserChargeWebResp> selectUserChargeList(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 查询seg用户提现列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    public List<SegchkUserCashWebResp> selectUserCashList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户消息列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    public List<SegchkMsgWebResp> selectUserMsgList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户预约时可用卡列表
+     *
+     * @param segchkServiceOrderWebReq
+     * @return seg用户扩展信息
+     */
+    public List<SegchkServiceOrderWebReq> selectUserOrderPredCardListWebInfo(SegchkServiceOrderWebReq segchkServiceOrderWebReq);
+
+    /**
+     * 查询seg用户预约时可用卡列表
+     *
+     * @param segchkServiceOrderWebReq
+     * @return seg用户扩展信息
+     */
+    public List<SegchkServiceOrderChkTestResp> selecttest(SegchkServiceOrderWebReq segchkServiceOrderWebReq);
+
+    /**
+     * 查询seg用户我想去订单的有效信息
+     *
+     * @param likegoId
+     * @return seg用户扩展信息
+     */
+    public SegchkServiceOrderChkTestResp selectUserOrderPredInfo(Long likegoId);
+
+    /**
+     * 查询seg用户可以充值的卡信息
+     *
+     * @param segchkUserWebReq
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserChargeCard> selectSegchkUserChargePre(SegchkUserWebReq segchkUserWebReq);
+
+    public SegchkUserLevelInfo selectUserLevelByMobile(String phoneno);
+
+    public int userIsExit(Map<String, Object> parmMap);
+
+    public int providerIsExit(Map<String, Object> parmMap);
+    public int storeIsExit(Map<String, Object> parmMap);
+
+    public int recommenderIsExit(Map<String, Object> parmMap);
+
+    int updateSegchkProviderWechat(SegchkUserWechat segchkUserWechat);
+
+    public int updateSegchkStoreWechat(SegchkUserWechat segchkUserWechat);
+
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    public WeChatCustomerLink getUserWechatOpenId(Long userId);
+
+    public String selectSegchkUserName(String userId);
+
+    public SegchkChargeReward selectSegchkRewardInfoForCharge(Map<String, Object> paramsMap);
+
+    int addAccountByReward(SegchkChargeReward segchkChargeReward);
+
+    Map<String, Object> getCardInfo(Map<String, Object> paramsMap);
+
+    SegchkChargeReward selectSegchkRewardInfoForCheck(Map<String, Object> params);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkProviderIndexService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkProviderIndexService.java
new file mode 100644
index 0000000..eda3586
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkProviderIndexService.java
@@ -0,0 +1,49 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.*;
+
+import java.util.List;
+
+/**
+ * seg用户基本信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface ISegchkProviderIndexService
+{
+
+    /**
+     * 查询运营商个人中心信息
+     *
+     * @param segchkUserWebReq 查询实体对象
+     * @return 结果
+     */
+    public SegchkUserWebResp selectSegchkProviderWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询运营商下核消，售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 查询实体对象
+     * @return 结果
+     */
+    public List<SegchkServiceAndSaleWebResp> selectProviderServiceAndSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 查询运营商下核消，售卡统计详情
+     *
+     * @param segchkServiceAndSaleWebReq 查询实体对象
+     * @return 结果
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectProviderServiceAndSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 返回运营商openid
+     *
+     * @param userId 运营商id
+     * @return 结果
+     */
+    public String selectWeChatInfoByProviderId(Long userId);
+
+    public String selectSegchkProviderName(String recommenderId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkStoreIndexService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkStoreIndexService.java
new file mode 100644
index 0000000..a4b7f5e
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkStoreIndexService.java
@@ -0,0 +1,191 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * seg首页轮播图管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface ISegchkStoreIndexService
+{
+    /**
+     * 商户列表
+     * 
+     * @param segchkStoreWebReq seg首页轮播图管理ID
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreList(SegchkStoreWebReq segchkStoreWebReq);
+
+    /**
+     * 标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkRecommendLableList(Long providerId);
+
+    /**
+     * 全量标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkLableList(Long providerId);
+
+    /**
+     * 商户查找
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return 商户查找
+     */
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreSearch(SegchkStoreWebReq segchkStoreWebReq);
+
+
+    /**
+     * 商户详情页展示
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public SegchkStoreBasicInfoWebResp selectSegchkStoreDetails(SegchkStoreWebReq segchkStoreWebReq);
+
+    /**
+     * 根据商户id，查询商户相关评价列表
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceCommentWebResp> selectSegchkStoreComments(SegchkStoreWebReq segchkStoreWebReq);
+
+    /**
+     * 根据商户id，查询商户个人中心信息
+     *
+     * @param segchkUserWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public SegchkUserWebResp selectSegchkStoreWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleWebResp> selectStoreServiceAndSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户核消详情，或售卡详情
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkServiceAndSaleDetailWebResp> selectStoreServiceAndSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+    /**
+     * 根据商户id，查询商户提现记录
+     *
+     * @param segchkUserWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkUserCashWebResp> selectStoreCashList(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 根据商户id，查询商户的预约列表
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkUserLikeGoWebResp> selectStoreUserLikeGoList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq);
+
+
+    /**
+     * 根据行政区域id，查询对应运营商id，如果没有，则返回默认运营商id
+     *
+     * @param adcode 行政区代码
+     * @return seg首页轮播图管理
+     */
+    public HashMap<String, Object> getProvider(Map<String, Object> adcode);
+
+    /**
+     * 根据提现id，进行提现结果保存，及余额更新
+     *
+     * @param chargeId 行政区代码
+     * @param ret 行政区代码
+     * @return seg首页轮播图管理
+     */
+    public void cashRet(String chargeId, int ret);
+
+    /**
+     * 根据运营商id，获取相应的轮播图列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    public List<SegchkCarouseMgt> getBanners(Long providerId);
+
+    /**
+     * 根据用户提交信息进行修改
+     *
+     * @param segchkUserSetInfoReq 用户评价提交实体
+     * @return 更新结果
+     */
+    public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq);
+
+
+    /**
+     * 返回seg首页推荐商户信息
+     *
+     * @param segchkRecommenderStoreWebReq seg首页推荐商户ID
+     * @return 结果
+     */
+    public List<SegchkRecommenderStoreWebResp> selectSegchkRecommenderStoreListByProvider(SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq);
+
+    /**
+     * 返回商户openid
+     *
+     * @param userId 商户id
+     * @return 结果
+     */
+    public WeChatCustomerLink selectWeChatInfoByStoreId(Long userId);
+
+
+    /**
+     * 验证推荐人是否存在
+     *
+     * @param recommenderId 推荐人id
+     * @param recommenderLevel 推荐人角色
+     * @return 结果
+     */
+    int recommenderIsExit(String recommenderId, String recommenderLevel, String providerId);
+
+
+    /**
+     * 检查该商户是否已被当前用户收藏
+     *
+     * @param providerId 推荐人id
+     * @param storeId 推荐人角色
+     * @param userId 推荐人角色
+     * @return 是否收藏，1已收藏，0未收藏
+     */
+    Integer isCollectByUser(Long providerId, Long storeId, Long userId);
+
+    public String selectSegchkStoreName(String storeId);
+
+    Integer addStoreSelfCard(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    public int addAccountByReward(SegchkChargeReward segchkChargeReward);
+
+    Long getVipCardFromLikego(Long likegoId);
+
+    HashMap<String, Object> getCustomService(Long providerId);
+
+    public int addCommentAccByComment(Long commentId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java
new file mode 100644
index 0000000..f5667d6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.SegchkUserCash;
+
+import java.util.List;
+
+/**
+ * seg用户提现记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserCashService 
+{
+    /**
+     * 查询seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return seg用户提现记录
+     */
+    public SegchkUserCash selectSegchkUserCashByCashId(Long cashId);
+
+    /**
+     * 查询seg用户提现记录列表
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return seg用户提现记录集合
+     */
+    public List<SegchkUserCash> selectSegchkUserCashList(SegchkUserCash segchkUserCash);
+
+    /**
+     * 新增seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int insertSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 修改seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int updateSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 批量删除seg用户提现记录
+     * 
+     * @param cashIds 需要删除的seg用户提现记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashIds(Long[] cashIds);
+
+    /**
+     * 删除seg用户提现记录信息
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashId(Long cashId);
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java
new file mode 100644
index 0000000..d3ddda2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java
@@ -0,0 +1,70 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+
+import java.util.List;
+
+/**
+ * seg用户收藏记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserCollectService 
+{
+    /**
+     * 查询seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return seg用户收藏记录
+     */
+    public SegchkUserCollect selectSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 查询seg用户收藏记录列表
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return seg用户收藏记录集合
+     */
+    public List<SegchkUserCollect> selectSegchkUserCollectList(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 新增seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int insertSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 修改seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int updateSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 批量删除seg用户收藏记录
+     * 
+     * @param collectIds 需要删除的seg用户收藏记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectIds(Long[] collectIds);
+
+    /**
+     * 删除seg用户收藏记录信息
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 批量删除seg用户收藏记录
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByIds(String ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserIndexService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserIndexService.java
new file mode 100644
index 0000000..b7d487a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserIndexService.java
@@ -0,0 +1,295 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.util.Claims;
+import com.ruoyi.util.CommonResponse;
+import com.ruoyi.util.bean.PrepayResult;
+import com.ruoyi.util.bean.WxTransferResult;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * seg用户基本信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface ISegchkUserIndexService
+{
+    /**
+     * 查询seg用户中心信息
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public SegchkUserWebResp selectSegchkUserWebInfo(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 查询seg用户核消列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserWebSCResp> selectUserServiceCHKList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户可用会员卡列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserWebCardResp> selectUserCardList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户收藏列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserCollectWebResp> selectUserCollectList(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 查询seg用户预约列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserLikeGoWebResp> selectUserLikGoList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户充值列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserChargeWebResp> selectUserChargeList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户提现列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkUserCashWebResp> selectUserCashList(SegchkUserWebReq segchkUserWebReq);
+
+    /**
+     * 查询seg用户消息列表
+     *
+     * @param segchkUserWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkMsgWebResp> selectUserMsgList(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 查询seg用户预约可用卡券列表
+     *
+     * @param segchkServiceOrderWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    public List<SegchkServiceOrderWebReq> selectUserOrderPredCardListWebInfo(SegchkServiceOrderWebReq segchkServiceOrderWebReq);
+
+    /**
+     * 根据用户核消二维码提取出来相应的信息进行核消，1、检查核卡是否可以核消(防止该卡已经在该商家不能再次核消)，2、检查该预约id，是否已经使用（防止多次预约核消使用）
+     *
+     * @param segchkUserLikego seg用户想去记录实体
+     * @return 结果
+     */
+    public void CheckUserServiceChk(SegchkUserLikego segchkUserLikego);
+
+    public SegchkServiceOrderChkTestResp selectUserOrderPredInfo(Long likeGoId);
+
+    /**
+     * 根据核查结果进行核消。说明已经满足核消条件
+     *
+     * @param segchkServiceOrderChkTestResp 核消检查信息
+     * @param likegoId 预约单id
+     * @param stoRewardWithChk
+     * @return 结果
+     */
+    public int OrderCheckTransaction(SegchkServiceOrderChkTestResp segchkServiceOrderChkTestResp, Long likegoId, Boolean stoRewardWithChk);
+
+    /**
+     * 根据支付回调结果，进行相应的更新
+     *
+     * @param chargeId 核消检查信息
+     * @param ret 预约单id
+     * @return 结果
+     */
+    public void chargeRet(String chargeId, int ret);
+
+
+    /**
+     * 根据用户充值等信息获取相关的返利信息
+     *
+     * @param params 充值信息
+     * @return 结果
+     */
+    int makeChargeReward(Map<String, Object> params);
+
+    /**
+     * 根据支用户id，运营商id，查询该用户可购买的卡
+     *
+     * @param segchkUserWebReq 用户请示信息体
+     * @return 结果
+     */
+    public List<SegchkUserChargeCard> SegchkUserChargePre(SegchkUserWebReq segchkUserWebReq);
+
+
+    /**
+     * 根据支用户id，运营商id，用户充值时可用余额
+     *
+     * @param segchkUserCharge 用户请示信息体
+     * @return 结果
+     */
+    public BigDecimal getAccount(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 根据用户id(或者商户id)，运营商id，用户身份查询用户余额
+     *
+     * @param segchkUserCashOpsReq 用户请示信息体
+     * @param ip
+     * @return 结果
+     */
+    public int getAccountForCash(SegchkUserCashOpsReq segchkUserCashOpsReq, String ip);
+
+    /**
+     * 根据提现id，进行提现结果保存，及余额更新
+     *
+     * @param chargeId 行政区代码
+     * @param ret 行政区代码
+     * @return seg首页轮播图管理
+     */
+    public void cashRet(String chargeId, int ret);
+
+    /**
+     * 新增用户评价
+     *
+     * @param segchkServiceComment 用户评价提交实体
+     * @return seg首页轮播图管理
+     */
+    public int insertSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceComment);
+
+    /**
+     * 根据评价id，查询用户评价
+     *
+     * @param segchkServiceCommentUserReq 用户评价提交实体
+     * @return seg首页轮播图管理
+     */
+    public SegchkServiceComment selectSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceCommentUserReq);
+
+    /**
+     * 根据用户提交信息进行修改
+     *
+     * @param segchkUserSetInfoReq 用户评价提交实体
+     * @return 更新结果
+     */
+    public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq);
+
+    /**
+     * 根据用户提交信息实名设置
+     *
+     * @param segchkUserCertificationInfo 用户提交实体
+     * @return 更新结果
+     */
+    public int userCerticify(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 根据用户信息返回用户身份
+     *
+     * @param phoneno 用户信息
+     * @return 更新结果
+     */
+    public SegchkUserLevelInfo selectUserLevelByMobile(String phoneno);
+
+    /**
+     * 根据用户信息注册用户基本信息表
+     *
+     * @param segchkUserBasicInfo 用户信息
+     * @return 插入结果
+     */
+    public int addUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 根据推荐人信息，检查推荐人是否存在
+     *
+     * @param parmMap 推荐人信息
+     * @return 查询记录数
+     */
+    public int recommenderIsExit(Map<String, Object> parmMap);
+
+    /**
+     * 根据推荐人信息，更新用户扩展信息表
+     *
+     * @param segchkUserExtInfo 推荐人信息
+     * @return 查询记录数
+     */
+    public int insertUserExtInfo(SegchkUserExtInfo segchkUserExtInfo);
+
+
+    /**
+     * 根据用户基本信息查找用户微信信息
+     *
+     * @param segchkUserLevelInfo 用户基本信息
+     * @return 查询记录数
+     */
+    public String getWeChatInfoByUserId(SegchkUserLevelInfo segchkUserLevelInfo);
+
+    /**
+     * 根据用户信息，更新用户微信信息表
+     *
+     * @param segchkUserWechat 用户基本信息
+     * @param userLevel
+     * @return 查询记录数
+     */
+    public int updateWeChatInfoByUserId(SegchkUserWechat segchkUserWechat, String userLevel);
+
+    /**
+     * 微信小程序支付
+     *
+     * @param orderCode  订单code
+     * @param userId 用户id
+     * @param ip         请求真实ip
+     * @param type       支付类型 1:订单支付 2:预存款充值 ---> 1用户支付，2商户支付
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -3:没有待支付的订单 -5:微信生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用 1 成功
+     */
+    CommonResponse<PrepayResult> wechatAppletPay(String orderCode, Long userId, Long providerId, String ip, int type);
+
+    /**
+     * 微信小程序提现
+     *
+     * @param orderCode  订单code
+     * @param userId 用户id
+     * @param providerId 用户id
+     * @param ip         请求真实ip
+     * @param type       支付类型 1:订单支付 2:预存款充值 ---> 1用户支付，2商户支付
+     * @param openId
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -3:没有待支付的订单 -5:微信生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用 1 成功
+     */
+    CommonResponse<WxTransferResult> wechatAppletTransfers(String orderCode, Long userId, Long providerId, String ip, int type, String openId);
+
+    /**
+     * 微信回调(小程序) 回调
+     *
+     * @param inputStream 微信回调参数
+     * @return 返回码 1:成功 -1:没有订单
+     */
+    int weChatAppletNotify(InputStream inputStream);
+
+    /**
+     * 根据预约单，查询相关信息
+     *
+     * @param segchkUserLikego 包含预约单id
+     * @return SegchkUserLikego
+     */
+    public SegchkUserLikego selectUserLikeGo(SegchkUserLikego segchkUserLikego);
+
+    int insertSegchkUserCharge(SegchkUserCharge segchkUserCharge);
+
+    SegchkUserWechat queryWeChatInfoByUserId(Claims claims);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java
new file mode 100644
index 0000000..087870e
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java
@@ -0,0 +1,62 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+
+import java.util.List;
+
+/**
+ * seg用户想去记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserLikegoService 
+{
+    /**
+     * 查询seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return seg用户想去记录
+     */
+    public SegchkUserLikego selectSegchkUserLikegoByLikegoId(Long likegoId);
+
+    /**
+     * 查询seg用户想去记录列表
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return seg用户想去记录集合
+     */
+    public List<SegchkUserLikego> selectSegchkUserLikegoList(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 新增seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int insertSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 修改seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int updateSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 批量删除seg用户想去记录
+     * 
+     * @param likegoIds 需要删除的seg用户想去记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoIds(Long[] likegoIds);
+
+    /**
+     * 删除seg用户想去记录信息
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoId(Long likegoId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java
new file mode 100644
index 0000000..b1ec5f0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java
@@ -0,0 +1,62 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+
+import java.util.List;
+
+/**
+ * seg用户微信信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserWechatService 
+{
+    /**
+     * 查询seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return seg用户微信信息
+     */
+    public SegchkUserWechat selectSegchkUserWechatByUserId(Long userId);
+
+    /**
+     * 查询seg用户微信信息列表
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return seg用户微信信息集合
+     */
+    public List<SegchkUserWechat> selectSegchkUserWechatList(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 新增seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int insertSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 修改seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 批量删除seg用户微信信息
+     * 
+     * @param userIds 需要删除的seg用户微信信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserIds(Long[] userIds);
+
+    /**
+     * 删除seg用户微信信息信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserId(Long userId);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/ISegchkStoreIndexServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/ISegchkStoreIndexServiceImpl.java
new file mode 100644
index 0000000..6ba3dcf
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/ISegchkStoreIndexServiceImpl.java
@@ -0,0 +1,393 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.mapper.SegchkIndexStoreAccountMapper;
+import com.ruoyi.segchk.mapper.SegchkStoreCashMapper;
+import com.ruoyi.segchk.mapper.SegchkStoreIndexMapper;
+import com.ruoyi.segchk.mapper.SegchkStoreSecurityMapper;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.segchk.domain.WeChatCustomerLink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
+
+    private static final Logger logger = LoggerFactory.getLogger(ISegchkStoreIndexServiceImpl.class);
+
+    @Autowired
+    private SegchkStoreIndexMapper segchkStoreIndexMapper;
+
+    @Autowired
+    private SegchkStoreCashMapper segchkStoreCashMapper;
+
+    @Autowired
+    private SegchkIndexStoreAccountMapper segchkIndexStoreAccountMapper;
+
+    @Autowired
+    private SegchkStoreSecurityMapper segchkStoreSecurityMapper;
+
+    @Autowired
+    private ISegchkUserIndexService segchkUserIndexService;
+
+    @Autowired
+    private ISegchkProviderMgtService segchkProviderMgtService;
+
+    @Autowired
+    private ISegchkPreferenceLableService segchkPreferenceLableService;
+
+    @Autowired
+    private ISegchkStoreSelfMgtService segchkStoreSelfMgtService;
+    /**
+     * 根据标签id，商户列表
+     *
+     * @param segchkStoreWebReq seg首页轮播图管理ID
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreList(SegchkStoreWebReq segchkStoreWebReq) {
+
+        if(segchkStoreWebReq.getSortType() == null){
+            segchkStoreWebReq.setSortType(0);
+        }
+        boolean cardempty = ObjectUtils.isEmpty(segchkStoreWebReq.getCardId());
+        boolean lableempty = ObjectUtils.isEmpty(segchkStoreWebReq.getTypeId());
+        if(cardempty && lableempty) {
+//            全空，说明查询所有商家列表
+            logger.debug("selectSegchkStoreList all with: {}", segchkStoreWebReq.toString());
+            return segchkStoreIndexMapper.selectSegchkStoreListByAll(segchkStoreWebReq);
+        }
+        else if(!lableempty && cardempty){
+//            标签不为空,全部会员卡
+            logger.debug("selectSegchkStoreList one non-card lable with: {}", segchkStoreWebReq.toString());
+            return segchkStoreIndexMapper.selectSegchkStoreListByOneLable(segchkStoreWebReq);
+        }
+
+        else if(lableempty && !cardempty){
+//            查询指定会员卡，全部标签
+            segchkStoreWebReq.setLableId(segchkStoreWebReq.getCardId());
+            segchkStoreWebReq.setTypeId(0);
+            segchkStoreWebReq.setCardId(null);
+            logger.debug("selectSegchkStoreList one card lable with: {}", segchkStoreWebReq.toString());
+            return segchkStoreIndexMapper.selectSegchkStoreListByOneLable(segchkStoreWebReq);
+        }
+        logger.debug("selectSegchkStoreList some lable with: {}", segchkStoreWebReq.toString());
+        return segchkStoreIndexMapper.selectSegchkStoreList(segchkStoreWebReq);
+    }
+
+    /**
+     * 标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkRecommendLableList(Long providerId) {
+        logger.debug("selectSegchkRecommendLableList with: {}", providerId);
+        return segchkStoreIndexMapper.selectSegchkStoreRecommendLableList(providerId);
+    }
+
+    /**
+     * 全量标签列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkRecommenderStoreLableWeb> selectSegchkLableList(Long providerId) {
+        logger.debug("selectSegchkLableList with {}", providerId);
+        return segchkStoreIndexMapper.selectSegchkStoreLableList(providerId);
+    }
+
+    /**
+     * 商户查找
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkStoreIndexWebResp> selectSegchkStoreSearch(SegchkStoreWebReq segchkStoreWebReq) {
+        logger.debug("selectSegchkStoreSearch with: {}", segchkStoreWebReq.toString());
+        segchkStoreWebReq.setSortType(0);
+        List<SegchkStoreIndexWebResp> segchkStoreIndexWebResps = segchkStoreIndexMapper.selectSegchkStoreSearch(segchkStoreWebReq);
+        boolean card_empty = ObjectUtils.isEmpty(segchkStoreWebReq.getCardId());
+        boolean lable_empty = ObjectUtils.isEmpty(segchkStoreWebReq.getTypeId());
+        List<SegchkStoreIndexWebResp> resps = segchkStoreIndexWebResps.parallelStream().filter(store -> {
+            List<SegchkRecommenderStoreLableWeb> lables = store.getLables();
+            boolean cardflag = card_empty ? true : lables.parallelStream().anyMatch(lable -> lable.getLableTypeId() == 0 && lable.getLableId() == segchkStoreWebReq.getCardId());
+            boolean lableflag = lable_empty ? true : lables.parallelStream().anyMatch(lable -> lable.getLableTypeId() == segchkStoreWebReq.getTypeId() && lable.getLableId() == segchkStoreWebReq.getLableId());
+            return cardflag && lableflag;
+        }).collect(Collectors.toList());
+        return resps;
+    }
+
+    /**
+     * 商户详情页展示
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public SegchkStoreBasicInfoWebResp selectSegchkStoreDetails(SegchkStoreWebReq segchkStoreWebReq) {
+        logger.debug("selectSegchkStoreDetails with: {}", segchkStoreWebReq.toString());
+        return segchkStoreIndexMapper.selectSegchkStoreDetails(segchkStoreWebReq);
+    }
+
+    /**
+     * 根据商户id，查询商户相关评价列表
+     *
+     * @param segchkStoreWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkServiceCommentWebResp> selectSegchkStoreComments(SegchkStoreWebReq segchkStoreWebReq) {
+        logger.debug("selectSegchkStoreComments with: {}", segchkStoreWebReq.toString());
+        return segchkStoreIndexMapper.selectSegchkStoreComments(segchkStoreWebReq);
+    }
+
+    /**
+     * 根据商户id，查询商户个人中心信息
+     *
+     * @param segchkUserWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public SegchkUserWebResp selectSegchkStoreWebInfo(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectSegchkStoreWebInfo with: {}", segchkUserWebReq.toString());
+        SegchkUserWebResp segchkUserWebResp = segchkStoreIndexMapper.selectSegchkStoreWebInfo(segchkUserWebReq);
+        segchkUserWebResp.setProviderId(segchkUserWebReq.getProviderId());
+        segchkUserWebResp.setUserId(segchkUserWebReq.getUserId());
+        return segchkUserWebResp;
+    }
+
+    /**
+     * 根据商户id，查询商户核消统计，或售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     *
+     * {
+     *   "providerId": 4,
+     *   "storeId": 123,
+     *   "staticLevel": 0,
+     *   "staticMonth": "6",
+     *   "userLevel": 1,
+     *   "srcFlag": 0
+     * }
+     */
+    @Override
+    public List<SegchkServiceAndSaleWebResp> selectStoreServiceAndSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
+        logger.debug("selectStoreServiceAndSaleList with: {}", segchkServiceAndSaleWebReq.toString());
+        if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
+            return segchkStoreIndexMapper.selectSegchkStoreServiceList(segchkServiceAndSaleWebReq);
+        else
+            return segchkStoreIndexMapper.selectSegchkStoreSaleList(segchkServiceAndSaleWebReq);
+    }
+
+    /**
+     * 根据商户id，查询商户核消详情，或售卡详情
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkServiceAndSaleDetailWebResp> selectStoreServiceAndSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
+        logger.debug("selectStoreServiceAndSaleDetails with: {}", segchkServiceAndSaleWebReq.toString());
+        if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
+            return segchkStoreIndexMapper.selectSegchkStoreServiceDetails(segchkServiceAndSaleWebReq);
+        else
+            return segchkStoreIndexMapper.selectSegchkStoreSaleDetails(segchkServiceAndSaleWebReq);
+    }
+
+    /**
+     * 根据商户id，查询商户提现记录
+     *
+     * @param segchkUserWebReq@return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkUserCashWebResp> selectStoreCashList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectStoreCashList with: {}", segchkUserWebReq.toString());
+        return segchkStoreIndexMapper.selectStoreCashList(segchkUserWebReq);
+    }
+
+    /**
+     * 根据商户id，查询商户的预约列表
+     *
+     * @param segchkServiceAndSaleWebReq 搜索对象
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkUserLikeGoWebResp> selectStoreUserLikeGoList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
+        logger.debug("selectStoreUserLikeGoList with: {}", segchkServiceAndSaleWebReq.toString());
+        return segchkStoreIndexMapper.selectStoreUserLikeGoList(segchkServiceAndSaleWebReq);
+    }
+
+    /**
+     * 根据行政区域id，查询对应运营商id，如果没有，则返回默认运营商id
+     *
+     * @param adcode 行政区代码
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public HashMap<String, Object> getProvider(Map<String, Object> adcode) {
+        logger.debug("getProvider with: {}", adcode);
+        return segchkStoreIndexMapper.selectSegchkProviderBycode(adcode);
+    }
+
+    /**
+     * 根据提现id，进行提现结果保存，及余额更新
+     *
+     * @param chargeId 行政区代码
+     * @param ret      行政区代码
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public void cashRet(String chargeId, int ret) {
+        logger.debug("cashRet with: {}---{}", chargeId, ret);
+        int opsRet = 0;
+        SegchkStoreCash segchkStoreCash = new SegchkStoreCash();
+        segchkStoreCash.setCashId(Long.valueOf(chargeId));
+        segchkStoreCash.setRetFlag(ret == 0 ? "1" : "2");
+        opsRet = segchkStoreCashMapper.updateSegchkStoreCash(segchkStoreCash);
+        if(ret != 0){
+            opsRet += segchkIndexStoreAccountMapper.deleteSegchkStoreAccountByCash(segchkStoreCash);
+        }
+    }
+
+    /**
+     * 根据运营商id，获取相应的轮播图列表
+     *
+     * @param providerId 运营商id
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkCarouseMgt> getBanners(Long providerId) {
+        logger.debug("getBanners with: {}", providerId);
+        SegchkCarouseMgt segchkCarouseMgt = new SegchkCarouseMgt();
+        segchkCarouseMgt.setProviderId(providerId);
+        segchkCarouseMgt.setMgtState(0);
+        List<SegchkCarouseMgt> segchkCarouseMgtList = segchkStoreIndexMapper.selectSegchkCarouseStoreList(segchkCarouseMgt);
+        return segchkCarouseMgtList;
+    }
+
+    /**
+     * 根据用户提交信息进行修改
+     *
+     * @param segchkUserSetInfoReq 用户评价提交实体
+     * @return 更新结果
+     */
+    @Override
+    public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq) {
+        logger.debug("updateUserInfo with: {}", segchkUserSetInfoReq.toString());
+        SegchkStoreSecurity segchkStoreSecurity = new SegchkStoreSecurity();
+        segchkStoreSecurity.setPasswd(segchkUserSetInfoReq.getPasswd());
+        segchkStoreSecurity.setProviderId(segchkUserSetInfoReq.getProviderId());
+        segchkStoreSecurity.setStoreId(segchkUserSetInfoReq.getUserId());
+        return segchkStoreSecurityMapper.insertSegchkStoreSecurity(segchkStoreSecurity);
+    }
+
+
+    /**
+     * 返回seg首页推荐商户信息
+     *
+     * @param segchkRecommenderStoreWebReq seg首页推荐商户ID
+     * @return 结果
+     */
+    @Override
+    public List<SegchkRecommenderStoreWebResp> selectSegchkRecommenderStoreListByProvider(SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq) {
+        logger.debug("selectSegchkRecommenderStoreListByProvider with: {}", segchkRecommenderStoreWebReq.toString());
+        return segchkStoreIndexMapper.selectSegchkRecommenderStoreListWeb(segchkRecommenderStoreWebReq);
+    }
+
+    /**
+     * 返回商户openid
+     *
+     * @param storeId 商户id
+     * @return 结果
+     */
+    @Override
+    public WeChatCustomerLink selectWeChatInfoByStoreId(Long storeId) {
+        logger.debug("selectWeChatInfoByStoreId with: {}", storeId);
+        return segchkStoreIndexMapper.selectStoreOpenIdById(storeId);
+    }
+
+    /**
+     * 验证推荐人是否存在
+     *
+     * @param recommenderId    推荐人id
+     * @param recommenderLevel 推荐人角色
+     * @return 结果
+     */
+    @Override
+    public int recommenderIsExit(String recommenderId, String recommenderLevel, String providerId) {
+        logger.debug("recommenderIsExit with: {}---{}---{}", recommenderId, recommenderLevel, providerId);
+        Map<String, Object> parmMap = new HashMap<>();
+        parmMap.put("recommondId", recommenderId);
+        parmMap.put("recommondLevel", recommenderLevel);
+        parmMap.put("providerId", providerId);
+        return segchkUserIndexService.recommenderIsExit(parmMap);
+    }
+
+    /**
+     * 检查该商户是否已被当前用户收藏
+     *
+     * @param providerId 推荐人id
+     * @param storeId    推荐人角色
+     * @param userId     推荐人角色
+     * @return 是否收藏，1已收藏，0未收藏
+     */
+    @Override
+    public Integer isCollectByUser(Long providerId, Long storeId, Long userId) {
+        logger.debug("isCollectByUser with: {}---{}---{}", providerId, storeId, userId);
+        Map<String, Object> params = new HashMap<>();
+        params.put("providerId", providerId);
+        params.put("storeId", storeId);
+        params.put("userId", userId);
+        return segchkStoreIndexMapper.isCollectByUser(params);
+    }
+
+    @Override
+    public String selectSegchkStoreName(String storeId) {
+        return segchkStoreIndexMapper.selectSegchkStoreName(storeId);
+    }
+
+    @Override
+    public Integer addStoreSelfCard(SegchkStoreSelfMgt segchkStoreSelfMgt) {
+        if(segchkStoreSelfMgt.getTypeId() == 2){
+//            说明是优惠券
+            SegchkPreferenceLable segchkPreferenceLable = segchkPreferenceLableService.selectSegchkPreferenceLableByPreferenceId(segchkStoreSelfMgt.getLableId());
+            segchkStoreSelfMgt.setFreeName(segchkPreferenceLable.getPreferenceName());
+        }
+        return segchkStoreSelfMgtService.insertSegchkStoreSelfMgt(segchkStoreSelfMgt);
+    }
+
+    @Override
+    public int addAccountByReward(SegchkChargeReward segchkChargeReward) {
+        return segchkStoreIndexMapper.addAccountByReward(segchkChargeReward);
+    }
+
+    @Override
+    public Long getVipCardFromLikego(Long likegoId) {
+        return segchkStoreIndexMapper.getVipCardFromLikego(likegoId);
+    }
+
+    @Override
+    public HashMap<String, Object> getCustomService(Long providerId) {
+        return segchkProviderMgtService.getCustomService(providerId);
+    }
+
+    @Override
+    public int addCommentAccByComment(Long commentId) {
+        int ret = segchkStoreIndexMapper.addCommentAccByComment(commentId);
+        logger.debug("addCommentAccByComment with ({}) {}", commentId, (ret > 0 ? "successed" : "failed"));
+        return ret;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderIndexServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderIndexServiceImpl.java
new file mode 100644
index 0000000..fa00c62
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderIndexServiceImpl.java
@@ -0,0 +1,78 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.mapper.SegchkProviderIndexMapper;
+import com.ruoyi.segchk.service.ISegchkProviderIndexService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg运营商管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+@Service
+public class SegchkProviderIndexServiceImpl implements ISegchkProviderIndexService
+{
+    @Autowired
+    private SegchkProviderIndexMapper segchkProviderIndexMapper;
+
+
+    /**
+     * 查询运营商个人中心信息
+     *
+     * @param segchkUserWebReq 查询实体对象
+     * @return 结果
+     */
+    @Override
+    public SegchkUserWebResp selectSegchkProviderWebInfo(SegchkUserWebReq segchkUserWebReq) {
+        return segchkProviderIndexMapper.selectSegchkProviderWebInfo(segchkUserWebReq);
+    }
+
+    /**
+     * 查询运营商下核消，售卡统计
+     *
+     * @param segchkServiceAndSaleWebReq 查询实体对象
+     * @return 结果
+     */
+    @Override
+    public List<SegchkServiceAndSaleWebResp> selectProviderServiceAndSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
+        if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
+            return segchkProviderIndexMapper.selectSegchkStoreServiceList(segchkServiceAndSaleWebReq);
+        else
+            return segchkProviderIndexMapper.selectSegchkStoreSaleList(segchkServiceAndSaleWebReq);
+    }
+
+    /**
+     * 查询运营商下核消，售卡统计详情
+     *
+     * @param segchkServiceAndSaleWebReq 查询实体对象
+     * @return 结果
+     */
+    @Override
+    public List<SegchkServiceAndSaleDetailWebResp> selectProviderServiceAndSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
+        if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
+            return segchkProviderIndexMapper.selectSegchkStoreServiceDetails(segchkServiceAndSaleWebReq);
+        else
+            return segchkProviderIndexMapper.selectSegchkStoreSaleDetails(segchkServiceAndSaleWebReq);
+    }
+
+    /**
+     * 返回运营商openid
+     *
+     * @param providerId 运营商id
+     * @return 结果
+     */
+    @Override
+    public String selectWeChatInfoByProviderId(Long providerId) {
+        return segchkProviderIndexMapper.selectProviderOpenIdById(providerId);
+    }
+
+    @Override
+    public String selectSegchkProviderName(String providerId) {
+        return segchkProviderIndexMapper.selectSegchkProviderName(providerId);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java
new file mode 100644
index 0000000..376359b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java
@@ -0,0 +1,100 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.segchk.domain.SegchkUserCash;
+import com.ruoyi.segchk.mapper.SegchkUserCashMapper;
+import com.ruoyi.segchk.service.ISegchkUserCashService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg用户提现记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserCashServiceImpl implements ISegchkUserCashService 
+{
+
+    private static final Logger logger = LoggerFactory.getLogger(SegchkUserCashServiceImpl.class);
+
+    @Autowired
+    private SegchkUserCashMapper segchkUserCashMapper;
+
+    /**
+     * 查询seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return seg用户提现记录
+     */
+    @Override
+    public SegchkUserCash selectSegchkUserCashByCashId(Long cashId)
+    {
+        return segchkUserCashMapper.selectSegchkUserCashByCashId(cashId);
+    }
+
+    /**
+     * 查询seg用户提现记录列表
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return seg用户提现记录
+     */
+    @Override
+    public List<SegchkUserCash> selectSegchkUserCashList(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.selectSegchkUserCashList(segchkUserCash);
+    }
+
+    /**
+     * 新增seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCash(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.insertSegchkUserCash(segchkUserCash);
+    }
+
+    /**
+     * 修改seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCash(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.updateSegchkUserCash(segchkUserCash);
+    }
+
+    /**
+     * 批量删除seg用户提现记录
+     * 
+     * @param cashIds 需要删除的seg用户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCashByCashIds(Long[] cashIds)
+    {
+        return segchkUserCashMapper.deleteSegchkUserCashByCashIds(cashIds);
+    }
+
+    /**
+     * 删除seg用户提现记录信息
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCashByCashId(Long cashId)
+    {
+        return segchkUserCashMapper.deleteSegchkUserCashByCashId(cashId);
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java
new file mode 100644
index 0000000..ea6e280
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java
@@ -0,0 +1,107 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+import com.ruoyi.segchk.mapper.SegchkUserCollectMapper;
+import com.ruoyi.segchk.service.ISegchkUserCollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg用户收藏记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserCollectServiceImpl implements ISegchkUserCollectService 
+{
+    @Autowired
+    private SegchkUserCollectMapper segchkUserCollectMapper;
+
+    /**
+     * 查询seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return seg用户收藏记录
+     */
+    @Override
+    public SegchkUserCollect selectSegchkUserCollectByCollectId(Long collectId)
+    {
+        return segchkUserCollectMapper.selectSegchkUserCollectByCollectId(collectId);
+    }
+
+    /**
+     * 查询seg用户收藏记录列表
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return seg用户收藏记录
+     */
+    @Override
+    public List<SegchkUserCollect> selectSegchkUserCollectList(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.selectSegchkUserCollectList(segchkUserCollect);
+    }
+
+    /**
+     * 新增seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCollect(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.insertSegchkUserCollect(segchkUserCollect);
+    }
+
+    /**
+     * 修改seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCollect(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.updateSegchkUserCollect(segchkUserCollect);
+    }
+
+    /**
+     * 批量删除seg用户收藏记录
+     * 
+     * @param collectIds 需要删除的seg用户收藏记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByCollectIds(Long[] collectIds)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectIds(collectIds);
+    }
+
+    /**
+     * 删除seg用户收藏记录信息
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByCollectId(Long collectId)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectId(collectId);
+    }
+
+    /**
+     * 删除seg用户收藏记录对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByIds(String ids)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectIds(Convert.toLongArray(ids));
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserIndexServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserIndexServiceImpl.java
new file mode 100644
index 0000000..4600d24
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserIndexServiceImpl.java
@@ -0,0 +1,1380 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.order.service.impl.PaySupplier;
+//import com.ruoyi.order.service.impl.WechatWithdrawSupplier;
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.mapper.*;
+import com.ruoyi.segchk.service.*;
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import com.ruoyi.setting.bean.WechatPaySet;
+import com.ruoyi.setting.service.ILsPaySettingService;
+import com.ruoyi.util.*;
+import com.ruoyi.util.bean.*;
+import com.weixin.pay.WXPay;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * seg用户基本信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+@Service
+public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
+{
+    private static final Logger logger = LoggerFactory.getLogger(SegchkUserIndexServiceImpl.class);
+
+    @Autowired
+    private SegchkUserIndexMapper segchkUserIndexMapper;
+
+    @Autowired
+    private SegchkIndexUserVipMapper segchkIndexUserVipMapper;
+
+    @Autowired
+    private SegchkServiceChkMapper segchkServiceChkMapper;
+
+    @Autowired
+    private SegchkStoreSelfMgtMapper segchkStoreSelfMgtMapper;
+
+    @Autowired
+    private SegchkSelfServiceChkMapper segchkSelfServiceChkMapper;
+
+    @Autowired
+    private SegchkUserLikegoMapper segchkUserLikegoMapper;
+
+    @Autowired
+    private SegchkUserChargeMapper segchkUserChargeMapper;
+
+    @Autowired
+    private SegchkIndexUserAccountMapper segchkIndexUserAccountMapper;
+
+    @Autowired
+    private SegchkIndexStoreAccountMapper segchkIndexStoreAccountMapper;
+
+    @Autowired
+    private SegchkUserSecurityMapper segchkUserSecurityMapper;
+
+    @Autowired
+    private SegchkUserCertificationInfoMapper segchkUserCertificationInfoMapper;
+
+    @Autowired
+    private SegchkStoreCashMapper segchkStoreCashMapper;
+
+    @Autowired
+    private SegchkUserCashMapper segchkUserCashMapper;
+
+
+    @Autowired
+    private SegchkServiceCommentMapper segchkServiceCommentMapper;
+
+    @Autowired
+    private SegchkUserBasicInfoMapper segchkUserBasicInfoMapper;
+
+    @Autowired
+    private SegchkUserExtInfoMapper segchkUserExtInfoMapper;
+
+    @Autowired
+    private SegchkUserWechatMapper segchkUserWechatMapper;
+
+    @Autowired
+    private ISegchkUserRewardService segchkUserRewardService;
+
+    @Autowired
+    private ISegchkStoreIndexService segchkStoreIndexService;
+
+    @Autowired
+    private ISegchkProviderIndexService segchkProviderIndexService;
+
+    @Autowired
+    private ISegchkSystemSettingService segchkSystemSettingService;
+
+    @Autowired
+    private ISegchkStoreRewardService segchkStoreRewardService;
+
+
+    @Autowired
+    private ISegchkUserAccountService segchkUserAccountService;
+
+    /**
+     * 注入支付设置服务
+     */
+    @Autowired
+    private ILsPaySettingService paySetService;
+
+    @Value("${segchk.cash.store_threshold:#{0.0}}")
+    private BigDecimal storeThreshold;
+
+    @Value("${segchk.cash.user_threshold:#{0.0}}")
+    private BigDecimal userThreshold;
+
+    @Value("${segchk.cash.store_threshold_first:#{0.0}}")
+    private BigDecimal storeThresholdFirst;
+
+    @Value("${segchk.cash.user_threshold_first:#{0.0}}")
+    private BigDecimal userThresholdFirst;
+
+    @Value("${segchk.cash.sandbox:#{null}}")
+    private Integer sandbox;
+
+    /**
+     * 查询seg用户中心信息
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    @Override
+    public SegchkUserWebResp selectSegchkUserWebInfo(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectSegchkUserWebInfo with: {}", segchkUserWebReq.toString());
+        SegchkUserWebResp segchkUserWebResp = segchkUserIndexMapper.selectSegchkUserWebInfo(segchkUserWebReq);
+        segchkUserWebResp.setProviderId(segchkUserWebReq.getProviderId());
+        if(ObjectUtils.isEmpty(segchkUserWebResp.getRecommenderId()) || ObjectUtils.isEmpty(segchkUserWebResp.getRecommenderLevel())){
+//            说明是平台用户，无推荐人
+            segchkUserWebResp.setRecommenderLevel(null);
+            segchkUserWebResp.setRecommenderId(null);
+            segchkUserWebResp.setRecommenderName("无");
+            logger.debug("selectSegchkUserWebInfo res: ({})", segchkUserWebResp.toString());
+            return segchkUserWebResp;
+        }
+        switch (segchkUserWebResp.getRecommenderLevel()){
+            case "0": segchkUserWebResp.setRecommenderName(segchkProviderIndexService.selectSegchkProviderName(segchkUserWebResp.getRecommenderId()));break;
+            case "1": segchkUserWebResp.setRecommenderName(segchkStoreIndexService.selectSegchkStoreName(segchkUserWebResp.getRecommenderId()));break;
+            case "2": segchkUserWebResp.setRecommenderName(segchkUserIndexMapper.selectSegchkUserName(segchkUserWebResp.getRecommenderId()));break;
+        }
+        logger.debug("selectSegchkUserWebInfo res: ({})", segchkUserWebResp.toString());
+        return segchkUserWebResp;
+    }
+
+    /**
+     * 查询seg用户核消列表
+     *
+     * @param segchkUserWebReq
+     * @return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserWebSCResp> selectUserServiceCHKList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserServiceCHKList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserServiceCHKList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户会员卡列表或赠卡优惠券列表
+     *
+     * @param segchkUserWebReq
+     * @return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserWebCardResp> selectUserCardList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserCardList with: {}", segchkUserWebReq.toString());
+        if(segchkUserWebReq.getCardFlag() == 0) {
+            return segchkUserIndexMapper.selectUserCardList(segchkUserWebReq);
+        }
+        else if(segchkUserWebReq.getCardFlag() == 1){
+            return segchkUserIndexMapper.selectUserPerformanceList(segchkUserWebReq);
+        }
+        return null;
+    }
+
+    /**
+     * 查询seg用户收藏列表
+     *
+     * @param segchkUserWebReq
+     * @return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserCollectWebResp> selectUserCollectList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserCollectList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserCollectList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户预约列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserLikeGoWebResp> selectUserLikGoList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserLikGoList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserLikGoList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户充值列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserChargeWebResp> selectUserChargeList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserChargeList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserChargeList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户提现列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserCashWebResp> selectUserCashList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserCashList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserCashList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户消息列表
+     *
+     * @param segchkUserWebReq@return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkMsgWebResp> selectUserMsgList(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("selectUserMsgList with: {}", segchkUserWebReq.toString());
+        return segchkUserIndexMapper.selectUserMsgList(segchkUserWebReq);
+    }
+
+    /**
+     * 查询seg用户预约可用卡券列表
+     *
+     * @param segchkServiceOrderWebReq seg用户中心请求实体
+     * @return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkServiceOrderWebReq> selectUserOrderPredCardListWebInfo(SegchkServiceOrderWebReq segchkServiceOrderWebReq) {
+        List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqs = segchkUserIndexMapper.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
+//        如果返回结果是空，则说明无会员卡或赠卡或用，如果返回的结果中没有会员卡，说明无可用卡；如果返回的结果中，存在会员卡的store_id为空的情况：说明该赠卡可用，但是该会员卡在该商家不可用;如果是会员卡的时候并且card_id也是空的情况：说明该赠卡可用，但是该会员卡在该商家已经超过了商家的核销次数
+        AtomicInteger a = new AtomicInteger(-1);
+        if(CollectionUtils.isEmpty(segchkServiceOrderWebReqs)
+                || segchkServiceOrderWebReqs.stream().noneMatch(v -> v.getTypeId() == 0)){
+            logger.debug("selectUserOrderPredCardListWebInfo with: {} --- {}", segchkServiceOrderWebReq.toString(), "this user no card can use in this store");
+            return new ArrayList<SegchkServiceOrderWebReq>();
+        }
+        List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqs1 = segchkServiceOrderWebReqs.stream().filter(v -> {
+            if (v.getTypeId() == 0) {
+                a.set(0);
+                if (Objects.isNull(v.getStoreId())) {
+                    a.set(1);
+                    return false;
+                } else if (Objects.isNull(v.getCardId())) {
+                    a.set(2);
+                    return false;
+                } else
+                    return true;
+            }
+            return true;
+        }).collect(Collectors.toList());
+        StringBuffer sb = new StringBuffer();
+        switch (a.get()){
+            case 1 : sb.append("this store not support this vip card");break;
+            case 2 : sb.append("this vip card check over in this store");break;
+            default : sb.append("this vip card can use  in this store");break;
+        }
+        logger.debug("selectUserOrderPredCardListWebInfo with: {} --- {}{}", segchkServiceOrderWebReq.toString(), sb.toString(), segchkServiceOrderWebReqs1.size());
+
+        return segchkServiceOrderWebReqs1;
+    }
+
+    /**
+     * 根据用户核消二维码提取出来相应的信息进行核消，1、检查核卡是否可以核消(防止该卡已经在该商家不能再次核消)，2、检查该预约id，是否已经使用（防止多次预约核消使用）
+     *
+     * @param segchkUserLikego seg用户想去记录实体
+     * @return 结果
+     */
+    @Override
+    public void CheckUserServiceChk(SegchkUserLikego segchkUserLikego) {
+        logger.debug("CheckUserServiceChk with: {}", segchkUserLikego.toString());
+        SegchkServiceOrderWebReq segchkServiceOrderWebReq = new SegchkServiceOrderWebReq();
+        segchkServiceOrderWebReq.setProviderId(segchkUserLikego.getProviderId());
+        segchkServiceOrderWebReq.setUserId(segchkUserLikego.getUserId());
+        segchkServiceOrderWebReq.setStoreId(segchkUserLikego.getStoreId());
+        List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexMapper.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
+        if(segchkServiceOrderWebReqList == null || segchkServiceOrderWebReqList.isEmpty()){
+            logger.warn("CheckUserServiceChk user has no card can use {}", segchkUserLikego.toString());
+//            说明该用户已经没有可使用的卡了
+        }
+        else {
+            final List<SegchkServiceOrderWebReq> collect = segchkServiceOrderWebReqList.stream().filter(v -> v.getProviderId() == segchkUserLikego.getProviderId() && v.getUserId() == segchkUserLikego.getUserId() && v.getStoreId() == segchkUserLikego.getStoreId() && v.getCardId() == segchkUserLikego.getCardId() && v.getTypeId() == segchkUserLikego.getCardType()).collect(Collectors.toList());
+        }
+        
+    }
+
+    @Override
+    public SegchkServiceOrderChkTestResp selectUserOrderPredInfo(Long likegoId) {
+        logger.debug("selectUserOrderPredInfo with: {}", likegoId.toString());
+        return segchkUserIndexMapper.selectUserOrderPredInfo(likegoId);
+    }
+
+    /**
+     * 根据核查结果进行核消。说明已经满足核消条件
+     *
+     * @param segchkServiceOrderChkTestResp
+     * @param likegoId
+     * @param stoRewardWithChk
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int OrderCheckTransaction(SegchkServiceOrderChkTestResp segchkServiceOrderChkTestResp, Long likegoId, Boolean stoRewardWithChk) {
+        logger.debug("OrderCheckTransaction with: {}---{}", segchkServiceOrderChkTestResp.toString(), likegoId);
+        int ret = 0;
+        Long tmpStoreId = segchkServiceOrderChkTestResp.getStoreId();
+        if(segchkServiceOrderChkTestResp.getCardType() == 0){
+//            说明是会员卡，则先更新会员卡次数。然后插入核消记录，最后更新预约订单状态
+//            SegchkUserVip segchkUserVip = new SegchkUserVip();
+            logger.debug("OrderCheckTransaction will check with vip card");
+            ret += segchkIndexUserVipMapper.updateSegchkUserVipCheck(segchkServiceOrderChkTestResp.getCardId());
+            logger.debug("OrderCheckTransaction checked({}) with vip card({})"
+                    , (ret == 1 ? "successed" : "failed")
+                    , segchkServiceOrderChkTestResp.getCardId());
+            SegchkServiceChk segchkServiceChk = new SegchkServiceChk();
+            segchkServiceChk.setCardId(segchkServiceOrderChkTestResp.getCardId());
+//            segchkServiceChk.setCardTypeId(0L);
+            segchkServiceChk.setProviderId(segchkServiceOrderChkTestResp.getProviderId());
+            segchkServiceChk.setStoreId(tmpStoreId);
+            segchkServiceChk.setUserId(segchkServiceOrderChkTestResp.getUserId());
+
+            ret += segchkServiceChkMapper.insertSegchkServiceChk(segchkServiceChk);
+            logger.debug("OrderCheckTransaction save({}) service-check with ({})"
+                    , (ret == 2 ? "successed" : "failed")
+                    , segchkServiceChk.toString());
+
+            if(stoRewardWithChk){
+//                如果允许，会员卡第一次核消，将给该商家返利
+                Map<String, Object> params = new HashMap<>();
+                params.put("cardId", segchkServiceChk.getCardId());
+                params.put("storeId", tmpStoreId);
+                params.put("userId", segchkServiceChk.getUserId());
+//                根据卡号id，获取会员卡相关信息
+                SegchkChargeReward segchkChargeReward = segchkUserIndexMapper.selectSegchkRewardInfoForCheck(params);
+
+                int validateForCheck = segchkChargeReward.validateForCheck(tmpStoreId);
+                if(validateForCheck < 0){
+                    logger.warn("validateForCheselectUserOrderPredCardListWebInfock can not make reword for store({}), because {}", tmpStoreId, (validateForCheck == -1 ? "持卡用户推荐人不是平台" : validateForCheck == -2 ? "已使用过" : validateForCheck == -3 ? "该商家不支持该卡的核消" : "该商家不需要返利"));
+                }
+                else{
+                    segchkChargeReward.mkReward();
+                    segchkChargeReward.setRecommendersLevel(1);
+                    segchkChargeReward.setUserRecommenders(tmpStoreId);
+                    makeStoreReward(segchkChargeReward);
+                }
+            }
+        }
+        else {
+//            说明是优惠券或赠卡则先更新赠卡次数。然后插入核消记录，最后更新预约订单状态
+            logger.debug("OrderCheckTransaction will check with store card");
+            ret += segchkStoreSelfMgtMapper.updateSegchkUserVipCheck(segchkServiceOrderChkTestResp.getCardId());
+            logger.debug("OrderCheckTransaction checked({}) with vip card({})"
+                    , (ret == 1 ? "successed" : "failed")
+                    , segchkServiceOrderChkTestResp.getCardId());
+            SegchkSelfServiceChk segchkSelfServiceChk = new SegchkSelfServiceChk();
+            segchkSelfServiceChk.setCardId(segchkServiceOrderChkTestResp.getCardId());
+            segchkSelfServiceChk.setProviderId(segchkServiceOrderChkTestResp.getProviderId());
+            segchkSelfServiceChk.setStoreId(tmpStoreId);
+            segchkSelfServiceChk.setUserId(segchkServiceOrderChkTestResp.getUserId());
+            ret += segchkSelfServiceChkMapper.insertSegchkSelfServiceChk(segchkSelfServiceChk);
+            logger.debug("OrderCheckTransaction save({}) service-check with ({})"
+                    , (ret == 2 ? "successed" : "failed")
+                    , segchkSelfServiceChk.toString());
+        }
+        SegchkUserLikego segchkUserLikego = new SegchkUserLikego();
+        segchkUserLikego.setLikegoId(likegoId);
+        segchkUserLikego.setMgtState(2);
+
+        ret += segchkUserLikegoMapper.updateSegchkUserLikego(segchkUserLikego);
+        logger.debug("OrderCheckTransaction update({}) likego({})"
+                , (ret == 3 ? "successed" : "failed")
+                , likegoId);
+        return ret;
+    }
+
+    /**
+     * 根据支付回调结果，进行相应的更新
+     *
+     * @param chargeId 核消检查信息
+     * @param ret      预约单id
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void chargeRet(String chargeId, int ret) {
+//        根据回调结果。如果成功，则插入生成会员卡，并获取会员卡号，否则不产生新的会员卡号
+        logger.debug("chargeRet with: {}---{}", chargeId, ret);
+        SegchkUserCharge segchkUserCharge1 = segchkUserChargeMapper.selectSegchkUserChargeByChargeId(Long.valueOf(chargeId));
+        if(ObjectUtils.isEmpty(segchkUserCharge1) || ObjectUtils.isEmpty(segchkUserCharge1.getRetFlag())) {
+            logger.debug("chargeRet with: {} is not exit", chargeId);
+            return;
+        }
+        if(segchkUserCharge1.getRetFlag() != 0){
+            logger.debug("chargeRet charge:{}{} had been updated with: {} on {}", chargeId, ret, segchkUserCharge1.getRetFlag(), segchkUserCharge1.getModTime());
+            return;
+        }
+        else if(ret == 0){
+//            支付成功，生成新的会员卡信息
+            SegchkChargeRet segchkChargeRet = new SegchkChargeRet();
+            segchkChargeRet.setChargeId(Long.valueOf(chargeId));
+            int insert_ret = segchkIndexUserVipMapper.insertSegchkUserVipByCharge(segchkChargeRet);
+            if(insert_ret == 0){
+                logger.error("chargeRet生成新的会员卡失败--->{0}\n", segchkChargeRet.getChargeId());
+            }
+            else{
+                logger.info("chargeRet生成新的会员卡成功--->{0}:{1}\n", chargeId, segchkChargeRet.getCardId());
+                SegchkUserBasicInfo segchkUserBasicInfo = new SegchkUserBasicInfo();
+                segchkUserBasicInfo.setUserId(segchkUserCharge1.getUserId());
+                segchkUserBasicInfo.setCardTypeId(segchkUserCharge1.getCardTypeId());
+                segchkUserBasicInfoMapper.updateSegchkUserBasicInfo(segchkUserBasicInfo);
+            }
+//            根据新生成的会员卡号，充值id，更新相应的充值记录表，商家赠卡表等
+            SegchkUserCharge segchkUserCharge = new SegchkUserCharge();
+            segchkUserCharge.setChargeId(segchkChargeRet.getChargeId());
+            if(segchkChargeRet.getCardId() != null && segchkChargeRet.getCardId() != 0L) {
+                logger.debug("chargeRet chargeId: {}---cardId: {}", segchkChargeRet.getChargeId(), segchkChargeRet.getCardId());
+                segchkUserCharge.setCardId(segchkChargeRet.getCardId());
+            }
+            else{
+                logger.warn("chargeRet chargeId: {} without cardId", segchkChargeRet.getChargeId());
+            }
+            segchkUserCharge.setRetFlag(1);
+            int updaterest = segchkUserChargeMapper.updateSegchkUserChargeByRet(segchkUserCharge);
+            logger.warn("chargeRet update with {} result: {}", "success", updaterest == 1 ? "successed" : "failed");
+
+            Map<String, Object> params = new HashMap<>();
+            params.put("chargeId", segchkUserCharge1.getChargeId());
+            params.put("userId", segchkUserCharge1.getUserId());
+            params.put("providerId", segchkUserCharge1.getProviderId());
+            params.put("cardTypeId", segchkUserCharge1.getCardTypeId());
+            params.put("cardId", segchkChargeRet.getCardId());
+            updaterest = makeChargeReward(params);
+        }
+        else{
+            logger.warn("chargeRet with: {}---{}, 充值失败！！！", chargeId.toString(), ret);
+            SegchkUserCharge segchkUserCharge = new SegchkUserCharge();
+            segchkUserCharge.setChargeId(Long.parseLong(chargeId));
+            segchkUserCharge.setRetFlag(-1);
+            int updaterest = segchkUserChargeMapper.updateSegchkUserCharge(segchkUserCharge);
+            int deleterest = segchkIndexUserAccountMapper.deleteSegchkUserAccountByCharge(segchkUserCharge);
+            logger.warn("chargeRet update with {} result: {}", "failed", deleterest == 1 ? "successed" : "failed");
+        }
+    }
+
+    @Override
+    public int makeChargeReward(Map<String, Object> params) {
+        logger.debug("makeChargeReward with --- ({})", JSON.toJSONString(params));
+        int ret = 0;
+//            计算返利.给用户或商户,运营商加余额
+        SegchkChargeReward segchkChargeReward = segchkUserIndexMapper.selectSegchkRewardInfoForCharge(params);
+        segchkChargeReward.setCardId((Long) params.get("cardId"));
+        segchkChargeReward.setChargeId((Long) params.get("chargeId"));
+        if(ObjectUtils.isEmpty(segchkChargeReward.getUserRecommenders()) || ObjectUtils.isEmpty(segchkChargeReward.getRecommendersLevel())){
+//                推荐人是平台
+            logger.warn("chargeRet charge({}) reward is will belong to platform", params.get("chargeId"));
+        }
+            /*else if(segchkChargeReward.getRecommendersLevel() == 0){
+
+            }*/
+        else{
+            switch (segchkChargeReward.getRecommendersLevel()){
+                case 0: {
+//                    return makeProviderReward(segchkChargeReward, params);
+                    return 0;
+                }
+                case 1: {
+                    return makeStoreReward(segchkChargeReward);
+                }
+                case 2: {
+                    return makeUserReward(segchkChargeReward);
+                }
+                default: return 0;
+            }
+        }
+        return ret;
+    }
+
+    private int makeUserReward(SegchkChargeReward segchkChargeReward) {
+        logger.debug("makeUserReward with ({})", segchkChargeReward.toString());
+        int ret = 0;
+        if(ObjectUtils.isEmpty(segchkChargeReward.getReward()) || segchkChargeReward.getReward().compareTo(new BigDecimal(0.0)) <= 0){
+            logger.debug("makeUserReward reword is null or 0.0");
+            return 1;
+        }
+//                如果推荐是用户。则给用户累加奖励
+        SegchkUserReward segchkUserReward = new SegchkUserReward();
+        segchkUserReward.setProviderId(segchkChargeReward.getProviderId());
+        segchkUserReward.setReward(segchkChargeReward.getReward());
+        segchkUserReward.setRewardCardId(segchkChargeReward.getCardId());
+        segchkUserReward.setRewardCardTypeId(Long.valueOf(segchkChargeReward.getCardTypeId()));
+        segchkUserReward.setUserId(segchkChargeReward.getUserRecommenders());
+        ret = segchkUserRewardService.insertSegchkUserReward(segchkUserReward);
+        if(ret > 0 ){
+            logger.debug("makeUserReward save reward success with chargeId({})--- {}", segchkChargeReward.getChargeId(), segchkUserReward.toString());
+        }
+        else{
+            logger.warn("makeUserReward save reward failed with chargeId({}) --- {}", segchkChargeReward.getChargeId(), segchkUserReward.toString());
+        }
+
+        segchkChargeReward.setChargeId(segchkChargeReward.getChargeId());
+        segchkChargeReward.setRewardId(segchkUserReward.getRewardId());
+//                形成商户余额
+        ret = segchkUserIndexMapper.addAccountByReward(segchkChargeReward);
+        if(ret > 0){
+            logger.debug("makeUserReward add account successed for --- {}", segchkChargeReward.toString());
+        }
+        else {
+            logger.warn("makeUserReward add account failed for --- {}", segchkChargeReward.toString());
+        }
+        return ret;
+    }
+
+    private int makeStoreReward(SegchkChargeReward segchkChargeReward) {
+        logger.debug("makeStoreReward with ({})", segchkChargeReward.toString());
+        int ret = 0;
+        if(ObjectUtils.isEmpty(segchkChargeReward.getReward()) || segchkChargeReward.getReward().compareTo(new BigDecimal(0.0)) <= 0){
+            logger.debug("makeStoreReward reword is null or 0.0");
+            return 1;
+        }
+//                如果推荐是商户。则给商户累加奖励
+        SegchkStoreReward segchkStoreReward = new SegchkStoreReward();
+        segchkStoreReward.setProviderId(segchkChargeReward.getProviderId());
+        segchkStoreReward.setReward(segchkChargeReward.getReward());
+        segchkStoreReward.setRewardCardId(segchkChargeReward.getCardId());
+        segchkStoreReward.setRewardCardTypeId(Long.valueOf(segchkChargeReward.getCardTypeId()));
+        segchkStoreReward.setStoreId(segchkChargeReward.getUserRecommenders());
+        ret = segchkStoreRewardService.insertSegchkStoreReward(segchkStoreReward);
+        if(ret > 0 ){
+            logger.debug("makeStoreReward save reward success with chargeId({})--- {}", segchkChargeReward.getChargeId(), segchkStoreReward.toString());
+        }
+        else{
+            logger.warn("makeStoreReward save reward failed with chargeId({}) --- {}", segchkChargeReward.getChargeId(), segchkStoreReward.toString());
+        }
+
+        segchkChargeReward.setChargeId(segchkChargeReward.getChargeId());
+        segchkChargeReward.setRewardId(segchkStoreReward.getRewardId());
+//                形成商户余额
+        ret = segchkStoreIndexService.addAccountByReward(segchkChargeReward);
+        if(ret > 0){
+            logger.debug("chargeRet add account successed for --- {}", segchkChargeReward.toString());
+        }
+        else {
+            logger.warn("chargeRet add account failed for --- {}", segchkChargeReward.toString());
+        }
+        return ret;
+    }
+
+    private int makeProviderReward(SegchkChargeReward segchkChargeReward, Map<String, Object> params) {
+        return 0;
+    }
+
+    /**
+     * 根据支用户id，运营商id，查询该用户可购买的卡
+     *
+     * @param segchkUserWebReq 用户请示信息体
+     * @return 结果
+     */
+    @Override
+    public List<SegchkUserChargeCard> SegchkUserChargePre(SegchkUserWebReq segchkUserWebReq) {
+        logger.debug("SegchkUserChargePre with: {}", segchkUserWebReq.toString());
+        List<SegchkUserChargeCard> segchkUserChargeCards = segchkUserIndexMapper.selectSegchkUserChargePre(segchkUserWebReq);
+
+//        说明该用户购买过正式会员卡
+//        boolean b = segchkUserChargeCards.parallelStream().anyMatch(v -> v.getHadBuy() != 0 && v.getCardTypeValue().compareTo(new BigDecimal(20.0)) = -1);
+        if(segchkUserChargeCards.parallelStream().anyMatch(v -> v.getCanBuy() == 1 || v.getCanBuy() == 3)){
+//            如果有一张卡，为正在使用中1，则不可以再充值购买
+            logger.debug("SegchkUserChargePre user had one using card");
+            return null;
+        }
+        else{
+            List<SegchkUserChargeCard> segchkUserChargeCards1 = segchkUserChargeCards.parallelStream().filter(v -> {
+//                通过过滤出可购买的卡（间接过滤到为超限不能再买的卡）
+                return v.getCanBuy() == 0;
+            }).collect(Collectors.toList());
+            return segchkUserChargeCards1.size() == 0 || segchkUserChargeCards1.isEmpty() ? null : segchkUserChargeCards1;
+        }
+    }
+
+    /**
+     * 根据支用户id，运营商id，用户充值时可用余额
+     *
+     * @param segchkUserCharge 用户请示信息体
+     * @return 结果
+     */
+    @Override
+    public BigDecimal getAccount(SegchkUserCharge segchkUserCharge) {
+        logger.debug("getAccount with: {}", segchkUserCharge.toString());
+        SegchkUserAccountCheck segchkUserAccountCheck = new SegchkUserAccountCheck();
+        segchkUserAccountCheck.setAccount(segchkUserCharge.getAccountUsed());
+        segchkUserAccountCheck.setProviderId(segchkUserCharge.getProviderId());
+        segchkUserAccountCheck.setUserId(segchkUserCharge.getUserId());
+        BigDecimal ret = segchkIndexUserAccountMapper.checkSegchkUserAccount(segchkUserAccountCheck);
+        return ret;
+    }
+
+    /**
+     * 根据用户id(或者商户id)，运营商id，用户身份查询用户余额
+     *
+     * @param segchkUserCashOpsReq 用户请示信息体
+     * @param ip
+     * @return 结果
+     */
+    @Override
+    public int getAccountForCash(SegchkUserCashOpsReq segchkUserCashOpsReq, String ip) {
+        logger.debug("getAccountForCash with: {}---{}", segchkUserCashOpsReq.toString(), ip);
+        SegchkUserCashOpsResp segchkUserCashOpsResp = segchkIndexUserAccountMapper.selectSegchkUserAccountForCash(segchkUserCashOpsReq);
+        if(segchkUserCashOpsResp == null){
+//            说明用户没有任何余额信息
+            return -1;
+        }
+
+        if(segchkUserCashOpsReq.getUserLevel() != 1 && segchkUserCashOpsReq.getUserLevel() != 2){
+//            非正常用户
+            return -2;
+        }
+        BigDecimal firstline = segchkUserCashOpsReq.getUserLevel() == 1 ? storeThresholdFirst : userThresholdFirst;
+        BigDecimal baseline = segchkUserCashOpsReq.getUserLevel() == 1 ? storeThreshold : userThreshold;
+
+        if(segchkUserCashOpsReq.getCash().compareTo(segchkUserCashOpsReq.getCashId() == null ? firstline : baseline) != 1){
+//            首次提现余额受限
+            return -3;
+        }
+        if(segchkUserCashOpsReq.getCash().compareTo(segchkUserCashOpsResp.getAccount()) == 1){
+//            提现金额超过余额
+            return -4;
+        }
+
+//        1、创建提现记录
+//        2 新增余额记录
+//        ret = 2 成功
+        int ret = makeCashOps(segchkUserCashOpsReq, ip);
+
+        return ret;
+    }
+
+    /**
+     * 根据提现id，进行提现结果保存，及余额更新
+     *
+     * @param chargeId 行政区代码
+     * @param ret      行政区代码
+     * @return seg首页轮播图管理
+     */
+    @Override
+    @Transactional
+    public void cashRet(String chargeId, int ret) {
+        logger.debug("cashRet with: {}---{}", chargeId.toString(), ret);
+        int opsRet = 0;
+        SegchkUserCash segchkUserCash = new SegchkUserCash();
+        segchkUserCash.setCashId(Long.valueOf(chargeId));
+        segchkUserCash.setRetFlag(ret == 0 ? 1 : 2);
+        opsRet = segchkUserCashMapper.updateSegchkUserCash(segchkUserCash);
+        if(ret != 0){
+            opsRet = segchkIndexUserAccountMapper.deleteSegchkUserAccountByCash(segchkUserCash);
+        }
+    }
+
+    /**
+     * 新增用户评价
+     *
+     * @param segchkServiceCommentUserReq 用户评价提交实体
+     * @return seg首页轮播图管理
+     */
+    @Override
+    @Transactional
+    public int insertSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceCommentUserReq) {
+        logger.debug("insertSegchkServiceComment with: {}", segchkServiceCommentUserReq.toString());
+        int ret = segchkServiceCommentMapper.insertSegchkServiceCommentByChk(segchkServiceCommentUserReq);
+        SegchkServiceChk segchkServiceChk = new SegchkServiceChk();
+        segchkServiceChk.setCommentId(segchkServiceCommentUserReq.getCommentId());
+        segchkServiceChk.setChkServiceId(segchkServiceCommentUserReq.getChkServiceId());
+        ret += segchkStoreIndexService.addCommentAccByComment(segchkServiceCommentUserReq.getCommentId());
+        ret += segchkServiceChkMapper.updateSegchkServiceChk(segchkServiceChk);
+        return ret;
+    }
+
+    /**
+     * 根据评价id，查询用户评价
+     *
+     * @param segchkServiceCommentUserReq 用户评价提交实体
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public SegchkServiceComment selectSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceCommentUserReq) {
+        logger.debug("selectSegchkServiceComment with: {}", segchkServiceCommentUserReq.toString());
+        return segchkServiceCommentMapper.selectSegchkServiceCommentByCommentId(segchkServiceCommentUserReq.getCommentId());
+    }
+
+    /**
+     * 根据用户提交信息进行修改
+     *
+     * @param segchkUserSetInfoReq 用户评价提交实体
+     * @return 更新结果
+     */
+    @Override
+    public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq) {
+        logger.debug("updateUserInfo with: {}", segchkUserSetInfoReq.toString());
+        SegchkUserSecurity segchkUserSecurity = new SegchkUserSecurity();
+        segchkUserSecurity.setPasswd(segchkUserSetInfoReq.getPasswd());
+        segchkUserSecurity.setUserId(segchkUserSetInfoReq.getUserId());
+        segchkUserSecurity.setProviderId(segchkUserSetInfoReq.getProviderId());
+        return segchkUserSecurityMapper.insertSegchkUserSecurity(segchkUserSecurity);
+    }
+
+    /**
+     * 根据用户提交信息实名设置
+     *
+     * @param segchkUserCertificationInfo 用户提交实体
+     * @return 更新结果
+     */
+    @Override
+    public int userCerticify(SegchkUserCertificationInfo segchkUserCertificationInfo) {
+        logger.debug("userCerticify with: {}", segchkUserCertificationInfo.toString());
+        SegchkUserCertificationInfo tmp = new SegchkUserCertificationInfo();
+        tmp.setUserId(segchkUserCertificationInfo.getUserId());
+        tmp.setProviderId(segchkUserCertificationInfo.getProviderId());
+        List<SegchkUserCertificationInfo> infos = segchkUserCertificationInfoMapper.selectSegchkUserCertificationInfoList(tmp);
+        if(infos == null || infos.isEmpty()){
+            return segchkUserCertificationInfoMapper.insertSegchkUserCertificationInfo(segchkUserCertificationInfo);
+        }
+        else{
+            segchkUserCertificationInfo.setUsercardId(infos.get(0).getUsercardId());
+            return segchkUserCertificationInfoMapper.updateSegchkUserCertificationInfo(segchkUserCertificationInfo);
+        }
+    }
+
+    /**
+     * 根据用户信息返回用户身份
+     *
+     * @param phoneno 用户信息
+     * @return 更新结果
+     */
+    @Override
+    public SegchkUserLevelInfo selectUserLevelByMobile(String phoneno) {
+        logger.debug("selectUserLevelByMobile with: {}", phoneno.toString());
+        return segchkUserIndexMapper.selectUserLevelByMobile(phoneno);
+    }
+
+    /**
+     * 根据用户信息注册用户基本信息表
+     *
+     * @param segchkUserBasicInfo 用户信息
+     * @return 插入结果
+     */
+    @Override
+    public int addUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo) {
+        logger.debug("addUserBasicInfo with: {}", segchkUserBasicInfo.toString());
+        return segchkUserBasicInfoMapper.insertSegchkUserBasicInfo(segchkUserBasicInfo);
+    }
+
+    /**
+     * 根据推荐人信息，检查推荐人是否存在
+     *
+     * @param parmMap 推荐人信息
+     * @return 查询记录数
+     */
+    @Override
+    public int recommenderIsExit(Map<String, Object> parmMap) {
+        logger.debug("recommenderIsExit with: {}", parmMap.toString());
+        return segchkUserIndexMapper.recommenderIsExit(parmMap);
+    }
+
+    /**
+     * 根据推荐人信息，更新用户扩展信息表
+     *
+     * @param segchkUserExtInfo 推荐人信息
+     * @return 查询记录数
+     */
+    @Override
+    public int insertUserExtInfo(SegchkUserExtInfo segchkUserExtInfo) {
+        logger.debug("insertUserExtInfo with: {}", segchkUserExtInfo.toString());
+        return segchkUserExtInfoMapper.insertSegchkUserExtInfo(segchkUserExtInfo);
+    }
+
+    /**
+     * 根据用户基本信息查找用户微信信息
+     *
+     * @param segchkUserLevelInfo 用户基本信息
+     * @return 查询记录数
+     */
+    @Override
+    public String getWeChatInfoByUserId(SegchkUserLevelInfo segchkUserLevelInfo) {
+        logger.debug("getWeChatInfoByUserId with: {}", segchkUserLevelInfo.toString());
+        if(segchkUserLevelInfo.getUserLevel() == 2) {
+            SegchkUserWechat segchkUserWechat = segchkUserWechatMapper.selectSegchkUserWechatByUserId(segchkUserLevelInfo.getUserId());
+            if(ObjectUtils.isEmpty(segchkUserWechat)
+                    || StringUtils.isEmpty(segchkUserWechat.getOpenid())){
+                return null;
+            }
+            return segchkUserWechat.getOpenid();
+        }
+        else if(segchkUserLevelInfo.getUserLevel() == 1){
+            WeChatCustomerLink weChatCustomerLink = segchkStoreIndexService.selectWeChatInfoByStoreId(segchkUserLevelInfo.getUserId());
+            return ObjectUtils.isEmpty(weChatCustomerLink) ? null : weChatCustomerLink.getOpenId();
+        }
+        else if(segchkUserLevelInfo.getUserLevel() == 0){
+            return segchkProviderIndexService.selectWeChatInfoByProviderId(segchkUserLevelInfo.getUserId());
+        }
+        else return null;
+    }
+
+    /**
+     * 根据用户信息，更新用户微信信息表
+     *
+     * @param segchkUserWechat 用户基本信息
+     * @param userLevel
+     * @return 查询记录数
+     */
+    @Override
+    public int updateWeChatInfoByUserId(SegchkUserWechat segchkUserWechat, String userLevel) {
+        logger.debug("updateWeChatInfoByUserId with: {}---{}", segchkUserWechat.toString(), userLevel);
+        if(!ObjectUtils.isEmpty(segchkUserWechat.getNickName())) {
+//            如果用户昵称不空，则对昵称进行utf转换，避免用户昵称特殊字符无法存入
+            try {
+                segchkUserWechat.setNickName(URLEncoder.encode(segchkUserWechat.getNickName(), "utf-8"));
+            } catch (UnsupportedEncodingException e) {
+                logger.error("updateWeChatInfoByUserId get nickName error: {}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+        switch (userLevel){
+            case "0": return segchkUserIndexMapper.updateSegchkProviderWechat(segchkUserWechat);
+            case "1": return segchkUserIndexMapper.updateSegchkStoreWechat(segchkUserWechat);
+            case "2": return segchkUserIndexMapper.updateSegchkUserWechat(segchkUserWechat);
+            default: return -1;
+        }
+    }
+
+
+    @Transactional
+    public int makeCashOps(SegchkUserCashOpsReq segchkUserCashOpsReq, String ip) {
+        logger.debug("makeCashOps with: {}", segchkUserCashOpsReq.toString());
+        int ret = 0;
+        int type = segchkUserCashOpsReq.getUserLevel();
+        String cashId = null;
+            if(type == 1){
+//                说明是商户提现
+                SegchkStoreCash segchkStoreCash = new SegchkStoreCash();
+                segchkStoreCash.setCash(segchkUserCashOpsReq.getCash());
+                segchkStoreCash.setCashType("0");
+                segchkStoreCash.setProviderId(segchkUserCashOpsReq.getProviderId());
+                segchkStoreCash.setStoreId(segchkUserCashOpsReq.getUserId());
+                segchkStoreCash.setRetFlag("0");
+//                增加提现记录
+                ret = segchkStoreCashMapper.insertSegchkStoreCash(segchkStoreCash);
+//                根据提现计算商户全额
+                ret += segchkIndexStoreAccountMapper.insertSegchkStoreAccountByCash(segchkStoreCash);
+                cashId = segchkStoreCash.getCashId().toString();
+            }
+        else if(type == 2){
+            SegchkUserCash segchkUserCash = new SegchkUserCash();
+                segchkUserCash.setCash(segchkUserCashOpsReq.getCash());
+                segchkUserCash.setCashType("0");
+                segchkUserCash.setProviderId(segchkUserCashOpsReq.getProviderId());
+                segchkUserCash.setUserId(segchkUserCashOpsReq.getUserId());
+                segchkUserCash.setRetFlag(0);
+//                增加提现记录
+            ret = segchkUserCashMapper.insertSegchkUserCash(segchkUserCash);
+//                根据提现计算最新的余额
+            ret += segchkIndexUserAccountMapper.insertSegchkStoreAccountByCash(segchkUserCash);
+            cashId = segchkUserCash.getCashId().toString();
+
+        }
+        if(ret != 2 || StringUtils.isEmpty(cashId)){
+            logger.error("makeCashOps fail due to create cash order createcnt{}---return{}---cashId{}....", ret, -12, cashId);
+            return -12;
+        }
+        String openId = segchkUserCashOpsReq.getSearchValue();
+        Boolean usesandbox = !StringUtils.isEmpty(segchkUserCashOpsReq.getRemark());
+        return wechatAppletTransfers(cashId, segchkUserCashOpsReq.getUserId(), segchkUserCashOpsReq.getProviderId(), ip, type, openId).getFlag();
+    }
+
+    /**
+     * 微信小程序支付
+     *
+     * @param orderCode  订单code
+     * @param userId 用户id
+     * @param providerId 用户id
+     * @param ip         请求真实ip
+     * @param type       支付类型 1:订单支付 2:预存款充值 ---> 1用户支付，2商户支付
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -3:没有待支付的订单 -5:微信生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用 1 成功
+     */
+    @Override
+    public CommonResponse<PrepayResult> wechatAppletPay(String orderCode, Long userId, Long providerId, String ip, int type) {
+        logger.debug("wechatAppletPay and orderCode:{} \r\n userId:{} \r\n ip:{} \r\n:type:{}", orderCode, userId, ip, type);
+
+     /*   WeChatCustomerLink weChatCustomerLink = weChatCustomerLinkService.queryWeChatCustomerLinkByCustomerId(customerId);
+        if (ObjectUtils.isEmpty(weChatCustomerLink) || StringUtils.isEmpty(weChatCustomerLink.getAppletOpenId())) {
+            logger.error("wechatAppletPay fail due to no weChatCustomerLink or appletOpenId is null....");
+            return CommonResponse.build(null, -10);
+        }*/
+        WeChatCustomerLink weChatCustomerLink = segchkUserIndexMapper.getUserWechatOpenId(userId);
+        logger.debug("wechatAppletPay get WeChatCustomerLink: {}", weChatCustomerLink.toString());
+        if (ObjectUtils.isEmpty(weChatCustomerLink) || ObjectUtils.isEmpty(weChatCustomerLink.getOpenId())){
+            logger.error("wechatAppletPay fail due to wechat error not auth....");
+            return CommonResponse.build(null, -10);
+        }
+        return weChatCommonPay(
+                orderCode
+                , providerId
+                , userId
+                , type
+                , WechatSetting.build(ip, WechatUtils.APPLET_PAY, "/default/user/wechatnotify").addOpenId(weChatCustomerLink.getOpenId()), (setting, orderInfo) -> {
+                    //获取预支付信息
+                    PrepayResult prepayResult = WechatUtils.getPrepay(setting, orderInfo);
+                    //微信生成预支付信息错误
+                    if (ObjectUtils.isEmpty(prepayResult)) {
+                        logger.error("wechatAppletPay fail due to wechat error....");
+                        return CommonResponse.build(null, -5);
+                    }
+                    return CommonResponse.build(prepayResult, 1);
+                });
+    }
+
+
+    /**
+     * 微信小程序提现
+     *
+     * @param orderCode  订单code
+     * @param userId 用户id
+     * @param providerId 用户id
+     * @param ip         请求真实ip
+     * @param type       支付类型 1:订单支付 2:预存款充值 ---> 2用户支付，1商户支付
+     * @param openId
+     * @return 返回码和支付宝支付的html 返回码说明  -1:用户不存在 -3:没有待支付的订单 -5:微信生成订单出错 -7 没有设置网站地址 -8 缺少配置  -9 没有启用 1 成功
+     */
+    @Override
+    public CommonResponse<WxTransferResult> wechatAppletTransfers(String orderCode, Long userId, Long providerId, String ip, int type, String openId) {
+        logger.debug("wechatAppletTransfers and orderCode:{} \r\n userId:{} \r\n ip:{} \r\n:type:{}", orderCode, userId, ip, type);
+
+        return weChatCommonTransfer(
+                orderCode
+                , providerId
+                , userId
+                , type
+                , WechatSetting.build(ip, WechatUtils.APPLET_PAY, "").addOpenId(openId), (setting, orderInfo) -> {
+                    //获取预支付信息
+//                    WxTransferResult wxTransferResult = WechatUtils.getTransfers(setting, orderInfo);
+                    WxTransferResult wxTransferResult = null;
+                    try {
+                        SegchkWXPayConfigImpl instance = SegchkWXPayConfigImpl.getInstance();
+                        instance.setAppId(setting.getAppId());
+                        instance.setMchId(setting.getMerchantNum());
+                        instance.setMchKey(setting.getApiKey());
+                        instance.setCertData(setting.getCertFile());
+                        WXPay wxPay = new WXPay(instance, false, !ObjectUtils.isEmpty(sandbox));
+                        Map<String, String> transfers = wxPay.transfers(orderInfo.getOrderCode(), openId, orderInfo.getPrice().toString(), String.valueOf(orderInfo.getType()), ip);
+                        wxTransferResult = JSON.parseObject(JSON.toJSONString(transfers), WxTransferResult.class);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        wxTransferResult = null;
+                    }
+                    //微信生成预支付信息错误
+                    if (ObjectUtils.isEmpty(wxTransferResult)) {
+                        logger.error("wechatAppletTransfers fail due to wechat error....");
+                        return CommonResponse.build(null, -5);
+                    }
+                    return CommonResponse.build(wxTransferResult, 1);
+                });
+    }
+
+    /**
+     * 构建预支付订单信息
+     *
+     * @param transCode 交易号
+     * @param money     订单金额
+     * @param type      类型 1:订单支付 2:预存款充值
+     */
+    private OrderInfoForPay buildOrderInfoForPay(String transCode, BigDecimal money, int type) {
+        OrderInfoForPay orderInfoForPay = new OrderInfoForPay();
+        //商品名
+        orderInfoForPay.setGoodsName("用户支付");
+        //订单号
+        orderInfoForPay.setOrderCode(transCode);
+        //订单金额
+        orderInfoForPay.setPrice(money);
+        //支付类型
+        orderInfoForPay.setType(type);
+        return orderInfoForPay;
+    }
+
+    /**
+     * 构建预支付订单信息
+     *
+     * @param transCode 交易号
+     * @param money     订单金额
+     * @param type      类型 1:订单支付 2:预存款充值
+     */
+    private OrderInfoForPay buildOrderInfoForTrans(String transCode, BigDecimal money, int type) {
+        OrderInfoForPay orderInfoForPay = new OrderInfoForPay();
+        //商品名
+        orderInfoForPay.setGoodsName("用户奖励");
+        //订单号
+        orderInfoForPay.setOrderCode(transCode + type);
+        //订单金额
+        orderInfoForPay.setPrice(money);
+        //支付类型
+        orderInfoForPay.setType(type);
+        return orderInfoForPay;
+    }
+
+    /**
+     * 获得付款的实体
+     *
+     * @param chargeId  订单code
+     * @param userId 会员id
+     * @param type       类型 1 订单 2 预存款 3 门店订单
+     * @return 返回付款实体
+     */
+    private OrderInfoForPay getOrderInfoForPay(String chargeId, Long userId, int type) {
+
+        SegchkUserCharge segchkUserCharge = segchkUserChargeMapper.selectSegchkUserChargeByChargeId(Long.valueOf(chargeId));
+        if(ObjectUtils.isEmpty(segchkUserCharge)) {
+            return null;
+        }
+        return buildOrderInfoForPay(chargeId, segchkUserCharge.getCharge(), type);
+    }
+
+    /**
+     * 获得付款的实体
+     *
+     * @param cashId  订单code
+     * @param userId 会员id
+     * @param type       类型 1 商户 2 用户 3 门店订单
+     * @return 返回付款实体
+     */
+    private OrderInfoForPay getTransfersInfoForPay(String cashId, Long userId, int type) {
+        switch (type){
+            case 1: {
+                SegchkStoreCash segchkStoreCash = segchkStoreCashMapper.selectSegchkStoreCashByCashId(Long.valueOf(cashId));
+                if(ObjectUtils.isEmpty(segchkStoreCash)) {
+                    return null;
+                }
+                return buildOrderInfoForTrans(cashId, segchkStoreCash.getCash(), type);
+            }
+            case 2: {
+                SegchkUserCash segchkUserCash = segchkUserCashMapper.selectSegchkUserCashByCashId(Long.valueOf(cashId));
+                if(ObjectUtils.isEmpty(segchkUserCash)) {
+                    return null;
+                }
+                return buildOrderInfoForTrans(cashId, segchkUserCash.getCash(), type);
+            }
+            case 0: {
+                return null;
+            }
+
+        }
+        return null;
+
+    }
+
+    /**
+     * 微信支付公共方法
+     *
+     * @param orderCode     订单号
+     * @param userId    用户id
+     * @param providerId    用户id
+     * @param type          支付类型    1 订单支付 2 预存充值  1商户，2用户
+     * @param wechatSetting 微信设置
+     * @param supplier      回调
+     * @return -8 没有设置微信支付信息 -9 微信支付没启动 -7 没有配置站点信息 -1 用户不存在 -3 没有待支付订单 -5 微信生存支付信息失败 1 成功
+     */
+    private <T> CommonResponse<T> weChatCommonPay(String orderCode, Long providerId, Long userId, int type, WechatSetting wechatSetting, PaySupplier<WechatSetting, OrderInfoForPay, CommonResponse<T>> supplier) {
+
+        logger.debug("weChatCommonPay and orderCode:{} \r\n customerId:{}   \r\n:type:{}", orderCode, userId, type);
+
+        //微信支付设置(数据库)
+        WechatPaySet wechatPaySet = new WechatPaySet();
+
+        // 微信app、小程序支付和其他微信支付配置的信息不一样所以这边分开获取微信支付信息
+//        wechatPaySet.setAppSecret(appSecrt);
+//        wechatPaySet.setAppId(appId);
+//        wechatPaySet.setIsUse("1");
+        if (wechatSetting.isAppPay()) {
+            wechatPaySet = paySetService.queryPaySet().getWechatAppPaySet();
+        } else if (wechatSetting.isAppletPay()) {
+//            微信小程序
+            wechatPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        } else {
+            wechatPaySet = paySetService.queryPaySet().getWechatPaySet();
+        }
+
+        // 没设置微信支付信息
+        if (ObjectUtils.isEmpty(wechatPaySet)) {
+            logger.error("wechatQRPay fail due to no wechatPaySet is empty....");
+            return CommonResponse.build(null, -8);
+        }
+
+        // 微信支付没启用
+        if (!wechatPaySet.checkIsUse()) {
+            logger.error("wechatQRPay fail due to not used....");
+            return CommonResponse.build(null, -9);
+        }
+
+        // 网站基本信息
+        BaseInfoSet baseInfoSet = segchkSystemSettingService.queryBaseInfoSet();
+
+        if (ObjectUtils.isEmpty(baseInfoSet) || StringUtils.isEmpty(baseInfoSet.getSiteUrlWithBias()) || StringUtils.isEmpty(baseInfoSet.getSiteName())) {
+            logger.error("wechatH5Pay fail due to no baseinfoset....");
+            return CommonResponse.build(null, -7);
+        }
+
+        // 设置网站名称和网站地址
+        wechatSetting.addSiteName(baseInfoSet.getSiteName()).addSiteUrl(baseInfoSet.getSiteUrlWithBias());
+
+        // 设置微信支付成功后回调地址
+        wechatSetting.setPayCallback(baseInfoSet.getSiteUrlWithBias() + wechatSetting.getPayCallback());
+
+        BeanUtils.copyProperties(wechatPaySet, wechatSetting);
+        logger.info("wechatSetting="+wechatSetting);
+
+        // 检查参数
+        if (!wechatSetting.checkPayParams()) {
+            logger.error("wechatQRPay fail due to no checkPayParams fail....");
+            return CommonResponse.build(null, -8);
+        }
+
+        // 查询用户信息
+        Map<String, Object> parmMap = new HashMap<>();
+        parmMap.put("userId", userId);
+        parmMap.put("providerId", providerId);
+        int usercount = segchkUserIndexMapper.userIsExit(parmMap);
+
+        // 用户信息为空 则直接返回
+        if (Objects.isNull(usercount)) {
+            logger.error("weChatCommonPay fail due to member is not ");
+            return CommonResponse.build(null, -1);
+        }
+
+        // 待支付订单
+        OrderInfoForPay orderInfoForPay = getOrderInfoForPay(orderCode, userId, type);
+
+        // 没有待支付订单直接返回
+        if (Objects.isNull(orderInfoForPay)) {
+            logger.error("weChatCommonPay fail due to no order....");
+            return CommonResponse.build(null, -3);
+        }
+
+        return supplier.getPayParams(wechatSetting, orderInfoForPay);
+    }
+
+    /**
+     * 微信提现公共方法
+     *
+     * @param cashCode     订单号
+     * @param userId    用户id
+     * @param providerId    用户id
+     * @param type          支付类型    1 订单支付 2 预存充值  1商户，2用户
+     * @param wechatSetting 微信设置
+     * @param supplier      回调
+     * @return -8 没有设置微信支付信息 -9 微信支付没启动 -7 没有配置站点信息 -1 用户不存在 -3 没有待支付订单 -5 微信生存支付信息失败 1 成功
+     */
+    private <T> CommonResponse<T> weChatCommonTransfer(String cashCode, Long providerId, Long userId, int type, WechatSetting wechatSetting, PaySupplier<WechatSetting, OrderInfoForPay, CommonResponse<T>> supplier) {
+
+        logger.debug("weChatCommonTransfer and orderCode:{} \r\n customerId:{}   \r\n:type:{}", cashCode, userId, type);
+
+        //微信支付设置(数据库)
+        WechatPaySet wechatPaySet = new WechatPaySet();
+
+        // 微信app、小程序支付和其他微信支付配置的信息不一样所以这边分开获取微信支付信息
+//        wechatPaySet.setAppSecret(appSecrt);
+//        wechatPaySet.setAppId(appId);
+//        wechatPaySet.setIsUse("1");
+        if (wechatSetting.isAppPay()) {
+            wechatPaySet = paySetService.queryPaySet().getWechatAppPaySet();
+        } else if (wechatSetting.isAppletPay()) {
+//            小程序支付
+            wechatPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
+        } else {
+            wechatPaySet = paySetService.queryPaySet().getWechatPaySet();
+        }
+
+        // 没设置微信支付信息
+        if (ObjectUtils.isEmpty(wechatPaySet)) {
+            logger.error("weChatCommonTransfer fail due to no wechatPaySet is empty....");
+            return CommonResponse.build(null, -8);
+        }
+
+        // 微信支付没启用
+        if (!wechatPaySet.checkIsUse()) {
+            logger.error("weChatCommonTransfer fail due to not used....");
+            return CommonResponse.build(null, -9);
+        }
+
+        // 微信支付没启用
+        if (StringUtils.isEmpty(wechatPaySet.getCertFile())) {
+            logger.error("weChatCommonTransfer fail due to mch can not transfer....");
+            return CommonResponse.build(null, -10);
+        }
+
+        BeanUtils.copyProperties(wechatPaySet, wechatSetting);
+        logger.info("wechatSetting="+wechatSetting);
+
+        // 检查参数
+        if (!wechatSetting.checkPayParams()) {
+            logger.error("weChatCommonTransfer fail due to no checkPayParams fail....");
+            return CommonResponse.build(null, -8);
+        }
+
+        // 待支付订单
+        OrderInfoForPay orderInfoForPay = getTransfersInfoForPay(cashCode, userId, type);
+
+        // 没有待支付订单直接返回
+        if (Objects.isNull(orderInfoForPay)) {
+            logger.error("weChatCommonTransfer fail due to no order....");
+            return CommonResponse.build(null, -11);
+        }
+
+        return supplier.getPayParams(wechatSetting, orderInfoForPay);
+    }
+
+    @Override
+    public int weChatAppletNotify(InputStream inputStream) {
+        logger.debug("weChatAppletNotify...... ");
+        return weChatCommonNotify(inputStream, paySetService.queryPaySet().getWechatAppletPaySet());
+    }
+
+    /**
+     * 根据预约单，查询相关信息
+     *
+     * @param segchkUserLikego 包含预约单id
+     * @return SegchkUserLikego
+     */
+    @Override
+    public SegchkUserLikego selectUserLikeGo(SegchkUserLikego segchkUserLikego) {
+        List<SegchkUserLikego> segchkUserLikegos = segchkUserLikegoMapper.selectSegchkUserLikegoList(segchkUserLikego);
+        if(ObjectUtils.isEmpty(segchkUserLikegos)){
+            return null;
+        }
+        return segchkUserLikegos.get(0);
+    }
+
+    @Override
+    public int insertSegchkUserCharge(SegchkUserCharge segchkUserCharge) {
+        int i = segchkUserChargeMapper.addSegchkUserChargeWithRecommend(segchkUserCharge);
+        if(i < 1){
+//            生成订单失败
+            return i;
+        }
+        if(segchkUserCharge.getAccountUsed().compareTo(new BigDecimal(0.0)) > 1){
+//            只要使用了余额就进行余额更新无论充值是否实际发生支付 ，防止被其他行为如提现，返利打乱造成数据不一致
+//            如果全部使用用户余额支付，则更新用户余额信息
+            SegchkUserAccount segchkUserAccount = new SegchkUserAccount();
+            segchkUserAccount.setProviderId(segchkUserCharge.getProviderId());
+            segchkUserAccount.setChargeId(segchkUserCharge.getChargeId());
+            segchkUserAccount.setUserId(segchkUserCharge.getUserId());
+//            把用户使用充值的余额写进余额中
+            segchkUserAccount.setAccount(segchkUserCharge.getAccountUsed());
+            i = segchkUserAccountService.insertSegchkUserAccountBuyCharge(segchkUserAccount);
+        }
+        return i;
+
+    }
+
+    @Override
+    public SegchkUserWechat queryWeChatInfoByUserId(Claims claims) {
+
+        switch (claims.getUserLevel()){
+            case 0: {
+                String s = segchkProviderIndexService.selectWeChatInfoByProviderId(claims.getProviderId());
+                SegchkUserWechat segchkUserWechat = new SegchkUserWechat();
+                segchkUserWechat.setProviderId(claims.getProviderId());
+                segchkUserWechat.setUserId(claims.getUserId());
+                segchkUserWechat.setOpenid(s);
+                return segchkUserWechat;
+            }
+            case 1: {
+                WeChatCustomerLink weChatCustomerLink = segchkStoreIndexService.selectWeChatInfoByStoreId(claims.getUserId());
+                SegchkUserWechat segchkUserWechat = new SegchkUserWechat();
+                segchkUserWechat.setProviderId(claims.getProviderId());
+                segchkUserWechat.setUserId(claims.getUserId());
+                segchkUserWechat.setOpenid(weChatCustomerLink.getOpenId());
+                segchkUserWechat.setUnionId(weChatCustomerLink.getUnionId());
+                return segchkUserWechat;
+            }
+            case 2: {SegchkUserWechat segchkUserWechat = segchkUserWechatMapper.selectSegchkUserWechatByUserId(claims.getUserId());
+                return segchkUserWechat;
+            }
+            default: {return null;}
+        }
+    }
+
+
+    /**
+     * 微信支付回调
+     *
+     * @param inputStream  微信输入流
+     * @param wechatPaySet 微信设置
+     * @return 返回  0失败，大于0成功
+     */
+    private int weChatCommonNotify(InputStream inputStream, WechatPaySet wechatPaySet) {
+        logger.debug("weChatCommonNotifya and wechatPaySet:{}", wechatPaySet);
+        WechatSetting wechatSetting = new WechatSetting();
+        BeanUtils.copyProperties(wechatPaySet, wechatSetting);
+        if (StringUtils.isEmpty(wechatPaySet.getAppId()) || StringUtils.isEmpty(wechatPaySet.getMerchantNum())) {
+            logger.error("weChatNotify fail due to no checkPayParams fail....");
+            return -2;
+        }
+        OrderInfoAfterPay orderInfoAfterPay = WechatUtils.afterPayInfo(inputStream, wechatSetting);
+//        String chargeId = orderInfoAfterPay.getTransCode().substring(0, orderInfoAfterPay.getTransCode().length() - 1);
+        if (!orderInfoAfterPay.isSuccess()) {
+            logger.error("weChatNotify fail due to notify fail....");
+
+            chargeRet(orderInfoAfterPay.getOrderCode(), 1);
+            return -3;
+        }
+        chargeRet(orderInfoAfterPay.getOrderCode(), 0);
+        return 1;
+//        return paySuccess(orderInfoAfterPay.getOrderCode(), CommonConstant.QUERY_WITH_NO_CUSTOMER, orderInfoAfterPay.getType(), CommonConstant.WECHAT_PAY, orderInfoAfterPay.getTransCode());
+    }
+
+    /**
+     * 支付成功后的操作
+     *
+     * @param orderCode  订单code
+     * @param customerId 用户id
+     * @param type       1:订单支付    2 预存款充值
+     * @param channel    支付方式，预存款充值使用
+     * @param transCode  交易流水号
+     * @return 0失败，大于0成功
+     */
+    /*private int paySuccess(String orderCode, long customerId, int type, String channel, String transCode) {
+        logger.debug("paySuccess and orderCode:{} \r\n customerId:{} \r\n type:{} \r\n transCode:{}", orderCode, customerId, type, transCode);
+        //订单支付
+        if (CommonConstant.ORDER_PAY == type) {
+            // 根据订单编号和用户id查询待付款的订单信息
+            List<OmsOrder> orders = orderService.queryOrderByOrderCode(orderCode, customerId);
+            // 没有待支付的订单 则直接返回
+            if (CollectionUtils.isEmpty(orders)) {
+                logger.error("paySuccess fail due to no order....");
+                return -1;
+            }
+            // 修改订单状态
+            return orderServiceApi.confirmOrderPayed(ConfirmOrderParams.buildCustomerSource(customerId, 0, orders.stream().map(OmsOrder::getOrderCode).collect(Collectors.toList()), transCode, channel));
+        } else if (CommonConstant.RECHARGE_PAY == type) {
+            //预存款充值
+            return predepositRecordServiceApi.updateStatusSuccessByTransCode(orderCode, CommonConstant.QUERY_WITH_NO_CUSTOMER, channel, transCode);
+        } else {
+            // 根据订单编号和用户id查询待付款的门店订单信息
+            List<TStoreOrder> storeOrders = storeOrderService.queryOrderByOrderCode(orderCode, customerId);
+
+            if (CollectionUtils.isEmpty(storeOrders)) {
+                logger.error("paySuccess fail due to no order....");
+                return -1;
+            }
+
+            return storeOrderServiceApi.confirmOrderPayed(customerId, storeOrders.stream().map(TStoreOrder::getOrderCode).collect(Collectors.toList()), "0", transCode, channel);
+        }
+
+    }*/
+
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java
new file mode 100644
index 0000000..5c78c47
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+import com.ruoyi.segchk.mapper.SegchkUserLikegoMapper;
+import com.ruoyi.segchk.service.ISegchkUserLikegoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg用户想去记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserLikegoServiceImpl implements ISegchkUserLikegoService 
+{
+    @Autowired
+    private SegchkUserLikegoMapper segchkUserLikegoMapper;
+
+    /**
+     * 查询seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return seg用户想去记录
+     */
+    @Override
+    public SegchkUserLikego selectSegchkUserLikegoByLikegoId(Long likegoId)
+    {
+        return segchkUserLikegoMapper.selectSegchkUserLikegoByLikegoId(likegoId);
+    }
+
+    /**
+     * 查询seg用户想去记录列表
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return seg用户想去记录
+     */
+    @Override
+    public List<SegchkUserLikego> selectSegchkUserLikegoList(SegchkUserLikego segchkUserLikego)
+    {
+        return segchkUserLikegoMapper.selectSegchkUserLikegoList(segchkUserLikego);
+    }
+
+    /**
+     * 新增seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserLikego(SegchkUserLikego segchkUserLikego)
+    {
+        //        此处根据用户id，卡id，卡类型，卡标签，商户id，及运营商id，生成预约二维码
+        segchkUserLikego.setQrCode(String.format("qrcode-%s-%s-%s-%s-%s", segchkUserLikego.getProviderId(), segchkUserLikego.getStoreId(), segchkUserLikego.getUserId(), segchkUserLikego.getCardId(), segchkUserLikego.getCardType()));
+        return segchkUserLikegoMapper.insertSegchkUserLikego(segchkUserLikego);
+    }
+
+    /**
+     * 修改seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserLikego(SegchkUserLikego segchkUserLikego)
+    {
+        return segchkUserLikegoMapper.updateSegchkUserLikego(segchkUserLikego);
+    }
+
+    /**
+     * 批量删除seg用户想去记录
+     * 
+     * @param likegoIds 需要删除的seg用户想去记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserLikegoByLikegoIds(Long[] likegoIds)
+    {
+        return segchkUserLikegoMapper.deleteSegchkUserLikegoByLikegoIds(likegoIds);
+    }
+
+    /**
+     * 删除seg用户想去记录信息
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserLikegoByLikegoId(Long likegoId)
+    {
+        return segchkUserLikegoMapper.deleteSegchkUserLikegoByLikegoId(likegoId);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java
new file mode 100644
index 0000000..25eaa10
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java
@@ -0,0 +1,94 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.mapper.SegchkUserWechatMapper;
+import com.ruoyi.segchk.service.ISegchkUserWechatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg用户微信信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserWechatServiceImpl implements ISegchkUserWechatService 
+{
+    @Autowired
+    private SegchkUserWechatMapper segchkUserWechatMapper;
+
+    /**
+     * 查询seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return seg用户微信信息
+     */
+    @Override
+    public SegchkUserWechat selectSegchkUserWechatByUserId(Long userId)
+    {
+        return segchkUserWechatMapper.selectSegchkUserWechatByUserId(userId);
+    }
+
+    /**
+     * 查询seg用户微信信息列表
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return seg用户微信信息
+     */
+    @Override
+    public List<SegchkUserWechat> selectSegchkUserWechatList(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.selectSegchkUserWechatList(segchkUserWechat);
+    }
+
+    /**
+     * 新增seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserWechat(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.insertSegchkUserWechat(segchkUserWechat);
+    }
+
+    /**
+     * 修改seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.updateSegchkUserWechat(segchkUserWechat);
+    }
+
+    /**
+     * 批量删除seg用户微信信息
+     * 
+     * @param userIds 需要删除的seg用户微信信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserWechatByUserIds(Long[] userIds)
+    {
+        return segchkUserWechatMapper.deleteSegchkUserWechatByUserIds(userIds);
+    }
+
+    /**
+     * 删除seg用户微信信息信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserWechatByUserId(Long userId)
+    {
+        return segchkUserWechatMapper.deleteSegchkUserWechatByUserId(userId);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/AliPaySet.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/AliPaySet.java
new file mode 100644
index 0000000..246ca7a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/AliPaySet.java
@@ -0,0 +1,83 @@
+package com.ruoyi.setting.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 支付设置接口-支付宝支付接口设置实体类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public class AliPaySet {
+    /**
+     * appid
+     */
+
+    private String appId;
+    /**
+     * 开发者私钥，由开发者自己生成
+     */
+
+    private String appPrivateKey;
+    /**
+     * 支付宝公钥，由支付宝生成
+     */
+
+    private String alipayPublicKey;
+    /**
+     * 是否启用 1启用 0不启用
+     */
+
+    private String isUse;
+
+    /**
+     * 清理敏感信息
+     */
+    public void clearSensitiveInfo() {
+        this.appId = "";
+        this.appPrivateKey = "";
+        this.alipayPublicKey = "";
+    }
+
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppPrivateKey() {
+        return appPrivateKey;
+    }
+
+    public void setAppPrivateKey(String appPrivateKey) {
+        this.appPrivateKey = appPrivateKey;
+    }
+
+    public String getAlipayPublicKey() {
+        return alipayPublicKey;
+    }
+
+    public void setAlipayPublicKey(String alipayPublicKey) {
+        this.alipayPublicKey = alipayPublicKey;
+    }
+
+    public String getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(String isUse) {
+        this.isUse = isUse;
+    }
+
+    /**
+     * 检测是否启用 true 启用，反之不启用
+     */
+    @JsonIgnore
+    public boolean checkIsUse() {
+        return StringUtils.isEmpty(isUse) || "1".equals(isUse);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/OssSetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/OssSetting.java
new file mode 100644
index 0000000..225a16a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/OssSetting.java
@@ -0,0 +1,136 @@
+package com.ruoyi.setting.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.util.bean.OssYunConf;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by luozhuo on 20/7/7.
+ * 云存储配置类
+ */
+@ApiModel(description = "云存储配置实体")
+public class OssSetting {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 域名
+     */
+    @ApiModelProperty(value = "域名")
+    private String address;
+
+    /**
+     * 授权ID
+     */
+    @ApiModelProperty(value = "授权ID")
+    private String accessKeyId;
+
+    /**
+     * 授权密钥
+     */
+    @ApiModelProperty(value = "授权密钥")
+    private String accessKeySecret;
+
+    /**
+     * 桶名
+     */
+    @ApiModelProperty(value = "桶名")
+    private String bucketName;
+
+    /**
+     * 节点名
+     */
+    @ApiModelProperty(value = "节点名")
+    private String endPoint;
+
+    /**
+     * 样式
+     */
+    @ApiModelProperty(value = "样式")
+    private String styleName;
+
+    /**
+     * 前缀
+     */
+    @ApiModelProperty(value = "前缀")
+    private String prefix;
+
+    /**
+     * 获得阿里云的配置
+     *
+     * @return 返回阿里云配置
+     */
+    @JsonIgnore
+    public OssYunConf getUpYunConf() {
+        return OssYunConf.buildOssYunConf(this.accessKeyId, this.accessKeySecret, this.bucketName, this.endPoint, this.styleName, this.prefix, this.address);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getStyleName() {
+        return styleName;
+    }
+
+    public void setStyleName(String styleName) {
+        this.styleName = styleName;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySet.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySet.java
new file mode 100644
index 0000000..bbfa9b8
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySet.java
@@ -0,0 +1,75 @@
+package com.ruoyi.setting.bean;
+
+
+/**
+ * 支付接口设置数据库映射类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public class PaySet {
+    /**
+     * 主键id
+     */
+    private long id;
+    /**
+     * 支付方式 1:支付宝 2:微信 3:银联 4:预存款 5:微信APP支付 6:微信小程序支付
+     */
+    private String codeType;
+    /**
+     * 字段名称
+     */
+    private String columnName;
+    /**
+     * 字段值
+     */
+    private String columnValue;
+
+    /**
+     * 组装数据-用于向数据库插入数据
+     *
+     * @param paySet      数据库映射对象
+     * @param codeType    支付设置类型 1:支付宝 2:微信 3:银联 4:预存款 5:微信APP支付 6:微信小程序支付
+     * @param columnValue 字段的值
+     * @param columnName  字段名称
+     * @return paySet对象
+     */
+    public static PaySet getPaySet(PaySet paySet, String codeType, String columnValue, String columnName) {
+        paySet.setCodeType(codeType);
+        paySet.setColumnName(columnName);
+        paySet.setColumnValue(columnValue);
+        return paySet;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getCodeType() {
+        return codeType;
+    }
+
+    public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnValue() {
+        return columnValue;
+    }
+
+    public void setColumnValue(String columnValue) {
+        this.columnValue = columnValue;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySetCommon.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySetCommon.java
new file mode 100644
index 0000000..f75c1e0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PaySetCommon.java
@@ -0,0 +1,232 @@
+package com.ruoyi.setting.bean;
+
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 支付设置统一类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public class PaySetCommon {
+
+    /**
+     * 阿里支付
+     */
+    private AliPaySet aliPaySet = new AliPaySet();
+    /**
+     * 微信支付(公众号、扫码、H5)
+     */
+
+    private WechatPaySet wechatPaySet = new WechatPaySet();
+    /**
+     * 微信支付(app)
+     */
+
+    private WechatPaySet wechatAppPaySet = new WechatPaySet();
+
+    /**
+     * 微信支付(小程序支付）
+     */
+
+    private WechatPaySet wechatAppletPaySet = new WechatPaySet();
+
+    /**
+     * 银联支付
+     */
+    private UnionPaySet unionPaySet = new UnionPaySet();
+
+    /**
+     * 预存款支付
+     */
+    private PrePaySet prePaySet = new PrePaySet();
+
+    /**
+     * 用于组装支付设置对象在前端显示
+     *
+     * @param paySetCommon 支付设置对象
+     * @param paySets      数据库映射对象
+     * @return 支付设置对象
+     */
+    public static PaySetCommon getPaySetCommon(PaySetCommon paySetCommon, List<PaySet> paySets) {
+        paySets.forEach(paySet -> {
+            String value = paySet.getColumnValue();
+            //支付宝
+            if ("1".equals(paySet.getCodeType())) {
+                if ("appId".equals(paySet.getColumnName())) {
+                    paySetCommon.aliPaySet.setAppId(value);
+                }
+                if ("alipayPublicKey".equals(paySet.getColumnName())) {
+                    paySetCommon.aliPaySet.setAlipayPublicKey(value);
+                }
+                if ("appPrivateKey".equals(paySet.getColumnName())) {
+                    paySetCommon.aliPaySet.setAppPrivateKey(value);
+                }
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.aliPaySet.setIsUse(value);
+                }
+            }
+            //微信(公众号、扫码、H5)
+            if ("2".equals(paySet.getCodeType())) {
+                if ("appId".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setAppId(value);
+                }
+                if ("appSecret".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setAppSecret(value);
+                }
+                if ("merchantNum".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setMerchantNum(value);
+                }
+                if ("apiKey".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setApiKey(value);
+                }
+                if ("loginNotice".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setLoginNotice(value);
+                }
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatPaySet.setIsUse(value);
+                }
+            }
+            //银联
+            if ("3".equals(paySet.getCodeType())) {
+                if ("merchantNum".equals(paySet.getColumnName())) {
+                    paySetCommon.unionPaySet.setMerchantNum(value);
+                }
+                if ("apiKey".equals(paySet.getColumnName())) {
+                    paySetCommon.unionPaySet.setApiKey(value);
+                }
+
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.unionPaySet.setIsUse(value);
+                }
+            }
+            //预存款
+            if ("4".equals(paySet.getCodeType())) {
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.prePaySet.setIsUse(value);
+                }
+            }
+            //微信支付(app)
+            if ("5".equals(paySet.getCodeType())) {
+                if ("appId".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppPaySet.setAppId(value);
+                }
+                if ("appSecret".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppPaySet.setAppSecret(value);
+                }
+                if ("merchantNum".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppPaySet.setMerchantNum(value);
+                }
+                if ("apiKey".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppPaySet.setApiKey(value);
+                }
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppPaySet.setIsUse(value);
+                }
+            }
+
+            //微信支付(小程序)
+            if ("6".equals(paySet.getCodeType())) {
+                if ("appId".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setAppId(value);
+                }
+                if ("appSecret".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setAppSecret(value);
+                }
+                if ("merchantNum".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setMerchantNum(value);
+                }
+                if ("apiKey".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setApiKey(value);
+                }
+                if ("isUse".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setIsUse(value);
+                }
+                if ("certFile".equals(paySet.getColumnName())) {
+                    paySetCommon.wechatAppletPaySet.setCertFile(value);
+                }
+            }
+        });
+        return paySetCommon;
+    }
+
+    /**
+     * 清除敏感 信息
+     *
+     * @return 返回当前对象
+     */
+    public PaySetCommon clearSensitiveInfo() {
+
+        if (Objects.nonNull(this.wechatPaySet)) {
+            wechatPaySet.clearSensitiveInfo();
+        }
+
+        if (Objects.nonNull(this.wechatAppPaySet)) {
+            wechatAppPaySet.clearSensitiveInfo();
+        }
+
+        if (Objects.nonNull(this.wechatAppletPaySet)) {
+            wechatAppletPaySet.clearSensitiveInfo();
+        }
+
+        if (Objects.nonNull(this.aliPaySet)) {
+            aliPaySet.clearSensitiveInfo();
+        }
+
+
+        if (Objects.nonNull(this.unionPaySet)) {
+            unionPaySet.clearSensitiveInfo();
+        }
+        return this;
+    }
+
+    public AliPaySet getAliPaySet() {
+        return aliPaySet;
+    }
+
+    public void setAliPaySet(AliPaySet aliPaySet) {
+        this.aliPaySet = aliPaySet;
+    }
+
+    public WechatPaySet getWechatPaySet() {
+        return wechatPaySet;
+    }
+
+    public void setWechatPaySet(WechatPaySet wechatPaySet) {
+        this.wechatPaySet = wechatPaySet;
+    }
+
+    public WechatPaySet getWechatAppPaySet() {
+        return wechatAppPaySet;
+    }
+
+    public void setWechatAppPaySet(WechatPaySet wechatAppPaySet) {
+        this.wechatAppPaySet = wechatAppPaySet;
+    }
+
+    public WechatPaySet getWechatAppletPaySet() {
+        return wechatAppletPaySet;
+    }
+
+    public void setWechatAppletPaySet(WechatPaySet wechatAppletPaySet) {
+        this.wechatAppletPaySet = wechatAppletPaySet;
+    }
+
+    public UnionPaySet getUnionPaySet() {
+        return unionPaySet;
+    }
+
+    public void setUnionPaySet(UnionPaySet unionPaySet) {
+        this.unionPaySet = unionPaySet;
+    }
+
+    public PrePaySet getPrePaySet() {
+        return prePaySet;
+    }
+
+    public void setPrePaySet(PrePaySet prePaySet) {
+        this.prePaySet = prePaySet;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PrePaySet.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PrePaySet.java
new file mode 100644
index 0000000..50d868b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/PrePaySet.java
@@ -0,0 +1,33 @@
+package com.ruoyi.setting.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 预支付设置
+ */
+
+public class PrePaySet {
+
+    /**
+     * 是否启用 1启用 0不启用
+     */
+
+    private String isUse;
+
+    public String getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(String isUse) {
+        this.isUse = isUse;
+    }
+
+    /**
+     * 检测是否启用 true 启用，反之不启用
+     */
+    @JsonIgnore
+    public boolean checkIsUse() {
+        return StringUtils.isEmpty(isUse) || "1".equals(isUse);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UnionPaySet.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UnionPaySet.java
new file mode 100644
index 0000000..896558b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UnionPaySet.java
@@ -0,0 +1,68 @@
+package com.ruoyi.setting.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 支付设置接口-银联支付接口设置实体类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public class UnionPaySet {
+    /**
+     * 商户号
+     */
+    private String merchantNum;
+    /**
+     * API-KEY
+     */
+    private String apiKey;
+    /**
+     * 是否启用 1启用 0不启用
+     */
+
+    private String isUse;
+
+    public String getMerchantNum() {
+        return merchantNum;
+    }
+
+    public void setMerchantNum(String merchantNum) {
+        this.merchantNum = merchantNum;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public String getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(String isUse) {
+        this.isUse = isUse;
+    }
+
+    /**
+     * 清理敏感信息
+     */
+    public void clearSensitiveInfo() {
+        this.merchantNum = "";
+        this.apiKey = "";
+    }
+
+
+    /**
+     * 检测是否启用 true 启用，反之不启用
+     */
+    @JsonIgnore
+    public boolean checkIsUse() {
+        return StringUtils.isEmpty(isUse) || "1".equals(isUse);
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UploadData.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UploadData.java
new file mode 100644
index 0000000..cb46369
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/UploadData.java
@@ -0,0 +1,91 @@
+package com.ruoyi.setting.bean;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+
+/**
+ * 上传对象实体类
+ */
+public class UploadData {
+
+    MultipartFile multipartFile;
+    /**
+     * 输入流
+     */
+    private InputStream inputStream;
+
+    /**
+     * 数据
+     */
+    private byte[] datas;
+
+
+    /**
+     * 用户上传的文件名
+     */
+    private String fileOriginName;
+
+    /**
+     * 上传的类型 0 图片 1 视频
+     */
+    private String type;
+
+
+    /**
+     * 构造上传对象
+     *
+     * @param inputStream 输入流
+     * @param datas       数据
+     * @return 返回上传对象
+     */
+    public static UploadData build(InputStream inputStream, byte[] datas, String fileOriginName, String type, MultipartFile multipartFile) {
+        UploadData uploadData = new UploadData();
+        uploadData.inputStream = inputStream;
+        uploadData.datas = datas;
+        uploadData.fileOriginName = fileOriginName;
+        uploadData.type = type;
+        uploadData.multipartFile = multipartFile;
+        return uploadData;
+    }
+
+    public MultipartFile getMultipartFile() {
+        return multipartFile;
+    }
+
+    public void setMultipartFile(MultipartFile multipartFile) {
+        this.multipartFile = multipartFile;
+    }
+
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
+    public void setInputStream(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    public byte[] getDatas() {
+        return datas;
+    }
+
+    public void setDatas(byte[] datas) {
+        this.datas = datas;
+    }
+
+    public String getFileOriginName() {
+        return fileOriginName;
+    }
+
+    public void setFileOriginName(String fileOriginName) {
+        this.fileOriginName = fileOriginName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/WechatPaySet.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/WechatPaySet.java
new file mode 100644
index 0000000..17e9cec
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/bean/WechatPaySet.java
@@ -0,0 +1,126 @@
+package com.ruoyi.setting.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 支付设置接口-微信支付接口设置实体类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public class WechatPaySet {
+    /**
+     * 公众号appId
+     */
+
+    private String appId;
+    /**
+     * AppSecret
+     */
+
+    private String appSecret;
+    /**
+     * 商户号
+     */
+
+    private String merchantNum;
+
+    /**
+     * API密钥
+     */
+
+    private String apiKey;
+
+    /**
+     * 微信公众号 登录回调地址
+     */
+    private String loginNotice;
+
+    /**
+     * 是否启用 1启用 0不启用
+     */
+
+    private String isUse;
+
+    /**
+     * 是否启用 1启用 0不启用
+     */
+
+    private String certFile;
+
+    /**
+     * 清理敏感信息
+     */
+    public void clearSensitiveInfo() {
+        this.appId = "";
+        this.appSecret = "";
+        this.merchantNum = "";
+        this.apiKey = "";
+        this.certFile = "";
+    }
+
+    public String getLoginNotice() {
+        return loginNotice;
+    }
+
+    public void setLoginNotice(String loginNotice) {
+        this.loginNotice = loginNotice;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getMerchantNum() {
+        return merchantNum;
+    }
+
+    public void setMerchantNum(String merchantNum) {
+        this.merchantNum = merchantNum;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public String getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(String isUse) {
+        this.isUse = isUse;
+    }
+
+    /**
+     * 检测是否启用 true 启用，反之不启用
+     */
+    @JsonIgnore
+    public boolean checkIsUse() {
+        return StringUtils.isEmpty(isUse) || "1".equals(isUse);
+    }
+
+    public String getCertFile() {
+        return certFile;
+    }
+
+    public void setCertFile(String certFile) {
+        this.certFile = certFile;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/KsdSmsReq.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/KsdSmsReq.java
new file mode 100644
index 0000000..3e68416
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/KsdSmsReq.java
@@ -0,0 +1,5 @@
+package com.ruoyi.setting.domain;
+
+
+public class KsdSmsReq {
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsCity.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsCity.java
new file mode 100644
index 0000000..5144aca
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsCity.java
@@ -0,0 +1,158 @@
+package com.ruoyi.setting.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 区域市对象 ls_city
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsCity extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 市的名称
+     */
+    @Excel(name = "市的名称")
+    private String name;
+
+    /**
+     * 该市所属的省份id  对应ls_province 中的id
+     */
+    @Excel(name = "该市所属的省份id  对应ls_province 中的id")
+    private Long provinceId;
+
+    /**
+     * 排序  数值越小 排序越前
+     */
+    @Excel(name = "排序  数值越小 排序越前")
+    private Long sort;
+
+    /**
+     * 删除标记 0未删除 1删除 默认0
+     */
+    private int delFlag;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+
+    /**
+     * 市下面的区
+     */
+    @ApiModelProperty(value = "市下面的区")
+    private List<LsDistrict> child;
+
+
+    /**
+     * 设置添加市的默认
+     *
+     * @return 返回市
+     */
+    public LsCity setDefaultValuesForAdd() {
+        this.delFlag = 0;
+        return this;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Long provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public Long getSort() {
+        return sort;
+    }
+
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("provinceId", getProvinceId())
+                .append("sort", getSort())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .append("modifyTime", getModifyTime())
+                .append("delTime", getDelTime())
+                .toString();
+    }
+
+    public List<LsDistrict> getChild() {
+        return child;
+    }
+
+    public void setChild(List<LsDistrict> child) {
+        this.child = child;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsDistrict.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsDistrict.java
new file mode 100644
index 0000000..84f2aac
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsDistrict.java
@@ -0,0 +1,131 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 区域区对象 ls_district
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsDistrict extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 区名称
+     */
+    @Excel(name = "区名称")
+    private String name;
+
+    /**
+     * 对应ls_city表中的id
+     */
+    @Excel(name = "对应ls_city表中的id")
+    private Long cityId;
+
+    /**
+     * 排序 数值越小 越前
+     */
+    @Excel(name = "排序 数值越小 越前")
+    private Long sort;
+
+    /**
+     * 删除标记  0 未删除 1删除  默认0
+     */
+    private int delFlag;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public Long getSort() {
+        return sort;
+    }
+
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("cityId", getCityId())
+                .append("sort", getSort())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .append("modifyTime", getModifyTime())
+                .append("delTime", getDelTime())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsEmailSetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsEmailSetting.java
new file mode 100644
index 0000000..353c094
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsEmailSetting.java
@@ -0,0 +1,126 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 邮箱设置对象 ls_email_setting
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public class LsEmailSetting extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 发信邮箱
+     */
+    @Excel(name = "发信邮箱")
+    private String senderMail;
+
+    /**
+     * 发信人
+     */
+    @Excel(name = "发信人")
+    private String senderName;
+
+    /**
+     * SMTP的服务器地址
+     */
+    @Excel(name = "SMTP的服务器地址")
+    private String smtpServer;
+
+    /**
+     * SMTP 的端口
+     */
+    @Excel(name = "SMTP 的端口")
+    private Long smtpPort;
+
+    /**
+     * 邮箱帐号
+     */
+    @Excel(name = "邮箱帐号")
+    private String username;
+
+    /**
+     * 邮箱密码
+     */
+    @Excel(name = "邮箱密码")
+    private String password;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSenderMail() {
+        return senderMail;
+    }
+
+    public void setSenderMail(String senderMail) {
+        this.senderMail = senderMail;
+    }
+
+    public String getSenderName() {
+        return senderName;
+    }
+
+    public void setSenderName(String senderName) {
+        this.senderName = senderName;
+    }
+
+    public String getSmtpServer() {
+        return smtpServer;
+    }
+
+    public void setSmtpServer(String smtpServer) {
+        this.smtpServer = smtpServer;
+    }
+
+    public Long getSmtpPort() {
+        return smtpPort;
+    }
+
+    public void setSmtpPort(Long smtpPort) {
+        this.smtpPort = smtpPort;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("senderMail", getSenderMail())
+                .append("senderName", getSenderName())
+                .append("smtpServer", getSmtpServer())
+                .append("smtpPort", getSmtpPort())
+                .append("username", getUsername())
+                .append("password", getPassword())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsProvince.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsProvince.java
new file mode 100644
index 0000000..becc46f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsProvince.java
@@ -0,0 +1,141 @@
+package com.ruoyi.setting.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 区域省对象 ls_province
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsProvince extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 省份的名称
+     */
+    @Excel(name = "省份的名称")
+    private String name;
+
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /**
+     * 删除标记 0 未删除 1删除
+     */
+    private int delFlag;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+    /**
+     * 省下面的市
+     */
+    @ApiModelProperty(value = "省下面的市")
+    private List<LsCity> child;
+
+    /**
+     * 设置添加省份的默认
+     *
+     * @return 返回省份
+     */
+    public LsProvince setDefaultValuesForAdd() {
+        this.delFlag = 0;
+        return this;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getSort() {
+        return sort;
+    }
+
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("sort", getSort())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .append("modifyTime", getModifyTime())
+                .append("delTime", getDelTime())
+                .toString();
+    }
+
+    public List<LsCity> getChild() {
+        return child;
+    }
+
+    public void setChild(List<LsCity> child) {
+        this.child = child;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSmsSetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSmsSetting.java
new file mode 100644
index 0000000..abd3da4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSmsSetting.java
@@ -0,0 +1,197 @@
+package com.ruoyi.setting.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 短信接口设置对象 ls_sms_setting
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public class LsSmsSetting extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * AppSecret
+     */
+    @Excel(name = "AppSecret")
+    private String secret;
+
+    /**
+     * 短信接口地址
+     */
+    @Excel(name = "短信接口地址")
+    private String url;
+
+    /**
+     * 短信签名
+     */
+    @Excel(name = "短信签名")
+    private String sign;
+
+    /**
+     * 模板id
+     */
+    @Excel(name = "模板id")
+    private String templateId;
+
+    /**
+     * 核销门店订单的模版id
+     */
+    @Excel(name = "核销门店订单的模版id")
+    private String writeoffTemplateId;
+
+    /**
+     * 虚拟订单核销的模版id
+     */
+    @Excel(name = "虚拟订单核销的模版id")
+    private String virtualOrderTemplateId;
+
+    /**
+     * AppKey
+     */
+    @Excel(name = "AppKey")
+    private String key;
+
+    /**
+     * 社区团购审核结果通知模版id
+     */
+    @Excel(name = "社区团购审核结果通知模版id")
+    private String auditTemplateId;
+
+    /**
+     * 社区团购佣金结算模版id
+     */
+    @Excel(name = "社区团购佣金结算模版id")
+    private String settlementTemplateId;
+
+    /**
+     * 社区团购提现打款模版id
+     */
+    @Excel(name = "社区团购提现打款模版id")
+    private String withdrawTemplateId;
+    @ApiModelProperty("启用状态")
+    private Boolean status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getWriteoffTemplateId() {
+        return writeoffTemplateId;
+    }
+
+    public void setWriteoffTemplateId(String writeoffTemplateId) {
+        this.writeoffTemplateId = writeoffTemplateId;
+    }
+
+    public String getVirtualOrderTemplateId() {
+        return virtualOrderTemplateId;
+    }
+
+    public void setVirtualOrderTemplateId(String virtualOrderTemplateId) {
+        this.virtualOrderTemplateId = virtualOrderTemplateId;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAuditTemplateId() {
+        return auditTemplateId;
+    }
+
+    public void setAuditTemplateId(String auditTemplateId) {
+        this.auditTemplateId = auditTemplateId;
+    }
+
+    public String getSettlementTemplateId() {
+        return settlementTemplateId;
+    }
+
+    public void setSettlementTemplateId(String settlementTemplateId) {
+        this.settlementTemplateId = settlementTemplateId;
+    }
+
+    public String getWithdrawTemplateId() {
+        return withdrawTemplateId;
+    }
+
+    public void setWithdrawTemplateId(String withdrawTemplateId) {
+        this.withdrawTemplateId = withdrawTemplateId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("secret", getSecret())
+                .append("url", getUrl())
+                .append("sign", getSign())
+                .append("templateId", getTemplateId())
+                .append("writeoffTemplateId", getWriteoffTemplateId())
+                .append("virtualOrderTemplateId", getVirtualOrderTemplateId())
+                .append("key", getKey())
+                .append("auditTemplateId", getAuditTemplateId())
+                .append("settlementTemplateId", getSettlementTemplateId())
+                .append("withdrawTemplateId", getWithdrawTemplateId())
+                .toString();
+    }
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsStationLetter.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsStationLetter.java
new file mode 100644
index 0000000..6fd2656
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsStationLetter.java
@@ -0,0 +1,111 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 站内信对象 ls_station_letter
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsStationLetter extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 会员id
+     */
+    @Excel(name = "会员id")
+    private Long customerId;
+
+    /**
+     * 站内信标题
+     */
+    @Excel(name = "站内信标题")
+    private String title;
+
+    /**
+     * 站内信内容
+     */
+    @Excel(name = "站内信内容")
+    private String content;
+
+    /**
+     * 是否已读  0 未读  1 已读 默认0
+     */
+    @Excel(name = "是否已读  0 未读  1 已读 默认0 ")
+    private String isRead;
+
+    /**
+     * 删除标记  0 未删除 1 删除 默认0
+     */
+    private int delFlag;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(String isRead) {
+        this.isRead = isRead;
+    }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("customerId", getCustomerId())
+                .append("title", getTitle())
+                .append("content", getContent())
+                .append("isRead", getIsRead())
+                .append("delFlag", getDelFlag())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSystemSeo.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSystemSeo.java
new file mode 100644
index 0000000..36e822a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsSystemSeo.java
@@ -0,0 +1,96 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 系统seo设置对象 ls_system_seo
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsSystemSeo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * seo标题
+     */
+    @Excel(name = "seo标题")
+    private String title;
+
+    /**
+     * seo关键字
+     */
+    @Excel(name = "seo关键字")
+    private String keyWord;
+
+    /**
+     * seo描述
+     */
+    @Excel(name = "seo描述")
+    private String seoDesc;
+
+    /**
+     * 是否开启  0 未开启 1 开启
+     */
+    @Excel(name = "是否开启  0 未开启 1 开启 ")
+    private String isOpen;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public String getSeoDesc() {
+        return seoDesc;
+    }
+
+    public void setSeoDesc(String seoDesc) {
+        this.seoDesc = seoDesc;
+    }
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("title", getTitle())
+                .append("keyWord", getKeyWord())
+                .append("seoDesc", getSeoDesc())
+                .append("isOpen", getIsOpen())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsWxCustomerLink.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsWxCustomerLink.java
new file mode 100644
index 0000000..6046d70
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/LsWxCustomerLink.java
@@ -0,0 +1,96 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 微信登录和商城用户的关联对象 ls_wx_customer_link
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public class LsWxCustomerLink extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 微信的联合登录id
+     */
+    @Excel(name = "微信的联合登录id")
+    private String wxUnionId;
+
+    /**
+     * 用户id
+     */
+    @Excel(name = "用户id")
+    private Long customerId;
+
+    /**
+     * 微信的openid
+     */
+    @Excel(name = "微信的openid")
+    private String wxOpenId;
+
+    /**
+     * 小程序的openid
+     */
+    @Excel(name = "小程序的openid")
+    private String wxAppletOpenId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getWxUnionId() {
+        return wxUnionId;
+    }
+
+    public void setWxUnionId(String wxUnionId) {
+        this.wxUnionId = wxUnionId;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getWxOpenId() {
+        return wxOpenId;
+    }
+
+    public void setWxOpenId(String wxOpenId) {
+        this.wxOpenId = wxOpenId;
+    }
+
+    public String getWxAppletOpenId() {
+        return wxAppletOpenId;
+    }
+
+    public void setWxAppletOpenId(String wxAppletOpenId) {
+        this.wxAppletOpenId = wxAppletOpenId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("wxUnionId", getWxUnionId())
+                .append("customerId", getCustomerId())
+                .append("wxOpenId", getWxOpenId())
+                .append("wxAppletOpenId", getWxAppletOpenId())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SCommunityBuySetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SCommunityBuySetting.java
new file mode 100644
index 0000000..f132c71
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SCommunityBuySetting.java
@@ -0,0 +1,111 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 社区团购设置对象 s_community_buy_setting
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public class SCommunityBuySetting extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 团长名称
+     */
+    @Excel(name = "团长名称")
+    private String name;
+
+    /**
+     * 是否开启审核  0 开启 1 关闭 默认0
+     */
+    @Excel(name = "是否开启审核  0 开启 1 关闭 默认0")
+    private String audit;
+
+    /**
+     * 审核结果通知  0 通知 1 不通知 默认0
+     */
+    @Excel(name = "审核结果通知  0 通知 1 不通知 默认0 ")
+    private String smsAuditNotice;
+
+    /**
+     * 打款通知 0 通知 1 不通知默认0
+     */
+    @Excel(name = "打款通知 0 通知 1 不通知默认0 ")
+    private String smsPayNotice;
+
+    /**
+     * 佣金结算通知 0 通知 1 不通知默认0
+     */
+    @Excel(name = "佣金结算通知 0 通知 1 不通知默认0 ")
+    private String smsCommissionNotice;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAudit() {
+        return audit;
+    }
+
+    public void setAudit(String audit) {
+        this.audit = audit;
+    }
+
+    public String getSmsAuditNotice() {
+        return smsAuditNotice;
+    }
+
+    public void setSmsAuditNotice(String smsAuditNotice) {
+        this.smsAuditNotice = smsAuditNotice;
+    }
+
+    public String getSmsPayNotice() {
+        return smsPayNotice;
+    }
+
+    public void setSmsPayNotice(String smsPayNotice) {
+        this.smsPayNotice = smsPayNotice;
+    }
+
+    public String getSmsCommissionNotice() {
+        return smsCommissionNotice;
+    }
+
+    public void setSmsCommissionNotice(String smsCommissionNotice) {
+        this.smsCommissionNotice = smsCommissionNotice;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("audit", getAudit())
+                .append("smsAuditNotice", getSmsAuditNotice())
+                .append("smsPayNotice", getSmsPayNotice())
+                .append("smsCommissionNotice", getSmsCommissionNotice())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SegchkPaySetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SegchkPaySetting.java
new file mode 100644
index 0000000..e086ec0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/domain/SegchkPaySetting.java
@@ -0,0 +1,81 @@
+package com.ruoyi.setting.domain;
+
+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;
+
+/**
+ * 支付设置对象 ls_pay_setting
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public class SegchkPaySetting extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 支付方式 1:支付宝 2:微信 3:银联 4:预存款 5:微信APP支付 6:微信小程序支付
+     */
+    @Excel(name = "支付方式 1:支付宝 2:微信 3:银联 4:预存款 5:微信APP支付 6:微信小程序支付")
+    private String codetype;
+
+    /**
+     * 字段名称
+     */
+    @Excel(name = "字段名称")
+    private String columnName;
+
+    /**
+     * 字段值
+     */
+    @Excel(name = "字段值")
+    private String columnValue;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCodetype() {
+        return codetype;
+    }
+
+    public void setCodetype(String codetype) {
+        this.codetype = codetype;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getColumnValue() {
+        return columnValue;
+    }
+
+    public void setColumnValue(String columnValue) {
+        this.columnValue = columnValue;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("codetype", getCodetype())
+                .append("columnName", getColumnName())
+                .append("columnValue", getColumnValue())
+                .toString();
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/AreaMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/AreaMapper.java
new file mode 100644
index 0000000..4827c80
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/AreaMapper.java
@@ -0,0 +1,160 @@
+package com.ruoyi.setting.mapper;
+
+
+import com.ruoyi.setting.domain.LsCity;
+import com.ruoyi.setting.domain.LsDistrict;
+import com.ruoyi.setting.domain.LsProvince;
+
+import java.util.List;
+
+/**
+ * Created by 魔金商城 on 17/5/15.
+ * 地区数据库接口
+ */
+public interface AreaMapper {
+
+    /**
+     * 查询所有省份
+     *
+     * @return 返回所有省份
+     */
+
+    List<LsProvince> queryAllProvinces();
+
+    /**
+     * 根据省份id查询该省下面的市
+     *
+     * @param provinceId 省id
+     * @return 返回省下面的市
+     */
+
+    List<LsCity> queryCityByProvinceId(long provinceId);
+
+
+    /**
+     * 根据市id查询下面的区
+     *
+     * @param cityId 市id
+     * @return 返回该市下面的区
+     */
+
+    List<LsDistrict> queryDistrictByCityId(long cityId);
+
+    /**
+     * 添加省份
+     *
+     * @param province 省份信息
+     * @return 成功返回1  失败返回0
+     */
+
+    int addProvince(LsProvince province);
+
+    /**
+     * 添加市
+     *
+     * @param city 市信息
+     * @return 成功返回1  失败返回0
+     */
+
+    int addCity(LsCity city);
+
+    /**
+     * 添加区
+     *
+     * @param district 区信息
+     * @return 成功返回1  失败返回0
+     */
+
+    int addDistrict(LsDistrict district);
+
+
+    /**
+     * 根据省份id删除省份信息
+     *
+     * @param provinceId 省份id
+     * @return 成功返回1  失败返回0
+     */
+
+    int deleteProvinceById(long provinceId);
+
+    /**
+     * 根据市id删除市信息
+     *
+     * @param cityId 市id
+     * @return 成功返回1  失败返回0
+     */
+
+    int deleteCityById(long cityId);
+
+    /**
+     * 根据区id删除区信息
+     *
+     * @param districtId 区id
+     * @return 成功返回1  失败返回0
+     */
+
+    int deleteDistrictById(long districtId);
+
+    /**
+     * 根据省id查询省份信息
+     *
+     * @param id 省id
+     * @return 返回省份信息
+     */
+
+    LsProvince queryProvinceById(long id);
+
+    /**
+     * 根据市id查询市信息
+     *
+     * @param id 市id
+     * @return 返回市信息
+     */
+
+    LsCity queryCityById(long id);
+
+    /**
+     * 根据区id查询区信息
+     *
+     * @param id 区id
+     * @return 返回区信息
+     */
+
+    LsDistrict queryDistrictById(long id);
+
+    /**
+     * 修改省份信息
+     *
+     * @param province 修改省份
+     * @return 成功返回1  失败返回0
+     */
+
+    int updateProvince(LsProvince province);
+
+    /**
+     * 修改市信息
+     *
+     * @param city 市信息
+     * @return 成功返回1 失败返回0
+     */
+
+    int updateCity(LsCity city);
+
+    /**
+     * 修改区信息
+     *
+     * @param district 区信息
+     * @return 成功返回1  失败返回0
+     */
+
+    int updateDistrict(LsDistrict district);
+
+    /**
+     * 根据名称查询市id
+     *
+     * @param cityName 市名称
+     * @return 市id
+     */
+
+    Long queryCityIdByName(String cityName);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/BaseInfoSetMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/BaseInfoSetMapper.java
new file mode 100644
index 0000000..ac05963
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/BaseInfoSetMapper.java
@@ -0,0 +1,55 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.segchk.domain.BaseInfoSet;
+
+/**
+ * 基本信息设置mapper层
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+
+public interface BaseInfoSetMapper {
+    /**
+     * 查询基本信息设置
+     *
+     * @return 基本信息设置实体类
+     */
+
+    BaseInfoSet queryBaseInfoSet();
+
+    /**
+     * 编辑基本信息
+     *
+     * @param baseInfoSet 信息实体类
+     * @return 编辑返回码
+     */
+
+    int editBaseInfoSetA(BaseInfoSet baseInfoSet);
+
+    /**
+     * 编辑高级信息
+     *
+     * @param baseInfoSet 信息实体类
+     * @return 编辑返回码
+     */
+
+    int editBaseInfoSetB(BaseInfoSet baseInfoSet);
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+
+    int setAuditSwitch(String storeSpuAudit);
+
+    /**
+     * 设置审核开关
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+
+    int setMemberPriceStatus(String memberPriceStatus);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsCityMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsCityMapper.java
new file mode 100644
index 0000000..b501955
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsCityMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsCity;
+
+import java.util.List;
+
+/**
+ * 区域市Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsCityMapper {
+    /**
+     * 查询区域市
+     *
+     * @param id 区域市ID
+     * @return 区域市
+     */
+    public LsCity selectLsCityById(Long id);
+
+    /**
+     * 查询区域市列表
+     *
+     * @param lsCity 区域市
+     * @return 区域市集合
+     */
+    public List<LsCity> selectLsCityList(LsCity lsCity);
+
+    /**
+     * 新增区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    public int insertLsCity(LsCity lsCity);
+
+    /**
+     * 修改区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    public int updateLsCity(LsCity lsCity);
+
+    /**
+     * 删除区域市
+     *
+     * @param id 区域市ID
+     * @return 结果
+     */
+    public int deleteLsCityById(Long id);
+
+    /**
+     * 批量删除区域市
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsCityByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsDistrictMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsDistrictMapper.java
new file mode 100644
index 0000000..47d9c14
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsDistrictMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsDistrict;
+
+import java.util.List;
+
+/**
+ * 区域区Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsDistrictMapper {
+    /**
+     * 查询区域区
+     *
+     * @param id 区域区ID
+     * @return 区域区
+     */
+    public LsDistrict selectLsDistrictById(Long id);
+
+    /**
+     * 查询区域区列表
+     *
+     * @param lsDistrict 区域区
+     * @return 区域区集合
+     */
+    public List<LsDistrict> selectLsDistrictList(LsDistrict lsDistrict);
+
+    /**
+     * 新增区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    public int insertLsDistrict(LsDistrict lsDistrict);
+
+    /**
+     * 修改区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    public int updateLsDistrict(LsDistrict lsDistrict);
+
+    /**
+     * 删除区域区
+     *
+     * @param id 区域区ID
+     * @return 结果
+     */
+    public int deleteLsDistrictById(Long id);
+
+    /**
+     * 批量删除区域区
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsDistrictByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsEmailSettingMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsEmailSettingMapper.java
new file mode 100644
index 0000000..582c4d0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsEmailSettingMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsEmailSetting;
+
+import java.util.List;
+
+/**
+ * 邮箱设置Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface LsEmailSettingMapper {
+    /**
+     * 查询邮箱设置
+     *
+     * @param id 邮箱设置ID
+     * @return 邮箱设置
+     */
+    public LsEmailSetting selectLsEmailSettingById(Long id);
+
+    /**
+     * 查询邮箱设置列表
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 邮箱设置集合
+     */
+    public List<LsEmailSetting> selectLsEmailSettingList(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 新增邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    public int insertLsEmailSetting(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 修改邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    public int updateLsEmailSetting(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 删除邮箱设置
+     *
+     * @param id 邮箱设置ID
+     * @return 结果
+     */
+    public int deleteLsEmailSettingById(Long id);
+
+    /**
+     * 批量删除邮箱设置
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsEmailSettingByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsProvinceMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsProvinceMapper.java
new file mode 100644
index 0000000..8dba4d3
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsProvinceMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsProvince;
+
+import java.util.List;
+
+/**
+ * 区域省Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsProvinceMapper {
+    /**
+     * 查询区域省
+     *
+     * @param id 区域省ID
+     * @return 区域省
+     */
+    public LsProvince selectLsProvinceById(Long id);
+
+    /**
+     * 查询区域省列表
+     *
+     * @param lsProvince 区域省
+     * @return 区域省集合
+     */
+    public List<LsProvince> selectLsProvinceList(LsProvince lsProvince);
+
+    /**
+     * 新增区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    public int insertLsProvince(LsProvince lsProvince);
+
+    /**
+     * 修改区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    public int updateLsProvince(LsProvince lsProvince);
+
+    /**
+     * 删除区域省
+     *
+     * @param id 区域省ID
+     * @return 结果
+     */
+    public int deleteLsProvinceById(Long id);
+
+    /**
+     * 批量删除区域省
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsProvinceByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSmsSettingMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSmsSettingMapper.java
new file mode 100644
index 0000000..346d114
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSmsSettingMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsSmsSetting;
+
+import java.util.List;
+
+/**
+ * 短信接口设置Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface LsSmsSettingMapper {
+    /**
+     * 查询短信接口设置
+     *
+     * @param id 短信接口设置ID
+     * @return 短信接口设置
+     */
+    public LsSmsSetting selectLsSmsSettingById(Long id);
+
+    /**
+     * 查询短信接口设置列表
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 短信接口设置集合
+     */
+    public List<LsSmsSetting> selectLsSmsSettingList(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 新增短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    public int insertLsSmsSetting(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 修改短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    public int updateLsSmsSetting(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 删除短信接口设置
+     *
+     * @param id 短信接口设置ID
+     * @return 结果
+     */
+    public int deleteLsSmsSettingById(Long id);
+
+    /**
+     * 批量删除短信接口设置
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsSmsSettingByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsStationLetterMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsStationLetterMapper.java
new file mode 100644
index 0000000..c55e93f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsStationLetterMapper.java
@@ -0,0 +1,116 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsStationLetter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 站内信Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsStationLetterMapper {
+    /**
+     * 新增站内信
+     *
+     * @param stationLetters 站内信
+     * @return 成功返回>1 失败返回0
+     */
+
+    int addStationLetters(List<LsStationLetter> stationLetters);
+
+    /**
+     * 删除站内信
+     *
+     * @param id 站内信id
+     * @return 成功返回1，失败返回0
+     */
+
+    int deleteStationLetters(long id);
+
+    /**
+     * 根据会员id查询会员的站内信
+     *
+     * @param params 查询参数
+     * @return 返回会员的站内信
+     */
+
+    List<LsStationLetter> queryStationLettersByCustomerId(Map<String, Object> params);
+
+    /**
+     * 查询会员的站内信总纪录数
+     *
+     * @param params 查询参数
+     * @return 返回会员的站内信总记录数
+     */
+
+    int queryStationLettersCountByCustomerId(Map<String, Object> params);
+
+    /**
+     * 更新会员的站内信的阅读状态
+     *
+     * @param params 参数
+     * @return 成功返回1，失败返回0
+     */
+
+    int updateStationLettersIsRead(Map<String, Object> params);
+
+    /**
+     * 获得用户未读消息的数量
+     *
+     * @param customerId 用户id
+     * @return 返回用户未读消息的数量
+     */
+
+    int unReadNum(long customerId);
+
+    /**
+     * 查询站内信
+     *
+     * @param id 站内信ID
+     * @return 站内信
+     */
+    public LsStationLetter selectLsStationLetterById(Long id);
+
+    /**
+     * 查询站内信列表
+     *
+     * @param lsStationLetter 站内信
+     * @return 站内信集合
+     */
+    public List<LsStationLetter> selectLsStationLetterList(LsStationLetter lsStationLetter);
+
+    /**
+     * 新增站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    public int insertLsStationLetter(LsStationLetter lsStationLetter);
+
+    /**
+     * 修改站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    public int updateLsStationLetter(LsStationLetter lsStationLetter);
+
+    /**
+     * 删除站内信
+     *
+     * @param id 站内信ID
+     * @return 结果
+     */
+    public int deleteLsStationLetterById(Long id);
+
+    /**
+     * 批量删除站内信
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsStationLetterByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSystemSeoMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSystemSeoMapper.java
new file mode 100644
index 0000000..dabdaa7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsSystemSeoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsSystemSeo;
+
+import java.util.List;
+
+/**
+ * 系统seo设置Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsSystemSeoMapper {
+    /**
+     * 查询系统seo设置
+     *
+     * @param id 系统seo设置ID
+     * @return 系统seo设置
+     */
+    public LsSystemSeo selectLsSystemSeoById(Long id);
+
+    /**
+     * 查询系统seo设置列表
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 系统seo设置集合
+     */
+    public List<LsSystemSeo> selectLsSystemSeoList(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 新增系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    public int insertLsSystemSeo(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 修改系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    public int updateLsSystemSeo(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 删除系统seo设置
+     *
+     * @param id 系统seo设置ID
+     * @return 结果
+     */
+    public int deleteLsSystemSeoById(Long id);
+
+    /**
+     * 批量删除系统seo设置
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsSystemSeoByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsWxCustomerLinkMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsWxCustomerLinkMapper.java
new file mode 100644
index 0000000..82c3ccc
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/LsWxCustomerLinkMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.LsWxCustomerLink;
+
+import java.util.List;
+
+/**
+ * 微信登录和商城用户的关联Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface LsWxCustomerLinkMapper {
+    /**
+     * 查询微信登录和商城用户的关联
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 微信登录和商城用户的关联
+     */
+    public LsWxCustomerLink selectLsWxCustomerLinkById(Long id);
+
+    /**
+     * 查询微信登录和商城用户的关联列表
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 微信登录和商城用户的关联集合
+     */
+    public List<LsWxCustomerLink> selectLsWxCustomerLinkList(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 新增微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    public int insertLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 修改微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    public int updateLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 删除微信登录和商城用户的关联
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 结果
+     */
+    public int deleteLsWxCustomerLinkById(Long id);
+
+    /**
+     * 批量删除微信登录和商城用户的关联
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsWxCustomerLinkByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/OssMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/OssMapper.java
new file mode 100644
index 0000000..ff793d1
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/OssMapper.java
@@ -0,0 +1,30 @@
+package com.ruoyi.setting.mapper;
+
+
+import com.ruoyi.setting.bean.OssSetting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by luozhuo on 2020/7/7
+ * 云存储设置数据库接口
+ */
+@Repository
+public interface OssMapper {
+
+    /**
+     * 查询系统设置的云存储信息
+     *
+     * @return 返回云存储信息
+     */
+
+    OssSetting queryOssSetting();
+
+    /**
+     * 修改又拍云信息
+     *
+     * @param ossSetting 云存储信息
+     * @return 成功返回1 失败返回0
+     */
+
+    int updateOss(OssSetting ossSetting);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SCommunityBuySettingMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SCommunityBuySettingMapper.java
new file mode 100644
index 0000000..f401ad4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SCommunityBuySettingMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.domain.SCommunityBuySetting;
+
+import java.util.List;
+
+/**
+ * 社区团购设置Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface SCommunityBuySettingMapper {
+    /**
+     * 查询社区团购设置
+     *
+     * @param id 社区团购设置ID
+     * @return 社区团购设置
+     */
+    public SCommunityBuySetting selectSCommunityBuySettingById(Long id);
+
+    /**
+     * 查询社区团购设置列表
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 社区团购设置集合
+     */
+    public List<SCommunityBuySetting> selectSCommunityBuySettingList(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 新增社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    public int insertSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 修改社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    public int updateSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 删除社区团购设置
+     *
+     * @param id 社区团购设置ID
+     * @return 结果
+     */
+    public int deleteSCommunityBuySettingById(Long id);
+
+    /**
+     * 批量删除社区团购设置
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSCommunityBuySettingByIds(Long[] ids);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SegchkPaySettingMapper.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SegchkPaySettingMapper.java
new file mode 100644
index 0000000..dbbc923
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/mapper/SegchkPaySettingMapper.java
@@ -0,0 +1,82 @@
+package com.ruoyi.setting.mapper;
+
+import com.ruoyi.setting.bean.PaySet;
+import com.ruoyi.setting.domain.SegchkPaySetting;
+
+import java.util.List;
+
+/**
+ * 支付设置Mapper接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface SegchkPaySettingMapper {
+    /**
+     * 查询支付设置
+     *
+     * @param id 支付设置ID
+     * @return 支付设置
+     */
+    public SegchkPaySetting selectLsPaySettingById(Long id);
+
+    /**
+     * 查询支付设置列表
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 支付设置集合
+     */
+    public List<SegchkPaySetting> selectLsPaySettingList(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 新增支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    public int insertLsPaySetting(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 修改支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    public int updateLsPaySetting(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 删除支付设置
+     *
+     * @param id 支付设置ID
+     * @return 结果
+     */
+    public int deleteLsPaySettingById(Long id);
+
+    /**
+     * 批量删除支付设置
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLsPaySettingByIds(Long[] ids);
+
+    List<PaySet> queryPaySet();
+
+    /**
+     * 根据codeType删除支付接口设置
+     *
+     * @param codeType 1支付宝 2微信 3银联
+     * @return 返回删除行数
+     */
+
+    int deletePaySet(String codeType);
+
+    /**
+     * 批量插入支付接口设置
+     *
+     * @param list PaySet集合
+     * @return 返回插入行数
+     */
+
+    int addPaySet(List<PaySet> list);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/AreaService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/AreaService.java
new file mode 100644
index 0000000..f8b9fca
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/AreaService.java
@@ -0,0 +1,155 @@
+package com.ruoyi.setting.service;
+
+
+import com.ruoyi.setting.domain.LsCity;
+import com.ruoyi.setting.domain.LsDistrict;
+import com.ruoyi.setting.domain.LsProvince;
+import com.ruoyi.setting.vo.AreaItem;
+import com.ruoyi.setting.vo.Locality;
+
+import java.util.List;
+
+/**
+ * Created by 魔金商城 on 17/5/15.
+ * 地区服务接口
+ */
+public interface AreaService {
+
+    /**
+     * 查询所有省份
+     *
+     * @param areaItems 查询参数 不带只查询省
+     * @return 返回所有省份
+     */
+    List<LsProvince> queryAllProvinces(AreaItem... areaItems);
+
+
+    /**
+     * 查询所有地区信息(特殊数据接口)
+     *
+     * @return 所有地区信息
+     */
+    List<Locality> queryAllLocality();
+
+
+    /**
+     * 根据省份id查询下面的市
+     *
+     * @param provinceId 省份id
+     * @return 返回该省下面的市
+     */
+    List<LsCity> queryCityByProvinceId(long provinceId);
+
+    /**
+     * 根据市id查询下面的区县
+     *
+     * @param cityId 市id
+     * @return 返回市下面的区县
+     */
+    List<LsDistrict> queryDistrictByCityId(long cityId);
+
+    /**
+     * 添加省份
+     *
+     * @param province 省份信息
+     * @return 成功返回1  失败返回0
+     */
+    int addProvince(LsProvince province);
+
+    /**
+     * 添加市
+     *
+     * @param city 市
+     * @return 成返回1  失败返回0
+     */
+    int addCity(LsCity city);
+
+    /**
+     * 添加区
+     *
+     * @param district 区信息
+     * @return 成功返回1  失败返回0
+     */
+    int addDistrict(LsDistrict district);
+
+
+    /**
+     * 根据省份id删除省信息
+     *
+     * @param provinceId 省份id
+     * @return 1 成功 0 失败  -1 下面有市不能删除
+     */
+    int deleteProvinceById(long provinceId);
+
+    /**
+     * 根据市id删除市信息
+     *
+     * @param cityId 市id
+     * @return 返回 1 成功  0 失败  -1 下面有区 不能删除
+     */
+    int deleteCityById(long cityId);
+
+    /**
+     * 根据区id删除区
+     *
+     * @param districtId 区id
+     * @return 返回 1 成功  0 失败
+     */
+    int deleteDistrictById(long districtId);
+
+    /**
+     * 根据省份id查询省份信息
+     *
+     * @param id 省份id
+     * @return 返回省份信息
+     */
+    LsProvince queryProvinceById(long id);
+
+    /**
+     * 根据市id查询市信息
+     *
+     * @param id 市id
+     * @return 返回市信息
+     */
+    LsCity queryCityById(long id);
+
+    /**
+     * 根据区id查询区信息
+     *
+     * @param id 区id
+     * @return 返回区信息
+     */
+    LsDistrict queryDistrictById(long id);
+
+    /**
+     * 修改省份
+     *
+     * @param province 省份信息
+     * @return 成功返回1  失败返回0
+     */
+    int updateProvince(LsProvince province);
+
+    /**
+     * 修改市
+     *
+     * @param city 市信息
+     * @return 成功返回1  失败返回0
+     */
+    int updateCity(LsCity city);
+
+    /**
+     * 修改区
+     *
+     * @param district 区信息
+     * @return 成功返回1  失败返回0
+     */
+    int updateDistrict(LsDistrict district);
+
+    /**
+     * 根据市名称查找市id
+     *
+     * @param cityName 市名称
+     * @return 市id
+     */
+    long queryCityIdByName(String cityName);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/BaseInfoSetService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/BaseInfoSetService.java
new file mode 100644
index 0000000..3f079c5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/BaseInfoSetService.java
@@ -0,0 +1,49 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.segchk.domain.BaseInfoSet;
+
+/**
+ * 基本信息设置service层
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+public interface BaseInfoSetService {
+    /**
+     * 查询基本信息和高级信息设置
+     *
+     * @return 基本信息设置实体类
+     */
+    BaseInfoSet queryBaseInfoSet();
+
+    /**
+     * 编辑基本信息和高级信息
+     *
+     * @param baseInfoSet 基本信息实体类
+     * @param type        1 基本信息 0高级信息
+     * @return -1编辑失败 1编辑成功 0编辑失败
+     */
+    int editBaseInfoSet(BaseInfoSet baseInfoSet, int type);
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+    int setAuditSwitch(String storeSpuAudit);
+
+    /**
+     * 设置会员价启用状态
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+    int setMemberPriceStatus(String memberPriceStatus);
+
+    /**
+     * 判断单品是否需要审核
+     *
+     * @return 需要审核返回true  不需要返回false
+     */
+    boolean isSkuNeedAudit();
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsCityService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsCityService.java
new file mode 100644
index 0000000..72e28cb
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsCityService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsCity;
+
+import java.util.List;
+
+/**
+ * 区域市Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsCityService {
+    /**
+     * 查询区域市
+     *
+     * @param id 区域市ID
+     * @return 区域市
+     */
+    public LsCity selectLsCityById(Long id);
+
+    /**
+     * 查询区域市列表
+     *
+     * @param lsCity 区域市
+     * @return 区域市集合
+     */
+    public List<LsCity> selectLsCityList(LsCity lsCity);
+
+    /**
+     * 新增区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    public int insertLsCity(LsCity lsCity);
+
+    /**
+     * 修改区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    public int updateLsCity(LsCity lsCity);
+
+    /**
+     * 批量删除区域市
+     *
+     * @param ids 需要删除的区域市ID
+     * @return 结果
+     */
+    public int deleteLsCityByIds(Long[] ids);
+
+    /**
+     * 删除区域市信息
+     *
+     * @param id 区域市ID
+     * @return 结果
+     */
+    public int deleteLsCityById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsDistrictService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsDistrictService.java
new file mode 100644
index 0000000..f1d9db9
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsDistrictService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsDistrict;
+
+import java.util.List;
+
+/**
+ * 区域区Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsDistrictService {
+    /**
+     * 查询区域区
+     *
+     * @param id 区域区ID
+     * @return 区域区
+     */
+    public LsDistrict selectLsDistrictById(Long id);
+
+    /**
+     * 查询区域区列表
+     *
+     * @param lsDistrict 区域区
+     * @return 区域区集合
+     */
+    public List<LsDistrict> selectLsDistrictList(LsDistrict lsDistrict);
+
+    /**
+     * 新增区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    public int insertLsDistrict(LsDistrict lsDistrict);
+
+    /**
+     * 修改区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    public int updateLsDistrict(LsDistrict lsDistrict);
+
+    /**
+     * 批量删除区域区
+     *
+     * @param ids 需要删除的区域区ID
+     * @return 结果
+     */
+    public int deleteLsDistrictByIds(Long[] ids);
+
+    /**
+     * 删除区域区信息
+     *
+     * @param id 区域区ID
+     * @return 结果
+     */
+    public int deleteLsDistrictById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsEmailSettingService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsEmailSettingService.java
new file mode 100644
index 0000000..a851365
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsEmailSettingService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsEmailSetting;
+
+import java.util.List;
+
+/**
+ * 邮箱设置Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface ILsEmailSettingService {
+    /**
+     * 查询邮箱设置
+     *
+     * @param id 邮箱设置ID
+     * @return 邮箱设置
+     */
+    public LsEmailSetting selectLsEmailSettingById(Long id);
+
+    /**
+     * 查询邮箱设置列表
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 邮箱设置集合
+     */
+    public List<LsEmailSetting> selectLsEmailSettingList(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 新增邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    public int insertLsEmailSetting(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 修改邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    public int updateLsEmailSetting(LsEmailSetting lsEmailSetting);
+
+    /**
+     * 批量删除邮箱设置
+     *
+     * @param ids 需要删除的邮箱设置ID
+     * @return 结果
+     */
+    public int deleteLsEmailSettingByIds(Long[] ids);
+
+    /**
+     * 删除邮箱设置信息
+     *
+     * @param id 邮箱设置ID
+     * @return 结果
+     */
+    public int deleteLsEmailSettingById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsPaySettingService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsPaySettingService.java
new file mode 100644
index 0000000..349e9ca
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsPaySettingService.java
@@ -0,0 +1,76 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.bean.PaySetCommon;
+import com.ruoyi.setting.domain.SegchkPaySetting;
+
+import java.util.List;
+
+/**
+ * 支付设置Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface ILsPaySettingService {
+    /**
+     * 查询所有支付接口设置
+     *
+     * @return 返回PaySetCommon
+     */
+    PaySetCommon queryPaySet();
+
+    /**
+     * 编辑支付接口设置
+     *
+     * @return -1编辑出错 1成功
+     */
+    int editPaySet(PaySetCommon paySetCommon, String codeType);
+
+    /**
+     * 查询支付设置
+     *
+     * @param id 支付设置ID
+     * @return 支付设置
+     */
+    public SegchkPaySetting selectLsPaySettingById(Long id);
+
+    /**
+     * 查询支付设置列表
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 支付设置集合
+     */
+    public List<SegchkPaySetting> selectLsPaySettingList(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 新增支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    public int insertLsPaySetting(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 修改支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    public int updateLsPaySetting(SegchkPaySetting segchkPaySetting);
+
+    /**
+     * 批量删除支付设置
+     *
+     * @param ids 需要删除的支付设置ID
+     * @return 结果
+     */
+    public int deleteLsPaySettingByIds(Long[] ids);
+
+    /**
+     * 删除支付设置信息
+     *
+     * @param id 支付设置ID
+     * @return 结果
+     */
+    public int deleteLsPaySettingById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsProvinceService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsProvinceService.java
new file mode 100644
index 0000000..bf6b104
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsProvinceService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsProvince;
+
+import java.util.List;
+
+/**
+ * 区域省Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsProvinceService {
+    /**
+     * 查询区域省
+     *
+     * @param id 区域省ID
+     * @return 区域省
+     */
+    public LsProvince selectLsProvinceById(Long id);
+
+    /**
+     * 查询区域省列表
+     *
+     * @param lsProvince 区域省
+     * @return 区域省集合
+     */
+    public List<LsProvince> selectLsProvinceList(LsProvince lsProvince);
+
+    /**
+     * 新增区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    public int insertLsProvince(LsProvince lsProvince);
+
+    /**
+     * 修改区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    public int updateLsProvince(LsProvince lsProvince);
+
+    /**
+     * 批量删除区域省
+     *
+     * @param ids 需要删除的区域省ID
+     * @return 结果
+     */
+    public int deleteLsProvinceByIds(Long[] ids);
+
+    /**
+     * 删除区域省信息
+     *
+     * @param id 区域省ID
+     * @return 结果
+     */
+    public int deleteLsProvinceById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSmsSettingService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSmsSettingService.java
new file mode 100644
index 0000000..ea1ccb7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSmsSettingService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsSmsSetting;
+
+import java.util.List;
+
+/**
+ * 短信接口设置Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface ILsSmsSettingService {
+    /**
+     * 查询短信接口设置
+     *
+     * @param id 短信接口设置ID
+     * @return 短信接口设置
+     */
+    public LsSmsSetting selectLsSmsSettingById(Long id);
+
+    /**
+     * 查询短信接口设置列表
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 短信接口设置集合
+     */
+    public List<LsSmsSetting> selectLsSmsSettingList(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 新增短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    public int insertLsSmsSetting(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 修改短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    public int updateLsSmsSetting(LsSmsSetting lsSmsSetting);
+
+    /**
+     * 批量删除短信接口设置
+     *
+     * @param ids 需要删除的短信接口设置ID
+     * @return 结果
+     */
+    public int deleteLsSmsSettingByIds(Long[] ids);
+
+    /**
+     * 删除短信接口设置信息
+     *
+     * @param id 短信接口设置ID
+     * @return 结果
+     */
+    public int deleteLsSmsSettingById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsStationLetterService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsStationLetterService.java
new file mode 100644
index 0000000..c352bfa
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsStationLetterService.java
@@ -0,0 +1,105 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsStationLetter;
+import com.ruoyi.util.PageHelper;
+
+import java.util.List;
+
+/**
+ * 站内信Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsStationLetterService {
+    /**
+     * 查询站内信
+     *
+     * @param id 站内信ID
+     * @return 站内信
+     */
+    public LsStationLetter selectLsStationLetterById(Long id);
+
+    /**
+     * 查询站内信列表
+     *
+     * @param lsStationLetter 站内信
+     * @return 站内信集合
+     */
+    public List<LsStationLetter> selectLsStationLetterList(LsStationLetter lsStationLetter);
+
+    /**
+     * 新增站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    public int insertLsStationLetter(LsStationLetter lsStationLetter);
+
+    /**
+     * 修改站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    public int updateLsStationLetter(LsStationLetter lsStationLetter);
+
+    /**
+     * 批量删除站内信
+     *
+     * @param ids 需要删除的站内信ID
+     * @return 结果
+     */
+    public int deleteLsStationLetterByIds(Long[] ids);
+
+    /**
+     * 删除站内信信息
+     *
+     * @param id 站内信ID
+     * @return 结果
+     */
+    public int deleteLsStationLetterById(Long id);
+
+    /**
+     * 新增站内信
+     *
+     * @param stationLetters 站内信集合
+     * @return 成功返回>1 失败返回0
+     */
+    int addStationLetters(List<LsStationLetter> stationLetters);
+
+    /**
+     * 删除站内信
+     *
+     * @param id 站内信id
+     * @return 成功返回1，失败返回0
+     */
+    int deleteStationLetters(long id);
+
+    /**
+     * 根据会员di查询会员的站内信
+     *
+     * @param pageHelper 分页帮助类
+     * @param customerId 会员id
+     * @return 返回会员的站内信
+     */
+    PageHelper<LsStationLetter> queryStationLettersByCustomerId(PageHelper<LsStationLetter> pageHelper, long customerId);
+
+    /**
+     * 更新会员的站内信的阅读状态
+     *
+     * @param id         站内信id
+     * @param customerId 用户id
+     * @return 成功返回1，失败返回0
+     */
+    int updateStationLettersIsRead(long id, long customerId);
+
+    /**
+     * 获得用户未读的消息数量
+     *
+     * @param customerId 会员id
+     * @return 返回用户未读消息的数量
+     */
+    int unReadNum(long customerId);
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSystemSeoService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSystemSeoService.java
new file mode 100644
index 0000000..75851c1
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsSystemSeoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsSystemSeo;
+
+import java.util.List;
+
+/**
+ * 系统seo设置Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsSystemSeoService {
+    /**
+     * 查询系统seo设置
+     *
+     * @param id 系统seo设置ID
+     * @return 系统seo设置
+     */
+    public LsSystemSeo selectLsSystemSeoById(Long id);
+
+    /**
+     * 查询系统seo设置列表
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 系统seo设置集合
+     */
+    public List<LsSystemSeo> selectLsSystemSeoList(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 新增系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    public int insertLsSystemSeo(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 修改系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    public int updateLsSystemSeo(LsSystemSeo lsSystemSeo);
+
+    /**
+     * 批量删除系统seo设置
+     *
+     * @param ids 需要删除的系统seo设置ID
+     * @return 结果
+     */
+    public int deleteLsSystemSeoByIds(Long[] ids);
+
+    /**
+     * 删除系统seo设置信息
+     *
+     * @param id 系统seo设置ID
+     * @return 结果
+     */
+    public int deleteLsSystemSeoById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsWxCustomerLinkService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsWxCustomerLinkService.java
new file mode 100644
index 0000000..b2d328a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ILsWxCustomerLinkService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.LsWxCustomerLink;
+
+import java.util.List;
+
+/**
+ * 微信登录和商城用户的关联Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+public interface ILsWxCustomerLinkService {
+    /**
+     * 查询微信登录和商城用户的关联
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 微信登录和商城用户的关联
+     */
+    public LsWxCustomerLink selectLsWxCustomerLinkById(Long id);
+
+    /**
+     * 查询微信登录和商城用户的关联列表
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 微信登录和商城用户的关联集合
+     */
+    public List<LsWxCustomerLink> selectLsWxCustomerLinkList(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 新增微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    public int insertLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 修改微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    public int updateLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink);
+
+    /**
+     * 批量删除微信登录和商城用户的关联
+     *
+     * @param ids 需要删除的微信登录和商城用户的关联ID
+     * @return 结果
+     */
+    public int deleteLsWxCustomerLinkByIds(Long[] ids);
+
+    /**
+     * 删除微信登录和商城用户的关联信息
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 结果
+     */
+    public int deleteLsWxCustomerLinkById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ISCommunityBuySettingService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ISCommunityBuySettingService.java
new file mode 100644
index 0000000..c620b1a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/ISCommunityBuySettingService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+import com.ruoyi.setting.domain.SCommunityBuySetting;
+
+import java.util.List;
+
+/**
+ * 社区团购设置Service接口
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+public interface ISCommunityBuySettingService {
+    /**
+     * 查询社区团购设置
+     *
+     * @param id 社区团购设置ID
+     * @return 社区团购设置
+     */
+    public SCommunityBuySetting selectSCommunityBuySettingById(Long id);
+
+    /**
+     * 查询社区团购设置列表
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 社区团购设置集合
+     */
+    public List<SCommunityBuySetting> selectSCommunityBuySettingList(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 新增社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    public int insertSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 修改社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    public int updateSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting);
+
+    /**
+     * 批量删除社区团购设置
+     *
+     * @param ids 需要删除的社区团购设置ID
+     * @return 结果
+     */
+    public int deleteSCommunityBuySettingByIds(Long[] ids);
+
+    /**
+     * 删除社区团购设置信息
+     *
+     * @param id 社区团购设置ID
+     * @return 结果
+     */
+    public int deleteSCommunityBuySettingById(Long id);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/OssService.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/OssService.java
new file mode 100644
index 0000000..f59a877
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/OssService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.setting.service;
+
+
+import com.ruoyi.setting.bean.OssSetting;
+import com.ruoyi.setting.bean.UploadData;
+
+import java.util.List;
+
+/**
+ * Created by luozhuo on 2020/7/7.
+ * 云存储服务接口
+ */
+public interface OssService {
+
+    /**
+     * 上传到云存储
+     *
+     * @param uploadDatas 上传的参数
+     * @return 返回图片在云存储的地址
+     */
+    List<String> uploadToQqOss(List<UploadData> uploadDatas);
+
+    /**
+     * 上传到腾讯云存储（上传base64图片）
+     *
+     * @param uploadDatas 上传的参数
+     * @return 返回图片在云存储的地址
+     */
+    List<String> uploadToQqOssForBase64(List<UploadData> uploadDatas);
+
+    /**
+     * 上传到腾讯云存储
+     *
+     * @param uploadDatas 上传的参数
+     * @return 返回图片在云存储的地址
+     */
+    List<String> uploadToOss(List<UploadData> uploadDatas);
+
+    /**
+     * 上传到云存储（上传base64图片）
+     *
+     * @param uploadDatas 上传的参数
+     * @return 返回图片在云存储的地址
+     */
+    List<String> uploadToOssForBase64(List<UploadData> uploadDatas);
+
+    /**
+     * 查询系统设置的云存储信息
+     *
+     * @return 返回云存储信息
+     */
+    OssSetting queryOssSetting();
+
+    /**
+     * 修改云存储设置信息
+     *
+     * @param OssSetting 云存储设置实体
+     * @return 成功返回1  失败返回0
+     */
+    int updateOss(OssSetting OssSetting);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/AreaServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/AreaServiceImpl.java
new file mode 100644
index 0000000..d1905be
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/AreaServiceImpl.java
@@ -0,0 +1,270 @@
+package com.ruoyi.setting.service.impl;
+
+
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.setting.domain.LsCity;
+import com.ruoyi.setting.domain.LsDistrict;
+import com.ruoyi.setting.domain.LsProvince;
+import com.ruoyi.setting.mapper.AreaMapper;
+import com.ruoyi.setting.service.AreaService;
+import com.ruoyi.setting.vo.AreaItem;
+import com.ruoyi.setting.vo.Locality;
+import com.ruoyi.common.utils.RedisCahceKey;
+import org.apache.commons.lang.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Created by 魔金商城 on 17/5/15
+ * 地区服务实现接口
+ */
+@Service
+public class AreaServiceImpl implements AreaService {
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(AreaServiceImpl.class);
+
+    /**
+     * 地区数据库接口
+     */
+    @Autowired
+    private AreaMapper areaMapper;
+
+    @Cacheable(value = RedisCahceKey.AREA, key = "'AREA'+#areaItems.hashCode()")
+    @Override
+    public List<LsProvince> queryAllProvinces(AreaItem... areaItems) {
+        logger.debug("queryAllProvinces.....areaItems:{}", areaItems);
+
+        List<LsProvince> provinces = areaMapper.queryAllProvinces();
+
+        // 如果没有省则直接返回
+        if (CollectionUtils.isEmpty(provinces)) {
+            return provinces;
+        }
+
+        // 设置省下面的市
+        if (ArrayUtils.contains(areaItems, AreaItem.CITY)) {
+            provinces.parallelStream().forEach(province -> province.setChild(this.queryCityByProvinceId(province.getId())));
+        }
+
+        // 设置市下面的区
+        if (ArrayUtils.contains(areaItems, AreaItem.DISTRICT)) {
+            provinces.parallelStream().forEach(province -> province.getChild().stream().forEach(city -> city.setChild(this.queryDistrictByCityId(city.getId()))));
+        }
+
+        // 查询所有省市区
+        if (ArrayUtils.contains(areaItems, AreaItem.ALL)) {
+            provinces.parallelStream().forEach(province -> province.setChild(this.queryCityByProvinceId(province.getId())));
+            provinces.parallelStream().forEach(province -> province.getChild().stream().forEach(city -> city.setChild(this.queryDistrictByCityId(city.getId()))));
+        }
+
+        return provinces;
+    }
+
+
+    /**
+     * 查询所有地区信息(特殊数据接口)
+     *
+     * @return 所有地区信息
+     */
+    @Override
+    public List<Locality> queryAllLocality() {
+        logger.debug("queryAllLocality....");
+
+        List<LsProvince> provinceList = SpringUtils.getBean(AreaService.class).queryAllProvinces(AreaItem.ALL);
+
+        //初始化返回集合
+        List<Locality> localities = new ArrayList<>();
+
+        //构建数据结构
+        for (int i = 0, size = provinceList.size(); i < size; i++) {
+            //省份
+            localities.add(new Locality(provinceList.get(i).getName(), "P-" + provinceList.get(i).getId(), "0", provinceList.get(i).getId()));
+            for (int k = 0; k < provinceList.get(i).getChild().size(); k++) {
+                //城市
+                localities.add(new Locality(provinceList.get(i).getChild().get(k).getName(), "C-" + provinceList.get(i).getChild().get(k).getId(), "P-" + provinceList.get(i).getChild().get(k).getProvinceId(), provinceList.get(i).getChild().get(k).getId()));
+                for (int j = 0; j < provinceList.get(i).getChild().get(k).getChild().size(); j++) {
+                    //地区
+                    localities.add(new Locality(provinceList.get(i).getChild().get(k).getChild().get(j).getName(), "D-" + provinceList.get(i).getChild().get(k).getChild().get(j).getId(), "C-" + provinceList.get(i).getChild().get(k).getId(), provinceList.get(i).getChild().get(k).getChild().get(j).getId()));
+                }
+            }
+        }
+
+        return localities;
+
+    }
+
+
+    @Override
+    public List<LsCity> queryCityByProvinceId(long provinceId) {
+        logger.debug("queryCityByProvinceId and provinceId:{}", provinceId);
+        return areaMapper.queryCityByProvinceId(provinceId);
+    }
+
+    @Override
+    public List<LsDistrict> queryDistrictByCityId(long cityId) {
+        logger.debug("queryDistrictByCityId and cityId:{}", cityId);
+        return areaMapper.queryDistrictByCityId(cityId);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int addProvince(LsProvince province) {
+        logger.debug("addProvince and province:{}", province);
+
+        if (Objects.isNull(province)) {
+            logger.error("addProvince fail due to province is null....");
+            return 0;
+        }
+        return areaMapper.addProvince(province);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int addCity(LsCity city) {
+        logger.debug("addCity and city :{}", city);
+        if (Objects.isNull(city)) {
+            logger.error("addCity fail due to city is null....");
+            return 0;
+        }
+        return areaMapper.addCity(city);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int addDistrict(LsDistrict district) {
+
+        logger.debug("addDistrict and district:{}", district);
+
+        if (Objects.isNull(district)) {
+            logger.error("addDistrict fail due to district is null...");
+            return 0;
+        }
+        return areaMapper.addDistrict(district);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int deleteProvinceById(long provinceId) {
+        logger.debug("deleteProvinceById and provinceId:{}", provinceId);
+
+        if (!isProvinceCanDelete(provinceId)) {
+            logger.error("deleteProvinceById fail due to province has city...");
+            return -1;
+        }
+
+        return areaMapper.deleteProvinceById(provinceId);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int deleteCityById(long cityId) {
+        logger.debug("deleteCityById and cityId:{}", cityId);
+
+        if (!isCityCanDelete(cityId)) {
+            logger.error("deleteCityById fail due to city has district");
+            return -1;
+        }
+        return areaMapper.deleteCityById(cityId);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int deleteDistrictById(long districtId) {
+        logger.debug("deleteDistrictById and districtId:{}", districtId);
+        return areaMapper.deleteDistrictById(districtId);
+    }
+
+
+    @Override
+    public LsProvince queryProvinceById(long id) {
+        logger.debug("queryProvinceById and id:{}", id);
+        return areaMapper.queryProvinceById(id);
+    }
+
+    @Override
+    public LsCity queryCityById(long id) {
+        logger.debug("queryCityById and id:{}", id);
+        return areaMapper.queryCityById(id);
+    }
+
+    @Override
+    public LsDistrict queryDistrictById(long id) {
+        logger.debug("queryDistrictById and id :{}", id);
+        return areaMapper.queryDistrictById(id);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int updateProvince(LsProvince province) {
+        logger.debug("updateProvince and province:{}", province);
+        if (Objects.isNull(province)) {
+            logger.error("updateProvince fail ...");
+            return 0;
+        }
+        return areaMapper.updateProvince(province);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int updateCity(LsCity city) {
+        logger.debug("updateCity and city:{}", city);
+
+        if (Objects.isNull(city)) {
+            logger.error("updateCity fail...");
+            return 0;
+        }
+        return areaMapper.updateCity(city);
+    }
+
+    @CacheEvict(value = RedisCahceKey.AREA, allEntries = true)
+    @Override
+    public int updateDistrict(LsDistrict district) {
+        logger.debug("updateDistrict and district:{}", district);
+
+        if (Objects.isNull(district)) {
+            logger.error("updateDistrict fail....");
+            return 0;
+        }
+        return areaMapper.updateDistrict(district);
+    }
+
+    @Override
+    public long queryCityIdByName(String cityName) {
+        logger.debug("queryCityIdByName and cityName:{}", cityName);
+        Long cityId = areaMapper.queryCityIdByName(cityName);
+        return Objects.isNull(cityId) ? -1 : cityId;
+    }
+
+
+    /**
+     * 判断市是否可以删除
+     *
+     * @param cityId 市id
+     * @return 可以返回true  不可以返回false  市下面有区则不能删除
+     */
+    private boolean isCityCanDelete(long cityId) {
+        return CollectionUtils.isEmpty(this.queryDistrictByCityId(cityId));
+    }
+
+    /**
+     * 判断省份是否可以删除
+     *
+     * @param provinceId 省份id
+     * @return 可以删除 返回true  不可以删除 返回false (省份下面有市则不能删除)
+     */
+    private boolean isProvinceCanDelete(long provinceId) {
+        return CollectionUtils.isEmpty(this.queryCityByProvinceId(provinceId));
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/BaseInfoSetServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/BaseInfoSetServiceImpl.java
new file mode 100644
index 0000000..4c4672c
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/BaseInfoSetServiceImpl.java
@@ -0,0 +1,117 @@
+package com.ruoyi.setting.service.impl;
+
+
+import com.ruoyi.setting.mapper.BaseInfoSetMapper;
+import com.ruoyi.setting.service.BaseInfoSetService;
+import com.ruoyi.common.utils.RedisCahceKey;
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基本信息设置service实现类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+@Service
+public class BaseInfoSetServiceImpl implements BaseInfoSetService {
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(BaseInfoSetServiceImpl.class);
+
+    /**
+     * 注入信息设置mapper
+     */
+    @Autowired
+    private BaseInfoSetMapper baseInfoSetMapper;
+
+    /**
+     * 查询基本信息和高级信息设置
+     *
+     * @return 基本信息和高级信息设置实体类
+     */
+    @Cacheable(value = RedisCahceKey.BASE_INFO_SET, key = "'BaseInfoSet'")
+    @Override
+    public BaseInfoSet queryBaseInfoSet() {
+        logger.debug("queryBaseInfoSet...");
+        return baseInfoSetMapper.queryBaseInfoSet();
+    }
+
+    /**
+     * 编辑基本信息和高级信息
+     *
+     * @param baseInfoSet 基本信息实体类
+     * @param type        1 基本信息 0高级信息
+     * @return -1编辑失败 1编辑成功 0编辑失败
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int editBaseInfoSet(BaseInfoSet baseInfoSet, int type) {
+        logger.debug("editBaseInfoSet and baseInfoSet:{}\r\n type:{}", baseInfoSet, type);
+        //非法参数
+        if (!checkParam(type)) {
+            logger.error("editBaseInfoSet error due to type is illegal...");
+            return -1;
+        }
+        baseInfoSet.dealPicUrl();
+        //设置基本信息
+        if (type == 1) {
+            logger.debug("editBaseInfoSet to editBaseInfoSetA and type:{}", type);
+            return baseInfoSetMapper.editBaseInfoSetA(baseInfoSet);
+        }
+        //设置高级信息
+        if (type == 0) {
+            logger.debug("editBaseInfoSet to editBaseInfoSetB and type:{}", type);
+            return baseInfoSetMapper.editBaseInfoSetB(baseInfoSet);
+        }
+        return 0;
+    }
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int setAuditSwitch(String storeSpuAudit) {
+        logger.debug("setAuditSwitch and storeSpuAudit ：{}", storeSpuAudit);
+        return baseInfoSetMapper.setAuditSwitch(storeSpuAudit);
+    }
+
+    /**
+     * 设置会员价启用状态
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int setMemberPriceStatus(String memberPriceStatus) {
+        logger.debug("setMemberPriceStatus and memberPriceStatus ：{}", memberPriceStatus);
+        return baseInfoSetMapper.setMemberPriceStatus(memberPriceStatus);
+    }
+
+    @Override
+    public boolean isSkuNeedAudit() {
+        return queryBaseInfoSet().isSpuNeedAudit();
+    }
+
+    /**
+     * 校验参数是否为 0 或 1
+     *
+     * @param type 参数
+     * @return 正确true 错误 FALSE
+     */
+    private boolean checkParam(int type) {
+        return type == 1 || type == 0;
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsCityServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsCityServiceImpl.java
new file mode 100644
index 0000000..79a1ffd
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsCityServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.setting.domain.LsCity;
+import com.ruoyi.setting.mapper.LsCityMapper;
+import com.ruoyi.setting.service.ILsCityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 区域市Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsCityServiceImpl implements ILsCityService {
+    private static final Logger logger = LoggerFactory.getLogger(LsCityServiceImpl.class);
+    @Autowired
+    private LsCityMapper lsCityMapper;
+
+    /**
+     * 查询区域市
+     *
+     * @param id 区域市ID
+     * @return 区域市
+     */
+    @Override
+    public LsCity selectLsCityById(Long id) {
+        return lsCityMapper.selectLsCityById(id);
+    }
+
+    /**
+     * 查询区域市列表
+     *
+     * @param lsCity 区域市
+     * @return 区域市
+     */
+    @Override
+    public List<LsCity> selectLsCityList(LsCity lsCity) {
+        return lsCityMapper.selectLsCityList(lsCity);
+    }
+
+    /**
+     * 新增区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    @Override
+    public int insertLsCity(LsCity lsCity) {
+        lsCity.setCreateTime(DateUtils.getNowDate());
+        return lsCityMapper.insertLsCity(lsCity);
+    }
+
+    /**
+     * 修改区域市
+     *
+     * @param lsCity 区域市
+     * @return 结果
+     */
+    @Override
+    public int updateLsCity(LsCity lsCity) {
+        return lsCityMapper.updateLsCity(lsCity);
+    }
+
+    /**
+     * 批量删除区域市
+     *
+     * @param ids 需要删除的区域市ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsCityByIds(Long[] ids) {
+        return lsCityMapper.deleteLsCityByIds(ids);
+    }
+
+    /**
+     * 删除区域市信息
+     *
+     * @param id 区域市ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsCityById(Long id) {
+        return lsCityMapper.deleteLsCityById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsDistrictServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsDistrictServiceImpl.java
new file mode 100644
index 0000000..2bbca57
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsDistrictServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.setting.domain.LsDistrict;
+import com.ruoyi.setting.mapper.LsDistrictMapper;
+import com.ruoyi.setting.service.ILsDistrictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 区域区Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsDistrictServiceImpl implements ILsDistrictService {
+    private static final Logger logger = LoggerFactory.getLogger(LsDistrictServiceImpl.class);
+    @Autowired
+    private LsDistrictMapper lsDistrictMapper;
+
+    /**
+     * 查询区域区
+     *
+     * @param id 区域区ID
+     * @return 区域区
+     */
+    @Override
+    public LsDistrict selectLsDistrictById(Long id) {
+        return lsDistrictMapper.selectLsDistrictById(id);
+    }
+
+    /**
+     * 查询区域区列表
+     *
+     * @param lsDistrict 区域区
+     * @return 区域区
+     */
+    @Override
+    public List<LsDistrict> selectLsDistrictList(LsDistrict lsDistrict) {
+        return lsDistrictMapper.selectLsDistrictList(lsDistrict);
+    }
+
+    /**
+     * 新增区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    @Override
+    public int insertLsDistrict(LsDistrict lsDistrict) {
+        lsDistrict.setCreateTime(DateUtils.getNowDate());
+        return lsDistrictMapper.insertLsDistrict(lsDistrict);
+    }
+
+    /**
+     * 修改区域区
+     *
+     * @param lsDistrict 区域区
+     * @return 结果
+     */
+    @Override
+    public int updateLsDistrict(LsDistrict lsDistrict) {
+        return lsDistrictMapper.updateLsDistrict(lsDistrict);
+    }
+
+    /**
+     * 批量删除区域区
+     *
+     * @param ids 需要删除的区域区ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsDistrictByIds(Long[] ids) {
+        return lsDistrictMapper.deleteLsDistrictByIds(ids);
+    }
+
+    /**
+     * 删除区域区信息
+     *
+     * @param id 区域区ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsDistrictById(Long id) {
+        return lsDistrictMapper.deleteLsDistrictById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsEmailSettingServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsEmailSettingServiceImpl.java
new file mode 100644
index 0000000..38c3b1f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsEmailSettingServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.domain.LsEmailSetting;
+import com.ruoyi.setting.mapper.LsEmailSettingMapper;
+import com.ruoyi.setting.service.ILsEmailSettingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 邮箱设置Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+@Service
+public class LsEmailSettingServiceImpl implements ILsEmailSettingService {
+    private static final Logger logger = LoggerFactory.getLogger(LsEmailSettingServiceImpl.class);
+    @Autowired
+    private LsEmailSettingMapper lsEmailSettingMapper;
+
+    /**
+     * 查询邮箱设置
+     *
+     * @param id 邮箱设置ID
+     * @return 邮箱设置
+     */
+    @Override
+    public LsEmailSetting selectLsEmailSettingById(Long id) {
+        return lsEmailSettingMapper.selectLsEmailSettingById(id);
+    }
+
+    /**
+     * 查询邮箱设置列表
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 邮箱设置
+     */
+    @Override
+    public List<LsEmailSetting> selectLsEmailSettingList(LsEmailSetting lsEmailSetting) {
+        return lsEmailSettingMapper.selectLsEmailSettingList(lsEmailSetting);
+    }
+
+    /**
+     * 新增邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    @Override
+    public int insertLsEmailSetting(LsEmailSetting lsEmailSetting) {
+        return lsEmailSettingMapper.insertLsEmailSetting(lsEmailSetting);
+    }
+
+    /**
+     * 修改邮箱设置
+     *
+     * @param lsEmailSetting 邮箱设置
+     * @return 结果
+     */
+    @Override
+    public int updateLsEmailSetting(LsEmailSetting lsEmailSetting) {
+        return lsEmailSettingMapper.updateLsEmailSetting(lsEmailSetting);
+    }
+
+    /**
+     * 批量删除邮箱设置
+     *
+     * @param ids 需要删除的邮箱设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsEmailSettingByIds(Long[] ids) {
+        return lsEmailSettingMapper.deleteLsEmailSettingByIds(ids);
+    }
+
+    /**
+     * 删除邮箱设置信息
+     *
+     * @param id 邮箱设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsEmailSettingById(Long id) {
+        return lsEmailSettingMapper.deleteLsEmailSettingById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsPaySettingServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsPaySettingServiceImpl.java
new file mode 100644
index 0000000..617b08f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsPaySettingServiceImpl.java
@@ -0,0 +1,174 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.bean.PaySet;
+import com.ruoyi.setting.bean.PaySetCommon;
+import com.ruoyi.setting.domain.SegchkPaySetting;
+import com.ruoyi.setting.mapper.SegchkPaySettingMapper;
+import com.ruoyi.setting.service.ILsPaySettingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 支付设置Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+@Service
+public class LsPaySettingServiceImpl implements ILsPaySettingService {
+    private static final Logger logger = LoggerFactory.getLogger(LsPaySettingServiceImpl.class);
+    /**
+     * 支付类型列表
+     */
+    private final static List<String> codeTypeList = Arrays.asList("1", "2", "3", "4", "5", "6");
+    @Autowired
+    private SegchkPaySettingMapper segchkPaySettingMapper;
+
+    /**
+     * 查询支付设置
+     *
+     * @param id 支付设置ID
+     * @return 支付设置
+     */
+    @Override
+    public SegchkPaySetting selectLsPaySettingById(Long id) {
+        return segchkPaySettingMapper.selectLsPaySettingById(id);
+    }
+
+    /**
+     * 查询支付接口设置
+     *
+     * @return 返回PaySetCommon
+     */
+    @Override
+    public PaySetCommon queryPaySet() {
+        logger.debug("queryPaySet...");
+        return PaySetCommon.getPaySetCommon(new PaySetCommon(), segchkPaySettingMapper.queryPaySet());
+    }
+
+    /**
+     * 编辑支付接口设置
+     *
+     * @param paySetCommon 实体类参数
+     * @param codeType     支付设置类型 1 支付宝 2 微信(扫码，公众号，H5) 3 银联 4预存款 5 微信支app付 6微信小程序支付
+     * @return -1编辑出错 >=1成功
+     */
+    @Override
+    @Transactional
+    public int editPaySet(PaySetCommon paySetCommon, String codeType) {
+        List<PaySet> list = new ArrayList<>();
+        if (codeTypeList.indexOf(codeType) < 0) {
+            logger.error("editPaySet error codeType is illegal");
+            return -1;
+        }
+        //先删后增
+        segchkPaySettingMapper.deletePaySet(codeType);
+        if ("1".equals(codeType)) {
+            logger.debug("editPaySet aliPay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getAliPaySet().getAppId(), "appId"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getAliPaySet().getAlipayPublicKey(), "alipayPublicKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getAliPaySet().getAppPrivateKey(), "appPrivateKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getAliPaySet().getIsUse(), "isUse"));
+        }
+        if ("2".equals(codeType)) {
+            logger.debug("editPaySet wechatPay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getAppId(), "appId"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getAppSecret(), "appSecret"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getMerchantNum(), "merchantNum"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getApiKey(), "apiKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getLoginNotice(), "loginNotice"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatPaySet().getIsUse(), "isUse"));
+        }
+        if ("3".equals(codeType)) {
+            logger.debug("editPaySet unionPay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getUnionPaySet().getMerchantNum(), "merchantNum"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getUnionPaySet().getApiKey(), "apiKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getUnionPaySet().getIsUse(), "isUse"));
+        }
+        if ("4".equals(codeType)) {
+            logger.debug("editPaySet prePay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getPrePaySet().getIsUse(), "isUse"));
+        }
+        if ("5".equals(codeType)) {
+            logger.debug("editPaySet wechatAppPay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppPaySet().getAppId(), "appId"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppPaySet().getAppSecret(), "appSecret"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppPaySet().getMerchantNum(), "merchantNum"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppPaySet().getApiKey(), "apiKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppPaySet().getIsUse(), "isUse"));
+        }
+        if ("6".equals(codeType)) {
+//            微信小程序
+            logger.debug("editPaySet wechatAppletPay...");
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getAppId(), "appId"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getAppSecret(), "appSecret"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getMerchantNum(), "merchantNum"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getApiKey(), "apiKey"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getIsUse(), "isUse"));
+            list.add(PaySet.getPaySet(new PaySet(), codeType, paySetCommon.getWechatAppletPaySet().getCertFile(), "certFile"));
+        }
+        return segchkPaySettingMapper.addPaySet(list);
+    }
+
+    /**
+     * 查询支付设置列表
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 支付设置
+     */
+    @Override
+    public List<SegchkPaySetting> selectLsPaySettingList(SegchkPaySetting segchkPaySetting) {
+        return segchkPaySettingMapper.selectLsPaySettingList(segchkPaySetting);
+    }
+
+    /**
+     * 新增支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    @Override
+    public int insertLsPaySetting(SegchkPaySetting segchkPaySetting) {
+        return segchkPaySettingMapper.insertLsPaySetting(segchkPaySetting);
+    }
+
+    /**
+     * 修改支付设置
+     *
+     * @param segchkPaySetting 支付设置
+     * @return 结果
+     */
+    @Override
+    public int updateLsPaySetting(SegchkPaySetting segchkPaySetting) {
+        return segchkPaySettingMapper.updateLsPaySetting(segchkPaySetting);
+    }
+
+    /**
+     * 批量删除支付设置
+     *
+     * @param ids 需要删除的支付设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsPaySettingByIds(Long[] ids) {
+        return segchkPaySettingMapper.deleteLsPaySettingByIds(ids);
+    }
+
+    /**
+     * 删除支付设置信息
+     *
+     * @param id 支付设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsPaySettingById(Long id) {
+        return segchkPaySettingMapper.deleteLsPaySettingById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsProvinceServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsProvinceServiceImpl.java
new file mode 100644
index 0000000..1e4fb0c
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsProvinceServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.setting.domain.LsProvince;
+import com.ruoyi.setting.mapper.LsProvinceMapper;
+import com.ruoyi.setting.service.ILsProvinceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 区域省Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsProvinceServiceImpl implements ILsProvinceService {
+    private static final Logger logger = LoggerFactory.getLogger(LsProvinceServiceImpl.class);
+    @Autowired
+    private LsProvinceMapper lsProvinceMapper;
+
+    /**
+     * 查询区域省
+     *
+     * @param id 区域省ID
+     * @return 区域省
+     */
+    @Override
+    public LsProvince selectLsProvinceById(Long id) {
+        return lsProvinceMapper.selectLsProvinceById(id);
+    }
+
+    /**
+     * 查询区域省列表
+     *
+     * @param lsProvince 区域省
+     * @return 区域省
+     */
+    @Override
+    public List<LsProvince> selectLsProvinceList(LsProvince lsProvince) {
+        return lsProvinceMapper.selectLsProvinceList(lsProvince);
+    }
+
+    /**
+     * 新增区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    @Override
+    public int insertLsProvince(LsProvince lsProvince) {
+        lsProvince.setCreateTime(DateUtils.getNowDate());
+        return lsProvinceMapper.insertLsProvince(lsProvince);
+    }
+
+    /**
+     * 修改区域省
+     *
+     * @param lsProvince 区域省
+     * @return 结果
+     */
+    @Override
+    public int updateLsProvince(LsProvince lsProvince) {
+        return lsProvinceMapper.updateLsProvince(lsProvince);
+    }
+
+    /**
+     * 批量删除区域省
+     *
+     * @param ids 需要删除的区域省ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsProvinceByIds(Long[] ids) {
+        return lsProvinceMapper.deleteLsProvinceByIds(ids);
+    }
+
+    /**
+     * 删除区域省信息
+     *
+     * @param id 区域省ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsProvinceById(Long id) {
+        return lsProvinceMapper.deleteLsProvinceById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSmsSettingServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSmsSettingServiceImpl.java
new file mode 100644
index 0000000..05430f0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSmsSettingServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.domain.LsSmsSetting;
+import com.ruoyi.setting.mapper.LsSmsSettingMapper;
+import com.ruoyi.setting.service.ILsSmsSettingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 短信接口设置Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+@Service
+public class LsSmsSettingServiceImpl implements ILsSmsSettingService {
+    private static final Logger logger = LoggerFactory.getLogger(LsSmsSettingServiceImpl.class);
+    @Autowired
+    private LsSmsSettingMapper lsSmsSettingMapper;
+
+    /**
+     * 查询短信接口设置
+     *
+     * @param id 短信接口设置ID
+     * @return 短信接口设置
+     */
+    @Override
+    public LsSmsSetting selectLsSmsSettingById(Long id) {
+        return lsSmsSettingMapper.selectLsSmsSettingById(id);
+    }
+
+    /**
+     * 查询短信接口设置列表
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 短信接口设置
+     */
+    @Override
+    public List<LsSmsSetting> selectLsSmsSettingList(LsSmsSetting lsSmsSetting) {
+        return lsSmsSettingMapper.selectLsSmsSettingList(lsSmsSetting);
+    }
+
+    /**
+     * 新增短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    @Override
+    public int insertLsSmsSetting(LsSmsSetting lsSmsSetting) {
+        return lsSmsSettingMapper.insertLsSmsSetting(lsSmsSetting);
+    }
+
+    /**
+     * 修改短信接口设置
+     *
+     * @param lsSmsSetting 短信接口设置
+     * @return 结果
+     */
+    @Override
+    public int updateLsSmsSetting(LsSmsSetting lsSmsSetting) {
+        return lsSmsSettingMapper.updateLsSmsSetting(lsSmsSetting);
+    }
+
+    /**
+     * 批量删除短信接口设置
+     *
+     * @param ids 需要删除的短信接口设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsSmsSettingByIds(Long[] ids) {
+        return lsSmsSettingMapper.deleteLsSmsSettingByIds(ids);
+    }
+
+    /**
+     * 删除短信接口设置信息
+     *
+     * @param id 短信接口设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsSmsSettingById(Long id) {
+        return lsSmsSettingMapper.deleteLsSmsSettingById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsStationLetterServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsStationLetterServiceImpl.java
new file mode 100644
index 0000000..d37857f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsStationLetterServiceImpl.java
@@ -0,0 +1,147 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.setting.domain.LsStationLetter;
+import com.ruoyi.setting.mapper.LsStationLetterMapper;
+import com.ruoyi.setting.service.ILsStationLetterService;
+import com.ruoyi.util.PageHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * 站内信Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsStationLetterServiceImpl implements ILsStationLetterService {
+    private static final Logger logger = LoggerFactory.getLogger(LsStationLetterServiceImpl.class);
+    @Autowired
+    private LsStationLetterMapper lsStationLetterMapper;
+
+    /**
+     * 查询站内信
+     *
+     * @param id 站内信ID
+     * @return 站内信
+     */
+    @Override
+    public LsStationLetter selectLsStationLetterById(Long id) {
+        return lsStationLetterMapper.selectLsStationLetterById(id);
+    }
+
+    /**
+     * 查询站内信列表
+     *
+     * @param lsStationLetter 站内信
+     * @return 站内信
+     */
+    @Override
+    public List<LsStationLetter> selectLsStationLetterList(LsStationLetter lsStationLetter) {
+        return lsStationLetterMapper.selectLsStationLetterList(lsStationLetter);
+    }
+
+    /**
+     * 新增站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    @Override
+    public int insertLsStationLetter(LsStationLetter lsStationLetter) {
+        lsStationLetter.setCreateTime(DateUtils.getNowDate());
+        return lsStationLetterMapper.insertLsStationLetter(lsStationLetter);
+    }
+
+    /**
+     * 修改站内信
+     *
+     * @param lsStationLetter 站内信
+     * @return 结果
+     */
+    @Override
+    public int updateLsStationLetter(LsStationLetter lsStationLetter) {
+        return lsStationLetterMapper.updateLsStationLetter(lsStationLetter);
+    }
+
+    /**
+     * 批量删除站内信
+     *
+     * @param ids 需要删除的站内信ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsStationLetterByIds(Long[] ids) {
+        return lsStationLetterMapper.deleteLsStationLetterByIds(ids);
+    }
+
+
+    @Override
+    public int addStationLetters(List<LsStationLetter> stationLetters) {
+        logger.debug("addStationLetters and stationLetters:{}", stationLetters);
+
+        if (CollectionUtils.isEmpty(stationLetters)) {
+            logger.error("addStationLetters fail due to params is null...");
+            return 0;
+        }
+        return lsStationLetterMapper.addStationLetters(stationLetters);
+    }
+
+    /**
+     * 删除站内信
+     *
+     * @param id 站内信id
+     * @return 成功返回1，失败返回0
+     */
+    @Override
+    public int deleteStationLetters(long id) {
+        logger.debug("deleteStationLetters and id :{}", id);
+        return lsStationLetterMapper.deleteStationLetters(id);
+    }
+
+    /**
+     * 更新会员的站内信的阅读状态
+     *
+     * @param id 站内信id
+     * @return 成功返回1，失败返回0
+     */
+    @Override
+    public int updateStationLettersIsRead(long id, long customerId) {
+        logger.debug("updateStationLettersIsRead and id :{} \r\n customerId:{}", id, customerId);
+        Map<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        params.put("customerId", customerId);
+        return lsStationLetterMapper.updateStationLettersIsRead(params);
+    }
+
+    @Override
+    public PageHelper<LsStationLetter> queryStationLettersByCustomerId(PageHelper<LsStationLetter> pageHelper, long customerId) {
+        logger.debug("queryStationLettersByCustomerId and customerId:{} and pageHelper:{}", customerId, pageHelper);
+        Map<String, Object> params = new HashMap<>();
+        params.put("customerId", customerId);
+        return pageHelper.setListDates(lsStationLetterMapper.queryStationLettersByCustomerId(pageHelper.getQueryParams(params, lsStationLetterMapper.queryStationLettersCountByCustomerId(params))));
+    }
+
+    @Override
+    public int unReadNum(long customerId) {
+        logger.debug("unReadNum and customerId:{}", customerId);
+        return lsStationLetterMapper.unReadNum(customerId);
+    }
+
+    /**
+     * 删除站内信信息
+     *
+     * @param id 站内信ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsStationLetterById(Long id) {
+        return lsStationLetterMapper.deleteLsStationLetterById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSystemSeoServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSystemSeoServiceImpl.java
new file mode 100644
index 0000000..8c9622b
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsSystemSeoServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.domain.LsSystemSeo;
+import com.ruoyi.setting.mapper.LsSystemSeoMapper;
+import com.ruoyi.setting.service.ILsSystemSeoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 系统seo设置Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsSystemSeoServiceImpl implements ILsSystemSeoService {
+    private static final Logger logger = LoggerFactory.getLogger(LsSystemSeoServiceImpl.class);
+    @Autowired
+    private LsSystemSeoMapper lsSystemSeoMapper;
+
+    /**
+     * 查询系统seo设置
+     *
+     * @param id 系统seo设置ID
+     * @return 系统seo设置
+     */
+    @Override
+    public LsSystemSeo selectLsSystemSeoById(Long id) {
+        return lsSystemSeoMapper.selectLsSystemSeoById(id);
+    }
+
+    /**
+     * 查询系统seo设置列表
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 系统seo设置
+     */
+    @Override
+    public List<LsSystemSeo> selectLsSystemSeoList(LsSystemSeo lsSystemSeo) {
+        return lsSystemSeoMapper.selectLsSystemSeoList(lsSystemSeo);
+    }
+
+    /**
+     * 新增系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    @Override
+    public int insertLsSystemSeo(LsSystemSeo lsSystemSeo) {
+        return lsSystemSeoMapper.insertLsSystemSeo(lsSystemSeo);
+    }
+
+    /**
+     * 修改系统seo设置
+     *
+     * @param lsSystemSeo 系统seo设置
+     * @return 结果
+     */
+    @Override
+    public int updateLsSystemSeo(LsSystemSeo lsSystemSeo) {
+        return lsSystemSeoMapper.updateLsSystemSeo(lsSystemSeo);
+    }
+
+    /**
+     * 批量删除系统seo设置
+     *
+     * @param ids 需要删除的系统seo设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsSystemSeoByIds(Long[] ids) {
+        return lsSystemSeoMapper.deleteLsSystemSeoByIds(ids);
+    }
+
+    /**
+     * 删除系统seo设置信息
+     *
+     * @param id 系统seo设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsSystemSeoById(Long id) {
+        return lsSystemSeoMapper.deleteLsSystemSeoById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsWxCustomerLinkServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsWxCustomerLinkServiceImpl.java
new file mode 100644
index 0000000..92d1bd5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/LsWxCustomerLinkServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.domain.LsWxCustomerLink;
+import com.ruoyi.setting.mapper.LsWxCustomerLinkMapper;
+import com.ruoyi.setting.service.ILsWxCustomerLinkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 微信登录和商城用户的关联Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-29
+ */
+@Service
+public class LsWxCustomerLinkServiceImpl implements ILsWxCustomerLinkService {
+    private static final Logger logger = LoggerFactory.getLogger(LsWxCustomerLinkServiceImpl.class);
+    @Autowired
+    private LsWxCustomerLinkMapper lsWxCustomerLinkMapper;
+
+    /**
+     * 查询微信登录和商城用户的关联
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 微信登录和商城用户的关联
+     */
+    @Override
+    public LsWxCustomerLink selectLsWxCustomerLinkById(Long id) {
+        return lsWxCustomerLinkMapper.selectLsWxCustomerLinkById(id);
+    }
+
+    /**
+     * 查询微信登录和商城用户的关联列表
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 微信登录和商城用户的关联
+     */
+    @Override
+    public List<LsWxCustomerLink> selectLsWxCustomerLinkList(LsWxCustomerLink lsWxCustomerLink) {
+        return lsWxCustomerLinkMapper.selectLsWxCustomerLinkList(lsWxCustomerLink);
+    }
+
+    /**
+     * 新增微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    @Override
+    public int insertLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink) {
+        return lsWxCustomerLinkMapper.insertLsWxCustomerLink(lsWxCustomerLink);
+    }
+
+    /**
+     * 修改微信登录和商城用户的关联
+     *
+     * @param lsWxCustomerLink 微信登录和商城用户的关联
+     * @return 结果
+     */
+    @Override
+    public int updateLsWxCustomerLink(LsWxCustomerLink lsWxCustomerLink) {
+        return lsWxCustomerLinkMapper.updateLsWxCustomerLink(lsWxCustomerLink);
+    }
+
+    /**
+     * 批量删除微信登录和商城用户的关联
+     *
+     * @param ids 需要删除的微信登录和商城用户的关联ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsWxCustomerLinkByIds(Long[] ids) {
+        return lsWxCustomerLinkMapper.deleteLsWxCustomerLinkByIds(ids);
+    }
+
+    /**
+     * 删除微信登录和商城用户的关联信息
+     *
+     * @param id 微信登录和商城用户的关联ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLsWxCustomerLinkById(Long id) {
+        return lsWxCustomerLinkMapper.deleteLsWxCustomerLinkById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/OssServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/OssServiceImpl.java
new file mode 100644
index 0000000..6c743c9
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/OssServiceImpl.java
@@ -0,0 +1,89 @@
+package com.ruoyi.setting.service.impl;
+
+
+import com.ruoyi.setting.bean.OssSetting;
+import com.ruoyi.setting.bean.UploadData;
+import com.ruoyi.setting.mapper.OssMapper;
+import com.ruoyi.setting.service.OssService;
+import com.ruoyi.util.YunUploadUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+
+/**
+ * Created by luozhuo on 2020/7/7.
+ * 云存储服务实现类
+ */
+@Service
+public class OssServiceImpl implements OssService {
+
+    private Logger logger = LoggerFactory.getLogger(OssServiceImpl.class);
+
+    @Autowired
+    private OssMapper ossMapper;
+
+    @Override
+    public List<String> uploadToQqOss(List<UploadData> uploadDatas) {
+        logger.debug("Begin to uploadToQqOss....");
+        if (CollectionUtils.isEmpty(uploadDatas)) {
+            logger.error("uploadDatas fail  due to params is empty...");
+            return Arrays.asList("");
+        }
+        return uploadDatas.stream().filter(Objects::nonNull).map(uploadData -> YunUploadUtils.getInstance().uploadToQqOss(queryOssSetting().getUpYunConf(), uploadData.getMultipartFile(), uploadData.getDatas(), uploadData.getFileOriginName(), uploadData.getType())).collect(Collectors.toList());
+
+    }
+
+    @Override
+    public List<String> uploadToQqOssForBase64(List<UploadData> uploadDatas) {
+        if (CollectionUtils.isEmpty(uploadDatas)) {
+            logger.error("uploadToQqOssForBase64 fail  due to params is empty...");
+            return Arrays.asList("");
+        }
+        return uploadDatas.stream().filter(Objects::nonNull).map(uploadData -> YunUploadUtils.getInstance().
+                uploadToQqForBase64(queryOssSetting().getUpYunConf(), uploadData.getInputStream(), uploadData.getDatas(), uploadData.getFileOriginName())).collect(Collectors.toList());
+
+    }
+
+    @Override
+    public List<String> uploadToOss(List<UploadData> uploadDatas) {
+        logger.debug("Begin to uploadToOss....");
+        if (CollectionUtils.isEmpty(uploadDatas)) {
+            logger.error("uploadDatas fail  due to params is empty...");
+            return Arrays.asList("");
+        }
+        return uploadDatas.stream().filter(Objects::nonNull).map(uploadData -> YunUploadUtils.getInstance().uploadToOssYun(queryOssSetting().getUpYunConf(), uploadData.getInputStream(), uploadData.getDatas(), uploadData.getFileOriginName(), uploadData.getType())).collect(Collectors.toList());
+
+    }
+
+    @Override
+    public List<String> uploadToOssForBase64(List<UploadData> uploadDatas) {
+        if (CollectionUtils.isEmpty(uploadDatas)) {
+            logger.error("uploadToOssForBase64 fail  due to params is empty...");
+            return Arrays.asList("");
+        }
+
+        return uploadDatas.stream().filter(Objects::nonNull).map(uploadData -> YunUploadUtils.getInstance().
+                uploadToQqForBase64(queryOssSetting().getUpYunConf(), uploadData.getInputStream(), uploadData.getDatas(), uploadData.getFileOriginName())).collect(Collectors.toList());
+
+    }
+
+    @Override
+    public OssSetting queryOssSetting() {
+        logger.debug("Begin to queryUpYunSetting....");
+        return ossMapper.queryOssSetting();
+    }
+
+    @Override
+    public int updateOss(OssSetting ossSetting) {
+        logger.error("updateOss and OssSetting:{}", ossSetting);
+        return ossMapper.updateOss(ossSetting);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/SCommunityBuySettingServiceImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/SCommunityBuySettingServiceImpl.java
new file mode 100644
index 0000000..f9e4330
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/service/impl/SCommunityBuySettingServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ruoyi.setting.service.impl;
+
+import com.ruoyi.setting.domain.SCommunityBuySetting;
+import com.ruoyi.setting.mapper.SCommunityBuySettingMapper;
+import com.ruoyi.setting.service.ISCommunityBuySettingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 社区团购设置Service业务层处理
+ *
+ * @author 魔金商城
+ * @date 2020-07-28
+ */
+@Service
+public class SCommunityBuySettingServiceImpl implements ISCommunityBuySettingService {
+    private static final Logger logger = LoggerFactory.getLogger(SCommunityBuySettingServiceImpl.class);
+    @Autowired
+    private SCommunityBuySettingMapper sCommunityBuySettingMapper;
+
+    /**
+     * 查询社区团购设置
+     *
+     * @param id 社区团购设置ID
+     * @return 社区团购设置
+     */
+    @Override
+    public SCommunityBuySetting selectSCommunityBuySettingById(Long id) {
+        return sCommunityBuySettingMapper.selectSCommunityBuySettingById(id);
+    }
+
+    /**
+     * 查询社区团购设置列表
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 社区团购设置
+     */
+    @Override
+    public List<SCommunityBuySetting> selectSCommunityBuySettingList(SCommunityBuySetting sCommunityBuySetting) {
+        return sCommunityBuySettingMapper.selectSCommunityBuySettingList(sCommunityBuySetting);
+    }
+
+    /**
+     * 新增社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    @Override
+    public int insertSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting) {
+        return sCommunityBuySettingMapper.insertSCommunityBuySetting(sCommunityBuySetting);
+    }
+
+    /**
+     * 修改社区团购设置
+     *
+     * @param sCommunityBuySetting 社区团购设置
+     * @return 结果
+     */
+    @Override
+    public int updateSCommunityBuySetting(SCommunityBuySetting sCommunityBuySetting) {
+        return sCommunityBuySettingMapper.updateSCommunityBuySetting(sCommunityBuySetting);
+    }
+
+    /**
+     * 批量删除社区团购设置
+     *
+     * @param ids 需要删除的社区团购设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSCommunityBuySettingByIds(Long[] ids) {
+        return sCommunityBuySettingMapper.deleteSCommunityBuySettingByIds(ids);
+    }
+
+    /**
+     * 删除社区团购设置信息
+     *
+     * @param id 社区团购设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSCommunityBuySettingById(Long id) {
+        return sCommunityBuySettingMapper.deleteSCommunityBuySettingById(id);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/AreaItem.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/AreaItem.java
new file mode 100644
index 0000000..fb9974a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/AreaItem.java
@@ -0,0 +1,9 @@
+package com.ruoyi.setting.vo;
+
+/**
+ * Created by 魔金商城 on 17/11/21.
+ * 区域枚举
+ */
+public enum AreaItem {
+    CITY, DISTRICT, NO, ALL
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/Locality.java b/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/Locality.java
new file mode 100644
index 0000000..42e40f7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/setting/vo/Locality.java
@@ -0,0 +1,89 @@
+package com.ruoyi.setting.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author 魔金商城
+ * @date 2019-12-04 15:09
+ * <p>
+ * 地区新数据接口实体
+ */
+@ApiModel(description = "地区新数据接口实体")
+public class Locality {
+
+
+    /**
+     * 地区名称
+     */
+    @ApiModelProperty(value = "地区名称")
+    private String name;
+
+
+    /**
+     * 数据真实主键ID
+     */
+    @ApiModelProperty(value = "数据真实主键ID")
+    private String id;
+
+
+    /**
+     * 临时Id字串 保证唯一
+     */
+    @ApiModelProperty(value = "临时Id字串 保证唯一")
+    private String value;
+
+
+    /**
+     * 父类的临时字串  一级为0
+     */
+    @ApiModelProperty(value = "父类的临时字串  一级为0")
+    private String parent;
+
+
+    /**
+     * 重写全参构造
+     *
+     * @param name   地区名称
+     * @param value  ID
+     * @param parent 父类ID  一级为0
+     */
+    public Locality(String name, String value, String parent, long id) {
+        this.name = name;
+        this.value = value;
+        this.parent = parent;
+        this.id = String.valueOf(id);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getParent() {
+        return parent;
+    }
+
+    public void setParent(String parent) {
+        this.parent = parent;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/AesUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/AesUtils.java
new file mode 100644
index 0000000..5eddba5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/AesUtils.java
@@ -0,0 +1,82 @@
+package com.ruoyi.util;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.*;
+
+/**
+ * AES加密类
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class AesUtils {
+
+    {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    /**
+     * 获取对象
+     */
+    public static AesUtils getInstance() {
+        return LazyHolder.aesUtils;
+    }
+
+    // 生成iv
+    private static AlgorithmParameters generateIV(byte[] iv) throws Exception {
+        AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
+        params.init(new IvParameterSpec(iv));
+        return params;
+    }
+
+    /**
+     * AES对称解密工具类
+     *
+     * @param content 密文
+     * @return
+     * @throws InvalidAlgorithmParameterException
+     * @throws NoSuchProviderException
+     */
+    public byte[] decrypt(byte[] content, byte[] keyByte, byte[] ivByte) throws InvalidAlgorithmParameterException {
+        try {
+            // java是没有
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding", "BC");
+            Key sKeySpec = new SecretKeySpec(keyByte, "AES");
+
+            cipher.init(Cipher.DECRYPT_MODE, sKeySpec, generateIV(ivByte));// 初始化
+            byte[] result = cipher.doFinal(content);
+            return result;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        } catch (NoSuchProviderException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 延迟加载(线程安全)
+     */
+    private static class LazyHolder {
+        private static AesUtils aesUtils = new AesUtils();
+    }
+}
+
+
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/BaseResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/BaseResponse.java
new file mode 100644
index 0000000..7bc2a82
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/BaseResponse.java
@@ -0,0 +1,89 @@
+package com.ruoyi.util;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Created by 魔金商城 on 17/5/9.
+ * 分页基础响应类
+ */
+@ApiModel(description = "分页基础响应类")
+public class BaseResponse {
+
+
+    /**
+     * 返回的数据
+     */
+    @ApiModelProperty(value = "返回的数据")
+    private List data;
+    /**
+     * 总记录数
+     */
+    @ApiModelProperty(value = "总记录数")
+    private int recordsTotal;
+    /**
+     * 过滤后的记录数
+     */
+    @ApiModelProperty(value = "过滤后的记录数")
+    private int recordsFiltered;
+    /**
+     * 总的页数
+     */
+    @ApiModelProperty(value = "总的页数")
+    private int totalPage;
+
+    private BaseResponse() {
+
+    }
+
+    private BaseResponse(PageHelper pageHelper) {
+        this.data = pageHelper.getList();
+        this.recordsTotal = pageHelper.getRows();
+        this.recordsFiltered = pageHelper.getRows();
+        this.totalPage = pageHelper.getTotalPages();
+    }
+
+    /**
+     * 构造分页响应实体
+     *
+     * @param pageHelper 分页帮助类
+     * @return 返回分页响应实体
+     */
+    public static BaseResponse build(PageHelper pageHelper) {
+        return new BaseResponse(pageHelper);
+    }
+
+    public List getData() {
+        return data;
+    }
+
+    public void setData(List data) {
+        this.data = data;
+    }
+
+    public int getRecordsTotal() {
+        return recordsTotal;
+    }
+
+    public void setRecordsTotal(int recordsTotal) {
+        this.recordsTotal = recordsTotal;
+    }
+
+    public int getRecordsFiltered() {
+        return recordsFiltered;
+    }
+
+    public void setRecordsFiltered(int recordsFiltered) {
+        this.recordsFiltered = recordsFiltered;
+    }
+
+    public int getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/Claims.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/Claims.java
new file mode 100644
index 0000000..53a7ce4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/Claims.java
@@ -0,0 +1,132 @@
+package com.ruoyi.util;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by 魔金商城 on 2018/6/13.
+ * 小程序凭证实体
+ */
+public class Claims {
+
+    /**
+     * 小程序unionId
+     */
+    @JSONField(name = "unionId")
+    private String unionId;
+
+    /**
+     * 会员id
+     */
+    @JSONField(name = "userId")
+    private Long userId;
+
+    /**
+     * 小程序sessionKey
+     */
+    @JSONField(name = "sessionKey")
+    private String sessionKey;
+
+    /**
+     * 微信用户标识
+     */
+    @JSONField(name = "openId")
+    private String openId;
+
+    /**
+     * 用户角色
+     */
+    @JSONField(name = "userLevel")
+    private int userLevel;
+
+    /**
+     * 归属运营商id
+     */
+    @JSONField(name = "providerId")
+    private Long providerId;
+
+
+
+
+    /**
+     * 判断是否有unionId
+     *
+     * @return 有返回true  没有返回fasle
+     */
+    public boolean hasUnionId() {
+        return !StringUtils.isEmpty(this.unionId);
+    }
+
+    /**
+     * 判断是否有会员id
+     *
+     * @return 有返回true  没有返回false
+     */
+    public boolean hasCustomerId() {
+        return CommonConstant.NO_LOGIN_CUSTOMERID != this.userId;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public String getSessionKey() {
+        return sessionKey;
+    }
+
+    public void setSessionKey(String sessionKey) {
+        this.sessionKey = sessionKey;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setUserLevel(int userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    @Override
+    public String toString() {
+        return "Claims{" +
+                "unionId='" + unionId + '\'' +
+                ", userId=" + userId +
+                ", sessionKey='" + sessionKey + '\'' +
+                ", openId='" + openId + '\'' +
+                ", userLevel=" + userLevel +
+                ", providerId=" + providerId +
+                '}';
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public int getUserLevel() {
+        return userLevel;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonConstant.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonConstant.java
new file mode 100644
index 0000000..83c3599
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonConstant.java
@@ -0,0 +1,310 @@
+package com.ruoyi.util;
+
+/**
+ * Created by 魔金商城 on 17/5/2.
+ * 公共常量类
+ */
+public interface CommonConstant {
+
+    /**
+     * 开始页
+     */
+    String START_ROW_NUM = "startRowNum";
+
+    /**
+     * 每页大小
+     */
+    String PAGE_SIZE = "pageSize";
+
+    /**
+     * store端session放置手机验证码的key(代客下单)
+     */
+    String STORE_SHOPPING_CODE_KEY = "STORE_SHOPPING_CODE_KEY";
+
+    /**
+     * store端session放置验证标记key(代客下单)
+     */
+    String STORE_SHOPPING_MOBILE_KEY = "STORE_SHOPPING_VALIDFLAG_KEY";
+
+    /**
+     * 加号替换
+     */
+    String PLUS_REPLACE = "5lec2shop0";
+    /**
+     * 从pc端发出
+     */
+    String FROM_PC = "FROM_PC";
+
+    /**
+     * admin端店铺id默认值0
+     */
+    long ADMIN_STOREID = 0;
+
+    /**
+     * 查询的时候不需要带店铺id过滤
+     */
+    long QUERY_WITH_NO_STORE = -1;
+
+    /**
+     * 查询的收货不需要带用户id进行过滤
+     */
+    long QUERY_WITH_NO_CUSTOMER = -1;
+
+    /**
+     * 评论、回复不根据ISSHOW显示
+     */
+    long QUERY_WITH_NO_ISSHOW = -1;
+    /**
+     * 评论、回复根据ISSHOW显示
+     */
+    long QUERY_WITH_ISSHOW = 1;
+
+    /**
+     * 主题不根据ISUSE显示
+     */
+    long QUERY_WITH_NO_ISUSE = -1;
+    /**
+     * 主题根据ISUSE显示
+     */
+    long QUERY_WITH_ISUSE = 1;
+    /**
+     * 文章不根据columnId显示
+     */
+    long QUERY_WITH_NO_COLUMNID = -1;
+    /**
+     * 文章根据ISRELEASE显示
+     */
+    long QUERY_WITH_ISRELEASE = 1;
+    /**
+     * 验证通过标记
+     */
+    String PASS_FLAG = "PASS";
+
+    /**
+     * 未登录状态下的会员id
+     */
+    long NO_LOGIN_CUSTOMERID = -1;
+
+    /**
+     * 登录成功后把用户信息放入session的key
+     */
+    String MOBILE_LOGIN_SESSION_KEY = "MOBILE_LOGIN_SESSION_KEY";
+
+    /**
+     * 微信授权后把openId放入session的key(微信内置浏览器)
+     */
+    String MOBILE_OPENID_SESSION_KEY = "MOBILE_OPENID_SESSION_KEY";
+    /**
+     * 微信授权后把unionId放入session的key(微信内置浏览器)
+     */
+    String MOBILE_UNIONID_SESSION_KEY = "MOBILE_UNIONID_SESSION_KEY";
+
+    /**
+     * mobile端session放置手机验证码的key(注册)
+     */
+    String MOBILE_REGISTER_CODE_KEY = "MOBILE_REGISTER_CODE_KEY";
+
+    /**
+     * mobile端session放置手机验证码的key(忘记密码)
+     */
+    String MOBILE_FORGETPWD_CODE_KEY = "MOBILE_FORGETPWD_CODE_KEY";
+    /**
+     * mobile端session放置手机验证码的key(绑定新手机_旧手机验证码)
+     */
+    String MOBILE_BINDNEWMOBILE_CODE_KEY = "MOBILE_BINDNEWMOBILE_CODE_KEY";
+    /**
+     * mobile端session放置手机验证码的key(绑定新手机_新手机验证码)
+     */
+    String MOBILE_BINDNEWMOBILE_NEWMOBILE_CODE_KEY = "MOBILE_BINDNEWMOBILE_NEWMOBILE_CODE_KEY";
+    /**
+     * mobile端session放置验证标记key(绑定新手机)
+     */
+    String MOBILE_BINDNEWMOBILE_VALIDFLAG_KEY = "MOBILE_BINDNEWMOBILE_VALIDFLAG_KEY";
+    /**
+     * mobile端session放置手机验证码的key(更新支付密码)
+     */
+    String MOBILE_UPDATEPAYPWD_CODE_KEY = "MOBILE_UPDATEPAYPWD_CODE_KEY";
+    /**
+     * mobile端session放置手机验证码的key(更新密码)
+     */
+    String MOBILE_UPDATEPWD_CODE_KEY = "MOBILE_UPDATEPWD_CODE_KEY";
+    /**
+     * 订单支付
+     */
+    int ORDER_PAY = 1;
+
+    /**
+     * 门店订单支付
+     */
+    int STORE_ORDER_PAY = 3;
+
+    /**
+     * 预存款充值
+     */
+    int RECHARGE_PAY = 2;
+
+    /**
+     * 支付宝支付
+     */
+    String ALI_PAY = "支付宝";
+    /**
+     * 微信支付
+     */
+    String WECHAT_PAY = "微信";
+    /**
+     * 银联支付
+     */
+    String UNION_PAY = "银联";
+
+    /**
+     * 抢购代号
+     */
+    String PANIC_BUY = "3";
+
+    /**
+     * 未过期的活动标记
+     */
+    String NOT_PAST = "999";
+
+    /**
+     * 没有用户id
+     */
+    long NO_CUSTOMER_ID = -1;
+
+    /**
+     * 还没使用抢购
+     */
+    int NO_USE_PANIC = -1;
+
+    /**
+     * 没有抢购促销
+     */
+    int NO_PANIC_MARKETING = -2;
+
+    /**
+     * 没有商品试用申请
+     */
+    int NO_SKU_TRY_APPLY = -1;
+
+    /**
+     * 平台关注人数
+     */
+    int ADMIN_FOLLOW_NUM = 10000;
+
+
+    /**
+     * 小程序端redis放置手机验证码的key(注册)
+     */
+    String APPLET_REGISTER_CODE_KEY = "APPLET_REGISTER_CODE_KEY";
+
+    /**
+     * 小程序端redis短信验证测试key
+     */
+    String SMS_TEST_KEY = "APPLET_TEST_KEY";
+
+    /**
+     * 小程序端redis放置登录的key(注册登录)
+     */
+    String APPLET_LOGIN_KEY = "APPLET_LOGIN_KEY";
+    String APPLET_BIND_OPENID = "APPLET_BIND_OPENID";
+
+    String APPLET_SERVICE_CHK = "APPLET_SERVICE_CHK";
+
+
+    /**
+     * 与会员价互斥
+     */
+    long MEMBER_PRICE_EXCLUSION = 2L;
+
+    /**
+     * 与商品组合互斥
+     */
+    long COMBINATION_EXCLUSION = 1L;
+
+    /**
+     * 与批发单品互斥
+     */
+    long BATCH_SKU_EXCLUSION = 3L;
+
+
+    /**
+     * 上传的图片
+     */
+    String UPLOAD_PIC = "0";
+
+    /**
+     * 门店订单
+     */
+    String STORE_ORDER = "1";
+
+    /**
+     * 普通订单
+     */
+    String ORDINARY_ORDER = "2";
+
+    /**
+     * 预存款订单
+     */
+    String PREALSE_ORDER = "3";
+
+    /**
+     * 二级分销
+     */
+    String SECOND_COMMISSION_LEVEL = "2";
+
+    /**
+     * 抢购促销图片类型
+     */
+    String PANIC_MARKETING_PIC_TYPE = "1";
+
+    /**
+     * 预售促销图片类型
+     */
+    String PRESALE_MARKETING_PIC_TYPE = "2";
+
+    /**
+     * 拼团促销图片类型
+     */
+    String GROUP_MARKETING_PIC_TYPE = "3";
+
+    /**
+     * 试用促销图片类型
+     */
+    String TRY_MARKETING_PIC_TYPE = "4";
+
+    /**
+     * 秒杀促销显示
+     */
+    String PANIC_SHOW = "1";
+
+    /**
+     * 秒杀促销不显示
+     */
+    String PANIC_NOT_SHOW = "0";
+
+    /**
+     * 预售分类
+     */
+    String PRESALE_MARKETING_CATE = "1";
+
+    /**
+     * 拼团分类
+     */
+    String GROUP_MARKETING_CATE = "2";
+
+    /**
+     * 试用分类
+     */
+    String TRY_MARKETING_CATE = "3";
+
+    /**
+     * 定金预售类型
+     */
+    String DEPOSIT_PRESALE_TYPE = "1";
+
+    /**
+     * 全款预售类型
+     */
+    String FULL_PRESALE_TYPE = "2";
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonResponse.java
new file mode 100644
index 0000000..db7a516
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/CommonResponse.java
@@ -0,0 +1,73 @@
+package com.ruoyi.util;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Created by 魔金商城 on 17/12/1.
+ * 通用返回对象
+ */
+@ApiModel(description = "通用返回对象")
+public class CommonResponse<T> {
+
+    /**
+     * 返回码 1 成功 其他失败   默认0没有数据
+     */
+    @ApiModelProperty(value = "返回码 1 成功 其他失败   默认0没有数据")
+    private int flag = 0;
+
+    /**
+     * 数据
+     */
+    @ApiModelProperty(value = "数据")
+    private T data;
+
+
+    /**
+     * 构造返回对象
+     *
+     * @param t 返回的对象
+     * @return 返回的对象
+     */
+    public static <T> CommonResponse build(T t) {
+        CommonResponse<T> commonResponse = new CommonResponse<>();
+        // 没有数据
+        if (ObjectUtils.isEmpty(t)) {
+            return commonResponse;
+        }
+        commonResponse.flag = 1;
+        commonResponse.data = t;
+        return commonResponse;
+    }
+
+    /**
+     * 构造返回对象
+     *
+     * @param t    返回的对象
+     * @param code 返回码
+     * @return 返回的对象
+     */
+    public static <T> CommonResponse<T> build(T t, int code) {
+        CommonResponse<T> commonResponse = new CommonResponse<>();
+        commonResponse.flag = code;
+        commonResponse.data = t;
+        return commonResponse;
+    }
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public void setFlag(int flag) {
+        this.flag = flag;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/CustomHttpUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/CustomHttpUtils.java
new file mode 100644
index 0000000..549613d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/CustomHttpUtils.java
@@ -0,0 +1,349 @@
+package com.ruoyi.util;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 自定义http工具类
+ *
+ * @author 魔金商城 created on 2020/4/14
+ */
+public class CustomHttpUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(CustomHttpUtils.class);
+    /**
+     * 执行GET方法请求数据
+     *
+     * @param url 请求地址
+     * @return 返回数据
+     */
+    public static String doGet(String url) {
+        logger.debug("CustomHttpUtils.doGet and url:{}", url);
+        return getResult(getHttpClient(), new HttpGet(url));
+    }
+
+    /**
+     * 执行POST方法form方式请求数据
+     *
+     * @param url    请求地址
+     * @param params 请求参数
+     * @return 返回数据
+     */
+    public static String postForm(String url, Map<String, String> params) {
+        logger.debug("CustomHttpUtils.postForm and url:{} \r\n params:{}", url, params);
+        return getFormRequestResult(getHttpClient(), new HttpPost(url), params);
+    }
+
+
+    /**
+     * 执行POST方法json方式请求数据
+     *
+     * @param url        请求地址
+     * @param jsonString 请求参数（json字符串）
+     * @return 返回数据
+     */
+    public static String postJson(String url, String jsonString) {
+        logger.debug("CustomHttpUtils.postJson and url:{} \r\n jsonString:{}", url, jsonString);
+        return getJsonRequestResult(jsonString, getHttpClient(), new HttpPost(url));
+    }
+
+
+    /**
+     * 执行DELETE方法请求数据
+     *
+     * @param url 请求地址
+     * @return 返回数据
+     */
+    public static String doDelete(String url) {
+        logger.debug("CustomHttpUtils.doDelete and url:{}", url);
+        return getResult(getHttpClient(), new HttpDelete(url));
+    }
+
+
+    /**
+     * 执行put方法form方式请求数据
+     *
+     * @param url    请求地址
+     * @param params 请求参数
+     * @return 返回数据
+     */
+    public static String putForm(String url, Map<String, String> params) {
+        logger.debug("CustomHttpUtils.putForm and url:{} \r\n params:{}", url, params);
+        return getFormRequestResult(getHttpClient(), new HttpPut(url), params);
+    }
+
+
+    /**
+     * 执行put方法json方式请求数据
+     *
+     * @param url        请求地址
+     * @param jsonString 请求参数（json字符串）
+     * @return 返回数据
+     */
+    public static String putJson(String url, String jsonString) {
+        logger.debug("CustomHttpUtils.putJson and url:{} \r\n jsonString:{}", url, jsonString);
+        return getJsonRequestResult(jsonString, getHttpClient(), new HttpPut(url));
+    }
+
+
+    /**
+     * 从cookie中获取token
+     */
+    public static String getTokenFromCookie() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = "";
+        Cookie[] cookies = request.getCookies();
+        if (Objects.isNull(cookies)) {
+            return "";
+        }
+        for (Cookie temp : cookies) {
+            if (temp.getName().equals("Authorization")) {
+                token = temp.getValue();
+            }
+        }
+        return token;
+    }
+
+    /**
+     * 从header中获取token
+     */
+    public static String getTokenFromHeader() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = "";
+        // 认证信息在header 中的key
+        final String authHeader = request.getHeader("Authorization");
+        if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer ")) {
+            logger.info("getToken from header fail....");
+        } else {
+            token = authHeader.substring(7);
+        }
+        return token;
+    }
+
+    /**
+     * 通用获取token(如果request头中有Auth信息，则返回头中的token，否则返回cookie中的token)
+     *
+     * @return token
+     */
+    private static String getTokenCommon() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        if (!StringUtils.isEmpty(request.getHeader("Authorization"))) {
+            logger.info("getTokenCommon:getAuthorization from header is not empty");
+            return getTokenFromHeader();
+        }
+        return getTokenFromCookie();
+    }
+
+//    /**
+//     * 从token获取userName
+//     *
+//     * @param token     token
+//     * @param publicKey 公钥
+//     * @return userName
+//     */
+//    public static String getUserNameFromToken(String token, String publicKey) {
+//        log.debug("getUserNameFromToken and token:{} \r\n publicKey:{}", token, publicKey);
+//        if (StringUtils.isEmpty(token)) {
+//            return "";
+//        }
+//        Jwt jwt = null;
+//        try {
+//            SignatureVerifier verifier = new RsaVerifier(publicKey);
+//            jwt = JwtHelper.decodeAndVerify(token, verifier);
+//        } catch (Exception e) {
+//            log.error(e.getMessage());
+//        }
+//        if (Objects.nonNull(jwt)) {
+//            log.debug("getUserNameFromToken and claims:{}", jwt.getClaims());
+//            JSONObject claims = JSONObject.parseObject(jwt.getClaims());
+//            // 判断有效期是否过期
+//            if (Long.parseLong(claims.getString("exp")) > new Date().getTime() / 1000) {
+//                return claims.getString("user_name");
+//            }
+//        }
+//        return "";
+//    }
+
+    /**
+     * 下载文件
+     *
+     * @param out 输出流
+     * @param url 文件地址
+     */
+    public static void downLoadFile(OutputStream out, String url) {
+        logger.debug("downLoadFile and url:{}", url);
+        if (StringUtils.isEmpty(url)) {
+            logger.debug("downLoadFile fail : url is empty");
+            return;
+        }
+        InputStream inputStream = null;
+        try {
+            inputStream = getInputStreamResultFormUrl(url);
+            int b = 0;
+            byte[] buffer = new byte[512];
+            while (b != -1) {
+                b = inputStream.read(buffer);
+                //4.写到输出流(out)中
+                out.write(buffer, 0, b);
+            }
+
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+                out.close();
+                out.flush();
+            } catch (IOException e) {
+                logger.error(e.getMessage());
+            }
+        }
+    }
+
+    public static InputStream getInputStreamResultFormUrl(String url) throws IOException {
+        return getInputStreamResult(getHttpClient(), new HttpGet(url));
+    }
+
+    /**
+     * 设置下载信息
+     *
+     * @param response 返回
+     * @param fileName 文件名
+     */
+    public static void setDownloadInfo(HttpServletResponse response, String fileName) {
+        //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型
+        response.setContentType("multipart/form-data");
+        //2.设置文件头：最后一个参数是设置下载文件
+        response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
+    }
+
+    /**
+     * 获取httpClient
+     */
+    private static HttpClient getHttpClient() {
+        BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        return HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+    }
+
+
+    /**
+     * 获取json请求返回值
+     *
+     * @param jsonString  请求参数
+     * @param httpClient  http客户端
+     * @param httpRequest 请求对象
+     * @return 请求返回
+     */
+    private static String getJsonRequestResult(String jsonString, HttpClient httpClient, HttpEntityEnclosingRequestBase httpRequest) {
+        String result = null;
+        //设置token
+//        httpRequest.setHeader("Authorization", "Bearer " + getTokenCommon());
+        httpRequest.setHeader("Content-type", "application/json; charset=utf-8");
+        StringEntity requestParam = new StringEntity(jsonString, "UTF-8");
+        requestParam.setContentType("application/json");
+        try {
+            httpRequest.setEntity(requestParam);
+            result = EntityUtils.toString(httpClient.execute(httpRequest).getEntity(), "UTF-8");//取出应答字符串
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+        }
+        logger.debug("getJsonRequestResult and result:{}", result == null ? "" : result);
+        return result;
+    }
+
+    /**
+     * 获取form请求返回值
+     *
+     * @param formParam   请求参数
+     * @param httpClient  http客户端
+     * @param httpRequest 请求对象
+     * @return 请求返回
+     */
+    private static String getFormRequestResult(HttpClient httpClient, HttpEntityEnclosingRequestBase httpRequest, Map<String, String> formParam) {
+        String result = null;
+        List<NameValuePair> params = new ArrayList<>();
+        if (Objects.nonNull(formParam)) {
+            formParam.forEach((key, value) -> params.add(new BasicNameValuePair(key, value)));
+        }
+//        httpRequest.setHeader("Authorization", "Bearer " + getTokenCommon());
+        try {
+            httpRequest.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
+            result = EntityUtils.toString(httpClient.execute(httpRequest).getEntity(), "UTF-8");//取出应答字符串
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+        }
+        logger.debug("getFormRequestResult and result:{}", result == null ? "" : result);
+        return result;
+    }
+
+    /**
+     * 获取http请求返回
+     *
+     * @param httpClient  http客户端
+     * @param httpRequest 请求对象
+     * @return 请求返回
+     */
+    private static String getResult(HttpClient httpClient, HttpUriRequest httpRequest) {
+        String result = null;
+//        httpRequest.setHeader("Authorization", "Bearer " + getTokenCommon());
+        try {
+            result = EntityUtils.toString(httpClient.execute(httpRequest).getEntity(), Charset.forName("utf-8"));//取出应答字符串
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+        }
+        logger.debug("getResult and result:{}", result == null ? "" : result);
+        return result;
+    }
+
+    /**
+     * 获取http请求输入流返回
+     *
+     * @param httpClient  http客户端
+     * @param httpRequest 请求对象
+     * @return 请求返回
+     */
+    private static InputStream getInputStreamResult(HttpClient httpClient, HttpUriRequest httpRequest) throws IOException {
+        return httpClient.execute(httpRequest).getEntity().getContent();
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/Express100Utils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/Express100Utils.java
new file mode 100644
index 0000000..2ee1b61
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/Express100Utils.java
@@ -0,0 +1,47 @@
+package com.ruoyi.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 快递100工具类
+ */
+public class Express100Utils {
+
+    /**
+     * 快递100获取查询地址的接口地址
+     */
+    private final static String KUAIDI_URL = "https://www.kuaidi100.com/chaxun?com=%s&nu=%s";
+    /**
+     * H5查询物流信息地址
+     */
+    private final static String H5_KUAIDI_URL = "https://m.kuaidi100.com/app/query/?coname=lecshop&com=%s&nu=%s&callbackurl=%s";
+    /**
+     * 日志
+     */
+    static Logger logger = LoggerFactory.getLogger(Express100Utils.class);
+
+    /**
+     * 获得htmlapi的快递查询地址
+     *
+     * @param express100Code 快递代号
+     * @param waybillCode    运单号
+     */
+    public static String getHtmlApiURl(String express100Code, String waybillCode) {
+        logger.debug("getHtmlApiURl and express100Code:{} \r\n waybillCode:{}", express100Code, waybillCode);
+        return String.format(KUAIDI_URL, express100Code, waybillCode);
+    }
+
+    /**
+     * 生成H5查询物流信息url
+     *
+     * @param express100Code 快递代号
+     * @param waybillCode    运单号
+     * @param callBackUrl    回跳地址(http开头）
+     * @return h5物流信息url
+     */
+    public static String formatH5Url(String express100Code, String waybillCode, String callBackUrl) {
+        return String.format(H5_KUAIDI_URL, express100Code, waybillCode, callBackUrl);
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/Graphics2DUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/Graphics2DUtils.java
new file mode 100644
index 0000000..d012904
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/Graphics2DUtils.java
@@ -0,0 +1,110 @@
+package com.ruoyi.util;
+
+import com.ruoyi.common.utils.StringUtils;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+public class Graphics2DUtils {
+    /**
+     * 向画布上写文字
+     *
+     * @param g       Graphics2D对象
+     * @param color   颜色
+     * @param font    字体
+     * @param content 内容
+     * @param x       坐标x
+     * @param y       坐标y
+     */
+    public static void drawString(Graphics2D g, Color color, Font font, String content, float x, float y) {
+        g.setColor(color);
+        g.setFont(font);
+        g.drawString(content, x, y);
+    }
+
+    /**
+     * 向画布上写多行文字文字，自动居中
+     *
+     * @param g           Graphics2D对象
+     * @param color       颜色
+     * @param font        字体
+     * @param content     内容
+     * @param x           坐标X
+     * @param y           坐标y
+     * @param width       画布宽度
+     * @param lineWordNum 每行字数
+     * @param linePadding 行间距
+     * @param center      是否居中
+     */
+    public static void drawString(Graphics2D g, Color color, Font font, String content, float x, float y, int width, int lineWordNum, int linePadding, boolean center) {
+        int num = content.length();
+
+        ArrayList<String> contents = new ArrayList<>();
+        if (num <= lineWordNum) {
+
+            contents.add(content);
+        } else {
+            for (int i = 0; i < num; i += lineWordNum) {
+                contents.add(StringUtils.substring(content, i, i + lineWordNum));
+            }
+
+        }
+        for (int i = 0; i < contents.size(); i++) {
+            String s = contents.get(i);
+            if (i != 0) {
+                y += linePadding + font.getSize();
+            }
+            if (center) {
+                drawCenterString(g, color, font, s, width, y);
+            } else {
+                drawString(g, color, font, s, x, y);
+            }
+        }
+    }
+
+    /**
+     * 向画布上写多行文字文字，自动居中
+     *
+     * @param g           Graphics2D对象
+     * @param color       颜色
+     * @param font        字体
+     * @param content     内容
+     * @param y           坐标y
+     * @param width       画布宽度
+     * @param lineWordNum 每行字数
+     * @param linePadding 行间距
+     */
+    public static void drawCenterString(Graphics2D g, Color color, Font font, String content, float y, int width, int lineWordNum, int linePadding) {
+        drawString(g, color, font, content, 0, y, width, lineWordNum, linePadding, true);
+    }
+
+    /**
+     * 向画布上写文字，自动居中
+     *
+     * @param g       Graphics2D对象
+     * @param color   颜色
+     * @param font    字体
+     * @param content 内容
+     * @param width   画布宽度
+     * @param y       坐标y
+     */
+    public static void drawCenterString(Graphics2D g, Color color, Font font, String content, int width, float y) {
+        int textWidth = getStringWidth(g, font, content);
+
+        drawString(g, color, font, content, (width - textWidth) / 2, y);
+    }
+
+    /**
+     * 获取字符串内容的宽度
+     *
+     * @param g       Graphics2D对象
+     * @param font    字体
+     * @param content 内容
+     * @return
+     */
+    public static int getStringWidth(Graphics2D g, Font font, String content) {
+        FontMetrics fm = g.getFontMetrics(font);
+        //获取字符串宽度
+        return fm.stringWidth(content);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/JaxbUtil.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/JaxbUtil.java
new file mode 100644
index 0000000..d1c91f4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/JaxbUtil.java
@@ -0,0 +1,130 @@
+package com.ruoyi.util;
+
+
+import javax.xml.bind.*;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.namespace.QName;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Collection;
+
+
+/**
+ * xml转换工具类
+ */
+public class JaxbUtil {
+    // 多线程安全的Context.
+    private JAXBContext jaxbContext;
+
+    /**
+     * @param types 所有需要序列化的Root对象的类型.
+     */
+    public JaxbUtil(Class<?>... types) {
+        try {
+            jaxbContext = JAXBContext.newInstance(types);
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Java Object->Xml.
+     */
+    public String toXml(Object root, String encoding) {
+        try {
+            StringWriter writer = new StringWriter();
+            createMarshaller(encoding).marshal(root, writer);
+            return writer.toString();
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Java Object->Xml, 特别支持对Root Element是Collection的情形.
+     */
+    @SuppressWarnings("unchecked")
+    public String toXml(Collection root, String rootName, String encoding) {
+        try {
+            CollectionWrapper wrapper = new CollectionWrapper();
+            wrapper.collection = root;
+
+            JAXBElement<CollectionWrapper> wrapperElement = new JAXBElement<CollectionWrapper>(
+                    new QName(rootName), CollectionWrapper.class, wrapper);
+
+            StringWriter writer = new StringWriter();
+            createMarshaller(encoding).marshal(wrapperElement, writer);
+
+            return writer.toString();
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Xml->Java Object.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T fromXml(String xml) {
+        try {
+            StringReader reader = new StringReader(xml);
+            return (T) createUnmarshaller().unmarshal(reader);
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Xml->Java Object, 支持大小写敏感或不敏感.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T fromXml(String xml, boolean caseSensitive) {
+        try {
+            String fromXml = xml;
+            if (!caseSensitive)
+                fromXml = xml.toLowerCase();
+            StringReader reader = new StringReader(fromXml);
+            return (T) createUnmarshaller().unmarshal(reader);
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 创建Marshaller, 设定encoding(可为Null).
+     */
+    public Marshaller createMarshaller(String encoding) {
+        try {
+            Marshaller marshaller = jaxbContext.createMarshaller();
+
+            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+
+            if (!org.springframework.util.StringUtils.isEmpty(encoding)) {
+                marshaller.setProperty(Marshaller.JAXB_ENCODING, encoding);
+            }
+            return marshaller;
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 创建UnMarshaller.
+     */
+    public Unmarshaller createUnmarshaller() {
+        try {
+            return jaxbContext.createUnmarshaller();
+        } catch (JAXBException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 封装Root Element 是 Collection的情况.
+     */
+    public static class CollectionWrapper {
+        @SuppressWarnings("unchecked")
+        @XmlAnyElement
+        protected Collection collection;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/MarketingConstant.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/MarketingConstant.java
new file mode 100644
index 0000000..d1b21bd
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/MarketingConstant.java
@@ -0,0 +1,76 @@
+package com.ruoyi.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by 魔金商城 on 17/6/8.
+ * 促销常量类
+ */
+public interface MarketingConstant {
+
+    /**
+     * 直降促销
+     */
+    String FALL_MARKETING = "1";
+
+    /**
+     * 满赠
+     */
+    String FULL_GIFT_MARKETING = "2";
+
+    /**
+     * 抢购促销
+     */
+    String PANIC_BUY_MARKETING = "3";
+
+    /**
+     * 满减促销
+     */
+    String FULL_DOWN_MARKETING = "4";
+
+    /**
+     * 满折促销
+     */
+    String FULL_DISCOUNT_MARKETING = "5";
+
+    /**
+     * 包邮促销
+     */
+    String FREE_SHIP_MARKETING = "6";
+
+    /**
+     * 定金预售
+     */
+    String DEPOSIT_PRE_SALE_MARKETING = "7";
+
+    /**
+     * 全款预售
+     */
+    String FULL_PRE_SALE_MARKETING = "8";
+
+    /**
+     * 试用促销
+     */
+    String TRY_MARKETING = "9";
+
+    /**
+     * 拼团促销
+     */
+    String GROUP_MARKETING = "10";
+
+    /**
+     * 众筹促销
+     */
+    String CROWD_FUNDING_MARKETING = "11";
+
+    /**
+     * 存在互斥的促销类型
+     */
+    List<String> EXCLUSION_MARKETING_TYPES = Arrays.asList(PANIC_BUY_MARKETING, FALL_MARKETING, GROUP_MARKETING, DEPOSIT_PRE_SALE_MARKETING, FULL_PRE_SALE_MARKETING, TRY_MARKETING, CROWD_FUNDING_MARKETING);
+
+    /**
+     * 批发商品互斥的促销类型
+     */
+    List<String> BATCH_EXCLUSION_MARKETING_TYPES = Arrays.asList(PANIC_BUY_MARKETING, GROUP_MARKETING, DEPOSIT_PRE_SALE_MARKETING, FULL_PRE_SALE_MARKETING, TRY_MARKETING, CROWD_FUNDING_MARKETING);
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/PageHelper.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/PageHelper.java
new file mode 100644
index 0000000..6290a95
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/PageHelper.java
@@ -0,0 +1,132 @@
+package com.ruoyi.util;
+
+
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Created by 魔金商城 on 17/5/2.
+ * 分页帮助类
+ */
+
+public class PageHelper<T> {
+
+    /**
+     * 当前查询的列表数据
+     */
+    private List<T> list = new ArrayList<>();
+
+    /**
+     * 总计录数
+     */
+    private int rows;
+
+    /**
+     * 每页显示记录数 默认10条记录
+     */
+    private int pageSize = 10;
+
+    /**
+     * 当前页码  默认第一页
+     */
+    private int pageNum = 0;
+
+    /**
+     * 构造分页对象
+     *
+     * @param pageHelper 原始分页对象
+     * @param function   转化函数
+     * @return 返回新的返回对象
+     */
+    public static PageHelper buildByCopy(PageHelper pageHelper, Function function) {
+        PageHelper pageHelper1 = new PageHelper();
+        pageHelper1.setRows(pageHelper.getRows());
+        pageHelper1.setPageNum(pageHelper.getPageNum());
+        pageHelper1.setPageSize(pageHelper.getPageSize());
+
+        if (!CollectionUtils.isEmpty(pageHelper.getList())) {
+            pageHelper1.setList((List) pageHelper.getList().stream().map(function).collect(Collectors.toList()));
+        }
+        return pageHelper1;
+    }
+
+    /**
+     * 获取开始页
+     *
+     * @return 返回开始页
+     */
+    public int getStartRowNum() {
+        return pageNum * pageSize;
+    }
+
+    /**
+     * 设置当前的数据列表
+     *
+     * @param list 当前数据
+     * @return 返回当前对象
+     */
+    public PageHelper setListDates(List<T> list) {
+        this.list = list;
+        return this;
+    }
+
+    /**
+     * 获得设置通用分页
+     *
+     * @param params 查询参数
+     * @param rows   总记录数
+     * @return 返回查询参数
+     */
+    public Map<String, Object> getQueryParams(Map<String, Object> params, int rows) {
+        this.setRows(rows);
+        params.put(CommonConstant.START_ROW_NUM, this.getStartRowNum());
+        params.put(CommonConstant.PAGE_SIZE, this.getPageSize());
+        return params;
+    }
+
+    /**
+     * 获得总页数
+     *
+     * @return 返回总的页数 此方法不能删除
+     */
+    public int getTotalPages() {
+        return rows % pageSize == 0 ? rows / pageSize : rows / pageSize + 1;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    public void setRows(int rows) {
+        this.rows = rows;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/PosterUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/PosterUtils.java
new file mode 100644
index 0000000..60c3fd2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/PosterUtils.java
@@ -0,0 +1,358 @@
+package com.ruoyi.util;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.setting.bean.PaySetCommon;
+import com.ruoyi.setting.service.ILsPaySettingService;
+//import com.sun.image.codec.jpeg.JPEGCodec;
+//import com.sun.image.codec.jpeg.JPEGImageEncoder;
+import net.sf.json.JSONObject;
+import org.apache.commons.io.FileUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class PosterUtils extends BaseEntity {
+    private static final String ACCESS_TOKEN = "微信小程序token";
+
+    private static final Logger logger = LoggerFactory.getLogger(PosterUtils.class);
+
+    /**
+     * 注入redis服务
+     */
+    @Autowired
+    private RedisCache redisService;
+
+    /**
+     * 注入支付设置服务
+     */
+    @Autowired
+    private ILsPaySettingService paySetService;
+
+    private static PosterUtils posterUtils;
+
+    @PostConstruct
+    public void init(){
+        posterUtils = this;
+        posterUtils.redisService = this.redisService;
+        posterUtils.paySetService = this.paySetService;
+    }
+
+    public static String createPoster(String posterTitle, String scene, String moneyReward, String petNameUrl, String qrpath, String bgpath, String sitepage) throws Exception {
+//        String resourcePath = PosterUtils.class.getResource("/image/").getPath();
+        long nowTime = System.currentTimeMillis();
+        /*String qrcodeName = UUID.randomUUID().toString().replace("-", "");
+        String petUrlName = UUID.randomUUID().toString().replace("-", "");
+        URL petUnitUrl = new URL(petNameUrl);
+        HttpURLConnection conn = (HttpURLConnection) petUnitUrl.openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(5 * 1000);
+        BufferedInputStream biss = new BufferedInputStream(conn.getInputStream());
+        OutputStream outputStream = new FileOutputStream(new File(resourcePath + petUrlName + ".png"));
+        int lens;
+        byte[] arrs = new byte[1024];
+        while ((lens = biss.read(arrs)) != -1) {
+            outputStream.write(arrs, 0, lens);
+            outputStream.flush();
+        }
+        outputStream.close();*/
+        PaySetCommon paySetCommon = posterUtils.paySetService.queryPaySet();
+        //二维码图片
+        String urlstr ="https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=";
+//        String url = "http://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=";
+        URL getCodeUrl = new URL(urlstr + GetAccessToken(paySetCommon.getWechatAppletPaySet().getAppId(), paySetCommon.getWechatAppletPaySet().getAppSecret()));
+        HttpURLConnection httpURLConnection = (HttpURLConnection) getCodeUrl.openConnection();
+        httpURLConnection.setRequestMethod("POST");// 提交模式
+        httpURLConnection.setDoOutput(true);
+        httpURLConnection.setDoInput(true);
+        PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream());
+        JSONObject paramJson = new JSONObject();
+        paramJson.accumulate("scene", scene).accumulate("page", sitepage);
+        paramJson.put("auto_color", false);
+        JSONObject lineColor = new JSONObject();
+        lineColor.put("r", 0);
+        lineColor.put("g", 0);
+        lineColor.put("b", 0);
+        paramJson.put("line_color", lineColor);
+        printWriter.write(paramJson.toString());
+        printWriter.flush();
+//        BufferedInputStream bis = new BufferedInputStream(httpURLConnection.getInputStream());
+        BufferedImage qrimg = ImageIO.read(httpURLConnection.getInputStream());
+
+        ImageIO.write(qrimg, "jpg", new File(qrpath));
+        /*OutputStream ost = new FileOutputStream(new File(qrpath));
+        int len;
+        byte[] arr = new byte[1024];
+        while ((len = bis.read(arr)) != -1) {
+            ost.write(arr, 0, len);
+            ost.flush();
+        }
+        ost.close();*/
+
+        //合成图片
+        String title = posterTitle;
+        if (title.length() > 21) {
+            title = StringUtils.substring(title, 0, 21) + "...";
+        }
+        //宠物图片文件
+        File petImg = FileUtils.toFile(PosterUtils.class.getResource("/templates/posters/bg.jpg"));
+        //二维码图片文件 1
+        File qrCodeImg = new File(qrpath);
+        //背景地址
+        //为了方便演示放在resources中，可根据实际情况（上传后）将背景模板放入单独的资源文件夹或远程资源服务器
+        URL url = PosterUtils.class.getResource("/templates/posters/bg.jpg");
+        File fileBg = FileUtils.toFile(url);
+        //1、背景图片输入流
+        FileInputStream fis = new FileInputStream(fileBg);
+        //2、背景图片对象
+        Image srcImg = ImageIO.read(fis);
+        //3、创建画布，根据背景图片的宽高
+        BufferedImage bufferedImage = new BufferedImage(
+                //宽度
+                srcImg.getWidth(null),
+                //高度
+                srcImg.getHeight(null),
+                //图片类型
+                BufferedImage.TYPE_INT_RGB);
+        int width = bufferedImage.getWidth();
+        int height = bufferedImage.getHeight();
+        //4、得到2d画笔对象
+        Graphics2D g = bufferedImage.createGraphics();
+        // 设置对线段的锯齿状边缘处理
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        //5、设置画布背景
+        g.drawImage(srcImg.getScaledInstance(width, height, Image.SCALE_SMOOTH), 0, 0, null);
+        //6、```````````开始作画```````````
+        Font rewardFirstFont = new Font("PingFang SC Bold", Font.PLAIN, 24);
+        Font rewardLastFont = new Font("PingFang SC Bold", Font.PLAIN, 48);
+        int rewardFirstWidth = Graphics2DUtils.getStringWidth(g, rewardFirstFont, "赏金￥");
+        int rewardLastWidth = Graphics2DUtils.getStringWidth(g, rewardLastFont, moneyReward);
+        //赏金内容
+        Graphics2DUtils.drawString(g, Color.decode("#ffd434"), rewardFirstFont, "赏金￥", (width - rewardFirstWidth - rewardLastWidth) / 2, 550);
+        Graphics2DUtils.drawString(g, Color.decode("#ffd434"), rewardLastFont, moneyReward, (width - rewardLastWidth + rewardFirstWidth) / 2, 550);
+        //标题
+        Graphics2DUtils.drawString(g, Color.decode("#323232"), new Font("PingFang SC Bold", Font.BOLD, 34), title, 0, 400, width, 12, 5, true);
+        //把宠物图片和二维码图片划入背景
+        g.drawImage(ImageIO.read(petImg), 130, 90, 362, 250, null);
+        g.drawImage(ImageIO.read(qrCodeImg), 100, 700, 175, 175, null);
+        //   ```````````结束作画```````````
+        //7、处理画作
+        g.dispose();
+        //8、得到输出流
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        ImageIO.write(bufferedImage, "jpg", os);
+        //9、转成base64编码前端可以直接显示，也可转换成其它形式比如文件
+        String encodeStr = Base64.getEncoder().encodeToString(os.toByteArray());
+        //保存为图片文件
+        FileUtils.writeByteArrayToFile(new File(bgpath), os.toByteArray());
+        //10、关闭输入输出流
+        fis.close();
+        os.close();
+        qrCodeImg.delete();
+        petImg.delete();
+        return encodeStr;
+
+    }
+
+    public static String GetAccessToken(String appId, String secret) throws ClientProtocolException,
+            IOException {
+        String access_token1 = posterUtils.redisService.getCacheObject("access_token");
+        if(!StringUtils.isEmpty(access_token1)){
+            return access_token1;
+        }
+        HttpGet httpGet = new HttpGet(
+                "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="
+                        + appId + "&secret="
+                        + secret );
+        HttpClient httpClient = HttpClients.createDefault();
+        HttpResponse res = httpClient.execute(httpGet);
+        HttpEntity entity = res.getEntity();
+        String result = EntityUtils.toString(entity, "UTF-8");
+        JSONObject jsons = JSONObject.fromObject(result);
+        String expires_in = jsons.getString("expires_in");
+
+        //缓存
+        if(Integer.parseInt(expires_in)==7200){
+            //ok
+            String access_token = jsons.getString("access_token");
+            posterUtils.redisService.setCacheObject("access_token", access_token, 2, TimeUnit.HOURS);
+            return access_token;
+        }else{
+            System.out.println("出错获取token失败！");
+            return null;
+        }
+    }
+
+//    获取二维码 信息图片
+    public static String GetPostUrl(String access_token,String id) throws Exception {
+        //String result = HttpRequest.sendPost("http://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="+access_token, path);
+        System.out.println(id);
+        String url ="https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=";
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("path", "pages/index/index?###="+id);//你二维码中跳向的地址
+        map.put("width", "430");//图片大小
+        JSONObject json = JSONObject.fromObject(map);
+        System.out.println(json);
+//        String  res= HttpClientConnectionManager.httpPostWithJSON(url
+//                + access_token, json.toString(),id);
+//        System.out.println(res);
+        return null;
+    }
+
+//    返回图片保存 ，根据 id
+    public static String httpPostWithJSON(String url, String json,String id)
+            throws Exception {
+        String result = null;
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
+
+        StringEntity se = new StringEntity(json);
+        se.setContentType("application/json");
+        se.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
+                "UTF-8"));
+        httpPost.setEntity(se);
+        // httpClient.execute(httpPost);
+        HttpResponse response = httpClient.execute(httpPost);
+        if (response != null) {
+            HttpEntity resEntity = response.getEntity();
+            if (resEntity != null) {
+                InputStream instreams = resEntity.getContent();
+                String uploadSysUrl = "D://erweima/";
+                File saveFile = new File(uploadSysUrl+id+".png");
+                // 判断这个文件（saveFile）是否存在
+                if (!saveFile.getParentFile().exists()) {
+                    // 如果不存在就创建这个文件夹
+                    saveFile.getParentFile().mkdirs();
+                }
+                saveToImgByInputStream(instreams, uploadSysUrl, id+".png");
+            }
+        }
+        httpPost.abort();
+        return result;
+    }
+
+    /* @param instreams 二进制流
+     * @param imgPath 图片的保存路径
+     * @param imgName 图片的名称
+     * @return
+     *      1：保存正常
+     *      0：保存失败
+     */
+    public static int saveToImgByInputStream(InputStream instreams,String imgPath,String imgName){
+
+        int stateInt = 1;
+        if(instreams != null){
+            try {
+                File file=new File(imgPath+imgName);//可以是任何图片格式.jpg,.png等
+                FileOutputStream fos=new FileOutputStream(file);
+
+                byte[] b = new byte[1024];
+                int nRead = 0;
+                while ((nRead = instreams.read(b)) != -1) {
+                    fos.write(b, 0, nRead);
+                }
+                fos.flush();
+                fos.close();
+            } catch (Exception e) {
+                stateInt = 0;
+                e.printStackTrace();
+            } finally {
+                try {
+                    instreams.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+        return stateInt;
+    }
+
+//    然后是图片重合和增加字体
+    public void changeImage(String imageurl,String i ){
+        try {
+//            InputStream imagein = new FileInputStream(
+//                    "D:/systemAvatarNew1.png");
+//            InputStream imagein2 = new FileInputStream(
+//                    "D:/qqfile/1852230493/FileRecv/4-02.png");
+            InputStream imagein = new FileInputStream(
+                    "D:/systemAvatarNew1.png");
+            InputStream imagein2 = new FileInputStream(
+                    imageurl);
+
+            BufferedImage image = ImageIO.read(imagein);
+            BufferedImage image2 = ImageIO.read(imagein2);
+            //image2.getWidth() - 160, image2.getHeight() - 155,
+            Graphics g = image.getGraphics();
+            g.drawImage(image2, 300, 230, 410,422,null);
+//            g.drawImage(image2, image.getWidth() - image2.getWidth() - 195,
+//                    image.getHeight() - image2.getHeight() - 190,
+//                     340,349,null);
+            OutputStream outImage = new FileOutputStream(
+                    imageurl);
+//            JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(outImage);
+//            enc.encode(image);
+
+
+            BufferedImage bimg=ImageIO.read(new FileInputStream(imageurl));
+            //得到Graphics2D 对象
+            Graphics2D g2d=(Graphics2D)bimg.getGraphics();
+            //设置颜色和画笔粗细
+            g2d.setColor(Color.black);
+            g2d.setStroke(new BasicStroke(5));
+            //String pathString = "D://qqfile/1852230493/FileRecv/SourceHanSansCN-/SourceHanSansCN-Heavy.otf";
+//            Font dynamicFont = Font.createFont(Font.TRUETYPE_FONT, new File(pathString));
+
+            g2d.setFont(new Font("微软雅黑", Font.PLAIN, 36));
+            //g2d.setFont(Loadfont.loadFont(pathString, 45));
+            //绘制图案或文字
+            g2d.drawString("编号: "+i, 320, 700);
+            //  g2d.drawString(i, 450, 700);
+
+            ImageIO.write(bimg, "JPG",new FileOutputStream(imageurl));
+
+
+            File fromFile = new File(imageurl);
+            File toFile = new File(imageurl);
+//            Image Image1 =new Image();
+//            Image1.resizePng(fromFile, toFile, 1000, 1000, false);
+
+
+
+            imagein.close();
+            imagein2.close();
+            outImage.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/QRCodeUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/QRCodeUtils.java
new file mode 100644
index 0000000..79bf8a4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/QRCodeUtils.java
@@ -0,0 +1,192 @@
+package com.ruoyi.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Hashtable;
+
+/**
+ * Created by 魔金商城 on 17/3/13.
+ * 二维码生成器
+ */
+public final class QRCodeUtils {
+
+    /**
+     * 黑色
+     */
+    private static final int BLACK = 0xFF000000;
+
+    /**
+     * 白色
+     */
+    private static final int WHITE = 0xFFFFFFFF;
+
+    private QRCodeUtils() {
+
+    }
+
+    /**
+     * 创建二维码图片
+     *
+     * @param url    链接地址
+     * @param width  宽
+     * @param height 高
+     */
+    public static void createQRImg(HttpServletResponse response, String url, Integer width, Integer height) {
+        OutputStream outputStream = null;
+        try {
+            //如果宽高没有赋值，则给一个默认值
+            if (ObjectUtils.isEmpty(width)) {
+                width = 200;
+            }
+            if (ObjectUtils.isEmpty(height)) {
+                height = 200;
+            }
+            outputStream = response.getOutputStream();
+            QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, null, null);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+
+    /**
+     * 生成二维码
+     *
+     * @param content 内容
+     * @param width   宽
+     * @param height  高
+     */
+    public static void createQrCode(String content, int width, int height, String format, OutputStream stream, String qrPath, String bgPath) throws Exception {
+
+        Hashtable<EncodeHintType, String> hints = new Hashtable<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints);
+
+        BufferedImage bufferedImage = toBufferedImage(deleteWhite(bitMatrix));
+        if(!StringUtils.isEmpty(bgPath)) {
+//            如果指定了海报路径。则说明是分享商家
+            BufferedImage poster = QRPostersUtil.drawImage2out(bgPath, bufferedImage, qrPath);
+            ImageIO.write(poster, format, stream);
+        }
+        else{
+            if(!StringUtils.isEmpty(qrPath)){
+                ImageIO.write(bufferedImage, format, new File(qrPath));
+            }
+            ImageIO.write(bufferedImage, format, stream);
+        }
+    }
+
+    /**
+     * 生成二维码
+     *
+     * @param content 内容
+     * @param width   宽
+     * @param height  高
+     * @param format  图片格式
+     * @return 返回图片字节
+     */
+    public static byte[] createQrCode(String content, int width, int height, String format) throws Exception {
+
+        Hashtable<EncodeHintType, String> hints = new Hashtable<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints);
+
+        return imageToBytes(toBufferedImage(bitMatrix), format);
+    }
+
+
+    /**
+     * 生成图片
+     */
+    private static BufferedImage toBufferedImage(BitMatrix matrix) {
+        int width = matrix.getWidth();
+        int height = matrix.getHeight();
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                image.setRGB(x, y, matrix.get(x, y) ? BLACK : WHITE);
+            }
+        }
+        return image;
+    }
+
+
+    /**
+     * 去白边
+     */
+    private static BitMatrix deleteWhite(BitMatrix matrix) {
+        int[] rec = matrix.getEnclosingRectangle();
+        int resWidth = rec[2] + 1;
+        int resHeight = rec[3] + 1;
+
+        BitMatrix resMatrix = new BitMatrix(resWidth, resHeight);
+        resMatrix.clear();
+        for (int i = 0; i < resWidth; i++) {
+            for (int j = 0; j < resHeight; j++) {
+                if (matrix.get(i + rec[0], j + rec[1])) {
+                    resMatrix.set(i, j);
+                }
+            }
+        }
+
+        int width = resMatrix.getWidth();
+        int height = resMatrix.getHeight();
+        BufferedImage image = new BufferedImage(width, height,
+                BufferedImage.TYPE_INT_RGB);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                image.setRGB(x, y, resMatrix.get(x, y) ? 0 : 255);
+            }
+        }
+
+        return resMatrix;
+
+    }
+
+    /**
+     * 转换BufferedImage 数据为byte数组
+     *
+     * @param bImage
+     * @param format image格式字符串.如"gif","png"
+     * @return byte数组
+     */
+    public static byte[] imageToBytes(BufferedImage bImage, String format) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        byte[] bytes = null;
+        try {
+            ImageIO.write(bImage, format, out);
+            bytes = out.toByteArray();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return bytes;
+    }
+
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/QRPostersUtil.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/QRPostersUtil.java
new file mode 100644
index 0000000..c25f279
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/QRPostersUtil.java
@@ -0,0 +1,362 @@
+package com.ruoyi.util;
+
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ResourceUtils;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.RoundRectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Random;
+
+/**
+ * 提供二维码生成和解析工具类
+ * @author Administrator
+ *
+ */
+public class QRPostersUtil {
+
+    private static final String CHARSET = "utf-8";
+    private static final String FORMAT_NAME = "JPG";
+    private static final int QRCODE_SIZE = 150; // 二维码尺寸，宽度和高度均是300
+    private static final int WIDTH = 50;  //LOGO宽度
+    private static final int HEIGHT = 50; //LOGO高度
+
+
+    /**
+     * 生成二维码的方法
+     * @param content 目标url
+     * @param imgPath logo图片地址
+     * @param needCompress 是否压缩logo
+     * @return 二维码图片
+     * @throws Exception
+     */
+    private static BufferedImage createImage(String content, String imgPath,boolean needCompress) throws Exception {
+        Hashtable hints = new Hashtable();
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);//指定二维码的纠错等级为高级
+        hints.put(EncodeHintType.CHARACTER_SET, CHARSET);//指定字符编码为“utf-8”
+        hints.put(EncodeHintType.MARGIN, 1); //设置图片的边距
+        //参数1：内容，目标url,参数2：固定写法，参数3：二维码的宽度，参数4：二维码的高度，参数5：二维码属性设置
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(content,BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE, hints);
+        int width = bitMatrix.getWidth();//二维码的宽度
+        int height = bitMatrix.getHeight();//二维码的高度
+        BufferedImage image = new BufferedImage(width, height,BufferedImage.TYPE_INT_RGB);//生成的二维码image
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000: 0xFFFFFFFF);
+            }
+        }
+        if (imgPath == null || "".equals(imgPath)) {//logo图片地址为null或空时
+            return image; //只返回二维码图片，无中间的logo
+        }
+        // 插入logo图片  参数1：二维码图片，参数2：logo图片地址，参数3：压缩图片
+        QRPostersUtil.insertImage(image, imgPath, needCompress);
+        return image;
+    }
+    /**
+     * 插入logo图片
+     * @param source 二维码图片
+     * @param imgPath LOGO图片地址
+     * @param needCompress 是否压缩
+     * @throws Exception
+     */
+    private static void insertImage(BufferedImage source, String imgPath,boolean needCompress) throws Exception {
+
+        File file = new File(imgPath);//logo图片地址放入文件
+        Image src;
+        if (!file.exists()) {
+            //通过网络路径获取
+            InputStream  inputStream=getImageStream(imgPath);
+            src = ImageIO.read(inputStream);
+        }else {
+            //本地路径获取
+            src = ImageIO.read(new File(imgPath));
+        }
+        int width = src.getWidth(null);
+        int height = src.getHeight(null);
+        if (needCompress) { // 压缩LOGO
+            if (width > WIDTH) { //如果上传logo宽 >60
+                width = WIDTH;
+            }
+            if (height > HEIGHT) { //如果上传logo高>60
+                height = HEIGHT;
+            }
+            Image image = src.getScaledInstance(width, height,Image.SCALE_SMOOTH);
+            BufferedImage tag = new BufferedImage(width, height,BufferedImage.TYPE_INT_RGB);
+            Graphics g = tag.getGraphics();
+            g.drawImage(image, 0, 0, null); // 绘制缩小后的图
+            g.dispose();
+            src = image;
+        }
+        // 插入LOGO
+        Graphics2D graph = source.createGraphics();
+        int x = (QRCODE_SIZE - width) / 2;
+        int y = (QRCODE_SIZE - height) / 2;
+        graph.drawImage(src, x, y, width, height, null);
+        Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6);
+        graph.setStroke(new BasicStroke(3f));
+        graph.draw(shape);
+        graph.dispose();
+    }
+    /**
+     * 生成二维码(内嵌LOGO)
+     * @param content  内容
+     * @param imgPath  logo地址
+     * @param destPath 存放目录
+     * @param needCompress 是否压缩logo
+     * @throws Exception
+     */
+    public static void encode(String content, String imgPath, String destPath, boolean needCompress) throws Exception {
+        BufferedImage image = QRPostersUtil.createImage(content, imgPath,needCompress); //生成二维码
+        mkdirs(destPath);
+        String file = new Random().nextInt(99999) + ".jpg";
+        ImageIO.write(image, FORMAT_NAME, new File(destPath + "/" + file));
+    }
+    /**
+     * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
+     * @param destPath 存放目录
+     */
+    public static void mkdirs(String destPath) {
+        File file = new File(destPath);
+        if (!file.exists() && !file.isDirectory()) {
+            file.mkdirs();
+        }
+    }
+
+
+    /**
+     * 生成二维码(内嵌LOGO)
+     *
+     * @param content      内容
+     * @param imgPath      LOGO地址
+     * @param output       输出流
+     * @param needCompress 是否压缩LOGO
+     * @throws Exception
+     */
+    public static void encode(String content, String imgPath,OutputStream output, boolean needCompress) throws Exception {
+        BufferedImage image = QRPostersUtil.createImage(content, imgPath,needCompress);
+        ImageIO.write(image, FORMAT_NAME, output);
+    }
+    /**
+     * 生成二维码
+     *
+     * @param content 内容
+     * @param output  输出流
+     * @throws Exception
+     */
+    public static void encode(String content, OutputStream output)throws Exception {
+        QRPostersUtil.encode(content, null, output, false);
+    }
+
+
+    /**
+     * 获取网络图片流
+     *
+     * @param url
+     * @return
+     */
+    public static InputStream getImageStream(String url) {
+        try {
+            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setReadTimeout(5000);
+            connection.setConnectTimeout(5000);
+            connection.setRequestMethod("GET");
+            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                InputStream inputStream = connection.getInputStream();
+                return inputStream;
+            }
+        } catch (IOException e) {
+            System.out.println("获取网络图片出现异常，图片路径为：" + url);
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     *将头像,二维码和海报合成
+     * @throws IOException
+     */
+    public static void drawImage() throws IOException {
+        //海报图
+        String backgroundImageUrl = "https://img.redocn.com/sheji/20170911/daxuexiaoyuanyinlejiegechangbisaihaibao_8694885.jpg";
+        //二维码
+        String qrCodeImageUrl = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553504957130&di=02fae20a5c0f885d52299b2b1d682c86&imgtype=0&src=http%3A%2F%2Fimg.atobo.com%2FProductImg%2FEWM%2FUWeb%2F3%2F2%2F1%2F3%2F061%2F3213061%2F1.gif";
+        //头像
+        String headUrl = "http://pic.51yuansu.com/pic3/cover/00/63/25/589bdedf5475d_610.jpg";
+
+        BufferedImage bgBufImage = ImageIO.read(new URL(backgroundImageUrl));
+        Graphics2D bgBufImageGraphics = bgBufImage.createGraphics();
+
+        BufferedImage qrCodeImage = ImageIO.read(new URL(qrCodeImageUrl));
+        BufferedImage headImage = ImageIO.read(new URL(headUrl));
+        //设置圆形图片
+        BufferedImage roundHeadImg = new BufferedImage(headImage.getWidth(), headImage.getHeight(), BufferedImage.TYPE_INT_RGB);
+
+        Graphics2D roundHeadGraphics = roundHeadImg.createGraphics();
+        Ellipse2D.Double shape = new Ellipse2D.Double(0, 0, roundHeadImg.getWidth(), roundHeadImg.getHeight());
+        roundHeadGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        roundHeadImg = roundHeadGraphics.getDeviceConfiguration().createCompatibleImage(headImage.getWidth(), headImage.getHeight(),
+                Transparency.TRANSLUCENT);
+        roundHeadGraphics = roundHeadImg.createGraphics();
+        // 使用 setRenderingHint 设置抗锯齿
+        roundHeadGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        roundHeadGraphics.setClip(shape);
+        roundHeadGraphics.drawImage(headImage, 0, 0, null);
+        roundHeadGraphics.dispose();
+
+        bgBufImageGraphics.drawImage(qrCodeImage,390, 200, qrCodeImage.getWidth(), qrCodeImage.getHeight(), null);
+        //bgBufImageGraphics.drawImage(roundHeadImg, 50, 100, HEAD_URL_WIDTH, HEAD_URL_HEIGHT, null);
+        bgBufImageGraphics.dispose();
+        ImageIO.write(bgBufImage, "png", new File("C:\\Users\\Public\\Desktop\\demo2.png"));
+        System.out.printf("生成图片完成");
+
+    }
+
+    /**
+     *将二维码和海报合成一张图片
+     * @throws IOException
+     */
+    public static void drawImage1(String backgroundImageUrl,BufferedImage qrCodeImage,String putImgPoster) throws IOException {
+        //这里对方法进行了修改直接把 BufferedImage qrCodeImage传入进来方便处理  也可以传入 String qrCodeImageUrl  图片网络路径
+        BufferedImage bgBufImage = ImageIO.read(new URL(backgroundImageUrl));
+        Graphics2D bgBufImageGraphics = bgBufImage.createGraphics();
+        //BufferedImage qrCodeImage = ImageIO.read(new URL(qrCodeImageUrl));
+        bgBufImageGraphics.drawImage(qrCodeImage,390, 200, qrCodeImage.getWidth(), qrCodeImage.getHeight(), null);
+        bgBufImageGraphics.dispose();
+        ImageIO.write(bgBufImage, "png", new File(putImgPoster));
+        System.out.printf("生成图片完成");
+    }
+
+    /**
+     *将二维码和海报合成一张图片
+     * @param backgroundImageUrl 海报背景图片url。为空时。使用 templates\posters\bg.jpg
+     * @param qrCodeImage 二维码图片流
+     * @param putImgPoster 海报保存地址
+     * @throws IOException
+     */
+    public static BufferedImage drawImage2out(String backgroundImageUrl,BufferedImage qrCodeImage,String putImgPoster) throws IOException {
+        //这里对方法进行了修改直接把 BufferedImage qrCodeImage传入进来方便处理  也可以传入 String qrCodeImageUrl  图片网络路径
+//        InputStream resourceAsStream = QRPostersUtil.class.getClassLoader().getResourceAsStream("templates/posters/bg.png");
+//        File bgPath = ResourceUtils.getFile("classpath:templates/posters/bg.png");
+//        Resource resource = new ClassPathResource("templates/posters/bg.png");
+//        Resource resource = new DefaultResourceLoader().getResource("templates/posters/bg.png");
+//        ClassPathResource classPathResource = new ClassPathResource("templates/posters/bg.png");
+        BufferedImage bgBufImage = null;
+        File f = new File(backgroundImageUrl);
+
+        if(f.exists()){
+            bgBufImage = ImageIO.read(f);
+        }
+        else {
+            bgBufImage = ImageIO.read(new URL(backgroundImageUrl));
+        }
+        Graphics2D bgBufImageGraphics = bgBufImage.createGraphics();
+        //BufferedImage qrCodeImage = ImageIO.read(new URL(qrCodeImageUrl));
+        Font font6 = new Font("苹方-简", Font.BOLD, 28);
+        drawString(bgBufImageGraphics, font6, "sdafasdfasdfasd",bgBufImage.getTileWidth(), 20, 10, 2 , 2);
+        bgBufImageGraphics.drawImage(qrCodeImage,(bgBufImage.getWidth()-qrCodeImage.getWidth())/2, (bgBufImage.getHeight()-qrCodeImage.getHeight())/2, qrCodeImage.getWidth(), qrCodeImage.getHeight(), null);
+        bgBufImageGraphics.dispose();
+        if(putImgPoster != null){
+//            Resource outres = new ClassPathResource("templates/posters/posters.png");
+            ImageIO.write(bgBufImage, "png", new File(putImgPoster));
+        }
+        System.out.printf("生成图片完成");
+        return bgBufImage;
+    }
+
+    /**
+     * 文字超出限定长度自动换行
+     *
+     * @param g 画布
+     * @param font 字体样式
+     * @param text 文字
+     * @param widthLength 最大长度 （多少长度后需要换行）
+     * @param x 文字位置坐标 x
+     * @param y 文字位置坐标 Y
+     * @param yn 每次换行偏移多少pt
+     * showLine 显示行数 文字可能过多 我们只显示showLine行文字
+     */
+    private static int drawString(Graphics2D g, Font font, String text, int widthLength, int x, int y, int yn,int showLine) {
+    FontMetrics fg = g.getFontMetrics(font);
+    ArrayList<String> ls = new ArrayList<String>();
+    getListText(fg, text, widthLength, ls);
+    g.setFont(font);
+    for (int i = 0; i < ls.size(); i++) {
+        if(i==showLine) {
+            break;
+        }
+        if (i == 0) {
+            g.drawString(ls.get(i), x, y);
+        } else {
+            g.drawString(ls.get(i), x, y + i*yn);
+        }
+    }
+    int height=fg.getHeight();
+    if(ls.size()<=showLine) {
+        y=y+height*ls.size();
+    }else {
+        y=y+height*showLine;
+    }
+    return y;
+    }
+
+    /**
+     * 递归 切割字符串
+     * @param fg
+     * @param text
+     * @param widthLength
+     * @param ls
+     */
+    private static void getListText(FontMetrics fg, String text, int widthLength, ArrayList<String> ls) {
+        String ba = text;
+        boolean b = true;
+        int i = 1;
+        while (b) {
+            if (fg.stringWidth(text) > widthLength) {
+                text = text.substring(0, text.length() - 1);
+                i++;
+            } else {
+                b = false;
+            }
+        }
+        if (i != 1) {
+            ls.add(ba.substring(0, ba.length() - i));
+            getListText(fg, ba.substring(ba.length() - i), widthLength, ls);
+        } else {
+            ls.add(text);
+        }
+    }
+
+    public static void main(String[] args) throws Exception{
+//        先生成二维码
+        BufferedImage ti =createImage("xh6lSOzYdIMVanArR9AY0","https://b-ssl.duitang.com/uploads/item/201706/27/20170627012435_mJLiX.thumb.700_0.jpeg",true);
+        //输出文件
+        File file = new File("E:\\123.jpg");
+        ImageIO.write(ti, "jpg", file);
+//        drawImage();
+        drawImage1("https://img.redocn.com/sheji/20170911/daxuexiaoyuanyinlejiegechangbisaihaibao_8694885.jpg",ti,"C:\\Users\\Public\\Desktop\\dome.jpg");
+    }
+
+
+}
+
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/QqOssClient.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/QqOssClient.java
new file mode 100644
index 0000000..85969ea
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/QqOssClient.java
@@ -0,0 +1,366 @@
+package com.ruoyi.util;
+
+
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.ClientConfig;
+import com.qcloud.cos.auth.BasicCOSCredentials;
+import com.qcloud.cos.auth.COSCredentials;
+import com.qcloud.cos.exception.CosClientException;
+import com.qcloud.cos.exception.CosServiceException;
+import com.qcloud.cos.model.*;
+import com.qcloud.cos.region.Region;
+import com.ruoyi.util.bean.OssYunConf;
+import com.ruoyi.util.md5.MD5;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: SunJunxian
+ * @Date: 2018/12/17
+ * @Description: java实现腾讯云存储服务（COSClient）
+ * @REGIONID 区域
+ * @KEY 上传上云之后的名字
+ * @KEY01 需要删除的文件
+ */
+public class QqOssClient {
+
+
+    private static final String ACCESSKEY = "AKID187989o64Q4hjfItRjjplnu6HFwouHOEo7AOQgl";
+    private static final String SECRETKEY = "ysBE66Bs64LZ56onV1KPIu3CUWWGfngdIhpiKn";
+    private static final String BUCKETNAME = "wans76787hunfu-1301582899";
+    private static final String APPID = "125178787827811";
+    private static final String REGIONID = "ap-g798uangzhou";
+    private static final String KEY = "MyFile1/989zookeeper-3.4.8.tar.gz";
+    private static final String KEY01 = "MyFil989e1/1.jpg";
+
+    /**
+     * 上传腾讯云
+     *
+     * @param file
+     * @param bytes 图片字节
+     * @param type  上传的类型 0 图片 1 视频
+     * @return 返回图片在又拍云的地址
+     */
+    public static String uploadToQqOss(OssYunConf cloudStorageConfig, MultipartFile file, byte[] bytes, String fileOriginName, String type) {
+        String url = null;
+
+        String accessKey = cloudStorageConfig.getAccessKeyId();
+        String secretKey = cloudStorageConfig.getAccessKeySecret();
+        String bucket = cloudStorageConfig.getEndPoint();
+        // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
+        String bucketName = cloudStorageConfig.getBucketName();
+        // 1 初始化用户身份信息(secretId, secretKey)
+        COSCredentials cred = new BasicCOSCredentials(accessKey, secretKey);
+        // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
+        ClientConfig clientConfig = new ClientConfig(new Region(bucket));
+        // 3 生成cos客户端
+        COSClient cosclient = new COSClient(cred, clientConfig);
+        //  String suffix = fileOriginName.substring(fileOriginName.lastIndexOf(".")).toLowerCase();
+        //获取腾讯云路径前缀
+        String dir = cloudStorageConfig.getPrefix();
+
+        // 简单文件上传, 最大支持 5 GB, 适用于小文件上传, 建议 20 M 以下的文件使用该接口
+        // 大文件上传请参照 API 文档高级 API 上传
+        File localFile = null;
+        try {
+            // 获取字符串的MD5结果，file.getBytes()--输入的字符串转换成字节数组
+            String md5 = MD5.getMessageDigest(file.getBytes());
+            String filePath = String.format("%1$s/%2$s%3$s", dir, md5, fileOriginName);
+            localFile = File.createTempFile("temp", null);
+            file.transferTo(localFile);
+            // 指定要上传到 COS 上的路径
+            String key = filePath;
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
+            PutObjectResult putObjectResult = cosclient.putObject(putObjectRequest);
+            String qCloudDomain = cloudStorageConfig.getAddress();
+            url = String.format("%1$s/%2$s", qCloudDomain, filePath);
+
+        } catch (IOException e) {
+
+        } finally {
+            // 关闭客户端(关闭后台线程)
+            cosclient.shutdown();
+        }
+
+        return url;
+    }
+
+    /**
+     * 初始化CosClient相关配置， appid、accessKey、secretKey、region
+     *
+     * @return
+     */
+    public static COSClient getCosClient() {
+        // 1 初始化用户身份信息(secretId, secretKey)
+        COSCredentials cred = new BasicCOSCredentials(ACCESSKEY, SECRETKEY);
+        // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
+        // clientConfig中包含了设置region, https(默认http), 超时, 代理等set方法, 使用可参见源码或者接口文档FAQ中说明
+        ClientConfig clientConfig = new ClientConfig(new Region(REGIONID));
+        // 3 生成cos客户端
+        COSClient cosClient = new COSClient(cred, clientConfig);
+        // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
+        //String bucketName = BUCKETNAME;
+        return cosClient;
+    }
+
+    /**
+     * 上传文件
+     *
+     * @return //绝对路径和相对路径都OK
+     */
+    public static String uploadFile() {
+//        File localFile = new File("E:\\software\\JavaProject\\demo\\demo20\\src\\main\\resources\\1.jpg");
+        File localFile = new File("C:\\Users\\DEL\\Desktop\\pic\\logo.png");
+        PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKETNAME, localFile.getName(), localFile);
+
+        // 设置存储类型, 默认是标准(Standard), 低频(standard_ia),一般为标准的
+        putObjectRequest.setStorageClass(StorageClass.Standard);
+
+        COSClient cc = getCosClient();
+        try {
+            PutObjectResult putObjectResult = cc.putObject(putObjectRequest);
+            // putobjectResult会返回文件的etag
+            String etag = putObjectResult.getETag();
+
+            System.out.println(etag);
+        } catch (CosServiceException e) {
+            e.printStackTrace();
+        } catch (CosClientException e) {
+            e.printStackTrace();
+        }
+        // 关闭客户端
+        cc.shutdown();
+        return null;
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param bucketName
+     * @param key
+     * @return
+     */
+    public static String downLoadFile(String bucketName, String key) {
+        File downFile = new File("E:\\software\\1.jpg");
+        COSClient cc = getCosClient();
+        GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
+
+        ObjectMetadata downObjectMeta = cc.getObject(getObjectRequest, downFile);
+        cc.shutdown();
+        String etag = downObjectMeta.getETag();
+        return etag;
+    }
+
+    /**
+     * 删除文件
+     *
+     * @param bucketName
+     * @param key
+     */
+    public static void deleteFile(String bucketName, String key) {
+        COSClient cc = getCosClient();
+        try {
+            cc.deleteObject(bucketName, key);
+        } catch (CosClientException e) {
+            e.printStackTrace();
+        } finally {
+            cc.shutdown();
+        }
+
+    }
+
+    /**
+     * 创建桶
+     *
+     * @param bucketName
+     * @return
+     * @throws CosClientException
+     * @throws CosServiceException
+     */
+    public static Bucket createBucket(String bucketName) throws CosClientException, CosServiceException {
+        COSClient cc = getCosClient();
+        Bucket bucket = null;
+        try {
+            bucket = cc.createBucket(bucketName);
+        } catch (CosClientException e) {
+            e.printStackTrace();
+        } finally {
+        }
+        return bucket;
+    }
+
+    ;
+
+    public static String uploadToUpYunForBase64(OssYunConf cloudStorageConfig, InputStream inputStream, byte[] bytes, String fileOriginName, byte[] bytes1) {
+        String url = null;
+
+        String accessKey = cloudStorageConfig.getAccessKeyId();
+        String secretKey = cloudStorageConfig.getAccessKeySecret();
+        String bucket = cloudStorageConfig.getEndPoint();
+        // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
+        String bucketName = cloudStorageConfig.getBucketName();
+        // 1 初始化用户身份信息(secretId, secretKey)
+        COSCredentials cred = new BasicCOSCredentials(accessKey, secretKey);
+        // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
+        ClientConfig clientConfig = new ClientConfig(new Region(bucket));
+        // 3 生成cos客户端
+        COSClient cosclient = new COSClient(cred, clientConfig);
+        //  String suffix = fileOriginName.substring(fileOriginName.lastIndexOf(".")).toLowerCase();
+        //获取腾讯云路径前缀
+        String dir = cloudStorageConfig.getPrefix();
+
+        // 简单文件上传, 最大支持 5 GB, 适用于小文件上传, 建议 20 M 以下的文件使用该接口
+        // 大文件上传请参照 API 文档高级 API 上传
+        try {
+            // 获取字符串的MD5结果，file.getBytes()--输入的字符串转换成字节数组
+            String md5 = MD5.getMessageDigest(bytes);
+            String filePath = String.format("%1$s/%2$s%3$s", dir, md5, fileOriginName);
+
+            // 指定要上传到 COS 上的路径
+            String key = filePath;
+            ObjectMetadata metadata = new ObjectMetadata();
+            // metadata.setContentType("image/jpeg");
+            String backUrl = "";
+            metadata.setContentLength(bytes.length);
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, new ByteArrayInputStream(bytes),
+                    metadata);
+
+            // 设置存储类型, 默认是标准(Standard), 低频(standard_ia)
+            putObjectRequest.setStorageClass(StorageClass.Standard_IA);
+            COSClient cc = getCosClient();
+            try {
+                PutObjectResult putObjectResult1 = cc.putObject(putObjectRequest);
+                // putobjectResult会返回文件的etag
+                backUrl = cloudStorageConfig.getAddress() + "/" + key;
+                return backUrl;
+            } catch (CosServiceException e) {
+                e.printStackTrace();
+            } catch (CosClientException e) {
+                e.printStackTrace();
+            }
+            // 关闭客户端
+            cc.shutdown();
+
+            return backUrl;
+
+        } catch (Exception e) {
+
+        } finally {
+            // 关闭客户端(关闭后台线程)
+            cosclient.shutdown();
+        }
+
+        return url;
+    }
+
+    /**
+     * 判断桶是否存在
+     *
+     * @param bucketName
+     * @return
+     * @throws CosClientException
+     * @throws CosServiceException
+     */
+    public static boolean doesBucketExist(String bucketName) throws CosClientException, CosServiceException {
+        COSClient cc = getCosClient();
+        boolean bucketExistFlag = cc.doesBucketExist(bucketName);
+        return bucketExistFlag;
+    }
+
+    ;
+
+    /**
+     * 查看桶文件
+     *
+     * @param bucketName
+     * @return
+     * @throws CosClientException
+     * @throws CosServiceException
+     */
+    public static ObjectListing listObjects(String bucketName) throws CosClientException, CosServiceException {
+        COSClient cc = getCosClient();
+
+        // 获取 bucket 下成员（设置 delimiter）
+        ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
+        listObjectsRequest.setBucketName(bucketName);
+        // 设置 list 的 prefix, 表示 list 出来的文件 key 都是以这个 prefix 开始
+        listObjectsRequest.setPrefix("");
+        // 设置 delimiter 为/, 即获取的是直接成员，不包含目录下的递归子成员
+        listObjectsRequest.setDelimiter("/");
+        // 设置 marker, (marker 由上一次 list 获取到, 或者第一次 list marker 为空)
+        listObjectsRequest.setMarker("");
+        // 设置最多 list 100 个成员,（如果不设置, 默认为 1000 个，最大允许一次 list 1000 个 key）
+        listObjectsRequest.setMaxKeys(100);
+
+        ObjectListing objectListing = cc.listObjects(listObjectsRequest);
+        // 获取下次 list 的 marker
+        String nextMarker = objectListing.getNextMarker();
+        // 判断是否已经 list 完, 如果 list 结束, 则 isTruncated 为 false, 否则为 true
+        boolean isTruncated = objectListing.isTruncated();
+        List<COSObjectSummary> objectSummaries = objectListing.getObjectSummaries();
+        for (COSObjectSummary cosObjectSummary : objectSummaries) {
+            // get file path
+            String key = cosObjectSummary.getKey();
+            // get file length
+            long fileSize = cosObjectSummary.getSize();
+            // get file etag
+            String eTag = cosObjectSummary.getETag();
+            // get last modify time
+            Date lastModified = cosObjectSummary.getLastModified();
+            // get file save type
+            String StorageClassStr = cosObjectSummary.getStorageClass();
+        }
+        return objectListing;
+    }
+
+    ;
+
+    /**
+     * 查询一个 Bucket 所在的 Region。
+     *
+     * @param bucketName
+     * @return
+     * @throws CosClientException
+     * @throws CosServiceException
+     */
+    public static String getBucketLocation(String bucketName) throws CosClientException, CosServiceException {
+        COSClient cosClient = getCosClient();
+        // bucket 的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
+        String location = cosClient.getBucketLocation(bucketName);
+        return location;
+    }
+
+    public static void main(String[] args) {
+        uploadFile();
+//          downLoadFile(BUCKETNAME , KEY);
+        // deleteFile(BUCKETNAME , KEY01);
+//        createBucket("sunjunxian01-1251782781");
+        //deleteBucket();
+//        doesBucketExist("sunjunxian01-1251782781");
+//        System.out.println(listObjects(BUCKETNAME));
+        //System.out.println("BUCKETNAME的位置：" + getBucketLocation(BUCKETNAME));
+    }
+
+    /**
+     * 删除桶
+     *
+     * @param bucketName
+     * @throws CosClientException
+     * @throws CosServiceException
+     */
+    public void deleteBucket(String bucketName) throws CosClientException, CosServiceException {
+        COSClient cc = getCosClient();
+        try {
+            cc.deleteBucket(bucketName);
+        } catch (CosClientException e) {
+            e.printStackTrace();
+        } finally {
+        }
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/RandomMathLetter.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/RandomMathLetter.java
new file mode 100644
index 0000000..a2fc8d3
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/RandomMathLetter.java
@@ -0,0 +1,37 @@
+package com.ruoyi.util;
+
+import java.util.Random;
+
+/**
+ * 随机生成字母和数字组合
+ *
+ * @author 魔金商城 on 2017/6/1.
+ */
+public class RandomMathLetter {
+    /**
+     * 产生随机字符串
+     */
+    private static Random randGen = null;
+    /**
+     * 数字和字母
+     */
+    private static char[] numbersAndLetters = null;
+
+    /**
+     * 字符串
+     */
+    public static String randomString(int length) {
+        if (length < 1) {
+            return null;
+        }
+        if (randGen == null) {
+            randGen = new Random();
+            numbersAndLetters = ("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
+        }
+        char[] randBuffer = new char[length];
+        for (int i = 0; i < randBuffer.length; i++) {
+            randBuffer[i] = numbersAndLetters[randGen.nextInt(35)];
+        }
+        return new String(randBuffer);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/RedisCacheErrorHandler.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/RedisCacheErrorHandler.java
new file mode 100644
index 0000000..ed83962
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/RedisCacheErrorHandler.java
@@ -0,0 +1,44 @@
+package com.ruoyi.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cache.Cache;
+import org.springframework.cache.interceptor.CacheErrorHandler;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by 魔金商城 on 18/2/5.
+ * redis 异常处理器
+ */
+@Service
+public class RedisCacheErrorHandler implements CacheErrorHandler {
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(RedisCacheErrorHandler.class);
+
+    @Override
+    public void handleCacheClearError(RuntimeException e, Cache cache) {
+        logger.error("handleCacheClearError", e);
+    }
+
+    @Override
+    public void handleCacheGetError(RuntimeException e, Cache cache, Object o) {
+        logger.error("get from redis fail and cache:{} \r\n o:{}", cache, o);
+        logger.error("handleCacheGetError", e);
+
+    }
+
+
+    @Override
+    public void handleCacheEvictError(RuntimeException e, Cache cache, Object o) {
+        logger.error("Evict from redis fail and cache:{} \r\n o:{}", cache, o);
+        logger.error("handleCacheEvictError", e);
+    }
+
+    @Override
+    public void handleCachePutError(RuntimeException e, Cache cache, Object o, Object o1) {
+        logger.error("handleCachePutError", e);
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/SegchkWXPayConfigImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/SegchkWXPayConfigImpl.java
new file mode 100644
index 0000000..1991448
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/SegchkWXPayConfigImpl.java
@@ -0,0 +1,126 @@
+package com.ruoyi.util;
+
+import com.weixin.pay.WXPayConfig;
+import com.weixin.pay.WXPayDomain;
+import com.weixin.pay.constants.WXPayConstants;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * 测试/第二个微信支付实体的微信支付实现类
+ *
+ * @author yclimb
+ * @date 2018/7/31
+ */
+public class SegchkWXPayConfigImpl extends WXPayConfig {
+
+    private byte[] certData;
+    private static SegchkWXPayConfigImpl INSTANCE;
+
+    private String appId = WXPayConstants.APP_ID_XXX;
+    private String mchId = WXPayConstants.MCH_ID_XXX;
+    private String mchKey = WXPayConstants.API_KEY_XXX;
+
+    private SegchkWXPayConfigImpl() throws Exception{
+
+        String certPath = WXPayConstants.APICLIENT_CERT_XXX;
+        File file = new File(certPath);
+        if(!file.exists())
+        {
+            return;
+        }
+        InputStream certStream = new FileInputStream(file);
+        this.certData = new byte[(int) file.length()];
+        certStream.read(this.certData);
+        certStream.close();
+    }
+
+    public static SegchkWXPayConfigImpl getInstance() throws Exception{
+        if (INSTANCE == null) {
+            synchronized (SegchkWXPayConfigImpl.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new SegchkWXPayConfigImpl();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    @Override
+    public String getAppID() {
+        return this.appId;
+    }
+
+    @Override
+    public String getMchID() {
+        return this.mchId;
+    }
+
+    @Override
+    public String getKey() {
+        return this.mchKey;
+    }
+
+    @Override
+    public InputStream getCertStream() {
+        ByteArrayInputStream certBis;
+        certBis = new ByteArrayInputStream(this.certData);
+        return certBis;
+    }
+
+    @Override
+    public int getHttpConnectTimeoutMs() {
+        return 2000;
+    }
+
+    @Override
+    public int getHttpReadTimeoutMs() {
+        return 10000;
+    }
+
+    @Override
+    public WXPayDomain getWXPayDomain() {
+        return WXPayDomainSimpleImpl.instance();
+    }
+
+    public String getPrimaryDomain() {
+        return "api.mch.weixin.qq.com";
+    }
+
+    public String getAlternateDomain() {
+        return "api2.mch.weixin.qq.com";
+    }
+
+    @Override
+    public int getReportWorkerNum() {
+        return 1;
+    }
+
+    @Override
+    public int getReportBatchSize() {
+        return 2;
+    }
+
+    public void setCertData(String certPath) throws Exception{
+        File file = new File(certPath);
+        InputStream certStream = new FileInputStream(file);
+        this.certData = new byte[(int) file.length()];
+        certStream.read(this.certData);
+        certStream.close();
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public void setMchId(String mchId) {
+        this.mchId = mchId;
+    }
+
+    public void setMchKey(String mchKey) {
+        this.mchKey = mchKey;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/ShareCodeUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/ShareCodeUtils.java
new file mode 100644
index 0000000..9586b29
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/ShareCodeUtils.java
@@ -0,0 +1,64 @@
+package com.ruoyi.util;
+
+import java.util.Random;
+
+/**
+ * 邀请码生成器，算法原理：<br/>
+ * 1) 获取id: 1127738 <br/>
+ * 2) 使用自定义进制转为：gpm6 <br/>
+ * 3) 转为字符串，并在后面加'o'字符：gpm6o <br/>
+ * 4）在后面随机产生若干个随机数字字符：gpm6o7 <br/>
+ * 转为自定义进制后就不会出现o这个字符，然后在后面加个'o'，这样就能确定唯一性。最后在后面产生一些随机字符进行补全。<br/>
+ */
+public class ShareCodeUtils {
+
+    /**
+     * 自定义进制(0,1没有加入,容易与o,l混淆)
+     */
+    private static final char[] r = new char[]{'q', 'w', 'e', '8', 'a', 's', '2', 'd', 'z', 'x', '9', 'c', '7', 'p', '5', 'i', 'k', '3', 'm', 'j', 'u', 'f', 'r', '4', 'v', 'y', 'l', 't', 'n', '6', 'b', 'g', 'h'};
+
+    /**
+     * (不能与自定义进制有重复)
+     */
+    private static final char b = 'o';
+
+    /**
+     * 进制长度
+     */
+    private static final int binLen = r.length;
+
+    /**
+     * 序列最小长度
+     */
+    private static final int s = 6;
+
+    /**
+     * 根据ID生成六位随机码
+     *
+     * @param id ID
+     * @return 随机码
+     */
+    public static String toSerialCode(long id) {
+        char[] buf = new char[32];
+        int charPos = 32;
+
+        while ((id / binLen) > 0) {
+            int ind = (int) (id % binLen);
+            buf[--charPos] = r[ind];
+            id /= binLen;
+        }
+        buf[--charPos] = r[(int) (id % binLen)];
+        String str = new String(buf, charPos, (32 - charPos));
+        // 不够长度的自动随机补全
+        if (str.length() < s) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(b);
+            Random rnd = new Random();
+            for (int i = 1; i < s - str.length(); i++) {
+                sb.append(r[rnd.nextInt(binLen)]);
+            }
+            str += sb.toString();
+        }
+        return str;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/SmsUtil.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/SmsUtil.java
new file mode 100644
index 0000000..704b03d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/SmsUtil.java
@@ -0,0 +1,124 @@
+package com.ruoyi.util;
+
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.ruoyi.util.bean.RequestParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Objects;
+
+/**
+ * 发送短信工具类
+ *
+ * @author 魔金商城 on 2017/9/7.
+ */
+public class SmsUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(SmsUtil.class);
+
+    /**
+     * 发送短信-新
+     *
+     * @param requestParam 请求中的参数实体类
+     * @return 0 成功 1失败
+     */
+    public static int newSendSms(RequestParam requestParam) {
+        logger.info("newSendSms response info:{}", requestParam);
+        if (Objects.isNull(requestParam)) {
+            logger.info("newSendSms error due to requestParam is null");
+            return 1;
+        }
+        //设置超时时间-可自行调整
+        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
+        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
+        //初始化ascClient需要的几个参数
+        final String product = "Dysmsapi";//短信API产品名称（短信产品名固定，无需修改）
+        final String domain = requestParam.getInterfaceUrl();//短信API产品域名（接口地址固定，无需修改）
+        //你的accessKeyId
+        final String accessKeyId = requestParam.getAccessKeyId();
+        //你的accessKeySecret
+        final String accessKeySecret = requestParam.getAccessKeySecret();
+        //组装请求对象
+        SendSmsRequest sendSmsRequest = new SendSmsRequest();
+        //使用post提交
+        sendSmsRequest.setMethod(MethodType.POST);
+        //必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式
+        sendSmsRequest.setPhoneNumbers(requestParam.getPhoneNumbers());
+        //必填:短信签名-可在短信控制台中找到
+        sendSmsRequest.setSignName(requestParam.getSignName());
+        //必填:短信模板-可在短信控制台中找到
+        sendSmsRequest.setTemplateCode(requestParam.getTemplateCode());
+        //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为(友情提示:如果JSON中需要带换行符,请参照标准的JSON协议对换行符的要求,比如短信内容中包含\r\n的情况在JSON中需要表示成\\r\\n,否则会导致JSON在服务端解析失败)
+        sendSmsRequest.setTemplateParam("{\"code\":\"" + requestParam.getTemplateParam() + "\"}");
+        //1.可选-上行短信扩展码(无特殊需求用户请忽略此字段):request.setSmsUpExtendCode("90997");//2.可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者:request.setOutId("yourOutId");
+        //请求失败这里会抛ClientException异常
+        SendSmsResponse sendSmsResponse;
+        try {
+            //初始化ascClient,暂时不支持多region
+            DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
+            sendSmsResponse = new DefaultAcsClient(DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret)).getAcsResponse(sendSmsRequest);
+        } catch (ClientException e) {
+            logger.error("newSendSms error{}:", e);
+            return 1;
+        }
+        logger.info("newSendSms response code:{} \r\n message:{}", sendSmsResponse.getCode(), sendSmsResponse.getMessage());
+        return "OK".equals(sendSmsResponse.getCode()) ? 0 : 1;
+    }
+
+
+    /**
+     * 发送短信-新通用
+     *
+     * @param requestParam 请求中的参数实体类
+     * @return 0 成功 1失败
+     */
+    public static int newSendSmsCommon(RequestParam requestParam) {
+        logger.info("newSendSms response info:{}", requestParam);
+        if (Objects.isNull(requestParam)) {
+            logger.info("newSendSms error due to requestParam is null");
+            return 1;
+        }
+        //设置超时时间-可自行调整
+        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
+        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
+        //初始化ascClient需要的几个参数
+        final String product = "Dysmsapi";//短信API产品名称（短信产品名固定，无需修改）
+        final String domain = requestParam.getInterfaceUrl();//短信API产品域名（接口地址固定，无需修改）
+        //你的accessKeyId
+        final String accessKeyId = requestParam.getAccessKeyId();
+        //你的accessKeySecret
+        final String accessKeySecret = requestParam.getAccessKeySecret();
+        //组装请求对象
+        SendSmsRequest sendSmsRequest = new SendSmsRequest();
+        //使用post提交
+        sendSmsRequest.setMethod(MethodType.POST);
+        //必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式
+        sendSmsRequest.setPhoneNumbers(requestParam.getPhoneNumbers());
+        //必填:短信签名-可在短信控制台中找到
+        sendSmsRequest.setSignName(requestParam.getSignName());
+        //必填:短信模板-可在短信控制台中找到
+        sendSmsRequest.setTemplateCode(requestParam.getTemplateCode());
+        //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为(友情提示:如果JSON中需要带换行符,请参照标准的JSON协议对换行符的要求,比如短信内容中包含\r\n的情况在JSON中需要表示成\\r\\n,否则会导致JSON在服务端解析失败)
+        sendSmsRequest.setTemplateParam(requestParam.getSmsParamString());
+        //1.可选-上行短信扩展码(无特殊需求用户请忽略此字段):request.setSmsUpExtendCode("90997");//2.可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者:request.setOutId("yourOutId");
+        //请求失败这里会抛ClientException异常
+        SendSmsResponse sendSmsResponse;
+        try {
+            //初始化ascClient,暂时不支持多region
+            DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
+            sendSmsResponse = new DefaultAcsClient(DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret)).getAcsResponse(sendSmsRequest);
+        } catch (ClientException e) {
+            logger.error("newSendSms error{}:", e);
+            return 1;
+        }
+        logger.info("newSendSms response code:{} \r\n message:{}", sendSmsResponse.getCode(), sendSmsResponse.getMessage());
+        return "OK".equals(sendSmsResponse.getCode()) ? 0 : 1;
+    }
+
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/SnowflakeIdWorker.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/SnowflakeIdWorker.java
new file mode 100644
index 0000000..7100e4f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/SnowflakeIdWorker.java
@@ -0,0 +1,171 @@
+package com.ruoyi.util;
+
+
+/**
+ * Created by 魔金商城 on 17/11/02.
+ * <p>
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeIdWorker {
+    /**
+     * 开始时间截 (2015-01-01)
+     */
+    private final long twepoch = 1420041600000L;
+
+    /**
+     * 机器id所占的位数
+     */
+    private final long workerIdBits = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private final long datacenterIdBits = 5L;
+
+    /**
+     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+     */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /**
+     * 支持的最大数据标识id，结果是31
+     */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /**
+     * 序列在id中占的位数
+     */
+    private final long sequenceBits = 12L;
+
+    /**
+     * 机器ID向左移12位
+     */
+    private final long workerIdShift = sequenceBits;
+
+    /**
+     * 数据标识id向左移17位(12+5)
+     */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /**
+     * 时间截向左移22位(5+5+12)
+     */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /**
+     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+     */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/ThreadTask.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/ThreadTask.java
new file mode 100644
index 0000000..4893cb6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/ThreadTask.java
@@ -0,0 +1,33 @@
+package com.ruoyi.util;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by 魔金商城 on 17/6/20.
+ * 线程池
+ */
+public class ThreadTask {
+
+    private static final ThreadTask threadTask = new ThreadTask();
+    /**
+     * 固定线程池
+     */
+    private ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+
+    private ThreadTask() {
+    }
+
+    public static ThreadTask getInstance() {
+        return threadTask;
+    }
+
+    /**
+     * 加入线程池执行
+     *
+     * @param runnable 执行线程
+     */
+    public void addTask(Runnable runnable) {
+        executorService.execute(runnable);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/UnionPayUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/UnionPayUtils.java
new file mode 100644
index 0000000..e69de29
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/VerifyCodeUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/VerifyCodeUtils.java
new file mode 100644
index 0000000..3701ce3
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/VerifyCodeUtils.java
@@ -0,0 +1,202 @@
+package com.ruoyi.util;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Random;
+
+/**
+ * 验证码工具类
+ *
+ * @author ruoyi
+ */
+public class VerifyCodeUtils {
+    // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
+    public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
+
+    private static Random random = new SecureRandom();
+
+    /**
+     * 使用系统默认字符源生成验证码
+     *
+     * @param verifySize 验证码长度
+     * @return
+     */
+    public static String generateVerifyCode(int verifySize) {
+        return generateVerifyCode(verifySize, VERIFY_CODES);
+    }
+
+    /**
+     * 使用指定源生成验证码
+     *
+     * @param verifySize 验证码长度
+     * @param sources    验证码字符源
+     * @return
+     */
+    public static String generateVerifyCode(int verifySize, String sources) {
+        if (sources == null || sources.length() == 0) {
+            sources = VERIFY_CODES;
+        }
+        int codesLen = sources.length();
+        Random rand = new Random(System.currentTimeMillis());
+        StringBuilder verifyCode = new StringBuilder(verifySize);
+        for (int i = 0; i < verifySize; i++) {
+            verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
+        }
+        return verifyCode.toString();
+    }
+
+    /**
+     * 输出指定验证码图片流
+     *
+     * @param w
+     * @param h
+     * @param os
+     * @param code
+     * @throws IOException
+     */
+    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
+        int verifySize = code.length();
+        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+        Random rand = new Random();
+        Graphics2D g2 = image.createGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        Color[] colors = new Color[5];
+        Color[] colorSpaces = new Color[]{Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
+                Color.ORANGE, Color.PINK, Color.YELLOW};
+        float[] fractions = new float[colors.length];
+        for (int i = 0; i < colors.length; i++) {
+            colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
+            fractions[i] = rand.nextFloat();
+        }
+        Arrays.sort(fractions);
+
+        g2.setColor(Color.GRAY);// 设置边框色
+        g2.fillRect(0, 0, w, h);
+
+        Color c = getRandColor(200, 250);
+        g2.setColor(c);// 设置背景色
+        g2.fillRect(0, 2, w, h - 4);
+
+        // 绘制干扰线
+        Random random = new Random();
+        g2.setColor(getRandColor(160, 200));// 设置线条的颜色
+        for (int i = 0; i < 20; i++) {
+            int x = random.nextInt(w - 1);
+            int y = random.nextInt(h - 1);
+            int xl = random.nextInt(6) + 1;
+            int yl = random.nextInt(12) + 1;
+            g2.drawLine(x, y, x + xl + 40, y + yl + 20);
+        }
+
+        // 添加噪点
+        float yawpRate = 0.05f;// 噪声率
+        int area = (int) (yawpRate * w * h);
+        for (int i = 0; i < area; i++) {
+            int x = random.nextInt(w);
+            int y = random.nextInt(h);
+            int rgb = getRandomIntColor();
+            image.setRGB(x, y, rgb);
+        }
+
+        shear(g2, w, h, c);// 使图片扭曲
+
+        g2.setColor(getRandColor(100, 160));
+        int fontSize = h - 4;
+        Font font = new Font("Algerian", Font.ITALIC, fontSize);
+        g2.setFont(font);
+        char[] chars = code.toCharArray();
+        for (int i = 0; i < verifySize; i++) {
+            AffineTransform affine = new AffineTransform();
+            affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
+                    (w / verifySize) * i + fontSize / 2, h / 2);
+            g2.setTransform(affine);
+            g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
+        }
+
+        g2.dispose();
+        ImageIO.write(image, "jpg", os);
+    }
+
+    private static Color getRandColor(int fc, int bc) {
+        if (fc > 255) {
+            fc = 255;
+        }
+        if (bc > 255) {
+            bc = 255;
+        }
+        int r = fc + random.nextInt(bc - fc);
+        int g = fc + random.nextInt(bc - fc);
+        int b = fc + random.nextInt(bc - fc);
+        return new Color(r, g, b);
+    }
+
+    private static int getRandomIntColor() {
+        int[] rgb = getRandomRgb();
+        int color = 0;
+        for (int c : rgb) {
+            color = color << 8;
+            color = color | c;
+        }
+        return color;
+    }
+
+    private static int[] getRandomRgb() {
+        int[] rgb = new int[3];
+        for (int i = 0; i < 3; i++) {
+            rgb[i] = random.nextInt(255);
+        }
+        return rgb;
+    }
+
+    private static void shear(Graphics g, int w1, int h1, Color color) {
+        shearX(g, w1, h1, color);
+        shearY(g, w1, h1, color);
+    }
+
+    private static void shearX(Graphics g, int w1, int h1, Color color) {
+
+        int period = random.nextInt(2);
+
+        boolean borderGap = true;
+        int frames = 1;
+        int phase = random.nextInt(2);
+
+        for (int i = 0; i < h1; i++) {
+            double d = (double) (period >> 1)
+                    * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+            g.copyArea(0, i, w1, 1, (int) d, 0);
+            if (borderGap) {
+                g.setColor(color);
+                g.drawLine((int) d, i, 0, i);
+                g.drawLine((int) d + w1, i, w1, i);
+            }
+        }
+
+    }
+
+    private static void shearY(Graphics g, int w1, int h1, Color color) {
+
+        int period = random.nextInt(40) + 10; // 50;
+
+        boolean borderGap = true;
+        int frames = 20;
+        int phase = 7;
+        for (int i = 0; i < w1; i++) {
+            double d = (double) (period >> 1)
+                    * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+            g.copyArea(i, 0, 1, h1, 0, (int) d);
+            if (borderGap) {
+                g.setColor(color);
+                g.drawLine(i, (int) d, i, 0);
+                g.drawLine(i, (int) d + h1, i, h1);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WXPayDomainSimpleImpl.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WXPayDomainSimpleImpl.java
new file mode 100644
index 0000000..bd15eac
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WXPayDomainSimpleImpl.java
@@ -0,0 +1,120 @@
+package com.ruoyi.util;
+
+import com.weixin.pay.WXPayConfig;
+import com.weixin.pay.WXPayDomain;
+import com.weixin.pay.constants.WXPayConstants;
+
+import org.apache.http.conn.ConnectTimeoutException;
+
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信支付域名实现类（官方简单版）
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayDomainSimpleImpl implements WXPayDomain {
+    private WXPayDomainSimpleImpl() {
+    }
+
+    private static class WxpayDomainHolder {
+        private static WXPayDomain holder = new WXPayDomainSimpleImpl();
+    }
+
+    public static WXPayDomain instance() {
+        return WxpayDomainHolder.holder;
+    }
+
+    @Override
+    public synchronized void report(final String domain, long elapsedTimeMillis, final Exception ex) {
+        DomainStatics info = domainData.get(domain);
+        if (info == null) {
+            info = new DomainStatics(domain);
+            domainData.put(domain, info);
+        }
+
+        // success
+        if (ex == null) {
+            if (info.succCount >= 2) {
+                // continue succ, clear error count
+                info.connectTimeoutCount = info.dnsErrorCount = info.otherErrorCount = 0;
+            } else {
+                ++info.succCount;
+            }
+        } else if (ex instanceof ConnectTimeoutException) {
+            info.succCount = info.dnsErrorCount = 0;
+            ++info.connectTimeoutCount;
+        } else if (ex instanceof UnknownHostException) {
+            info.succCount = 0;
+            ++info.dnsErrorCount;
+        } else {
+            info.succCount = 0;
+            ++info.otherErrorCount;
+        }
+    }
+
+    @Override
+    public synchronized DomainInfo getDomain(final WXPayConfig config) {
+        DomainStatics primaryDomain = domainData.get(WXPayConstants.DOMAIN_API);
+        if (primaryDomain == null ||
+                primaryDomain.isGood()) {
+            return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+        }
+
+        long now = System.currentTimeMillis();
+        if (switchToAlternateDomainTime == 0) {
+            // first switch
+            switchToAlternateDomainTime = now;
+            return new DomainInfo(WXPayConstants.DOMAIN_API2, false);
+        } else if (now - switchToAlternateDomainTime < MIN_SWITCH_PRIMARY_MSEC) {
+            DomainStatics alternateDomain = domainData.get(WXPayConstants.DOMAIN_API2);
+            if (alternateDomain == null ||
+                    alternateDomain.isGood() ||
+                    alternateDomain.badCount() < primaryDomain.badCount()) {
+                return new DomainInfo(WXPayConstants.DOMAIN_API2, false);
+            } else {
+                return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+            }
+        } else {  //force switch back
+            switchToAlternateDomainTime = 0;
+            primaryDomain.resetCount();
+            DomainStatics alternateDomain = domainData.get(WXPayConstants.DOMAIN_API2);
+            if (alternateDomain != null) {
+                alternateDomain.resetCount();
+            }
+            return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+        }
+    }
+
+    static class DomainStatics {
+        final String domain;
+        int succCount = 0;
+        int connectTimeoutCount = 0;
+        int dnsErrorCount = 0;
+        int otherErrorCount = 0;
+
+        DomainStatics(String domain) {
+            this.domain = domain;
+        }
+
+        void resetCount() {
+            succCount = connectTimeoutCount = dnsErrorCount = otherErrorCount = 0;
+        }
+
+        boolean isGood() {
+            return connectTimeoutCount <= 2 && dnsErrorCount <= 2;
+        }
+
+        int badCount() {
+            return connectTimeoutCount + dnsErrorCount * 5 + otherErrorCount / 4;
+        }
+    }
+
+    // 3 minutes
+    private final int MIN_SWITCH_PRIMARY_MSEC = 3 * 60 * 1000;
+    private long switchToAlternateDomainTime = 0;
+    private Map<String, DomainStatics> domainData = new HashMap<String, DomainStatics>();
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletLoginResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletLoginResponse.java
new file mode 100644
index 0000000..374291e
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletLoginResponse.java
@@ -0,0 +1,132 @@
+package com.ruoyi.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * 微信小程序登录返回
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class WeChatAppletLoginResponse {
+    /**
+     * 用户唯一标志
+     */
+    @JSONField(name = "openid")
+    private String openid;
+
+    /**
+     * 会话密钥
+     */
+    @JSONField(name = "session_key")
+    private String session_key;
+
+    /**
+     * 联合登录id 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。
+     */
+    @JSONField(name = "unionid")
+    private String unionid;
+
+    /**
+     * 错误码（出错时返回）
+     */
+    @JSONField(name = "errcode")
+    private Integer errcode;
+
+    /**
+     * 错误信息（出错时返回）
+     */
+    @JSONField(name = "errmsg")
+    private String errmsg;
+
+    public WeChatAppletLoginResponse(String openid, String session_key, String unionid) {
+        this.openid = openid;
+        this.session_key = session_key;
+        this.unionid = unionid;
+    }
+
+    /**
+     * 转换为字符串
+     */
+    @Override
+    public String toString() {
+        return JSONObject.toJSONString(this);
+    }
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return this.errcode != null && this.errcode != 0 ;
+    }
+
+    /**
+     * 返回错误码解释
+     */
+    @JsonIgnore
+    public String errCodeDesc() {
+        switch (this.errcode){
+            case -1: return "系统繁忙，此时请开发者稍候再试";
+            case 0: return "请求成功";
+            case 40029: return "code 无效";
+            case 45011: return "频率限制，每个用户每分钟100次";
+            case 40226: return "高风险等级用户，小程序登录拦截 ";
+            default: return "未知错误";
+        }
+    }
+
+
+    /**
+     * 判断是否有unionId
+     *
+     * @return 有返回true, 否则返回false
+     */
+    public boolean hasUnionId() {
+        return !StringUtils.isEmpty(unionid);
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getSession_key() {
+        return session_key;
+    }
+
+    public void setSession_key(String session_key) {
+        this.session_key = session_key;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public Integer getErrcode() {
+        return errcode;
+    }
+
+    public void setErrcode(Integer errcode) {
+        this.errcode = errcode;
+    }
+
+    public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUserInfo.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUserInfo.java
new file mode 100644
index 0000000..c50fe05
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUserInfo.java
@@ -0,0 +1,101 @@
+package com.ruoyi.util;
+
+
+/**
+ * 微信小程序用户信息实体
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class WeChatAppletUserInfo {
+
+    /**
+     * 错误信息
+     */
+    private String errMsg;
+
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法
+     */
+    private String encryptedData;
+
+    /**
+     * 加密算法的初始向量，详细见加密数据解密算法
+     */
+    private String iv;
+
+    /**
+     * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，参考文档
+     */
+    private String signature;
+
+    /**
+     * 不包括敏感信息的原始数据字符串，用于计算签名。
+     */
+    private String rawData;
+
+    /**
+     * 联合登录id 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。
+     */
+    private String unionId;
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
+
+    public String getEncryptedData() {
+        return encryptedData;
+    }
+
+    public void setEncryptedData(String encryptedData) {
+        this.encryptedData = encryptedData;
+    }
+
+    public String getIv() {
+        return iv;
+    }
+
+    public void setIv(String iv) {
+        this.iv = iv;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getRawData() {
+        return rawData;
+    }
+
+    public void setRawData(String rawData) {
+        this.rawData = rawData;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    @Override
+    public String toString() {
+        return "WeChatAppletUserInfo{" +
+                "errMsg='" + errMsg + '\'' +
+                ", encryptedData='" + encryptedData + '\'' +
+                ", iv='" + iv + '\'' +
+                ", signature='" + signature + '\'' +
+                ", rawData='" + rawData + '\'' +
+                ", unionId='" + unionId + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUtils.java
new file mode 100644
index 0000000..558d5e2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WeChatAppletUtils.java
@@ -0,0 +1,311 @@
+package com.ruoyi.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.util.WeChatAppletLoginResponse;
+import com.ruoyi.util.WeChatAppletUserInfo;
+import com.ruoyi.util.WechatSetting;
+import com.ruoyi.util.bean.SegUserProfile;
+import com.ruoyi.util.bean.UserInfoProfile;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * 微信小程序工具类
+ *
+ * @author SK
+ * @since 2018/6/13
+ */
+public class WeChatAppletUtils {
+    private static final Logger logger = LoggerFactory.getLogger(WeChatAppletUtils.class);
+    /**
+     * 获取登录信息地址
+     */
+    private final static String GET_LOGIN_INFO_URL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
+    /**
+     * 新的获取登录信息地址
+     */
+    private final static String GET_LOGIN_INFO_URL1 = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
+    /**
+     * 获取微信小程序access_token地址（参数为 appid 和 secret）
+     */
+    private final static String GET_WECHAT_APPLET_ACCESS_TOKEN_ = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
+    /**
+     * 获取微信小程序分享码请求地址
+     */
+    private final static String GET_WECHAT_APPLET_SHARE_CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s";
+    /**
+     * 获取微信小程序直播房间列表地址
+     */
+    private final static String GET_WECHAT_APPLET_LIVE_PLAYER_LIST_URL = "http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=%s";
+
+    private WeChatAppletUtils() {
+    }
+
+    /**
+     * 获取登录信息
+     *
+     * @param code          用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 api，使用 code 换取 openid 和 session_key 等信息
+     * @param wechatSetting 微信设置
+     * @return 微信小程序登录返回实体
+     */
+    public static WeChatAppletLoginResponse getLoginInfo(String code, WechatSetting wechatSetting) {
+        logger.debug("getLoginInfo and code:{} \r\n wechatSetting:{}", code, wechatSetting);
+        /*WeChatAppletLoginResponse weChatAppletLoginResponse = wechatSetting.getType() == 999999
+                ? new WeChatAppletLoginResponse(code, code, code)
+                : JSON.parseObject(WechatUtils.executeHttpGet(String.format(GET_LOGIN_INFO_URL, wechatSetting.getAppId(), wechatSetting.getAppSecret(), code)), WeChatAppletLoginResponse.class);*/
+//        WeChatAppletLoginResponse weChatAppletLoginResponse = null;
+        String s = WechatUtils.executeHttpGet(String.format(GET_LOGIN_INFO_URL, wechatSetting.getAppId(), wechatSetting.getAppSecret(), code));
+        logger.warn("getLoginInfo res: ({})", s);
+        WeChatAppletLoginResponse weChatAppletLoginResponse = JSONObject.parseObject(s, WeChatAppletLoginResponse.class);
+//        logger.warn("getLoginInfo get WeChatAppletLoginResponse: {}", weChatAppletLoginResponse.toString());
+        if (Objects.isNull(weChatAppletLoginResponse)) {
+            logger.error("getLoginInfo fail : weChatAppletLoginResponse is null");
+            return null;
+        }
+        if (weChatAppletLoginResponse.isError()) {
+            logger.debug("getLoginInfo fail and errorMsg:({}) errCode:({})", weChatAppletLoginResponse.getErrmsg(), weChatAppletLoginResponse.getErrcode());
+            return null;
+        }
+        logger.debug("getLoginInfo get user wechat info: {}", weChatAppletLoginResponse.toString());
+        return weChatAppletLoginResponse;
+    }
+
+    /**
+     * 根据用户信息UserProfile获取用户信息
+     *
+     * @param sessionKey           会话密钥
+     * @param segUserProfile 微信小程序用户信息实体
+     * @return 用户unionId
+     */
+    public static String getUserInfoFromUserProfile(String sessionKey, SegUserProfile segUserProfile) {
+        logger.debug("getUserInfoFromUserProfile and sessionKey:{} \r\n weChatAppletUserInfo:{}", sessionKey, segUserProfile);
+        String unionId = null;
+        if (Objects.isNull(segUserProfile)) {
+            logger.error("getUserInfoFromUserProfile fail:weChatAppletUserInfo is null ");
+            return null;
+        }
+        // 被加密的数据
+        byte[] dataByte = Base64.decodeBase64(segUserProfile.getEncryptedData());
+        // 加密秘钥
+        byte[] aeskey = Base64.decodeBase64(sessionKey);
+        // 偏移量
+        byte[] ivByte = Base64.decodeBase64(segUserProfile.getIv());
+
+        try {
+            /*int base = 16;
+            if (aeskey.length % base != 0) {
+                int groups = aeskey.length / base + (aeskey.length % base != 0 ? 1 : 0);
+                byte[] temp = new byte[groups * base];
+                Arrays.fill(temp, (byte) 0);
+                System.arraycopy(aeskey, 0, temp, 0, aeskey.length);
+                aeskey = temp;
+            }*/
+            byte[] resultByte = AesUtils.getInstance().decrypt(dataByte, aeskey, ivByte);
+            if (!ObjectUtils.isEmpty(resultByte)) {
+                String result = new String(resultByte, "UTF-8");
+                return JSONObject.parseObject(result).toJSONString();
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return unionId;
+    }
+
+    /**
+     * 根据用户信息获取unionId
+     *
+     * @param sessionKey           会话密钥
+     * @param weChatAppletUserInfo 微信小程序用户信息实体
+     * @return 用户unionId
+     */
+    public static String getUnionIdFromUserInfo(String sessionKey, WeChatAppletUserInfo weChatAppletUserInfo) {
+        logger.debug("getUnionIdFromUserInfo and sessionKey:{} \r\n weChatAppletUserInfo:{}", sessionKey, weChatAppletUserInfo);
+        String unionId = null;
+        if (Objects.isNull(weChatAppletUserInfo)) {
+            logger.error("getUnionIdFromUserInfo fail:weChatAppletUserInfo is null ");
+            return null;
+        }
+        // 被加密的数据
+        byte[] dataByte = Base64.decodeBase64(weChatAppletUserInfo.getEncryptedData());
+        // 加密秘钥
+        byte[] aeskey = Base64.decodeBase64(sessionKey);
+        // 偏移量
+        byte[] ivByte = Base64.decodeBase64(weChatAppletUserInfo.getIv());
+
+        try {
+            byte[] resultByte = AesUtils.getInstance().decrypt(dataByte, aeskey, ivByte);
+            String userInfo = new String(resultByte, "UTF-8");
+            unionId = JSON.parseObject(userInfo).getString("unionId");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return unionId;
+    }
+
+    /**
+     * 获取微信小程序access_token（有效期两小时）
+     *
+     * @param wechatSetting 微信设置实体
+     * @return 微信小程序access_token
+     */
+    public static String getAccessToken(WechatSetting wechatSetting) {
+        logger.debug("getAccessToken and wechatSetting:{} ", wechatSetting);
+        String accessTokenForShareUrl = String.format(GET_WECHAT_APPLET_ACCESS_TOKEN_, wechatSetting.getAppId(), wechatSetting.getAppSecret());
+        JSONObject res = JSON.parseObject(CustomHttpUtils.doGet(accessTokenForShareUrl));
+        if (!StringUtils.isEmpty(res.getString("errcode"))) {
+            if (!StringUtils.isEmpty(res.getString("errmsg"))) {
+                logger.error("getAccessToken Fail and errmsg:{}", res.getString("errmsg"));
+            }
+            return null;
+        } else {
+            return res.getString("access_token");
+        }
+    }
+
+    /**
+     * 获取json参数post请求返回值（微信小程序码）
+     *
+     * @param url        请求地址
+     * @param jsonString 请求参数
+     * @return 请求返回（ByteArrayInputStream格式，访问数组的字节输入流）
+     */
+    public static ByteArrayInputStream getJsonRequestResult(String url, String jsonString) {
+        logger.debug("getWeChatAppletCode and url :{} \r\n jsonString :{} ", url, jsonString);
+        String result = null;
+        InputStream inputStream = null;
+        ByteArrayInputStream byteArrayInputStream = null;
+        BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+        HttpPost httpRequest = new HttpPost(url);
+        httpRequest.setHeader("Content-type", "application/json; charset=utf-8");
+        StringEntity requestParam = new StringEntity(jsonString, "UTF-8");
+        requestParam.setContentType("application/json");
+        try {
+            httpRequest.setEntity(requestParam);
+            HttpResponse response = httpClient.execute(httpRequest);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                HttpEntity entity = response.getEntity();
+                inputStream = entity.getContent();
+                ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+                // 创建一个Buffer字符串
+                byte[] buffer = new byte[1024];
+                // 每次读取的字符串长度，如果为-1，代表全部读取完毕
+                int len = 0;
+                // 使用一个输入流从buffer里把数据读取出来
+                while ((len = inputStream.read(buffer)) != -1) {
+                    // 用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                    outStream.write(buffer, 0, len);
+                }
+                // 关闭输入流
+                inputStream.close();
+                // 把outStream里的数据写入内存
+                byteArrayInputStream = new ByteArrayInputStream(outStream.toByteArray());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            logger.error(e.getMessage());
+        }
+        logger.debug("getJsonRequestResult and result:{}", result == null ? "" : result);
+        return byteArrayInputStream;
+    }
+
+    /**
+     * 数组的字节输入流转化为base64字符串
+     *
+     * @param inputStream 输入流
+     * @return base64字符串
+     */
+    public static String getBase64FromInputStream(InputStream inputStream) {
+        // 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        byte[] data = null;
+        // 读取图片字节数组
+        try {
+            if (Objects.isNull(inputStream) || inputStream.available() <= 200) {
+                logger.error("getBase64FromInputStream fail due to inputStream is null");
+                return null;
+            }
+            ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+            byte[] buff = new byte[100];
+            int rc = 0;
+            while ((rc = inputStream.read(buff, 0, 100)) > 0) {
+                swapStream.write(buff, 0, rc);
+            }
+            data = swapStream.toByteArray();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return java.util.Base64.getEncoder().encodeToString(data);
+    }
+
+    /**
+     * 获取微信小程序分享码请求地址
+     *
+     * @param accessToken 微信小程序access_token
+     * @return 微信小程序分享码请求地址
+     */
+    public static String getWeChatAppletShareCodeUrl(String accessToken) {
+        if (StringUtils.isEmpty(accessToken)) {
+            logger.error("getWeChatAppletShareCodeUrl fail due to accessToken is null");
+            return null;
+        }
+        return String.format(GET_WECHAT_APPLET_SHARE_CODE_URL, accessToken);
+    }
+
+    /**
+     * 获取微信小程序直播列表地址
+     *
+     * @param accessToken 微信小程序access_token
+     * @return 微信小程序直播列表地址
+     */
+    public static String getWeChatAppletLivePlayerListUrl(String accessToken) {
+        if (StringUtils.isEmpty(accessToken)) {
+            logger.error("getWeChatAppletLivePlayerListUrl fail due to accessToken is null");
+            return null;
+        }
+        return String.format(GET_WECHAT_APPLET_LIVE_PLAYER_LIST_URL, accessToken);
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatSetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatSetting.java
new file mode 100644
index 0000000..3b63348
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatSetting.java
@@ -0,0 +1,297 @@
+package com.ruoyi.util;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 微信设置实体类
+ */
+public class WechatSetting {
+    /**
+     * 公众号appId(必传)
+     */
+    private String appId;
+    /**
+     * AppSecret(必传)
+     */
+    private String appSecret;
+    /**
+     * 商户号（支付时必传）
+     */
+    private String merchantNum;
+    /**
+     * API密钥（支付时必传）
+     */
+    private String apiKey;
+    /**
+     * 支付回调（支付时必传）
+     */
+    private String payCallback;
+    /**
+     * 网页授权回调地址(授权时必传)
+     */
+    private String url;
+    /**
+     * 网站域名 (H5支付时必传）
+     */
+    private String siteUrl;
+
+    /**
+     * 网站名称（H5支付时必传）
+     */
+    private String siteName;
+
+    /**
+     * 终端ip地址
+     */
+    private String ip;
+
+    /**
+     * 支付方式 1:公众号支付（openid必传） 2:H5支付 3:扫码支付 4:APP支付 5:小程序支付（openId必传）
+     */
+    private int type;
+
+    /**
+     * 公众号支付必传 openid（微信公众号支付）
+     */
+    private String openId;
+
+
+    private String certFile;
+
+    /**
+     * 构造微信支付参数实体
+     *
+     * @param ip          终端ip
+     * @param type        支付方式 1:公众号支付（openid必传） 2:H5支付 3:扫码支付 4:APP支付
+     * @param callBackUrl 微信异步回调地址
+     * @return 返回构造微信支付参数实体
+     */
+    public static WechatSetting build(String ip, int type, String callBackUrl) {
+        WechatSetting wechatSetting = new WechatSetting();
+        wechatSetting.ip = ip;
+        wechatSetting.type = type;
+        wechatSetting.payCallback = callBackUrl;
+        return wechatSetting;
+    }
+
+    /**
+     * 是否是app支付
+     *
+     * @return app支付返回true  否则返回false
+     */
+    public boolean isAppPay() {
+        return 4 == this.type;
+    }
+
+    /**
+     * 是否是h5支付
+     *
+     * @return h5支付返回true 否则返回false
+     */
+    public boolean isH5Pay() {
+        return 2 == this.type;
+    }
+
+    /**
+     * 是否是扫码支付
+     *
+     * @return 扫码支付返回true  否则返回false
+     */
+    public boolean isQRPay() {
+        return 3 == this.type;
+    }
+
+    /**
+     * 是否是公众号支付
+     *
+     * @return 公众号支付返回true 否则返回false
+     */
+    public boolean isOfficialAccountPay() {
+        return 1 == this.type;
+    }
+
+    /**
+     * 是否是小程序支付
+     *
+     * @return 小程序支付返回true 否则返回false
+     */
+    public boolean isAppletPay() {
+        return 5 == this.type;
+    }
+
+    /**
+     * 检测支付时的参数
+     */
+    public boolean checkPayParams() {
+        return !StringUtils.isEmpty(appId) && !StringUtils.isEmpty(appSecret) &&
+                !StringUtils.isEmpty(merchantNum) && !StringUtils.isEmpty(apiKey);
+    }
+
+    /**
+     * 增加openid
+     *
+     * @param openId 公众号支付必传 openid（微信公众号支付）
+     * @return 返回当前对象
+     */
+    public WechatSetting addOpenId(String openId) {
+        this.openId = openId;
+        return this;
+    }
+
+    /**
+     * 增加网站名称
+     *
+     * @param siteName 网站名称
+     * @return 返回当前对象
+     */
+    public WechatSetting addSiteName(String siteName) {
+        this.siteName = siteName;
+        return this;
+    }
+
+    /**
+     * 增加网站域名
+     *
+     * @param siteUrl 网站域名
+     * @return 返回当前对象
+     */
+    public WechatSetting addSiteUrl(String siteUrl) {
+        this.siteUrl = siteUrl;
+        return this;
+    }
+
+    /**
+     * 检测H5支付时的参数
+     */
+    public boolean checkH5PayParams() {
+        return !StringUtils.isEmpty(siteUrl) && !StringUtils.isEmpty(siteName) && checkPayParams();
+    }
+
+    /**
+     * 检测授权时的参数
+     */
+    public boolean checkOAuthParams() {
+        return !StringUtils.isEmpty(appId) && !StringUtils.isEmpty(appSecret) &&
+                !StringUtils.isEmpty(url);
+    }
+
+    /**
+     * 检测小程序授权时的参数
+     */
+    public boolean checkAppletOAuthParams() {
+        return !StringUtils.isEmpty(appId) && !StringUtils.isEmpty(appSecret);
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getMerchantNum() {
+        return merchantNum;
+    }
+
+    public void setMerchantNum(String merchantNum) {
+        this.merchantNum = merchantNum;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public String getPayCallback() {
+        return payCallback;
+    }
+
+    public void setPayCallback(String payCallback) {
+        this.payCallback = payCallback;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getSiteUrl() {
+        return siteUrl;
+    }
+
+    public void setSiteUrl(String siteUrl) {
+        this.siteUrl = siteUrl;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    @Override
+    public String toString() {
+        return "WechatSetting{" +
+                "appId='" + appId + '\'' +
+                ", appSecret='" + appSecret + '\'' +
+                ", merchantNum='" + merchantNum + '\'' +
+                ", apiKey='" + apiKey + '\'' +
+                ", payCallback='" + payCallback + '\'' +
+                ", url='" + url + '\'' +
+                ", siteUrl='" + siteUrl + '\'' +
+                ", siteName='" + siteName + '\'' +
+                ", ip='" + ip + '\'' +
+                ", type=" + type +
+                ", openId='" + openId + '\'' +
+                '}';
+    }
+
+    public String getCertFile() {
+        return certFile;
+    }
+
+    public void setCertFile(String certFile) {
+        this.certFile = certFile;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatUtils.java
new file mode 100644
index 0000000..4d0a6f9
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/WechatUtils.java
@@ -0,0 +1,715 @@
+package com.ruoyi.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.util.md5.MD5Utils;
+import com.ruoyi.util.bean.*;
+import com.ruoyi.util.*;
+import com.weixin.pay.WXPay;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.*;
+
+
+/**
+ * 微信工具类
+ */
+public class WechatUtils {
+
+    /**
+     * 支付异步回调成功后需返回的xml
+     */
+    public final static String SUCCESS_RETURN = "<xml><return_code>SUCCESS</return_code><return_msg>OK</return_msg></xml>";
+    /**
+     * 成功
+     */
+    public final static String SUCCESS = "SUCCESS";
+    /**
+     * 公众号支付
+     */
+    public final static int OFFICIAL_ACCOUNT_PAY = 1;
+    /**
+     * H5支付
+     */
+    public final static int H5_PAY = 2;
+    /**
+     * 扫码支付
+     */
+    public final static int QR_PAY = 3;
+    /**
+     * app支付
+     */
+    public final static int APP_PAY = 4;
+    /**
+     * 小程序支付
+     */
+    public final static int APPLET_PAY = 5;
+    /**
+     * 调试日志
+     */
+    private static final Logger logger = LoggerFactory.getLogger(WechatUtils.class);
+    /**
+     * 获取code地址
+     */
+    private final static String GET_CODE_URL =
+            "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=%s#wechat_redirect";
+    /**
+     * 获取access_token地址
+     */
+    private final static String GET_ACCESS_TOKEN_URL =
+            "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
+    /**
+     * 获取用户信息地址
+     */
+    private final static String GET_USERINFO_URL =
+            "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN";
+    /**
+     * 小程序，公众号支付用户零钱地址
+     */
+    private final static String MMPAY_MKT_TRANSFERS =
+            "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+    /**
+     * 静默授权
+     */
+    private final static String SNSAPI_BASE = "snsapi_base";
+    /**
+     * 用户授权
+     */
+    private final static String SNSAPI_USERINFO = "snsapi_userinfo";
+    /**
+     * 微信支付统一下单地址
+     */
+    private final static String UNION_SUBMIT_ORDER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+    /**
+     * 获取微信分享access_token地址（参数为 appid 和 secret）
+     */
+    private final static String GET_ACCESS_TOKEN_FOR_SHARE_URL =
+            "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
+    /**
+     * 获取微信分享jsapi_ticket地址（参数为 access_token）
+     */
+    private final static String GET_JSAPI_TICKET_URL =
+            "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi";
+
+    private WechatUtils() {
+    }
+
+    /**
+     * 获取静默授权地址
+     *
+     * @param fromUrl       拦截前链接
+     * @param wechatSetting 微信设置实体
+     * @return 静默授权地址
+     */
+    public static String getCodeUrlBase(String fromUrl, WechatSetting wechatSetting) {
+        logger.debug("getCodeUrlBase and fromUrl:{} \r\n wechatSetting:{}", fromUrl, wechatSetting);
+        return String.format(GET_CODE_URL, wechatSetting.getAppId(), wechatSetting.getUrl(), SNSAPI_BASE, fromUrl);
+    }
+
+    /**
+     * 获取用户授权地址
+     *
+     * @param fromUrl       拦截前链接
+     * @param wechatSetting 微信设置实体
+     * @return 用户授权地址
+     */
+    public static String getCodeUrlInfo(String fromUrl, WechatSetting wechatSetting) {
+        logger.debug("getCodeUrlInfo and fromUrl:{}\r\n wechatSetting:{} ", fromUrl, wechatSetting);
+        return String.format(GET_CODE_URL, wechatSetting.getAppId(), wechatSetting.getUrl(), SNSAPI_USERINFO, fromUrl);
+    }
+
+    /**
+     * 获取网页授权access_token
+     *
+     * @param code          微信code
+     * @param state         与code一起返回的状态码（额外参数）
+     * @param wechatSetting 微信设置实体
+     * @return 网页授权返回实体类
+     */
+    public static AccessTokenResult getAccessToken(String code, String state, WechatSetting wechatSetting) {
+        AccessTokenResult res;
+        logger.debug("getAccessToken and code:{}\r\n wechatSetting:{} ", code, wechatSetting);
+        String accessTokenUrl = String.format(GET_ACCESS_TOKEN_URL, wechatSetting.getAppId(), wechatSetting.getAppSecret(), code);
+        res = JSON.parseObject(executeHttpGet(accessTokenUrl), AccessTokenResult.class);
+        if (res.isError()) {
+            if (!StringUtils.isEmpty(res.getErrmsg())) {
+                logger.error("getAccessToken Fail and errmsg:{}", res.getErrmsg());
+            }
+            return null;
+        } else {
+            res.setRedirectUrl(state);
+            return res;
+        }
+
+    }
+
+    /**
+     * 获取微信分享access_token
+     *
+     * @param wechatSetting 微信设置实体
+     * @return 微信分享access_token
+     */
+    public static String getAccessTokenForShare(WechatSetting wechatSetting) {
+        logger.debug("getAccessToken and wechatSetting:{} ", wechatSetting);
+        String accessTokenForShareUrl = String.format(GET_ACCESS_TOKEN_FOR_SHARE_URL, wechatSetting.getAppId(), wechatSetting.getAppSecret());
+        JSONObject res = JSON.parseObject(executeHttpGet(accessTokenForShareUrl));
+        if (!StringUtils.isEmpty(res.getString("errcode"))) {
+            if (!StringUtils.isEmpty(res.getString("errmsg"))) {
+                logger.error("getAccessTokenForShare Fail and errmsg:{}", res.getString("errmsg"));
+            }
+            return null;
+        } else {
+            return res.getString("access_token");
+        }
+    }
+
+    /**
+     * 获取微信分享jsapi_ticket
+     *
+     * @param access_token 凭证
+     * @return 微信分享jsapi_ticket
+     */
+    public static String getJsapiTicketForShare(String access_token) {
+        logger.debug("getAccessToken and access_token:{} ", access_token);
+        String jsapiTicketForShareUrl = String.format(GET_JSAPI_TICKET_URL, access_token);
+        JSONObject res = JSON.parseObject(executeHttpGet(jsapiTicketForShareUrl));
+        if (Integer.parseInt(res.getString("errcode")) != 0) {
+            if (!StringUtils.isEmpty(res.getString("errmsg"))) {
+                logger.error("getJsapiTicketForShare Fail and errmsg:{}", res.getString("errmsg"));
+            }
+            return null;
+        } else {
+            return res.getString("ticket");
+        }
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @param accessToken 网页授权接口调用凭证
+     * @param openId      用户的唯一标识
+     * @return 用户信息返回实体类
+     */
+    public static UserInfoResult getUserInfo(String accessToken, String openId) {
+        logger.debug("getUserInfo and access_token:{}\r\n openid:{} ", accessToken, openId);
+
+        String userInfoUrl = String.format(GET_USERINFO_URL, accessToken, openId);
+        UserInfoResult res = JSON.parseObject(executeHttpGet(userInfoUrl), UserInfoResult.class);
+        if (res.isError()) {
+            if (!StringUtils.isEmpty(res.getErrmsg())) {
+                logger.error("getUserInfo Fail and errmsg:{}", res.getErrmsg());
+            }
+            return null;
+        } else {
+            return res;
+        }
+    }
+
+    /**
+     * 获取预支付信息
+     *
+     * @param wechatSetting   微信设置实体
+     * @param orderInfoForPay 订单信息
+     * @return 预支付信息
+     */
+    public static PrepayResult getPrepay(WechatSetting wechatSetting, OrderInfoForPay orderInfoForPay) {
+        logger.debug("getPrepay and \r\n wechatSetting:{} \r\n orderInfoForPay:{} ", wechatSetting, orderInfoForPay);
+        String xml = getWxPayParm(wechatSetting, orderInfoForPay);
+        String res = executeHttpPost(UNION_SUBMIT_ORDER_URL, xml);
+        logger.debug("getPrepay and res:{}", res);
+
+        //将xml字符串转换为java对象
+        JaxbUtil resultBinder = new JaxbUtil(PrepayResult.class);
+        PrepayResult prepayResult = resultBinder.fromXml(res);
+        if (!prepayResult.isError()) {
+            //公众号支付时增加返回信息
+            if (wechatSetting.isOfficialAccountPay() || wechatSetting.isAppletPay()) {
+                SortedMap<String, String> packageParams = new TreeMap<>();
+                prepayResult.setPackage();
+                prepayResult.setSign_type("MD5");
+                prepayResult.setTime_stamp(getTimeStamp());
+                packageParams.put("appId", prepayResult.getAppid());
+                packageParams.put("timeStamp", prepayResult.getTime_stamp());
+                packageParams.put("nonceStr", prepayResult.getNonce_str());
+                packageParams.put("package", prepayResult.getPackage_());
+                packageParams.put("signType", prepayResult.getSign_type());
+                prepayResult.setPay_sign(createSign(packageParams, wechatSetting.getApiKey()));
+            }
+            else if (wechatSetting.isAppPay()) {
+                // app支付获得签名
+                SortedMap<String, String> packageParams = new TreeMap<>();
+                prepayResult.setTime_stamp(getTimeStamp());
+                packageParams.put("appid", prepayResult.getAppid());
+                packageParams.put("timestamp", prepayResult.getTime_stamp());
+                packageParams.put("noncestr", prepayResult.getNonce_str());
+                packageParams.put("package", "Sign=WXPay");
+                packageParams.put("partnerid", wechatSetting.getMerchantNum());
+                packageParams.put("prepayid", prepayResult.getPrepay_id());
+                prepayResult.setPay_sign(createSign(packageParams, wechatSetting.getApiKey()));
+            }
+            return prepayResult;
+        } else {
+            if (!StringUtils.isEmpty(prepayResult.getErr_code_des())) {
+                logger.error("getPrepay Fail and errcode:{} \r\n returnmsg:{} \r\n errormsg:{} ", prepayResult.getReturn_msg(), prepayResult.getErr_code(), prepayResult.getErr_code_des());
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * 获取提现信息
+     *
+     * @param wechatSetting   微信设置实体
+     * @param cashInfoForPay 订单信息
+     * @return 预支付信息
+     */
+    public static WxTransferResult getTransfers(WechatSetting wechatSetting, OrderInfoForPay cashInfoForPay) {
+        logger.debug("getPrepay and \r\n wechatSetting:{} \r\n orderInfoForPay:{} ", wechatSetting, cashInfoForPay);
+        String xml = getWxPayParm(wechatSetting, cashInfoForPay);
+        String res = executeHttpPost(MMPAY_MKT_TRANSFERS, xml);
+        logger.debug("getPrepay and res:{}", res);
+
+        //将xml字符串转换为java对象
+        JaxbUtil resultBinder = new JaxbUtil(WxTransferResult.class);
+        WxTransferResult wxTransferResult = resultBinder.fromXml(res);
+        if (!wxTransferResult.isError()) {
+            //公众号支付时增加返回信息
+            if (wechatSetting.isOfficialAccountPay() || wechatSetting.isAppletPay()) {
+                SortedMap<String, String> packageParams = new TreeMap<>();
+                wxTransferResult.setPackage();
+                wxTransferResult.setSign_type("MD5");
+                wxTransferResult.setTime_stamp(getTimeStamp());
+                packageParams.put("appId", wxTransferResult.getMch_appid());
+                packageParams.put("timeStamp", wxTransferResult.getPayment_time());
+                packageParams.put("nonceStr", wxTransferResult.getNonce_str());
+                packageParams.put("package", wxTransferResult.getPackage_());
+                packageParams.put("signType", wxTransferResult.getSign_type());
+                wxTransferResult.setPay_sign(createSign(packageParams, wechatSetting.getApiKey()));
+            } else if (wechatSetting.isAppPay()) {
+                // app支付获得签名
+                SortedMap<String, String> packageParams = new TreeMap<>();
+                wxTransferResult.setTime_stamp(getTimeStamp());
+                packageParams.put("appid", wxTransferResult.getMch_appid());
+                packageParams.put("timestamp", wxTransferResult.getTime_stamp());
+                packageParams.put("noncestr", wxTransferResult.getNonce_str());
+                packageParams.put("package", "Sign=WXPay");
+                packageParams.put("partnerid", wechatSetting.getMerchantNum());
+                packageParams.put("prepayid", wxTransferResult.getPrepay_id());
+                wxTransferResult.setPay_sign(createSign(packageParams, wechatSetting.getApiKey()));
+            }
+            return wxTransferResult;
+        } else {
+            if (!StringUtils.isEmpty(wxTransferResult.getErr_code_des())) {
+                logger.error("getPrepay Fail and returnmsg:{} \r\n errormsg:{} ", wxTransferResult.getReturn_msg(), wxTransferResult.getErr_code_des());
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 获取统一下单请求参数
+     *
+     * @param wechatSetting   微信设置实体
+     * @param orderInfoForPay 订单信息
+     * @return 统一下单请求参数
+     */
+    private static String getWxPayParm(WechatSetting wechatSetting, OrderInfoForPay orderInfoForPay) {
+        logger.debug("getWxPayParm and wechatSetting:{} \r\n orderInfoForPay:{} ", wechatSetting, orderInfoForPay);
+        SortedMap<String, String> packageParams = new TreeMap<>();
+        // 金额转化为分为单位
+        int finalmoney = Integer.parseInt(String.format("%.2f", orderInfoForPay.getPrice()).replace(".", ""));
+        //交易方式
+        String tradeType = "";
+        //场景信息
+        String sceneInfo;
+        //商品ID
+        String productId;
+        //公众号支付
+        if (wechatSetting.isOfficialAccountPay() || wechatSetting.isAppletPay()) {
+            //用户唯一标识
+            packageParams.put("openid", wechatSetting.getOpenId());
+            tradeType = "JSAPI";
+        }
+        //H5支付
+        if (wechatSetting.isH5Pay()) {
+            tradeType = "MWEB";
+            sceneInfo = "{\"h5_info\": {\"type\":\"Wap\",\"wap_url\": \"" + wechatSetting.getSiteUrl() + "\",\"wap_name\": \"" + wechatSetting.getSiteName() + "\"}}";
+            packageParams.put("scene_info", sceneInfo);
+        }
+        //扫码支付
+        if (wechatSetting.isQRPay()) {
+            tradeType = "NATIVE";
+            productId = String.valueOf(orderInfoForPay.getGoodsId());
+            packageParams.put("product_id", productId);
+        }
+
+        // APP支付
+        if (wechatSetting.isAppPay()) {
+            tradeType = "APP";
+        }
+        //公众账号ID
+        packageParams.put("appid", wechatSetting.getAppId());
+        //商户号
+        packageParams.put("mch_id", wechatSetting.getMerchantNum());
+        //随机字符串
+        packageParams.put("nonce_str", getRandomString());
+        //商品描述
+        packageParams.put("body", getSubGoodName(orderInfoForPay.getGoodsName()));
+        //附加数据(支付类型)
+        packageParams.put("attach", orderInfoForPay.getType() + "");
+        //商户订单号
+        packageParams.put("out_trade_no", orderInfoForPay.getOrderCode() + "-" + getTimeStamp());
+        //标价金额
+        packageParams.put("total_fee", String.valueOf(finalmoney));
+        //终端IP
+        packageParams.put("spbill_create_ip", wechatSetting.getIp());//本地测试需替换为外网ip
+        //通知地址
+        packageParams.put("notify_url", wechatSetting.getPayCallback());
+        //交易类型
+        packageParams.put("trade_type", tradeType);
+        //签名
+        packageParams.put("sign", createSign(packageParams, wechatSetting.getApiKey()));
+
+        return getRequestXml(packageParams);
+    }
+
+    /**
+     * 获取企业支付请求参数
+     *
+     * @param wechatSetting   微信设置实体
+     * @param cashInfoForPay 订单信息
+     * @return 统一下单请求参数
+     */
+    private static String getWxTransfersParm(WechatSetting wechatSetting, OrderInfoForPay cashInfoForPay) {
+        logger.debug("getWxPayParm and wechatSetting:{} \r\n orderInfoForPay:{} ", wechatSetting, cashInfoForPay);
+        SortedMap<String, String> packageParams = new TreeMap<>();
+        // 金额转化为分为单位
+        int finalmoney = Integer.parseInt(String.format("%.2f", cashInfoForPay.getPrice()).replace(".", ""));
+        //交易方式
+        String tradeType = "";
+        //场景信息
+        String sceneInfo;
+        //商品ID
+        String productId;
+        //公众号支付
+        if (wechatSetting.isOfficialAccountPay() || wechatSetting.isAppletPay()) {
+            //用户唯一标识
+            packageParams.put("openid", wechatSetting.getOpenId());
+            tradeType = "JSAPI";
+        }
+        //H5支付
+        if (wechatSetting.isH5Pay()) {
+            tradeType = "MWEB";
+            sceneInfo = "{\"h5_info\": {\"type\":\"Wap\",\"wap_url\": \"" + wechatSetting.getSiteUrl() + "\",\"wap_name\": \"" + wechatSetting.getSiteName() + "\"}}";
+            packageParams.put("scene_info", sceneInfo);
+        }
+        //扫码支付
+        if (wechatSetting.isQRPay()) {
+            tradeType = "NATIVE";
+            productId = String.valueOf(cashInfoForPay.getGoodsId());
+            packageParams.put("product_id", productId);
+        }
+
+        // APP支付
+        if (wechatSetting.isAppPay()) {
+            tradeType = "APP";
+        }
+        //商户账号appid
+        packageParams.put("mch_appid", wechatSetting.getAppId());
+        //商户号
+        packageParams.put("mchid", wechatSetting.getMerchantNum());
+        //随机字符串
+        packageParams.put("nonce_str", getRandomString());
+        //附加数据(支付类型)
+        packageParams.put("check_name", "NO_CHECK");
+        //商户订单号
+        packageParams.put("partner_trade_no", cashInfoForPay.getOrderCode() + "-" + getTimeStamp());
+        //金额
+        packageParams.put("amount", String.valueOf(finalmoney));
+        //付款备注
+        packageParams.put("desc", cashInfoForPay.getType() == 2 ? "奖励提取" : "提现");
+        //终端IP
+        packageParams.put("spbill_create_ip", wechatSetting.getIp());//本地测试需替换为外网ip
+        //签名
+        packageParams.put("sign", createSign(packageParams, wechatSetting.getApiKey()));
+
+        return getRequestXml(packageParams);
+    }
+
+
+    /**
+     * 截取商品名
+     *
+     * @param goodName 商品名
+     * @return 截取后的商品名
+     */
+    private static String getSubGoodName(String goodName) {
+        if (goodName.length() < 20) {
+            return goodName;
+        } else {
+            return goodName.substring(0, 19) + "...";
+        }
+    }
+
+
+    /**
+     * 验证返回信息
+     *
+     * @param inputStream   微信回调信息
+     * @param wechatSetting 微信设置
+     * @return 订单支付信息
+     */
+    public static OrderInfoAfterPay afterPayInfo(InputStream inputStream, WechatSetting wechatSetting) {
+        logger.debug("afterPayInfo and wechatSetting:{}", wechatSetting);
+        OrderInfoAfterPay orderInfoAfterPay = new OrderInfoAfterPay();
+        orderInfoAfterPay.setSuccess(false);
+        BufferedReader br;
+        br = new BufferedReader(new InputStreamReader(inputStream));
+        String line;
+        StringBuilder sb = new StringBuilder();
+        try {
+            while ((line = br.readLine()) != null) {
+                sb.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+
+            try {
+                br.close();
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //将xml字符串转换为java对象
+        JaxbUtil resultBinder = new JaxbUtil(WechatNotifyResult.class);
+        WechatNotifyResult wechatNotifyResult = resultBinder.fromXml(sb.toString());
+        //将xml字符串转换为map
+        SortedMap<String, String> resultMap = new TreeMap<>(parseMapFromXmlStr(sb.toString()));
+        //签名
+        String sign = createSign(resultMap, wechatSetting.getApiKey());
+
+        logger.info("wechat notify and wechatNotifyResult :{}", wechatNotifyResult);
+
+        //验证是否失败，并验证签名
+        if (!wechatNotifyResult.isError() && sign.equals(wechatNotifyResult.getSign())) {
+            //验证其他信息
+            if (SUCCESS.equals(wechatNotifyResult.getResult_code())
+                    && SUCCESS.equals(wechatNotifyResult.getReturn_code())
+                    && wechatSetting.getAppId().equals(wechatNotifyResult.getAppid())
+                    && wechatSetting.getMerchantNum().equals(wechatNotifyResult.getMch_id())
+            ) {
+                orderInfoAfterPay.setOrderCode(wechatNotifyResult.getOut_trade_no().split("-")[0]);
+                orderInfoAfterPay.setSuccess(true);
+                orderInfoAfterPay.setType(wechatNotifyResult.getAttach());
+                orderInfoAfterPay.setTransCode(wechatNotifyResult.getTransaction_id());
+            }
+
+        } else {
+            logger.error("wechat afterPayInfo fail: returnmsg:{}\r\n errormsg:{}", wechatNotifyResult.getReturn_msg(), wechatNotifyResult.getErr_code_des());
+        }
+        return orderInfoAfterPay;
+    }
+
+    /**
+     * 获取请求xml
+     *
+     * @param packageParams 请求参数
+     * @return 请求xml
+     */
+    private static String getRequestXml(SortedMap<String, String> packageParams) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<xml>");
+        Set es = packageParams.entrySet();
+        for (Object e : es) {
+            Map.Entry entry = (Map.Entry) e;
+            String key = (String) entry.getKey();
+            String value = (String) entry.getValue();
+            if ("body".equalsIgnoreCase(key) || "sign".equalsIgnoreCase(key)) {
+                sb.append("<").append(key).append(">").append("<![CDATA[").append(value).append("]]></").append(key).append(">");
+            } else {
+                sb.append("<").append(key).append(">").append(value).append("</").append(key).append(">");
+            }
+        }
+        sb.append("</xml>");
+        logger.debug("getRequestXml  and xml:{}", sb.toString());
+        return sb.toString();
+    }
+
+    /**
+     * 签名
+     *
+     * @param packageParams 签名参数
+     * @param apiKey        商户key
+     * @return 签名
+     */
+    private static String createSign(SortedMap<String, String> packageParams, String apiKey) {
+
+        StringBuilder sb = new StringBuilder();
+        Set es = packageParams.entrySet();
+        for (Object e : es) {
+            Map.Entry entry = (Map.Entry) e;
+            String k = (String) entry.getKey();
+            String v = (String) entry.getValue();
+            if ((v != null) && (!"".equals(v)) && (!"sign".equals(k)) &&
+                    (!"key".equals(k))) {
+                sb.append(k).append("=").append(v).append("&");
+            }
+        }
+        sb.append("key=").append(apiKey);
+        logger.debug("createSign  and key:{}", apiKey);
+        logger.debug("createSign  and stringSign:{}", sb.toString());
+        String sign = MD5Utils.getInstance().createMd5(sb.toString())
+                .toUpperCase();
+        logger.debug("createSign  and sign:{}", sign);
+        return sign;
+
+    }
+
+    /**
+     * 执行GET方法请求数据
+     *
+     * @param url 请求地址
+     * @return 返回数据
+     */
+    static String executeHttpGet(String url) {
+        logger.debug("executeHttpGet and url:{}", url);
+        String result = null;
+        BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpGet httpRequest = new HttpGet(url);
+
+        try {
+            //使用DefaultHttpClient类的execute方法发送HTTP GET请求，并返回HttpResponse对象。
+            HttpResponse httpResponse = httpClient.execute(httpRequest);//其中HttpGet是HttpUriRequst的子类
+            HttpEntity httpEntity = httpResponse.getEntity();
+            result = EntityUtils.toString(httpEntity, "UTF-8");//取出应答字符串
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 执行POST方法请求数据
+     *
+     * @param url 请求地址
+     * @param xml 请求参数
+     * @return 返回数据
+     */
+    public static String executeHttpPost(String url, String xml) {
+        logger.debug("executeHttpPost and url:{}", url);
+        String result = null;
+        BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+        HttpPost httpRequest = new HttpPost(url);
+
+        try {
+            httpRequest.setEntity(new StringEntity(xml, "UTF-8"));
+            //使用DefaultHttpClient类的execute方法发送HTTP GET请求，并返回HttpResponse对象。
+            HttpResponse httpResponse = httpClient.execute(httpRequest);//其中HttpGet是HttpUriRequst的子类
+            HttpEntity httpEntity = httpResponse.getEntity();
+            result = EntityUtils.toString(httpEntity, "UTF-8");//取出应答字符串
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+    /**
+     * 获取随机字符串
+     *
+     * @return 随机字符串
+     */
+    public static String getRandomString() {
+        String base = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 32; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取时间戳
+     *
+     * @return 时间戳（秒数）
+     */
+    public static String getTimeStamp() {
+        return String.valueOf(System.currentTimeMillis() / 1000L);
+    }
+
+    /**
+     * 将xml字符串转换成map
+     *
+     * @param xml xml
+     * @return Map
+     */
+    private static Map<String, String> parseMapFromXmlStr(String xml) {
+        Map<String, String> map = new HashMap<>();
+        Document doc;
+        try {
+            doc = DocumentHelper.parseText(xml); // 将字符串转为XML
+            Element rootElt = doc.getRootElement(); // 获取根节点
+            List<Element> list = rootElt.elements();//获取根节点下所有节点
+            for (Element element : list) {  //遍历节点
+                map.put(element.getName(), element.getText()); //节点的name为map的key，text为map的value
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return map;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/YunUploadUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/YunUploadUtils.java
new file mode 100644
index 0000000..0cd666d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/YunUploadUtils.java
@@ -0,0 +1,219 @@
+package com.ruoyi.util;
+
+import com.aliyun.oss.ClientException;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSException;
+import com.aliyun.oss.model.PutObjectRequest;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.util.bean.OssYunConf;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.UUID;
+
+/**
+ * Created by 魔金商城 on 17/5/8.
+ * 又拍云上传工具
+ */
+public class YunUploadUtils {
+
+    private static final YunUploadUtils INSTANCE = new YunUploadUtils();
+    /**
+     * 调试工具
+     */
+    private Logger logger = LoggerFactory.getLogger(YunUploadUtils.class);
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+
+    private YunUploadUtils() {
+    }
+
+    public static YunUploadUtils getInstance() {
+        return INSTANCE;
+    }
+
+
+    /**
+     * 获取文件保存路径
+     *
+     * @param fileOriginName 用户上传文件名
+     * @return 文件保存路径
+     */
+    private String getFilePath(String fileOriginName) {
+        String fileType = "jpg";
+        if (!StringUtils.isEmpty(fileOriginName) && fileOriginName.contains(".")) {
+            fileType = fileOriginName.substring(fileOriginName.lastIndexOf(".") + 1);
+        }
+        String fileName = String.valueOf(System.currentTimeMillis()) + "." + fileType;
+        String date = simpleDateFormat.format(Calendar.getInstance(TimeZone.getTimeZone("GMT+08:00")).getTime());
+        return "/" + date + "/" + fileName;
+    }
+
+    /**
+     * 判断是否是图片
+     *
+     * @param bytes 字节数组
+     * @return 是图片返回true  否则返回false
+     */
+    private boolean isPicture(byte[] bytes) {
+        try {
+            BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
+            return image != null;
+        } catch (IOException e) {
+            logger.error("file is not a picture ...", e);
+            return false;
+        }
+    }
+
+    /**
+     * 上传腾讯云
+     *
+     * @param file
+     * @param bytes 图片字节
+     * @param type  上传的类型 0 图片 1 视频
+     * @return 返回图片在又拍云的地址
+     */
+    public String uploadToQqOss(OssYunConf cloudStorageConfig, MultipartFile file, byte[] bytes, String fileOriginName, String type) {
+        return QqOssClient.uploadToQqOss(cloudStorageConfig, file, bytes, fileOriginName, type);
+    }
+
+    /**
+     * 上传又拍云
+     *
+     * @param upYunConf   又拍云设置
+     * @param inputStream 输入流
+     * @param bytes       图片字节
+     * @return 返回图片在又拍云的地址
+     */
+    public String uploadToQqForBase64(OssYunConf upYunConf, InputStream inputStream, byte[] bytes, String fileOriginName) {
+        logger.debug("Being to uploadToUpYun.....");
+        if (org.apache.commons.lang3.ArrayUtils.isEmpty(bytes)) {
+            logger.error("uploadToUpYun fail due to bytes is empty ....");
+            return "";
+        }
+        return QqOssClient.uploadToUpYunForBase64(upYunConf, inputStream, bytes, fileOriginName, bytes);
+    }
+
+    /**
+     * 上传阿里云
+     *
+     * @param inputStream 输入流
+     * @param bytes       图片字节
+     * @param type        上传的类型 0 图片 1 视频
+     * @return 返回图片在又拍云的地址
+     */
+    public String uploadToOssYun(OssYunConf config, InputStream inputStream, byte[] bytes, String fileOriginName, String type) {
+        String url = null;
+        try {
+            url = upload(config.getAccessKeyId(), config.getAccessKeySecret(), config.getBucketName(), config.getEndPoint(),
+                    config.getPrefix(), getKey(config.getBucketName(), ""), inputStream);
+
+        } catch (Exception e) {
+            return e.getMessage();
+        }
+        return url;
+    }
+
+    /**
+     * 上传又拍云
+     *
+     * @param inputStream 输入流
+     * @param bytes       图片字节
+     * @return 返回图片在又拍云的地址
+     */
+    public String uploadToOssYunForBase64(OssYunConf config, InputStream inputStream, byte[] bytes, String fileOriginName) {
+        String url = null;
+        try {
+            url = upload(config.getAccessKeyId(), config.getAccessKeySecret(), config.getBucketName(), config.getEndPoint(),
+                    config.getPrefix(), getKey(config.getBucketName(), ""), inputStream);
+
+        } catch (Exception e) {
+            return e.getMessage();
+        }
+        return url;
+    }
+
+    /**
+     * 上传文件<>基础方法</>
+     *
+     * @param accessKeyId     授权 ID
+     * @param accessKeySecret 授权密钥
+     * @param bucketName      桶名
+     * @param endpoint        节点名
+     * @param styleName       样式名
+     * @param key             文件名
+     * @param inputStream     文件流
+     * @return 访问路径 ，结果为null时说明上传失败
+     */
+    public String upload(String accessKeyId, String accessKeySecret, String bucketName, String endpoint, String
+            styleName, String key, InputStream inputStream) {
+        if (inputStream == null) {
+            return null;
+        }
+        String url = null;
+        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        try {
+            // 带进度条的上传
+            ossClient.putObject(new PutObjectRequest(bucketName, key, inputStream));
+        } catch (OSSException oe) {
+            oe.printStackTrace();
+            key = null;
+        } catch (ClientException ce) {
+            ce.printStackTrace();
+            key = null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            key = null;
+        } finally {
+            ossClient.shutdown();
+        }
+        if (key != null) {
+            // 拼接文件访问路径。由于拼接的字符串大多为String对象，而不是""的形式，所以直接用+拼接的方式没有优势
+            StringBuffer sb = new StringBuffer();
+            sb.append("http://").append(bucketName).append(".").append(endpoint).append("/").append(key);
+            if (StringUtils.isNotBlank(styleName)) {
+                sb.append("/").append(styleName);
+            }
+            url = sb.toString();
+        }
+        return url;
+    }
+
+    /**
+     * 获取文件名（bucket里的唯一key）
+     * 上传和删除时除了需要bucketName外还需要此值
+     *
+     * @param prefix 前缀（非必传），可以用于区分是哪个模块或子项目上传的文件
+     * @param suffix 后缀（非必传）, 可以是 png jpg 等
+     * @return
+     */
+    public String getKey(final String prefix, final String suffix) {
+        //生成uuid,替换 - 的目的是因为后期可能会用 - 将key进行split，然后进行分类统计
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        //文件路径
+        String path = DateUtils.parseDateToStr("yyyyMMdd", new Date()) + "-" + uuid;
+
+        if (StringUtils.isNotBlank(prefix)) {
+            path = prefix + "-" + path;
+        }
+        if (suffix != null) {
+            if (suffix.startsWith(".")) {
+                path = path + suffix;
+            } else {
+                path = path + "." + suffix;
+            }
+        }
+        return path;
+    }
+
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AccessTokenResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AccessTokenResult.java
new file mode 100644
index 0000000..a84de79
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AccessTokenResult.java
@@ -0,0 +1,164 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 网页授权返回实体类
+ */
+public class AccessTokenResult {
+
+
+    /**
+     * 网页授权接口调用凭证
+     */
+    @JSONField(name = "access_token")
+    private String access_token;
+
+    /**
+     * access_token接口调用凭证超时时间，单位（秒）
+     */
+    @JSONField(name = "expires_in")
+    private int expires_in;
+
+    /**
+     * 用户刷新access_token
+     */
+    @JSONField(name = "refresh_token")
+    private String refresh_token;
+
+    /**
+     * 用户唯一标识，请注意，在未关注公众号时，用户访问公众号的网页，也会产生一个用户和公众号唯一的OpenID
+     */
+    @JSONField(name = "openid")
+    private String openid;
+
+    /**
+     * 用户授权的作用域，使用逗号（,）分隔
+     */
+    @JSONField(name = "scope")
+    private String scope;
+
+    /**
+     * 联合登录id
+     */
+    @JSONField(name = "unionid")
+    private String unionid;
+
+    /**
+     * 错误码
+     */
+    @JSONField(name = "errcode")
+    private String errcode;
+
+    /**
+     * 重定向地址（出错时返回）
+     */
+    private String redirectUrl;
+
+    /**
+     * 错误信息（出错时返回）
+     */
+    @JSONField(name = "errmsg")
+    private String errmsg;
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return !StringUtils.isEmpty(this.errcode);
+    }
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public int getExpires_in() {
+        return expires_in;
+    }
+
+    public void setExpires_in(int expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public String getRefresh_token() {
+        return refresh_token;
+    }
+
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getErrcode() {
+        return errcode;
+    }
+
+    public void setErrcode(String errcode) {
+        this.errcode = errcode;
+    }
+
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
+    public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
+
+    /**
+     * 转换为字符串
+     */
+    @Override
+    public String toString() {
+        return "AccessTokenResult{" +
+                "access_token='" + access_token + '\'' +
+                ", expires_in=" + expires_in +
+                ", refresh_token='" + refresh_token + '\'' +
+                ", openid='" + openid + '\'' +
+                ", scope='" + scope + '\'' +
+                ", unionid='" + unionid + '\'' +
+                ", errcode='" + errcode + '\'' +
+                ", redirectUrl='" + redirectUrl + '\'' +
+                ", errmsg='" + errmsg + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AliPaySetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AliPaySetting.java
new file mode 100644
index 0000000..d0228f2
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/AliPaySetting.java
@@ -0,0 +1,106 @@
+package com.ruoyi.util.bean;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 支付宝设置实体类
+ */
+public class AliPaySetting {
+    /**
+     * APPID 即创建应用后生成
+     */
+    private String appId;
+    /**
+     * 开发者私钥，由开发者自己生成
+     */
+    private String appPrivateKey;
+    /**
+     * 支付宝公钥，由支付宝生成
+     */
+    private String alipayPublicKey;
+    /**
+     * 前台回调地址
+     */
+    private String beforeCallbackUrl;
+    /**
+     * 后台回调地址
+     */
+    private String backCallbackUrl;
+
+    /**
+     * 构造阿里支付实体
+     *
+     * @param beforeCallbackUrl 前台回调地址
+     * @param backCallbackUrl   后台回调地址
+     * @return 返回支付宝配置信息
+     */
+    public static AliPaySetting build(String beforeCallbackUrl, String backCallbackUrl) {
+        AliPaySetting aliPaySetting = new AliPaySetting();
+
+        //前台同步回调地址
+        aliPaySetting.setBeforeCallbackUrl(beforeCallbackUrl);
+        //异步回调地址
+        aliPaySetting.setBackCallbackUrl(backCallbackUrl);
+
+        return aliPaySetting;
+    }
+
+    /**
+     * 检测支付时的参数
+     */
+    public boolean checkPayParams() {
+        return !StringUtils.isEmpty(appId) && !StringUtils.isEmpty(appPrivateKey) &&
+                !StringUtils.isEmpty(alipayPublicKey);
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppPrivateKey() {
+        return appPrivateKey;
+    }
+
+    public void setAppPrivateKey(String appPrivateKey) {
+        this.appPrivateKey = appPrivateKey;
+    }
+
+    public String getAlipayPublicKey() {
+        return alipayPublicKey;
+    }
+
+    public void setAlipayPublicKey(String alipayPublicKey) {
+        this.alipayPublicKey = alipayPublicKey;
+    }
+
+    public String getBeforeCallbackUrl() {
+        return beforeCallbackUrl;
+    }
+
+    public void setBeforeCallbackUrl(String beforeCallbackUrl) {
+        this.beforeCallbackUrl = beforeCallbackUrl;
+    }
+
+    public String getBackCallbackUrl() {
+        return backCallbackUrl;
+    }
+
+    public void setBackCallbackUrl(String backCallbackUrl) {
+        this.backCallbackUrl = backCallbackUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "AliPaySetting{" +
+                "appId='" + appId + '\'' +
+                ", appPrivateKey='" + appPrivateKey + '\'' +
+                ", alipayPublicKey='" + alipayPublicKey + '\'' +
+                ", beforeCallbackUrl='" + beforeCallbackUrl + '\'' +
+                ", backCallbackUrl='" + backCallbackUrl + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/BeanUtils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/BeanUtils.java
new file mode 100644
index 0000000..5ff34ae
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/BeanUtils.java
@@ -0,0 +1,104 @@
+package com.ruoyi.util.bean;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Bean 工具类
+ *
+ * @author ruoyi
+ */
+public class BeanUtils extends org.springframework.beans.BeanUtils {
+    /**
+     * Bean方法名中属性名开始的下标
+     */
+    private static final int BEAN_METHOD_PROP_INDEX = 3;
+
+    /**
+     * 匹配getter方法的正则表达式
+     */
+    private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
+
+    /**
+     * 匹配setter方法的正则表达式
+     */
+    private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
+
+    /**
+     * Bean属性复制工具方法。
+     *
+     * @param dest 目标对象
+     * @param src  源对象
+     */
+    public static void copyBeanProp(Object dest, Object src) {
+        try {
+            copyProperties(src, dest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取对象的setter方法。
+     *
+     * @param obj 对象
+     * @return 对象的setter方法列表
+     */
+    public static List<Method> getSetterMethods(Object obj) {
+        // setter方法列表
+        List<Method> setterMethods = new ArrayList<Method>();
+
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+
+        // 查找setter方法
+
+        for (Method method : methods) {
+            Matcher m = SET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 1)) {
+                setterMethods.add(method);
+            }
+        }
+        // 返回setter方法列表
+        return setterMethods;
+    }
+
+    /**
+     * 获取对象的getter方法。
+     *
+     * @param obj 对象
+     * @return 对象的getter方法列表
+     */
+
+    public static List<Method> getGetterMethods(Object obj) {
+        // getter方法列表
+        List<Method> getterMethods = new ArrayList<Method>();
+        // 获取所有方法
+        Method[] methods = obj.getClass().getMethods();
+        // 查找getter方法
+        for (Method method : methods) {
+            Matcher m = GET_PATTERN.matcher(method.getName());
+            if (m.matches() && (method.getParameterTypes().length == 0)) {
+                getterMethods.add(method);
+            }
+        }
+        // 返回getter方法列表
+        return getterMethods;
+    }
+
+    /**
+     * 检查Bean方法名中的属性名是否相等。<br>
+     * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
+     *
+     * @param m1 方法名1
+     * @param m2 方法名2
+     * @return 属性名一样返回true，否则返回false
+     */
+
+    public static boolean isMethodPropEquals(String m1, String m2) {
+        return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/CommonWebResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/CommonWebResult.java
new file mode 100644
index 0000000..0eb14ad
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/CommonWebResult.java
@@ -0,0 +1,87 @@
+package com.ruoyi.util.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 前端通用返回类
+ *
+ * @author 徐凌峰
+ */
+@ApiModel("接口返回公共对象")
+public class CommonWebResult<T> {
+    public static final CommonWebResult SUCCESS = new CommonWebResult<>(true);
+    public static final CommonWebResult FAIL = new CommonWebResult(false);
+
+    static {
+        SUCCESS.setErrCode(0);
+        SUCCESS.setErrMsg("SUCCESS");
+    }
+
+    /**
+     * 返回给前端的业务数据
+     */
+    @ApiModelProperty("返回的具体业务数据")
+    private T data;
+    /**
+     * 错误码
+     */
+    private Integer errCode;
+    /**
+     * 错误信息
+     */
+    private String errMsg;
+
+    public CommonWebResult(T data) {
+        this.data = data;
+    }
+
+    public CommonWebResult() {
+    }
+
+    public static CommonWebResult getSUCCESS() {
+        return SUCCESS;
+    }
+
+    public static CommonWebResult getFAIL() {
+        return FAIL;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public Integer getErrCode() {
+        return errCode;
+    }
+
+    public void setErrCode(Integer errCode) {
+        this.errCode = errCode;
+    }
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
+
+    public CommonWebResult data(T data) {
+        this.setData(data);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CommonWebResult{" +
+                "data=" + data +
+                ", errCode=" + errCode +
+                ", errMsg='" + errMsg + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailConf.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailConf.java
new file mode 100644
index 0000000..6ae99c8
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailConf.java
@@ -0,0 +1,58 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * Created by 魔金商城 on 17/10/14.
+ * 邮箱配置类
+ */
+public class EmailConf {
+
+    /**
+     * 邮箱服务器的地址
+     */
+    private String host;
+
+    /**
+     * 发送邮件人的用户名
+     */
+    private String userName;
+
+    /**
+     * 发送邮件人的密码
+     */
+    private String password;
+
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String toString() {
+        return "EmailConf{" +
+                "host='" + host + '\'' +
+                ", userName='" + userName + '\'' +
+                ", password='" + password + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailContent.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailContent.java
new file mode 100644
index 0000000..6d75acb
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/EmailContent.java
@@ -0,0 +1,50 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * Created by 魔金商城 on 17/10/14.
+ * 邮箱内容
+ */
+public class EmailContent {
+
+
+    /**
+     * 邮件目的地
+     */
+    private String sendTo;
+
+
+    /**
+     * 邮件主题
+     */
+    private String subject;
+
+    /**
+     * 邮件内容
+     */
+    private String text;
+
+    public String getSendTo() {
+        return sendTo;
+    }
+
+    public void setSendTo(String sendTo) {
+        this.sendTo = sendTo;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/LineColor.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/LineColor.java
new file mode 100644
index 0000000..0674173
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/LineColor.java
@@ -0,0 +1,55 @@
+package com.ruoyi.util.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 颜色实体类
+ *
+ * @author 魔金商城 created on 2020/4/14
+ */
+@ApiModel(description = "颜色实体")
+public class LineColor {
+
+    /**
+     * 红色
+     */
+    @ApiModelProperty(value = "红色")
+    private int r;
+
+    /**
+     * 绿色
+     */
+    @ApiModelProperty(value = "绿色")
+    private int g;
+
+    /**
+     * 蓝色
+     */
+    @ApiModelProperty(value = "蓝色")
+    private int b;
+
+    public int getR() {
+        return r;
+    }
+
+    public void setR(int r) {
+        this.r = r;
+    }
+
+    public int getG() {
+        return g;
+    }
+
+    public void setG(int g) {
+        this.g = g;
+    }
+
+    public int getB() {
+        return b;
+    }
+
+    public void setB(int b) {
+        this.b = b;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/MonYunSmsResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/MonYunSmsResponse.java
new file mode 100644
index 0000000..4de8d83
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/MonYunSmsResponse.java
@@ -0,0 +1,44 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * 梦网云短信发送返回参数
+ */
+public class MonYunSmsResponse {
+    /**
+     * 短信发送请求处理结果：0代表成功；非0代表失败。错误代码详见附录
+     */
+    Integer result;
+    /**
+     * 平台流水号：非0代表64位整型，对应Java和C#的long，不可用int解析。result非0时，msgid为0
+     */
+    Long msgid;
+    /**
+     * 用户自定义流水号：默认与请求报文multimt包结构内第一条数据的custid保持一致，若请求报文中没有custid参数或值为空，则返回由梦网生成的代表本批短信的唯一编号，result非0时，custid为空
+     */
+    String custid;
+
+    public Integer getResult() {
+        return result;
+    }
+
+    public void setResult(Integer result) {
+        this.result = result;
+    }
+
+    public Long getMsgid() {
+        return msgid;
+    }
+
+    public void setMsgid(Long msgid) {
+        this.msgid = msgid;
+    }
+
+    public String getCustid() {
+        return custid;
+    }
+
+    public void setCustid(String custid) {
+        this.custid = custid;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoAfterPay.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoAfterPay.java
new file mode 100644
index 0000000..956fc53
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoAfterPay.java
@@ -0,0 +1,70 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * 支付后返回信息实体类
+ */
+public class OrderInfoAfterPay {
+
+    /**
+     * 订单code
+     */
+    private String orderCode;
+
+    /**
+     * 判断支付是否成功
+     */
+    private boolean isSuccess = false;
+
+    /**
+     * 支付类型 1:订单支付  2:预存款充值
+     */
+    private int type;
+
+    /**
+     * 交易流水号
+     */
+    private String transCode;
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public boolean isSuccess() {
+        return isSuccess;
+    }
+
+    public void setSuccess(boolean success) {
+        isSuccess = success;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getTransCode() {
+        return transCode;
+    }
+
+    public void setTransCode(String transCode) {
+        this.transCode = transCode;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderInfoAfterPay{" +
+                "orderCode='" + orderCode + '\'' +
+                ", isSuccess=" + isSuccess +
+                ", type=" + type +
+                ", transCode='" + transCode + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoForPay.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoForPay.java
new file mode 100644
index 0000000..7148fc0
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OrderInfoForPay.java
@@ -0,0 +1,86 @@
+package com.ruoyi.util.bean;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 待付订单信息
+ */
+public class OrderInfoForPay {
+
+    /**
+     * 订单code（或主订单code,必传）
+     */
+    private String orderCode;
+
+    /**
+     * 单品名称（必传）
+     */
+    private String goodsName;
+
+    /**
+     * 单品ID 扫码支付必传（微信支付）
+     */
+    private long goodsId;
+
+    /**
+     * 订单的最终价格 (用户实际付款的金额,必传)
+     */
+    private BigDecimal price;
+
+    /**
+     * 支付类型 1:订单支付  2:预存款充值(必传)
+     */
+    private int type;
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderInfoForPay{" +
+                "orderCode='" + orderCode + '\'' +
+                ", goodsName='" + goodsName + '\'' +
+                ", goodsId=" + goodsId +
+                ", price=" + price +
+                ", type=" + type +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OssYunConf.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OssYunConf.java
new file mode 100644
index 0000000..038feef
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/OssYunConf.java
@@ -0,0 +1,114 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * Created by 魔金商城 on 17/5/8.
+ * 又拍云配置
+ */
+
+public class OssYunConf {
+
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String bucketName;
+    private String endPoint;
+    private String styleName;
+    private String prefix;
+    private String address;
+
+    private OssYunConf() {
+
+    }
+
+    private OssYunConf(String accessKeyId, String accessKeySecret, String bucketName, String endPoint, String styleName, String prefix, String address) {
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.bucketName = bucketName;
+        this.endPoint = endPoint;
+        this.styleName = styleName;
+        this.prefix = prefix;
+        this.address = address;
+    }
+
+    /**
+     * @param accessKeyId
+     * @param accessKeySecret
+     * @param bucketName
+     * @param endPoint
+     * @param styleName
+     * @param prefix
+     * @return
+     */
+    public static OssYunConf buildOssYunConf(String accessKeyId, String accessKeySecret, String bucketName, String endPoint, String styleName, String prefix, String address) {
+        return new OssYunConf(accessKeyId, accessKeySecret, bucketName, endPoint, styleName, prefix, address);
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getStyleName() {
+        return styleName;
+    }
+
+    public void setStyleName(String styleName) {
+        this.styleName = styleName;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    @Override
+    public String toString() {
+        return "OssYunConf{" +
+                "accessKeyId='" + accessKeyId + '\'' +
+                ", accessKeySecret='" + accessKeySecret + '\'' +
+                ", bucketName='" + bucketName + '\'' +
+                ", endPoint='" + endPoint + '\'' +
+                ", styleName='" + styleName + '\'' +
+                ", prefix='" + prefix + '\'' +
+                ", address='" + address + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/PrepayResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/PrepayResult.java
new file mode 100644
index 0000000..7d92027
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/PrepayResult.java
@@ -0,0 +1,307 @@
+package com.ruoyi.util.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 统一下单接口返回实体类
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "xml")
+@ApiModel(description = "统一下单接口返回实体类")
+public class PrepayResult {
+
+    /**
+     * 返回状态码
+     */
+    @XmlElement(name = "return_code")
+    @ApiModelProperty(value = "返回状态码")
+    private String return_code;
+
+    /**
+     * 返回信息
+     */
+    @XmlElement(name = "return_msg")
+    @ApiModelProperty(value = "返回信息")
+    private String return_msg;
+
+    /**
+     * 公众账号ID
+     */
+    @XmlElement(name = "appid")
+    @ApiModelProperty(value = "公众账号ID")
+    private String appid;
+
+    /**
+     * 商户号
+     */
+    @XmlElement(name = "mch_id")
+    @ApiModelProperty(value = "商户号")
+    private String mch_id;
+
+    /**
+     * 随机字符串
+     */
+    @XmlElement(name = "nonce_str")
+    @ApiModelProperty(value = "随机字符串")
+    private String nonce_str;
+
+    /**
+     * 签名
+     */
+    @XmlElement(name = "sign")
+    @ApiModelProperty(value = "签名")
+    private String sign;
+
+    /**
+     * 业务结果
+     */
+    @XmlElement(name = "result_code")
+    @ApiModelProperty(value = "业务结果")
+    private String result_code;
+
+    /**
+     * 错误代码
+     */
+    @XmlElement(name = "err_code")
+    @ApiModelProperty(value = "错误代码")
+    private String err_code;
+
+    /**
+     * 错误代码描述
+     */
+    @XmlElement(name = "err_code_des")
+    @ApiModelProperty(value = "错误代码描述")
+    private String err_code_des;
+
+    /**
+     * 交易类型
+     */
+    @XmlElement(name = "trade_type")
+    @ApiModelProperty(value = "交易类型")
+    private String trade_type;
+
+    /**
+     * 预支付交易会话标识
+     */
+    @XmlElement(name = "prepay_id")
+    @ApiModelProperty(value = "预支付交易会话标识")
+    private String prepay_id;
+
+    /**
+     * 二维码链接
+     */
+    @XmlElement(name = "code_url")
+    @ApiModelProperty(value = "二维码链接")
+    private String code_url;
+
+    /**
+     * H5支付链接
+     */
+    @XmlElement(name = "mweb_url")
+    @ApiModelProperty(value = "H5支付链接")
+    private String mweb_url;
+
+    /**
+     * 时间戳（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "时间戳（公众号支付时返回）")
+    private String time_stamp;
+
+    /**
+     * 订单详情扩展字符串（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "订单详情扩展字符串（公众号支付时返回）")
+    private String package_;
+    /**
+     * 签名方式（公众号支付时返回）
+     */
+    @ApiModelProperty(value = " 签名方式（公众号支付时返回）")
+    private String sign_type;
+    /**
+     * 签名（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "签名（公众号支付时返回）")
+    private String pay_sign;
+
+    /**
+     * 生成订单详情扩展字符串
+     */
+    @JsonIgnore
+    public void setPackage() {
+        this.package_ = "prepay_id=" + prepay_id;
+    }
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return "FAIL".equals(this.return_code) || "FAIL".equals(this.result_code);
+    }
+
+    public String getReturn_code() {
+        return return_code;
+    }
+
+    public void setReturn_code(String return_code) {
+        this.return_code = return_code;
+    }
+
+    public String getReturn_msg() {
+        return return_msg;
+    }
+
+    public void setReturn_msg(String return_msg) {
+        this.return_msg = return_msg;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getMch_id() {
+        return mch_id;
+    }
+
+    public void setMch_id(String mch_id) {
+        this.mch_id = mch_id;
+    }
+
+    public String getNonce_str() {
+        return nonce_str;
+    }
+
+    public void setNonce_str(String nonce_str) {
+        this.nonce_str = nonce_str;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getResult_code() {
+        return result_code;
+    }
+
+    public void setResult_code(String result_code) {
+        this.result_code = result_code;
+    }
+
+    public String getErr_code() {
+        return err_code;
+    }
+
+    public void setErr_code(String err_code) {
+        this.err_code = err_code;
+    }
+
+    public String getErr_code_des() {
+        return err_code_des;
+    }
+
+    public void setErr_code_des(String err_code_des) {
+        this.err_code_des = err_code_des;
+    }
+
+    public String getTrade_type() {
+        return trade_type;
+    }
+
+    public void setTrade_type(String trade_type) {
+        this.trade_type = trade_type;
+    }
+
+    public String getPrepay_id() {
+        return prepay_id;
+    }
+
+    public void setPrepay_id(String prepay_id) {
+        this.prepay_id = prepay_id;
+    }
+
+    public String getCode_url() {
+        return code_url;
+    }
+
+    public void setCode_url(String code_url) {
+        this.code_url = code_url;
+    }
+
+    public String getMweb_url() {
+        return mweb_url;
+    }
+
+    public void setMweb_url(String mweb_url) {
+        this.mweb_url = mweb_url;
+    }
+
+    public String getTime_stamp() {
+        return time_stamp;
+    }
+
+    public void setTime_stamp(String time_stamp) {
+        this.time_stamp = time_stamp;
+    }
+
+    public String getPackage_() {
+        return package_;
+    }
+
+    public void setPackage_(String package_) {
+        this.package_ = package_;
+    }
+
+    public String getSign_type() {
+        return sign_type;
+    }
+
+    public void setSign_type(String sign_type) {
+        this.sign_type = sign_type;
+    }
+
+    public String getPay_sign() {
+        return pay_sign;
+    }
+
+    public void setPay_sign(String pay_sign) {
+        this.pay_sign = pay_sign;
+    }
+
+    @Override
+    public String toString() {
+        return "PrepayResult{" +
+                "return_code='" + return_code + '\'' +
+                ", return_msg='" + return_msg + '\'' +
+                ", appid='" + appid + '\'' +
+                ", mch_id='" + mch_id + '\'' +
+                ", nonce_str='" + nonce_str + '\'' +
+                ", sign='" + sign + '\'' +
+                ", result_code='" + result_code + '\'' +
+                ", err_code='" + err_code + '\'' +
+                ", err_code_des='" + err_code_des + '\'' +
+                ", trade_type='" + trade_type + '\'' +
+                ", prepay_id='" + prepay_id + '\'' +
+                ", code_url='" + code_url + '\'' +
+                ", mweb_url='" + mweb_url + '\'' +
+                ", time_stamp='" + time_stamp + '\'' +
+                ", package_='" + package_ + '\'' +
+                ", sign_type='" + sign_type + '\'' +
+                ", pay_sign='" + pay_sign + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/RequestParam.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/RequestParam.java
new file mode 100644
index 0000000..80a6d05
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/RequestParam.java
@@ -0,0 +1,147 @@
+package com.ruoyi.util.bean;
+
+
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
+
+/**
+ * 发送短信请求变量实体类
+ *
+ * @author 魔金商城 on 2017/9/7.
+ */
+public class RequestParam extends SendSmsRequest {
+    /**
+     * 短信接收号码
+     * (支持以逗号分隔的形式进行批量调用,批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式)
+     * 样例取值：15000000000
+     * 是否必填：是
+     */
+    private String phoneNumbers;
+    /**
+     * 短信签名
+     * 样例取值：云通信
+     * 是否必填：是
+     */
+    private String signName;
+    /**
+     * 短信模板ID
+     * 样例取值：SMS_0000
+     * 是否必填：是
+     */
+    private String templateCode;
+    /**
+     * 短信模板变量
+     * (友情提示:如果JSON中需要带换行符,请参照标准的JSON协议对换行符的要求,比如短信内容中包含\r\n的情况在JSON中需要表示成\r\n,否则会导致JSON在服务端解析失败)
+     * 样例取值：{“code”:”1234”,”product”:”ytx”}
+     * 是否必填：否
+     */
+    private String templateParam;
+    /**
+     * 上行短信扩展码,无特殊需要此字段的用户请忽略此字段
+     * 样例取值：90999
+     * 是否必填：否
+     */
+    private String smsUpExtendCode;
+    /**
+     * 外部流水扩展字段
+     * 样例取值：abcdefgh
+     * 是否必填：否
+     */
+    private String outId;
+    /**
+     * 短信接口URL
+     */
+    private String interfaceUrl;
+    /**
+     * accessKeyId
+     */
+    private String accessKeyId;
+    /**
+     * accessKeySecret
+     */
+    private String accessKeySecret;
+
+    /**
+     * 参数
+     */
+    private String SmsParamString;
+
+    public String getPhoneNumbers() {
+        return phoneNumbers;
+    }
+
+    public void setPhoneNumbers(String phoneNumbers) {
+        this.phoneNumbers = phoneNumbers;
+    }
+
+    public String getSignName() {
+        return signName;
+    }
+
+    public void setSignName(String signName) {
+        this.signName = signName;
+    }
+
+    public String getTemplateCode() {
+        return templateCode;
+    }
+
+    public void setTemplateCode(String templateCode) {
+        this.templateCode = templateCode;
+    }
+
+    public String getTemplateParam() {
+        return templateParam;
+    }
+
+    public void setTemplateParam(String templateParam) {
+        this.templateParam = templateParam;
+    }
+
+    public String getSmsUpExtendCode() {
+        return smsUpExtendCode;
+    }
+
+    public void setSmsUpExtendCode(String smsUpExtendCode) {
+        this.smsUpExtendCode = smsUpExtendCode;
+    }
+
+    public String getOutId() {
+        return outId;
+    }
+
+    public void setOutId(String outId) {
+        this.outId = outId;
+    }
+
+    public String getInterfaceUrl() {
+        return interfaceUrl;
+    }
+
+    public void setInterfaceUrl(String interfaceUrl) {
+        this.interfaceUrl = interfaceUrl;
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getSmsParamString() {
+        return SmsParamString;
+    }
+
+    public void setSmsParamString(String smsParamString) {
+        SmsParamString = smsParamString;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/SegUserProfile.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/SegUserProfile.java
new file mode 100644
index 0000000..f5023c6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/SegUserProfile.java
@@ -0,0 +1,107 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 用户信息返回实体类
+ */
+public class SegUserProfile {
+
+    /**
+     * 用户信息对象
+     */
+    @JSONField(name = "userInfo")
+    private String userInfo;
+
+    /**
+     * 不包括敏感信息的原始数据字符串，用于计算签名
+     */
+    @JSONField(name = "rawData")
+    private String rawData;
+
+    /**
+     * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息
+     */
+    @JSONField(name = "signature")
+    private String signature;
+
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据
+     */
+    @JSONField(name = "encryptedData")
+    private String encryptedData;
+
+    /**
+     * 加密算法的初始向量
+     */
+    @JSONField(name = "iv")
+    private String iv;
+
+    /**
+     * 敏感数据对应的云 ID
+     */
+    @JSONField(name = "cloudID")
+    private String cloudID;
+
+    public String getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(String userInfo) {
+        this.userInfo = userInfo;
+    }
+
+    public String getRawData() {
+        return rawData;
+    }
+
+    public void setRawData(String rawData) {
+        this.rawData = rawData;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getEncryptedData() {
+        return encryptedData;
+    }
+
+    public void setEncryptedData(String encryptedData) {
+        this.encryptedData = encryptedData;
+    }
+
+    public String getIv() {
+        return iv;
+    }
+
+    public void setIv(String iv) {
+        this.iv = iv;
+    }
+
+    public String getCloudID() {
+        return cloudID;
+    }
+
+    public void setCloudID(String cloudID) {
+        this.cloudID = cloudID;
+    }
+
+    @Override
+    public String toString() {
+        return "SegUserProfile{" +
+                "userInfo='" + userInfo + '\'' +
+                ", rawData='" + rawData + '\'' +
+                ", signature='" + signature + '\'' +
+                ", encryptedData='" + encryptedData + '\'' +
+                ", iv='" + iv + '\'' +
+                ", cloudID='" + cloudID + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UnionPaySetting.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UnionPaySetting.java
new file mode 100644
index 0000000..6bb45a5
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UnionPaySetting.java
@@ -0,0 +1,44 @@
+package com.ruoyi.util.bean;
+
+
+/**
+ * 银联支付设置实体
+ */
+public class UnionPaySetting {
+    /**
+     * 商户号
+     */
+    private String merchantNum;
+    /**
+     * 前台回调地址
+     */
+    private String beforeCallbackUrl;
+    /**
+     * 后台回调地址
+     */
+    private String backCallbackUrl;
+
+    public String getMerchantNum() {
+        return merchantNum;
+    }
+
+    public void setMerchantNum(String merchantNum) {
+        this.merchantNum = merchantNum;
+    }
+
+    public String getBeforeCallbackUrl() {
+        return beforeCallbackUrl;
+    }
+
+    public void setBeforeCallbackUrl(String beforeCallbackUrl) {
+        this.beforeCallbackUrl = beforeCallbackUrl;
+    }
+
+    public String getBackCallbackUrl() {
+        return backCallbackUrl;
+    }
+
+    public void setBackCallbackUrl(String backCallbackUrl) {
+        this.backCallbackUrl = backCallbackUrl;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserConstants.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserConstants.java
new file mode 100644
index 0000000..0e038ce
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserConstants.java
@@ -0,0 +1,89 @@
+package com.ruoyi.util.bean;
+
+/**
+ * 用户常量信息
+ *
+ * @author shenzhuan
+ */
+public class UserConstants {
+    /**
+     * 平台内系统用户的唯一标志
+     */
+    public static final String SYS_USER = "SYS_USER";
+
+    /**
+     * 正常状态
+     */
+    public static final String NORMAL = "0";
+
+    /**
+     * 异常状态
+     */
+    public static final String EXCEPTION = "1";
+
+    /**
+     * 用户封禁状态
+     */
+    public static final String USER_DISABLE = "1";
+
+    /**
+     * 角色封禁状态
+     */
+    public static final String ROLE_DISABLE = "1";
+
+    /**
+     * 部门正常状态
+     */
+    public static final String DEPT_NORMAL = "0";
+
+    /**
+     * 部门停用状态
+     */
+    public static final String DEPT_DISABLE = "1";
+
+    /**
+     * 字典正常状态
+     */
+    public static final String DICT_NORMAL = "0";
+
+    /**
+     * 是否为系统默认（是）
+     */
+    public static final String YES = "Y";
+
+    /**
+     * 是否菜单外链（是）
+     */
+    public static final String YES_FRAME = "0";
+
+    /**
+     * 是否菜单外链（否）
+     */
+    public static final String NO_FRAME = "1";
+
+    /**
+     * 菜单类型（目录）
+     */
+    public static final String TYPE_DIR = "M";
+
+    /**
+     * 菜单类型（菜单）
+     */
+    public static final String TYPE_MENU = "C";
+
+    /**
+     * 菜单类型（按钮）
+     */
+    public static final String TYPE_BUTTON = "F";
+
+    /**
+     * Layout组件标识
+     */
+    public final static String LAYOUT = "Layout";
+
+    /**
+     * 校验返回结果码
+     */
+    public final static String UNIQUE = "0";
+    public final static String NOT_UNIQUE = "1";
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoProfile.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoProfile.java
new file mode 100644
index 0000000..7a8531a
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoProfile.java
@@ -0,0 +1,120 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * 用户信息返回实体类
+ */
+public class UserInfoProfile {
+
+    /**
+     * 用户昵称
+     */
+    @JSONField(name = "nickName")
+    private String nickName;
+
+    /**
+     * 用户头像图片的 URL
+     */
+    @JSONField(name = "avatarUrl")
+    private String avatarUrl;
+
+    /**
+     * 用户性别
+     */
+    @JSONField(name = "gender")
+    private String gender;
+
+    /**
+     * 用户所在国家
+     */
+    @JSONField(name = "country")
+    private String country;
+
+    /**
+     * 省份
+     */
+    @JSONField(name = "province")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @JSONField(name = "city")
+    private String city;
+
+    /**
+     * 语言
+     */
+    @JSONField(name = "language")
+    private String language;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    @Override
+    public String toString() {
+        return "UserInfoProfile{" +
+                "nickName='" + nickName + '\'' +
+                ", avatarUrl='" + avatarUrl + '\'' +
+                ", gender='" + gender + '\'' +
+                ", country='" + country + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", language='" + language + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoResult.java
new file mode 100644
index 0000000..9c7e4e7
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/UserInfoResult.java
@@ -0,0 +1,179 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.StringUtils;
+
+/**
+ * 用户信息返回实体类
+ */
+public class UserInfoResult {
+
+    /**
+     * 用户唯一标志
+     */
+    @JSONField(name = "openid")
+    private String openid;
+
+    /**
+     * 昵称
+     */
+    @JSONField(name = "nickname")
+    private String nickname;
+
+    /**
+     * 性别
+     */
+    @JSONField(name = "sex")
+    private String sex;
+
+    /**
+     * 省份
+     */
+    @JSONField(name = "province")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @JSONField(name = "city")
+    private String city;
+
+    /**
+     * 国家
+     */
+    @JSONField(name = "country")
+    private String country;
+
+    /**
+     *
+     */
+    @JSONField(name = "headimgurl")
+    private String headimgurl;
+
+    /**
+     * 联合登录id 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。
+     */
+    @JSONField(name = "unionid")
+    private String unionid;
+
+    /**
+     * 错误码（出错时返回）
+     */
+    @JSONField(name = "errcode")
+    private String errcode;
+
+    /**
+     * 错误信息（出错时返回）
+     */
+    @JSONField(name = "errmsg")
+    private String errmsg;
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return !StringUtils.isEmpty(this.errcode);
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getHeadimgurl() {
+        return headimgurl;
+    }
+
+    public void setHeadimgurl(String headimgurl) {
+        this.headimgurl = headimgurl;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getErrcode() {
+        return errcode;
+    }
+
+    public void setErrcode(String errcode) {
+        this.errcode = errcode;
+    }
+
+    public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
+
+    /**
+     * 转换为字符串
+     */
+    @Override
+    public String toString() {
+        return "UserInfoResult{" +
+                "openid='" + openid + '\'' +
+                ", nickname='" + nickname + '\'' +
+                ", sex='" + sex + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", country='" + country + '\'' +
+                ", headimgurl='" + headimgurl + '\'' +
+                ", unionid='" + unionid + '\'' +
+                ", errcode='" + errcode + '\'' +
+                ", errmsg='" + errmsg + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WeChatAppletCodeRequest.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WeChatAppletCodeRequest.java
new file mode 100644
index 0000000..593b555
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WeChatAppletCodeRequest.java
@@ -0,0 +1,104 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 生成微信小程序码请求实体类
+ *
+ * @author 魔金商城 created on 2020/4/14
+ */
+@ApiModel(description = "生成微信小程序码请求实体")
+public class WeChatAppletCodeRequest {
+
+    /**
+     * 参数，最大32个可见字符，只支持数字，大小写英文以及部分特殊字符：!#$&'()*+,/:;=?@-._~，其它字符请自行编码为合法字符（因不支持%，中文无法使用 urlencode 处理，请使用其他编码方式）
+     */
+    @ApiModelProperty(value = "参数")
+    @JSONField(name = "scene")
+    private String scene;
+
+    /**
+     * 路径，必须是已经发布的小程序存在的页面（否则报错），例如 pages/index/index, 根路径前不要填加 /,不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面
+     */
+    @ApiModelProperty(value = "路径")
+    @JSONField(name = "page")
+    private String page;
+
+    /**
+     * 二维码的宽度，单位 px，最小 280px，最大 1280px，默认 430
+     */
+    @ApiModelProperty(value = "二维码的宽度")
+    @JSONField(name = "width")
+    private int width;
+
+    /**
+     * 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调，默认 false
+     */
+    @ApiModelProperty(value = "是否自动配置线条颜色")
+    @JSONField(name = "auto_color")
+    private boolean auto_color;
+
+    /**
+     * 颜色实体，auto_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"} 十进制表示
+     */
+    @ApiModelProperty(value = "颜色实体")
+    @JSONField(name = "line_color")
+    private LineColor line_color;
+
+    /**
+     * 是否需要透明底色，为 true 时，生成透明底色的小程序，默认 false
+     */
+    @ApiModelProperty(value = "是否需要透明底色")
+    @JSONField(name = "is_hyaline")
+    private boolean is_hyaline;
+
+    public String getScene() {
+        return scene;
+    }
+
+    public void setScene(String scene) {
+        this.scene = scene;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public boolean isAuto_color() {
+        return auto_color;
+    }
+
+    public void setAuto_color(boolean auto_color) {
+        this.auto_color = auto_color;
+    }
+
+    public LineColor getLine_color() {
+        return line_color;
+    }
+
+    public void setLine_color(LineColor line_color) {
+        this.line_color = line_color;
+    }
+
+    public boolean isIs_hyaline() {
+        return is_hyaline;
+    }
+
+    public void setIs_hyaline(boolean is_hyaline) {
+        this.is_hyaline = is_hyaline;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatApletPrepayResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatApletPrepayResult.java
new file mode 100644
index 0000000..b443ae3
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatApletPrepayResult.java
@@ -0,0 +1,121 @@
+package com.ruoyi.util.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 微信公众号，小程序支付返回实体类
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "xml")
+@ApiModel(description = "微信公众号，小程序支付返回实体类")
+public class WechatApletPrepayResult {
+
+    /**
+     * 返回状态码
+     */
+    @XmlElement(name = "appId")
+    @ApiModelProperty(value = "appId")
+    private String appId;
+
+    /**
+     * 随机字符串
+     */
+    @XmlElement(name = "nonceStr")
+    @ApiModelProperty(value = "随机字符串")
+    private String nonceStr;
+
+    /**
+     * 订单详情扩展字符串（公众号支付时返回）
+     */
+    @XmlElement(name = "package_")
+    @ApiModelProperty(value = "订单详情扩展字符串（公众号支付时返回）")
+    private String package_;
+
+    /**
+     * 签名方式
+     */
+    @XmlElement(name = "signType")
+    @ApiModelProperty(value = "签名方式（公众号支付时返回）")
+    private String signType;
+
+    /**
+     * 时间戳
+     */
+    @XmlElement(name = "timeStamp")
+    @ApiModelProperty(value = "时间戳（公众号支付时返回）")
+    private String timeStamp;
+
+    /**
+     * 签名
+     */
+    @XmlElement(name = "paySign")
+    @ApiModelProperty(value = "签名（公众号支付时返回）")
+    private String paySign;
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getNonceStr() {
+        return nonceStr;
+    }
+
+    public void setNonceStr(String nonceStr) {
+        this.nonceStr = nonceStr;
+    }
+
+    public String getPackage_() {
+        return package_;
+    }
+
+    public void setPackage_(String package_) {
+        this.package_ = package_;
+    }
+
+    public String getSignType() {
+        return signType;
+    }
+
+    public void setSignType(String signType) {
+        this.signType = signType;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getPaySign() {
+        return paySign;
+    }
+
+    public void setPaySign(String paySign) {
+        this.paySign = paySign;
+    }
+
+    @Override
+    public String toString() {
+        return "WechatApletPrepayResult{" +
+                "appId='" + appId + '\'' +
+                ", nonceStr='" + nonceStr + '\'' +
+                ", package_='" + package_ + '\'' +
+                ", signType='" + signType + '\'' +
+                ", timeStamp='" + timeStamp + '\'' +
+                ", paySign='" + paySign + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatNotifyResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatNotifyResult.java
new file mode 100644
index 0000000..44f7197
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatNotifyResult.java
@@ -0,0 +1,225 @@
+package com.ruoyi.util.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 统一下单接口返回实体类
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "xml")
+public class WechatNotifyResult {
+
+    /**
+     * 返回状态码
+     */
+    @XmlElement(name = "return_code")
+    private String return_code;
+
+    /**
+     * 返回信息
+     */
+    @XmlElement(name = "return_msg")
+    private String return_msg;
+
+    /**
+     * 公众账号ID
+     */
+    @XmlElement(name = "appid")
+    private String appid;
+
+    /**
+     * 商户号
+     */
+    @XmlElement(name = "mch_id")
+    private String mch_id;
+
+    /**
+     * 随机字符串
+     */
+    @XmlElement(name = "nonce_str")
+    private String nonce_str;
+
+    /**
+     * 签名
+     */
+    @XmlElement(name = "sign")
+    private String sign;
+
+    /**
+     * 业务结果
+     */
+    @XmlElement(name = "result_code")
+    private String result_code;
+
+    /**
+     * 错误代码
+     */
+    @XmlElement(name = "err_code")
+    private String err_code;
+
+    /**
+     * 错误代码描述
+     */
+    @XmlElement(name = "err_code_des")
+    private String err_code_des;
+
+    /**
+     * 交易类型
+     */
+    @XmlElement(name = "trade_type")
+    private String trade_type;
+
+    /**
+     * 附加参数(交易类型)
+     */
+    @XmlElement(name = "attach")
+    private int attach;
+
+    /**
+     * 订单号
+     */
+    @XmlElement(name = "out_trade_no")
+    private String out_trade_no;
+
+    /**
+     * 微信交易流水号
+     */
+    @XmlElement(name = "transaction_id")
+    private String transaction_id;
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return "FAIL".equals(this.return_code);
+    }
+
+    public String getReturn_code() {
+        return return_code;
+    }
+
+    public void setReturn_code(String return_code) {
+        this.return_code = return_code;
+    }
+
+    public String getReturn_msg() {
+        return return_msg;
+    }
+
+    public void setReturn_msg(String return_msg) {
+        this.return_msg = return_msg;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getMch_id() {
+        return mch_id;
+    }
+
+    public void setMch_id(String mch_id) {
+        this.mch_id = mch_id;
+    }
+
+    public String getNonce_str() {
+        return nonce_str;
+    }
+
+    public void setNonce_str(String nonce_str) {
+        this.nonce_str = nonce_str;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getResult_code() {
+        return result_code;
+    }
+
+    public void setResult_code(String result_code) {
+        this.result_code = result_code;
+    }
+
+    public String getErr_code() {
+        return err_code;
+    }
+
+    public void setErr_code(String err_code) {
+        this.err_code = err_code;
+    }
+
+    public String getErr_code_des() {
+        return err_code_des;
+    }
+
+    public void setErr_code_des(String err_code_des) {
+        this.err_code_des = err_code_des;
+    }
+
+    public String getTrade_type() {
+        return trade_type;
+    }
+
+    public void setTrade_type(String trade_type) {
+        this.trade_type = trade_type;
+    }
+
+    public int getAttach() {
+        return attach;
+    }
+
+    public void setAttach(int attach) {
+        this.attach = attach;
+    }
+
+    public String getOut_trade_no() {
+        return out_trade_no;
+    }
+
+    public void setOut_trade_no(String out_trade_no) {
+        this.out_trade_no = out_trade_no;
+    }
+
+    public String getTransaction_id() {
+        return transaction_id;
+    }
+
+    public void setTransaction_id(String transaction_id) {
+        this.transaction_id = transaction_id;
+    }
+
+    @Override
+    public String toString() {
+        return "WechatNotifyResult{" +
+                "return_code='" + return_code + '\'' +
+                ", return_msg='" + return_msg + '\'' +
+                ", appid='" + appid + '\'' +
+                ", mch_id='" + mch_id + '\'' +
+                ", nonce_str='" + nonce_str + '\'' +
+                ", sign='" + sign + '\'' +
+                ", result_code='" + result_code + '\'' +
+                ", err_code='" + err_code + '\'' +
+                ", err_code_des='" + err_code_des + '\'' +
+                ", trade_type='" + trade_type + '\'' +
+                ", attach=" + attach +
+                ", out_trade_no='" + out_trade_no + '\'' +
+                ", transaction_id='" + transaction_id + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponse.java
new file mode 100644
index 0000000..6a14738
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponse.java
@@ -0,0 +1,69 @@
+package com.ruoyi.util.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * 微信支付返回实体（订单支付）
+ */
+@ApiModel(description = "微信支付返回实体")
+public class WechatPayResponse {
+
+    /**
+     * 订单code
+     */
+    @ApiModelProperty(value = "订单code")
+    private String orderCode;
+
+    /**
+     * 订单总金额
+     */
+    @ApiModelProperty(value = "订单总金额")
+    private BigDecimal orderMoney;
+
+    /**
+     * 扫码支付url
+     */
+    @ApiModelProperty(value = "扫码支付url")
+    private String codeUrl;
+
+    /**
+     * mweb_url为拉起微信支付收银台的中间页面，可通过访问该url来拉起微信客户端，完成支付,mweb_url的有效期为5分钟。
+     */
+    @ApiModelProperty(value = "mweb_url为拉起微信支付收银台的中间页面，可通过访问该url来拉起微信客户端，完成支付,mweb_url的有效期为5分钟。")
+    private String mwebUrl;
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public BigDecimal getOrderMoney() {
+        return orderMoney;
+    }
+
+    public void setOrderMoney(BigDecimal orderMoney) {
+        this.orderMoney = orderMoney;
+    }
+
+    public String getCodeUrl() {
+        return codeUrl;
+    }
+
+    public void setCodeUrl(String codeUrl) {
+        this.codeUrl = codeUrl;
+    }
+
+    public String getMwebUrl() {
+        return mwebUrl;
+    }
+
+    public void setMwebUrl(String mwebUrl) {
+        this.mwebUrl = mwebUrl;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponseForRecharge.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponseForRecharge.java
new file mode 100644
index 0000000..89a892d
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WechatPayResponseForRecharge.java
@@ -0,0 +1,62 @@
+package com.ruoyi.util.bean;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 微信支付返回实体（充值）
+ */
+public class WechatPayResponseForRecharge {
+
+    /**
+     * 订单code
+     */
+    private String transCode;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 扫码支付url
+     */
+    private String codeUrl;
+
+    /**
+     * mweb_url为拉起微信支付收银台的中间页面，可通过访问该url来拉起微信客户端，完成支付,mweb_url的有效期为5分钟。
+     */
+    private String mwebUrl;
+
+    public String getTransCode() {
+        return transCode;
+    }
+
+    public void setTransCode(String transCode) {
+        this.transCode = transCode;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public String getCodeUrl() {
+        return codeUrl;
+    }
+
+    public void setCodeUrl(String codeUrl) {
+        this.codeUrl = codeUrl;
+    }
+
+    public String getMwebUrl() {
+        return mwebUrl;
+    }
+
+    public void setMwebUrl(String mwebUrl) {
+        this.mwebUrl = mwebUrl;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawRequest.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawRequest.java
new file mode 100644
index 0000000..5443edd
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawRequest.java
@@ -0,0 +1,73 @@
+package com.ruoyi.util.bean;
+
+
+import java.math.BigDecimal;
+
+/**
+ * Created by 魔金商城 on 18/2/7.
+ * 提现请求实体
+ */
+public class WithdrawRequest {
+
+    /**
+     * 交流流水号
+     */
+    private String tradeNo;
+
+    /**
+     * 支付包账户
+     */
+    private String account;
+
+    /**
+     * 支付包实名认证姓名
+     */
+    private String name;
+
+    /**
+     * 提现金额
+     */
+    private BigDecimal money;
+
+    public String getTradeNo() {
+        return tradeNo;
+    }
+
+    public void setTradeNo(String tradeNo) {
+        this.tradeNo = tradeNo;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    @Override
+    public String toString() {
+        return "WithdrawRequest{" +
+                "tradeNo='" + tradeNo + '\'' +
+                ", account='" + account + '\'' +
+                ", name='" + name + '\'' +
+                ", money=" + money +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawResponse.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawResponse.java
new file mode 100644
index 0000000..998b02f
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WithdrawResponse.java
@@ -0,0 +1,77 @@
+package com.ruoyi.util.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by 魔金商城 on 18/02/07.
+ * 提现返回实体
+ */
+@ApiModel(description = "提现返回实体")
+public class WithdrawResponse {
+
+    /**
+     * 返回code
+     */
+    @ApiModelProperty(value = "返回code")
+    private String code;
+    /**
+     * 业务code
+     */
+    @ApiModelProperty(value = "业务code")
+    private String subCode;
+
+    private WithdrawResponse() {
+
+    }
+
+    /**
+     * 构造提现返回实体
+     *
+     * @param code    返回code
+     * @param subCode 业务返回code
+     * @return 返回提现返回实体
+     */
+    public static WithdrawResponse build(String code, String subCode) {
+        WithdrawResponse withdrawResponse = new WithdrawResponse();
+        withdrawResponse.code = code;
+        withdrawResponse.subCode = subCode;
+        return withdrawResponse;
+    }
+
+    /**
+     * 构造系统异常实体
+     *
+     * @return 返回提现相应实体
+     */
+    public static WithdrawResponse buildSystemError() {
+        WithdrawResponse withdrawResponse = new WithdrawResponse();
+        withdrawResponse.code = "-10001";
+        return withdrawResponse;
+    }
+
+    /**
+     * 是否提现成功
+     *
+     * @return 成功返回true
+     */
+    public boolean isSuccess() {
+        return "10000".equals(this.code);
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSubCode() {
+        return subCode;
+    }
+
+    public void setSubCode(String subCode) {
+        this.subCode = subCode;
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WxTransferResult.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WxTransferResult.java
new file mode 100644
index 0000000..b042b07
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/bean/WxTransferResult.java
@@ -0,0 +1,352 @@
+package com.ruoyi.util.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 统一下单接口返回实体类
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "xml")
+@ApiModel(description = "统一下单接口返回实体类")
+public class WxTransferResult {
+
+    /**
+     * 返回状态码
+     */
+    @XmlElement(name = "return_code")
+    @ApiModelProperty(value = "返回状态码")
+    @JSONField(name = "return_code")
+    private String return_code;
+
+    /**
+     * 返回信息
+     */
+    @XmlElement(name = "return_msg")
+    @ApiModelProperty(value = "返回信息")
+    @JSONField(name = "return_msg")
+    private String return_msg;
+
+    /**
+     * 公众账号ID
+     */
+    @XmlElement(name = "mch_appid")
+    @ApiModelProperty(value = "商户appid")
+    @JSONField(name = "mch_appid")
+    private String mch_appid;
+
+    /**
+     * 商户号
+     */
+    @XmlElement(name = "mchid")
+    @ApiModelProperty(value = "商户号")
+    @JSONField(name = "mchid")
+    private String mchid;
+
+    /**
+     * 随机字符串
+     */
+    @XmlElement(name = "nonce_str")
+    @ApiModelProperty(value = "随机字符串")
+    @JSONField(name = "nonce_str")
+    private String nonce_str;
+
+    /**
+     * 签名
+     */
+    @XmlElement(name = "sign")
+    @ApiModelProperty(value = "签名")
+    private String sign;
+
+    /**
+     * 业务结果
+     */
+    @XmlElement(name = "result_code")
+    @ApiModelProperty(value = "业务结果")
+    @JSONField(name = "result_code")
+    private String result_code;
+
+    /**
+     * 错误代码
+     */
+    @XmlElement(name = "err_code")
+    @ApiModelProperty(value = "错误代码")
+    @JSONField(name = "err_code")
+    private String err_code;
+
+    /**
+     * 错误代码描述
+     */
+    @XmlElement(name = "err_code_des")
+    @ApiModelProperty(value = "错误代码描述")
+    @JSONField(name = "err_code_des")
+    private String err_code_des;
+
+    /**
+     * 商户订单号
+     */
+    @XmlElement(name = "partner_trade_no")
+    @ApiModelProperty(value = "商户订单号")
+    @JSONField(name = "partner_trade_no")
+    private String partner_trade_no;
+
+    /**
+     * 微信付款单号
+     */
+    @XmlElement(name = "payment_no")
+    @ApiModelProperty(value = "微信付款单号")
+    @JSONField(name = "payment_no")
+    private String payment_no;
+
+    /**
+     * 付款成功时间
+     */
+    @XmlElement(name = "payment_time")
+    @ApiModelProperty(value = "付款成功时间")
+    @JSONField(name = "payment_time")
+    private String payment_time;
+
+    /**
+     * 预支付交易会话标识
+     */
+    @XmlElement(name = "prepay_id")
+    @ApiModelProperty(value = "预支付交易会话标识")
+    @JSONField(name = "prepay_id")
+    private String prepay_id;
+
+    /**
+     * 二维码链接
+     */
+    @XmlElement(name = "code_url")
+    @ApiModelProperty(value = "二维码链接")
+    private String code_url;
+
+    /**
+     * H5支付链接
+     */
+    @XmlElement(name = "mweb_url")
+    @ApiModelProperty(value = "H5支付链接")
+    private String mweb_url;
+
+    /**
+     * 时间戳（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "时间戳（公众号支付时返回）")
+    private String time_stamp;
+
+    /**
+     * 订单详情扩展字符串（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "订单详情扩展字符串（公众号支付时返回）")
+    private String package_;
+    /**
+     * 签名方式（公众号支付时返回）
+     */
+    @ApiModelProperty(value = " 签名方式（公众号支付时返回）")
+    private String sign_type;
+    /**
+     * 签名（公众号支付时返回）
+     */
+    @ApiModelProperty(value = "签名（公众号支付时返回）")
+    private String pay_sign;
+
+    /**
+     * 生成订单详情扩展字符串
+     */
+    @JsonIgnore
+    public void setPackage() {
+        this.package_ = "prepay_id=" + prepay_id;
+    }
+
+    /**
+     * 判断是否失败
+     */
+    @JsonIgnore
+    public boolean isError() {
+        return "FAIL".equals(this.return_code);
+    }
+
+    public String getReturn_code() {
+        return return_code;
+    }
+
+    public void setReturn_code(String return_code) {
+        this.return_code = return_code;
+    }
+
+    public String getReturn_msg() {
+        return return_msg;
+    }
+
+    public void setReturn_msg(String return_msg) {
+        this.return_msg = return_msg;
+    }
+
+    public String getMch_appid() {
+        return mch_appid;
+    }
+
+    public void setMch_appid(String mch_appid) {
+        this.mch_appid = mch_appid;
+    }
+
+    public String getMchid() {
+        return mchid;
+    }
+
+    public void setMchid(String mchid) {
+        this.mchid = mchid;
+    }
+
+    public String getNonce_str() {
+        return nonce_str;
+    }
+
+    public void setNonce_str(String nonce_str) {
+        this.nonce_str = nonce_str;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getResult_code() {
+        return result_code;
+    }
+
+    public void setResult_code(String result_code) {
+        this.result_code = result_code;
+    }
+
+    public String getErr_code() {
+        return err_code;
+    }
+
+    public void setErr_code(String err_code) {
+        this.err_code = err_code;
+    }
+
+    public String getErr_code_des() {
+        return err_code_des;
+    }
+
+    public void setErr_code_des(String err_code_des) {
+        this.err_code_des = err_code_des;
+    }
+
+    public String getPartner_trade_no() {
+        return partner_trade_no;
+    }
+
+    public void setPartner_trade_no(String partner_trade_no) {
+        this.partner_trade_no = partner_trade_no;
+    }
+
+    public String getPayment_no() {
+        return payment_no;
+    }
+
+    public void setPayment_no(String payment_no) {
+        this.payment_no = payment_no;
+    }
+
+    public String getPayment_time() {
+        return payment_time;
+    }
+
+    public void setPayment_time(String payment_time) {
+        this.payment_time = payment_time;
+    }
+
+    public String getPrepay_id() {
+        return prepay_id;
+    }
+
+    public void setPrepay_id(String prepay_id) {
+        this.prepay_id = prepay_id;
+    }
+
+    public String getCode_url() {
+        return code_url;
+    }
+
+    public void setCode_url(String code_url) {
+        this.code_url = code_url;
+    }
+
+    public String getMweb_url() {
+        return mweb_url;
+    }
+
+    public void setMweb_url(String mweb_url) {
+        this.mweb_url = mweb_url;
+    }
+
+    public String getTime_stamp() {
+        return time_stamp;
+    }
+
+    public void setTime_stamp(String time_stamp) {
+        this.time_stamp = time_stamp;
+    }
+
+    public String getPackage_() {
+        return package_;
+    }
+
+    public void setPackage_(String package_) {
+        this.package_ = package_;
+    }
+
+    public String getSign_type() {
+        return sign_type;
+    }
+
+    public void setSign_type(String sign_type) {
+        this.sign_type = sign_type;
+    }
+
+    public String getPay_sign() {
+        return pay_sign;
+    }
+
+    public void setPay_sign(String pay_sign) {
+        this.pay_sign = pay_sign;
+    }
+
+    @Override
+    public String toString() {
+        return "WxTransferResult{" +
+                "return_code='" + return_code + '\'' +
+                ", return_msg='" + return_msg + '\'' +
+                ", mch_appid='" + mch_appid + '\'' +
+                ", mchid='" + mchid + '\'' +
+                ", nonce_str='" + nonce_str + '\'' +
+                ", sign='" + sign + '\'' +
+                ", result_code='" + result_code + '\'' +
+                ", err_code='" + err_code + '\'' +
+                ", err_code_des='" + err_code_des + '\'' +
+                ", partner_trade_no='" + partner_trade_no + '\'' +
+                ", payment_no='" + payment_no + '\'' +
+                ", payment_time='" + payment_time + '\'' +
+                ", prepay_id='" + prepay_id + '\'' +
+                ", code_url='" + code_url + '\'' +
+                ", mweb_url='" + mweb_url + '\'' +
+                ", time_stamp='" + time_stamp + '\'' +
+                ", package_='" + package_ + '\'' +
+                ", sign_type='" + sign_type + '\'' +
+                ", pay_sign='" + pay_sign + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5.java
new file mode 100644
index 0000000..af73692
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5.java
@@ -0,0 +1,59 @@
+package com.ruoyi.util.md5;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class MD5 {
+
+    private MD5() {
+    }
+
+    public final static String getMessageDigest(byte[] buffer) {
+        //首先初始化一个字符数组，用来存放每个16进制字符
+        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+        try {
+            // 拿到一个MD5转换器（如果想要SHA1参数换成"SHA1"）
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            // buffer 是输入字符串转换得到的字节数组
+            mdTemp.update(buffer);
+            // 转换并返回结果，也是字节数组，包含16个元素
+            byte[] md = mdTemp.digest();
+
+            int j = md.length;
+            // new一个字符数组，这个就是用来组成结果字符串的（解释一下：一个byte是八位二进制，也就是2位十六进制字符（2的8次方等于16的2次方））
+            char str[] = new char[j * 2];
+            int k = 0;
+            //遍历字节数组，通过位运算（位运算效率高），转换成字符放到字符数组中去
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            //字符数组转换成字符串返回
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static String hex(byte[] array) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < array.length; ++i) {
+            sb.append(Integer.toHexString((array[i]
+                    & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString();
+    }
+
+    public static String md5Hex(String message) {
+        try {
+            MessageDigest md =
+                    MessageDigest.getInstance("MD5");
+            return hex(md.digest(message.getBytes("CP1252")));
+        } catch (NoSuchAlgorithmException e) {
+        } catch (UnsupportedEncodingException e) {
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5Utils.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5Utils.java
new file mode 100644
index 0000000..dabcfa4
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MD5Utils.java
@@ -0,0 +1,121 @@
+package com.ruoyi.util.md5;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * md5工具类
+ */
+public class MD5Utils {
+
+    private static final MD5Utils INSTANCE = new MD5Utils();
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(MD5Utils.class);
+
+    private MD5Utils() {
+
+    }
+
+    public static MD5Utils getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * 判断订单号是否含有中文
+     *
+     * @param waybillCode 订单号
+     * @return true 含有中文 false 不含中文
+     */
+    public boolean isContainChinese(String waybillCode) {
+
+        Pattern p = Pattern.compile("[\u4e00-\u9fa5]");
+        Matcher m = p.matcher(waybillCode);
+        if (m.find()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 创建md5值
+     *
+     * @param string 待加密的字符串
+     * @return 返回加密后的值
+     */
+    public String createMd5(String string) {
+        String result = "";
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(string.getBytes("utf-8"));
+            byte b[] = md.digest();
+            int i;
+            StringBuilder buf = new StringBuilder();
+            for (int offset = 0; offset < b.length; offset++) {
+                i = b[offset];
+                if (i < 0) {
+                    i += 256;
+                }
+                if (i < 16) {
+                    buf.append("0");
+                }
+
+                buf.append(Integer.toHexString(i));
+            }
+            return buf.toString();
+        } catch (NoSuchAlgorithmException e) {
+            logger.error("createMd5 fail...", e);
+        } catch (UnsupportedEncodingException e) {
+            logger.error("createMd5 fail...", e);
+        }
+        return result;
+    }
+
+    /**
+     * 生成md5值
+     *
+     * @param is 输入流
+     * @return 返回md5加密后的字符串
+     * @throws IOException
+     */
+    public String createMd5ForImageUpload(InputStream is) throws IOException {
+        char[] hexDigits = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            byte[] j = new byte[1024];
+            while (true) {
+                int var14 = is.read(j);
+                if (var14 > 0) {
+                    md5.update(j, 0, var14);
+                }
+                if (var14 == -1) {
+                    is.skip(0L);
+                    break;
+                }
+            }
+        } catch (NoSuchAlgorithmException var12) {
+            throw new RuntimeException(var12.getMessage());
+        } finally {
+            is.close();
+        }
+        byte[] var15 = md5.digest();
+        int var16 = var15.length;
+        char[] finalValue = new char[var16 * 2];
+        int k = 0;
+        for (byte encoded : var15) {
+            finalValue[k++] = hexDigits[encoded >> 4 & 15];
+            finalValue[k++] = hexDigits[encoded & 15];
+        }
+        return new String(finalValue);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MessageSourceUtil.java b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MessageSourceUtil.java
new file mode 100644
index 0000000..86b3dd6
--- /dev/null
+++ b/ruoyi-segchk/src/main/java/com/ruoyi/util/md5/MessageSourceUtil.java
@@ -0,0 +1,38 @@
+package com.ruoyi.util.md5;
+
+import com.ruoyi.common.utils.spring.SpringUtils;
+import org.springframework.context.MessageSource;
+import org.springframework.context.NoSuchMessageException;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+
+/**
+ * 消息资源根据类
+ * Created by 魔金商城 on 17/7/10.
+ */
+public final class MessageSourceUtil {
+    private static MessageSource messageSource;
+
+    static {
+        init((MessageSource) SpringUtils.getBean(MessageSource.class));
+    }
+
+    public static void init(MessageSource messageSource) {
+        MessageSourceUtil.messageSource = messageSource;
+    }
+
+
+    /**
+     * 根据code 获得国际化文件中的值
+     *
+     * @param code key
+     * @return 返回值
+     */
+    public static String getMessage(String code) {
+        try {
+            return messageSource.getMessage(code, null, LocaleContextHolder.getLocale());
+        } catch (NoSuchMessageException e) {
+            return null;
+        }
+    }
+}
diff --git a/ruoyi-segchk/src/main/resources/mapper/member/WeChatCustomerLinkMapper.xml b/ruoyi-segchk/src/main/resources/mapper/member/WeChatCustomerLinkMapper.xml
new file mode 100644
index 0000000..2ac0ebb
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/member/WeChatCustomerLinkMapper.xml
@@ -0,0 +1,72 @@
+<?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.member.mapper.WeChatCustomerLinkMapper">
+
+    <resultMap id="wechatCustomerLink" type="com.ruoyi.segchk.domain.WeChatCustomerLink">
+        <result column="id" property="id"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="wx_union_id" property="unionId"/>
+        <result column="wx_open_id" property="openId"/>
+        <result column="wx_applet_open_id" property="appletOpenId"/>
+    </resultMap>
+
+
+    <select id="queryWeChatCustomerLinkByOpenId" parameterType="java.lang.String" resultMap="wechatCustomerLink">
+     select * from ls_wx_customer_link where wx_open_id=#{openId}
+    </select>
+    <select id="queryWeChatCustomerLinkByUnionId" parameterType="java.lang.String" resultMap="wechatCustomerLink">
+        select * from ls_wx_customer_link where wx_union_id=#{unionId}
+    </select>
+    <select id="queryWeChatCustomerLinkByCustomerId" parameterType="java.lang.Long" resultMap="wechatCustomerLink">
+        select * from ls_wx_customer_link where customer_id=#{customerId}
+    </select>
+    <insert id="addWeChatCustomerLink" parameterType="com.ruoyi.segchk.domain.WeChatCustomerLink">
+        INSERT into ls_wx_customer_link
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="customerId !=null">
+                customer_id,
+            </if>
+            <if test="unionId !=null and unionId !=''">
+                wx_union_id,
+            </if>
+            <if test="openId !=null and  openId !=''">
+                wx_open_id,
+            </if>
+            <if test="appletOpenId !=null and  appletOpenId !=''">
+                wx_applet_open_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="customerId !=null">
+                #{customerId},
+            </if>
+            <if test="unionId !=null and unionId !=''">
+                #{unionId},
+            </if>
+            <if test="openId !=null and  openId !=''">
+                #{openId},
+            </if>
+            <if test="appletOpenId !=null and  appletOpenId !=''">
+                #{appletOpenId},
+            </if>
+        </trim>
+    </insert>
+    <delete id="deleteWeChatCustomerLink" parameterType="java.lang.Long">
+     DELETE from ls_wx_customer_link where customer_id=#{customerId}
+    </delete>
+
+    <update id="updateWeChatCustomerLink" parameterType="com.ruoyi.segchk.domain.WeChatCustomerLink">
+        update ls_wx_customer_link
+        <set>
+            <trim suffixOverrides=",">
+                <if test="openId !=null and  openId !=''">
+                    wx_open_id=#{openId},
+                </if>
+                <if test="appletOpenId !=null and  appletOpenId !=''">
+                    wx_applet_open_id=#{appletOpenId},
+                </if>
+            </trim>
+        </set>
+        where id=#{id};
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkProviderIndexMapper.xml b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkProviderIndexMapper.xml
new file mode 100644
index 0000000..568f7ab
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkProviderIndexMapper.xml
@@ -0,0 +1,200 @@
+<?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.segchk.mapper.SegchkProviderIndexMapper">
+    
+    <resultMap type="SegchkProviderMgt" id="SegchkProviderMgtResult">
+        <result property="openid"    column="openid"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="wechatId"    column="wechat_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="phoneNo"    column="phone_no"    />
+        <result property="flagId"    column="flag_id"    />
+        <result property="districtId"    column="District_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="delTime"    column="del_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap type="SegchkUserWebResp" id="SegchkUserWebRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="userId" column="District_id"/>
+        <result property="phoneNo" column="phone_no"/>
+        <result property="userName" column="nick_name"/>
+        <result property="openid" column="openid"/>
+        <result property="userIcon" column="icon_url"/>
+<!--        <result property="iscertified" column="is_certified"/>-->
+        <result property="storeCount" column="store_count"/>
+        <result property="msgCount" column="msg_count"/>
+    </resultMap>
+
+    <resultMap type="SegchkServiceAndSaleWebResp" id="SegchkServiceAndSaleWebRespResult">
+        <result property="staticMonth" column="static_month"/>
+        <result property="staticCount" column="static_count"/>
+        <result property="queryMon" column="query_mon"/>
+
+    </resultMap>
+
+    <resultMap type="SegchkServiceAndSaleDetailWebResp" id="SegchkServiceAndSaleDetailWebRespResult">
+        <result property="modTime" column="static_month"/>
+        <result property="cardId" column="card_id"/>
+        <result property="cardName" column="card_name"/>
+        <result property="storeName" column="store_name"/>
+        <result property="staticCount" column="static_count"/>
+
+    </resultMap>
+
+    <sql id="selectSegchkProviderMgtVo">
+        select openid, union_id, wechat_id, provider_id, nick_name, icon_url, phone_no, flag_id, District_id, create_time, del_time, update_time from segchk_provider_mgt
+    </sql>
+
+    <select id="selectSegchkProviderMgtList" parameterType="SegchkProviderMgt" resultMap="SegchkProviderMgtResult">
+        <include refid="selectSegchkProviderMgtVo"/>
+        <where>  
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="wechatId != null  and wechatId != ''"> and wechat_id = #{wechatId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name = #{nickName}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="phoneNo != null  and phoneNo != ''"> and phone_no = #{phoneNo}</if>
+            <if test="flagId != null "> and flag_id = #{flagId}</if>
+            <if test="districtId != null "> and District_id = #{districtId}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="delTime != null "> and del_time = #{delTime}</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkProviderMgtById" parameterType="Long" resultMap="SegchkProviderMgtResult">
+        <include refid="selectSegchkProviderMgtVo"/>
+        where provider_id = #{providerId}
+    </select>
+        
+    <insert id="insertSegchkProviderMgt" parameterType="SegchkProviderMgt" useGeneratedKeys="true" keyProperty="providerId">
+        insert into segchk_provider_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openid != null">openid,</if>
+            <if test="unionId != null">union_id,</if>
+            <if test="wechatId != null">wechat_id,</if>
+            <if test="nickName != null">nick_name,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="phoneNo != null">phone_no,</if>
+            <if test="flagId != null">flag_id,</if>
+            <if test="districtId != null">District_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="delTime != null">del_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openid != null">#{openid},</if>
+            <if test="unionId != null">#{unionId},</if>
+            <if test="wechatId != null">#{wechatId},</if>
+            <if test="nickName != null">#{nickName},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="phoneNo != null">#{phoneNo},</if>
+            <if test="flagId != null">#{flagId},</if>
+            <if test="districtId != null">#{districtId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkProviderMgt" parameterType="SegchkProviderMgt">
+        update segchk_provider_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openid != null">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="phoneNo != null">phone_no = #{phoneNo},</if>
+            <if test="flagId != null">flag_id = #{flagId},</if>
+            <if test="districtId != null">District_id = #{districtId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where provider_id = #{providerId}
+    </update>
+
+    <delete id="deleteSegchkProviderMgtById" parameterType="Long">
+        delete from segchk_provider_mgt where provider_id = #{providerId}
+    </delete>
+
+    <delete id="deleteSegchkProviderMgtByIds" parameterType="String">
+        delete from segchk_provider_mgt where provider_id in 
+        <foreach item="providerId" collection="array" open="(" separator="," close=")">
+            #{providerId}
+        </foreach>
+    </delete>
+
+
+    <select id="selectSegchkProviderWebInfo" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebRespResult">
+        select provider.provider_id, provider.openid, provider.union_id, provider.nick_name, provider.icon_url, provider.phone_no, provider.District_id, store.store_count, ifnull(msgcnt.msgcount, 0) as msg_count from
+        (select provider_id, openid, union_id, nick_name, icon_url, phone_no, District_id from segchk_provider_mgt where provider_id = #{providerId} and flag_id = 0) provider
+        left join
+        (select provider_id, count(1) as store_count from segchk_store_basic_info where provider_id = #{providerId} and service_state = 0) store on provider.provider_id = store.provider_id
+        left join
+        (select provider_id, to_id, count(1) as msgcount from segchk_msg_detail where provider_id = #{providerId} and to_id = #{providerId} and recv_level = 0 and (msg_flag = 1) and from_time <![CDATA[ >=  ]]> NOW() - interval 30 day) msgcnt on msgcnt.provider_id = store.provider_id
+    </select>
+
+    <select id="selectSegchkStoreServiceList" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleWebRespResult">
+        select date_format( mod_time, '%Y%m' ) as static_month
+        , date_format(any_value(mod_time), '%Y-%m-01') as query_mon
+        , count(1) as static_count from segchk_service_chk where provider_id = #{providerId} and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="staticMonth == null">3</when>
+            <when test="staticMonth == 0">3</when>
+            <otherwise>#{staticMonth} - 1</otherwise>
+        </choose>
+         month group by date_format( mod_time, '%Y%m' ) order by date_format( mod_time, '%Y%m' ) desc
+    </select>
+
+    <select id="selectSegchkStoreSaleList" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleWebRespResult">
+        select date_format( mod_time, '%Y%m' ) as static_month
+        , date_format(any_value(mod_time), '%Y-%m-01') as query_mon
+        , count(1) as static_count from segchk_user_charge where provider_id = #{providerId} and ret_flag <![CDATA[ >=  ]]> 1 and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+        <when test="staticMonth == null">3</when>
+        <when test="staticMonth == 0">3</when>
+        <otherwise>#{staticMonth} - 1</otherwise>
+    </choose> month group by date_format( mod_time, '%Y%m' ) order by date_format( mod_time, '%Y%m' ) desc
+    </select>
+
+    <select id="selectSegchkStoreSaleDetails" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleDetailWebRespResult">
+        select store.store_name
+        , charge.charge_count as static_count
+        , ifnull(cardmgt.card_type_name, '未知卡') as card_name
+        from
+        (select store_id, card_type_id, provider_id, count(1) as charge_count from segchk_user_charge where provider_id = #{providerId} and ret_flag <![CDATA[ >=  ]]> 1 and date_format(mod_time, '%Y%m') = date_format(#{staticMonth}, '%Y%m') group by provider_id, card_type_id, store_id) charge
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) cardmgt on cardmgt.provider_id = charge.provider_id and cardmgt.card_type_id = charge.card_type_id
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) store on charge.provider_id = store.provider_id and charge.store_id = store.store_id
+        order by charge.store_id
+    </select>
+
+    <select id="selectSegchkStoreServiceDetails" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleDetailWebRespResult">
+        select chk.chk_count as static_count
+        , store.store_name
+        , ifnull(cardmgt.card_type_name, '未知卡') as card_name
+        from
+        (select provider_id, store_id, card_type_id, count(1) as chk_count from segchk_service_chk where provider_id = #{providerId} and date_format(mod_time, '%Y%m') = date_format(#{staticMonth}, '%Y%m') group by provider_id, store_id, card_type_id order by store_id, card_type_id) chk
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) cardmgt on cardmgt.provider_id = chk.provider_id and chk.card_type_id = cardmgt.card_type_id
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) store on chk.provider_id = store.provider_id and chk.store_id = store.store_id
+        order by chk.store_id
+    </select>
+
+    <select id="selectProviderOpenIdById" parameterType="long" resultType="string">
+        select openid from segchk_provider_mgt where provider_id = #{providerId}
+    </select>
+    <select id="selectSegchkProviderName" parameterType="string" resultType="java.lang.String">
+        select nick_name from segchk_provider_mgt where provider_id = #{providerId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkStoreIndexMapper.xml b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkStoreIndexMapper.xml
new file mode 100644
index 0000000..d2f5cbe
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkStoreIndexMapper.xml
@@ -0,0 +1,801 @@
+<?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.segchk.mapper.SegchkStoreIndexMapper">
+
+<!--    用于返回分类，搜索出的商户列表-->
+    <resultMap type="SegchkStoreIndexWebResp" id="SegchkStoreIndexWebRespResult">
+        <result property="providerId"        column="provider_id"          />
+        <result property="storeId"      column="store_id"        />
+        <result property="storeName"      column="store_name"        />
+        <result property="serviceState"      column="service_state"        />
+        <result property="storeSort"   column="store_sort"    />
+        <result property="storeIcon"   column="store_icon"    />
+        <result property="storeGificon" column="store_gificon" />
+        <result property="storeLon"      column="store_lon"        />
+        <result property="storeLat"    column="store_lat"      />
+        <result property="chkCount"    column="chkcount"      />
+        <result property="starAvg"     column="staravg"       />
+        <result property="salerId"     column="saler_id"       />
+        <result property="userDist"     column="user_dist"       />
+        <collection property="lables" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+<!--    用户返回具体商户详情页信息-->
+    <resultMap id="SegchkStoreBasicInfoWebRespResult" type="SegchkStoreBasicInfoWebResp">
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="storeName" column="store_name"/>
+        <result property="storePhone" column="store_phone"/>
+        <result property="serviceState" column="service_state"/>
+        <result property="salerId" column="saler_id"/>
+        <result property="storeAddr" column="store_addr"/>
+        <result property="storeLon" column="store_lon"/>
+        <result property="storeLat" column="store_lat"/>
+        <result property="onService" column="on_service"/>
+        <result property="detail" column="detail"/>
+        <result property="storeVR" column="store_vr"/>
+        <result property="storeCarousel1" column="store_carousel1"/>
+        <result property="storeCarousel2" column="store_carousel2"/>
+        <result property="storeCarousel3" column="store_carousel3"/>
+        <result property="storeCarousel4" column="store_carousel4"/>
+        <result property="storeCarousel5" column="store_carousel5"/>
+        <result property="storeCarousel6" column="store_carousel6"/>
+        <result property="chkCount" column="chkcount"/>
+        <result property="starAvg" column="staravg"/>
+        <collection property="segchkRecommenderStoreLableWebList" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+    <resultMap id="SegchkServiceCommentWebRespResult" type="SegchkServiceCommentWebResp">
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="starLevel" column="star_level"/>
+        <result property="contentText" column="content_text"/>
+        <result property="cardName" column="card_type_name"/>
+        <result property="userName" column="nick_name"/>
+        <result property="modTime" column="mod_time"/>
+    </resultMap>
+
+        <resultMap type="SegchkRecommenderStoreLableWeb" id="SegchkRecommenderStoreLableWebResult">
+            <result property="lableId"        column="lable_id"       />
+            <result property="lableSortId"     column="lable_sort"    />
+            <result property="lableTypeId"  column="type_id" />
+            <result property="lableName"     column="lable_name"    />
+            <result property="lablePic"     column="lable_pic"    />
+        </resultMap>
+
+    <resultMap type="SegchkUserWebResp" id="SegchkUserWebRespResult">
+        <result property="phoneNo" column="store_phone"/>
+        <result property="userName" column="store_name"/>
+        <result property="openid" column="openid"/>
+        <result property="userIcon" column="icon_url"/>
+        <result property="iscertified" column="is_certified"/>
+        <result property="account" column="account"/>
+        <result property="chkCount" column="chkcount"/>
+        <result property="chargeCount" column="chkcount"/>
+        <result property="cashCount" column="chkcount"/>
+        <result property="msgCount" column="msg_count"/>
+        <result property="likegoCount" column="like_count"/>
+    </resultMap>
+
+    <resultMap type="SegchkServiceAndSaleWebResp" id="SegchkServiceAndSaleWebRespResult">
+        <result property="staticMonth" column="static_month"/>
+        <result property="staticCount" column="static_count"/>
+        <result property="queryMon" column="query_mon"/>
+
+    </resultMap>
+
+    <resultMap type="SegchkServiceAndSaleDetailWebResp" id="SegchkServiceAndSaleDetailWebRespResult">
+        <result property="modTime" column="mod_time"/>
+        <result property="cardId" column="card_id"/>
+        <result property="cardName" column="card_name"/>
+        <result property="storeName" column="store_name"/>
+        <result property="staticCount" column="static_count"/>
+
+    </resultMap>
+
+    <resultMap type="SegchkUserCashWebResp" id="SegchkUserCashWebRespResult">
+        <result property="cash" column="cash"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="retFlag" column="ret_flag"/>
+    </resultMap>
+
+    <resultMap type="SegchkUserLikeGoWebResp" id="SegchkUserLikeGoWebRespResult">
+        <result property="cardId" column="card_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="cardName" column="card_name"/>
+        <result property="phoneNo" column="phone_no"/>
+        <result property="nickName" column="nick_name"/>
+    </resultMap>
+
+    <resultMap type="SegchkCarouseMgt" id="SegchkCarouseMgtResult">
+        <result property="carouseId"    column="carouse_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="storeCarousel"    column="store_carousel"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <resultMap type="SegchkRecommenderStoreWebResp" id="SegchkRecommenderStoreWebResult">
+        <result property="providerId"        column="provider_id"          />
+        <result property="storeId"      column="store_id"        />
+        <result property="storeName"      column="store_name"        />
+        <result property="storeSort"   column="store_sort"     />
+        <result property="storeIcon"   column="store_icon"    />
+        <result property="storeGificon" column="store_gificon" />
+        <result property="storeLon"      column="store_lon"        />
+        <result property="storeLat"    column="store_lat"      />
+        <result property="chkCount"    column="chkcount"      />
+        <result property="starAvg"     column="staravg"       />
+        <result property="userDist"     column="user_dist"       />
+        <collection property="lables" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+    <resultMap id="WeChatCustomerLinkResult" type="WeChatCustomerLink">
+        <result property="userId" column="user_id"/>
+        <result property="openId" column="openid"/>
+        <result property="providerId" column="provider_id"/>
+    </resultMap>
+
+    <sql id="selectSegchkCarouseMgtVo1">
+        select provider_id, store_id, store_carousel, sort_id from segchk_carouse_mgt
+    </sql>
+    <insert id="addAccountByReward" parameterType="SegchkChargeReward">
+        insert into segchk_store_account (store_id, account, reward_id, charge_id, mod_time, provider_id)
+
+        select suc.store_id, if(isnull(ssa.account), #{reward}, ssa.account + #{reward}) as account, reward_id, charge_id, now(), provider_id  from
+        (select #{userRecommenders} as store_id
+        , #{rewardId} as reward_id
+        , #{chargeId} as charge_id
+        , #{providerId} as provider_id
+        ) suc
+        left join
+        (
+<!--        #         上一次的余额-->
+        select account, store_id from segchk_store_account where store_id = #{userRecommenders} order by account_id desc limit 1
+        ) ssa
+        on ssa.store_id = suc.store_id
+    </insert>
+    <insert id="addCommentAccByComment">
+        insert into segchk_comment_acc (
+        star_count
+        , star_level
+        , store_id
+        , provider_id
+        , mod_time
+        , comment_id)
+        select
+        if(isnull(sca.star_count), ssc.cnt, ssc.cnt + sca.star_count) as star_count
+        , if(isnull(sca.star_level), ssc.star_level, ssc.star_level + sca.star_level) as start_level
+        , ssc.store_id
+        , ssc.provider_id
+        , now()
+        , ssc.comment_id from
+        (select provider_id, store_id, comment_id, 1 as cnt, star_level from segchk_service_comment where comment_id = #{commentId}) ssc
+        left join
+        (select provider_id, store_id, star_count, star_level from segchk_comment_acc where store_id = (select store_id from segchk_service_comment where comment_id = #{commentId}) order by update_id limit 1) sca
+        on sca.provider_id = ssc.provider_id and sca.store_id = ssc.store_id
+    </insert>
+
+    <select id="selectSegchkStoreList" parameterType="SegchkStoreWebReq" resultMap="SegchkStoreIndexWebRespResult">
+        select
+        a.provider_id as provider_id
+        , a.store_id as store_id
+        , a.store_name as store_name
+        , a.service_state as service_state
+        , a.store_id as store_sort
+        , a.saler_id as saler_id
+        , a.store_lon as store_lon
+        , a.store_lat as store_lat
+        , a.user_dist as user_dist
+        , img.store_icon as store_icon
+        , img.store_gificon as store_gificon
+        , ifnull(chkc.chkcount, 0) as chkcount
+        , ifnull(star.staravg, 0) as staravg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , ifnull(lable.sort_id, 0) as sort_id
+        from
+
+        (select basic.provider_id, basic.store_id, basic.store_name, basic.service_state, basic.saler_id, basic.store_lon, basic.store_lat, basic.user_dist from
+        (select provider_id, store_id, store_name, service_state, saler_id, store_lon, store_lat
+        <choose>
+            <when test="userLon != null and userLon != '' and userLat != null and userLat != ''">, round(st_distance_sphere(point(#{userLon},#{userLat}), point(store_lon, store_lat))/1000, 2)</when>
+            <otherwise>, 0</otherwise>
+        </choose>
+        as user_dist  from segchk_store_basic_info where provider_id = #{providerId} and service_state = 0) basic
+        right join (
+<!--        根据标签id查询相应的商户列表,找出既满足充值卡的又要满足标签的商户-->
+        select tmp.provider_id, tmp.store_id, tmp.lable_id, tmp.sort_id, tmp.type_id, mgt_state from (select provider_id, store_id, lable_id, type_id, mgt_state, sort_id from segchk_store_lable_mgt where provider_id = #{providerId}
+        <if test="cardId != null and cardId != ''">and lable_id = #{cardId} and type_id = 0</if>) tmp, (select provider_id, store_id, lable_id, type_id from segchk_store_lable_mgt where provider_id = #{providerId}
+        <if test="lableId != null and lableId != ''"> and lable_id = #{lableId}</if>
+        <if test="typeId != null and typeId != ''"> and type_id = #{typeId}</if>) tmp1 where tmp.store_id = tmp1.store_id
+        ) lable
+        on basic.provider_id = lable.provider_id and basic.store_id = lable.store_id
+        <if test="userDist != null and userDist != ''"> where basic.user_dist <![CDATA[ <=  ]]> #{userDist}</if>
+        ) a
+        left join (
+        select provider_id, store_id, store_icon, store_gificon from segchk_store_image where provider_id = #{providerId}
+        ) img on a.provider_id = img.provider_id and a.store_id = img.store_id
+        left join (
+<!--        查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on a.store_id = chkc.store_id and a.provider_id = chkc.provider_id
+        left join (
+<!--        查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on a.provider_id = star.provider_id and a.store_id = star.store_id
+        left join (
+<!--        查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on a.provider_id = lable.provider_id and a.store_id = lable.store_id
+        left join (
+<!--        从关键字，优惠表,充值卡表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on a.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+<!--        排序-->
+        <choose>
+            <when test="sortType == 1">order by chkcount desc, sort_id asc</when>
+            <when test="sortType == 2">order by staravg desc, sort_id asc</when>
+<!--            <when test="sortType == 3">order by user_dist asc, sort_id asc</when>-->
+<!--            <otherwise>order by store_sort asc, sort_id asc</otherwise>-->
+            <otherwise>order by user_dist asc, sort_id asc</otherwise>
+        </choose>
+    </select>
+
+
+
+    <select id="selectSegchkStoreListByOneLable" parameterType="SegchkStoreWebReq" resultMap="SegchkStoreIndexWebRespResult">
+        select
+        a.provider_id as provider_id
+        , a.store_id as store_id
+        , a.store_name as store_name
+        , a.service_state as service_state
+        , a.store_id as store_sort
+        , a.saler_id as saler_id
+        , a.store_lon as store_lon
+        , a.store_lat as store_lat
+        , a.user_dist as user_dist
+        , img.store_icon as store_icon
+        , img.store_gificon as store_gificon
+        , ifnull(chkc.chkcount, 0) as chkcount
+        , ifnull(star.staravg, 0) as staravg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , ifnull(lable.sort_id, 0) as sort_id
+        from
+
+        (select basic.provider_id, basic.store_id, basic.store_name, basic.service_state, basic.saler_id, basic.store_lon, basic.store_lat, basic.user_dist from
+        (select provider_id, store_id, store_name, service_state, saler_id, store_lon, store_lat
+        <choose>
+            <when test="userLon != null and userLon != '' and userLat != null and userLat != ''">, round(st_distance_sphere(point(#{userLon},#{userLat}), point(store_lon, store_lat))/1000, 2)</when>
+            <otherwise>, 0</otherwise>
+        </choose>
+        as user_dist  from segchk_store_basic_info where provider_id = #{providerId} and service_state = 0) basic
+        right join (
+<!--        根据标签id查询相应的商户列表,找出既满足充值卡的又要满足标签的商户-->
+        select provider_id, store_id, lable_id, type_id, mgt_state, sort_id from segchk_store_lable_mgt where provider_id = #{providerId}
+        <if test="lableId != null and lableId != ''"> and lable_id = #{lableId}</if>
+        <if test="typeId != null and typeId != ''"> and type_id = #{typeId}</if> ) lable
+        on basic.provider_id = lable.provider_id and basic.store_id = lable.store_id
+        <if test="userDist != null and userDist != ''"> where basic.user_dist <![CDATA[ <=  ]]> #{userDist}</if>
+        ) a
+        left join (
+        select provider_id, store_id, store_icon, store_gificon from segchk_store_image where provider_id = #{providerId}
+        ) img on a.provider_id = img.provider_id and a.store_id = img.store_id
+        left join (
+<!--        查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on a.store_id = chkc.store_id and a.provider_id = chkc.provider_id
+        left join (
+<!--        查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on a.provider_id = star.provider_id and a.store_id = star.store_id
+        left join (
+<!--        查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on a.provider_id = lable.provider_id and a.store_id = lable.store_id
+        left join (
+<!--        从关键字，优惠表,充值卡表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on a.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+<!--        排序-->
+        <choose>
+            <when test="sortType == 1">order by chkcount desc, sort_id asc</when>
+            <when test="sortType == 2">order by staravg desc, sort_id asc</when>
+<!--            <when test="sortType == 3">order by user_dist asc, sort_id asc</when>-->
+<!--            <otherwise>order by store_sort asc, sort_id asc</otherwise>-->
+            <otherwise>order by user_dist asc, sort_id asc</otherwise>
+        </choose>
+    </select>
+
+
+
+    <select id="selectSegchkStoreListByAll" parameterType="SegchkStoreWebReq" resultMap="SegchkStoreIndexWebRespResult">
+        select
+        a.provider_id as provider_id
+        , a.store_id as store_id
+        , a.store_name as store_name
+        , a.service_state as service_state
+        , a.store_id as store_sort
+        , a.saler_id as saler_id
+        , a.store_lon as store_lon
+        , a.store_lat as store_lat
+        , a.user_dist as user_dist
+        , img.store_icon as store_icon
+        , img.store_gificon as store_gificon
+        , ifnull(chkc.chkcount, 0) as chkcount
+        , ifnull(star.staravg, 0) as staravg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , ifnull(lable.sort_id, 0) as sort_id
+        from
+
+        (select basic.provider_id, basic.store_id, basic.store_name, basic.service_state, basic.saler_id, basic.store_lon, basic.store_lat, basic.user_dist from
+        (select provider_id, store_id, store_name, service_state, saler_id, store_lon, store_lat
+        <choose>
+            <when test="userLon != null and userLon != '' and userLat != null and userLat != ''">, round(st_distance_sphere(point(#{userLon},#{userLat}), point(store_lon, store_lat))/1000, 2)</when>
+            <otherwise>, 0</otherwise>
+        </choose>
+        as user_dist  from segchk_store_basic_info where provider_id = #{providerId} and service_state = 0) basic where 1 = 1
+        <if test="userDist != null and userDist != ''"> and basic.user_dist <![CDATA[ <=  ]]> #{userDist}</if>
+        ) a
+        left join (
+        select provider_id, store_id, store_icon, store_gificon from segchk_store_image where provider_id = #{providerId}
+        ) img on a.provider_id = img.provider_id and a.store_id = img.store_id
+        left join (
+<!--        查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on a.store_id = chkc.store_id and a.provider_id = chkc.provider_id
+        left join (
+<!--        查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on a.provider_id = star.provider_id and a.store_id = star.store_id
+        left join (
+<!--        查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on a.provider_id = lable.provider_id and a.store_id = lable.store_id
+        left join (
+<!--        从关键字，优惠表,充值卡表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on a.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+<!--        排序-->
+        <choose>
+            <when test="sortType == 1">order by chkcount desc, sort_id asc</when>
+            <when test="sortType == 2">order by staravg desc, sort_id asc</when>
+<!--            <when test="sortType == 3">order by user_dist asc, sort_id asc</when>-->
+<!--            <otherwise>order by store_sort asc, sort_id asc</otherwise>-->
+            <otherwise>order by user_dist asc, sort_id asc</otherwise>
+        </choose>
+    </select>
+
+
+    <select id="selectSegchkStoreRecommendLableList" parameterType="long" resultMap="SegchkRecommenderStoreLableWebResult">
+        select card_type_id as lable_id
+        , card_type_name as lable_name
+        , sort_id as lable_sort
+        , lable_flag as type_id
+        , icon_url as lable_pic
+        from segchk_lable_mgt
+        where provider_id = #{providerId}
+        and mgt_state = 0
+        order by type_id asc, lable_sort asc;
+    </select>
+
+
+    <select id="selectSegchkStoreLableList" parameterType="long" resultMap="SegchkRecommenderStoreLableWebResult">
+        select * from
+        (select card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId}) scc
+        union
+        (select keyword_id as lable_id, keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId})
+        union
+        select preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId}
+        order by type_id asc, lable_id asc;
+    </select>
+
+    <select id="selectSegchkStoreSearch" parameterType="SegchkStoreWebReq" resultMap="SegchkStoreIndexWebRespResult">
+        select a.provider_id as provider_id
+        , a.store_id as store_id
+        , ifnull(a.store_id, 0) as store_sort
+        , a.store_name as store_name
+        , a.service_state as service_state
+        , a.saler_id as saler_id
+        , a.store_lon as store_lon
+        , a.store_lat as store_lat
+        , a.user_dist as user_dist
+        , img.store_icon as store_icon
+        , img.store_gificon as store_gificon
+        , ifnull(chkc.chkcount, 0) as chkcount
+        , ifnull(star.staravg, 1.0) as staravg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , ifnull(lable.sort_id, 0) as lable_sort
+        from
+        (select basic.provider_id, basic.store_id, basic.store_name, basic.service_state, basic.saler_id, basic.effective_date, basic.state_flag, basic.store_lon, basic.store_lat, basic.user_dist  from
+        (select provider_id, store_id, store_name, service_state, saler_id, effective_date, state_flag, store_lon, store_lat
+        <choose>
+            <when test="userLon != null and userLon != '' and userLat != null and userLat != ''">, round(st_distance_sphere(point(#{userLon},#{userLat}), point(store_lon, store_lat))/1000, 2)</when>
+            <otherwise>, 0</otherwise>
+        </choose>
+         as user_dist from segchk_store_basic_info where provider_id = #{providerId} and service_state = 0
+        <if test="storeId != null"> and store_id = #{storeId}</if>
+        ) basic
+        left join
+        (select lable_name, store_id, sort_id, mgt_state,store_lab.lable_id,store_lab.type_id from
+        (select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}
+        ) store_lab
+        right join
+        (select * from
+        (select provider_id, keyword_name as lable_name, keyword_id as lable_id, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}
+        <if test="lableName != null and lableName != ''">
+            <bind name="storekeyName" value="'%' + lableName + '%'"/>
+            and keyword_name like #{storekeyName} </if>
+        <!--<if test="typeId == 1 and lableId != null and lableId != ''">
+            and keyword_id = #{lableId}
+        </if>-->
+        ) kw
+        union (select provider_id, preference_name as lable_name, preference_id as lable_id, 2 as type_id from segchk_preference_lable where provider_id = #{providerId}
+        <if test="lableName != null || lableName != ''">
+            <bind name="storekeyName" value="'%' + lableName + '%'"/>
+            and preference_name like #{storekeyName} </if>
+        <!--<if test="typeId == 2 and lableId != null and lableId != ''">
+            and preference_id = #{lableId}
+        </if>-->
+        )
+        union (select provider_id, card_type_name as lable_name, card_type_id as lable_id, 0 as type_id from segchk_charge_card where provider_id = #{providerId}
+        <if test="lableName != null || lableName != ''">
+            <bind name="storekeyName" value="'%' + lableName + '%'"/>
+            and card_type_name like #{storekeyName} </if>
+        <!--<if test="cardId != -1 and cardId != null and cardId != ''">
+            and card_type_id = #{cardId}
+        </if>-->
+        )
+        ) lab on store_lab.lable_id = lab.lable_id and store_lab.type_id = lab.type_id
+        <!--where 1 = 1
+        <if test="lableId != null">and lab.lable_id = #{lableId}</if>
+        <if test="typeId != null">and lab.type_id = #{typeId}</if>-->
+        ) lab1 on (lab1.store_id = basic.store_id
+
+        )
+        where
+        (1 = 0
+        <if test="lableName != null || lableName != ''">
+            <bind name="storekeyName" value="'%' + lableName + '%'"/>
+            or lable_name like #{storekeyName} </if>
+        <if test="storeName != null || storeName != ''">
+            <bind name="storekeyName" value="'%' + storeName + '%'"/>
+            or basic.store_name like #{storekeyName} </if>
+        )
+        <if test="userDist != null and userDist != '' and userDist != 0.0 and userDist != 0">
+            and basic.user_dist <![CDATA[ <=  ]]> #{userDist}
+        </if>
+        <!--<if test="cardId != -1 and cardId != null and cardId != ''">
+            and card_type_id = #{cardId}
+        </if>-->
+        group by basic.store_id) a
+        left join (
+        select provider_id, store_id, store_icon, store_gificon from segchk_store_image where provider_id = #{providerId}
+        ) img on a.provider_id = img.provider_id and a.store_id = img.store_id
+        left join (
+<!--        #     查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on a.store_id = chkc.store_id and a.provider_id = chkc.provider_id
+        left join (
+<!--        #     查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on a.provider_id = star.provider_id and a.store_id = star.store_id
+        left join (
+<!--        #     查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on a.provider_id = lable.provider_id and a.store_id = lable.store_id
+        left join (
+<!--        #     从关键字，优惠表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on a.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+        <choose>
+            <when test="sortType == 1">order by chkcount desc, lable_sort asc</when>
+            <when test="sortType == 2">order by staravg desc, lable_sort asc</when>
+            <when test="sortType == 3">order by user_dist asc, lable_sort asc</when>
+            <otherwise>order by store_sort asc, lable_sort asc</otherwise>
+        </choose>
+    </select>
+
+    <select id="selectSegchkStoreDetails" parameterType="SegchkStoreWebReq" resultMap="SegchkStoreBasicInfoWebRespResult">
+<!--        # 根据商户id查找商户详情页内容-->
+        select basic.provider_id as provider_id
+        , basic.store_id as store_id
+        , basic.store_name as store_name
+        , basic.store_phone as store_phone
+        , basic.service_state as service_state
+        , basic.saler_id as saler_id
+        , basic.store_addr as store_addr
+        , basic.store_lon as store_lon
+        , basic.store_lat as store_lat
+        , basic.on_service as on_service
+        , basic.detail as detail
+        , vrinfo.vr_url as store_vr
+        , img.store_carousel1 as store_carousel1
+        , img.store_carousel2 as store_carousel2
+        , img.store_carousel3 as store_carousel3
+        , img.store_carousel4 as store_carousel4
+        , img.store_carousel5 as store_carousel5
+        , img.store_carousel6 as store_carousel6
+        , ifnull(chkc.chkcount, 0) as chkcount
+        , ifnull(star.staravg, 0) as staravg
+        , ifnull(lable.sort_id, 0) as lable_sort
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        from
+        (select provider_id, store_id, store_name, store_phone, service_state, saler_id, store_addr, store_lon, store_lat, on_service, detail from segchk_store_basic_info where provider_id = #{providerId} and store_id = #{storeId}) basic
+        left join
+        (select provider_id, store_id, vr_url, thumb_path, service_state from segchk_store_vr_info where provider_id = #{providerId} and store_id = #{storeId} and service_state = 0) vrinfo on vrinfo.store_id = basic.store_id and vrinfo.provider_id = basic.provider_id
+        (select provider_id, store_id, store_carousel1, store_carousel2, store_carousel3, store_carousel4, store_carousel5, store_carousel6 from segchk_store_image where provider_id = #{providerId} and store_id = #{storeId}) img on img.store_id = basic.store_id and img.provider_id = basic.provider_id
+        left join (
+<!--        #     查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} and store_id = #{storeId} group by provider_id, store_id
+        ) chkc on basic.store_id = chkc.store_id and basic.provider_id = chkc.provider_id
+        left join (
+<!--        #     查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} and store_id = #{storeId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on basic.provider_id = star.provider_id and basic.store_id = star.store_id
+        left join (
+<!--        #     查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId} and store_id = #{storeId}) lable
+        on basic.provider_id = lable.provider_id and basic.store_id = lable.store_id
+        left join (
+<!--        #     从关键字，优惠表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on basic.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+        order by lable_sort asc;
+    </select>
+
+    <select id="selectSegchkStoreComments" parameterType="SegchkStoreWebReq" resultMap="SegchkServiceCommentWebRespResult">
+        select comment.comment_id
+        , ifnull(comment.star_level, 0) as star_level
+        , comment.content_text
+        , ifnull(comment.mod_time, now()) as mod_time
+        , comment.provider_id
+        , comment.store_id
+        , servicechk.card_id
+        , servicechk.card_type_id
+        , servicechk.user_id
+        , card.card_type_name
+        , ifnull(wechat.nick_name, '匿名用户'), nick_name
+        from
+        (select comment_id, star_level, content_text, mod_time, provider_id, store_id from segchk_service_comment where provider_id = #{providerId} and store_id = #{storeId}
+<!--        取当月的所有评价记录，测试时可以先去掉-->
+        <!--<if test="remark != null and remark != ''">
+            and DATE_FORMAT( mod_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        </if>-->
+        order by mod_time desc limit 20) comment
+        left join
+        (
+        select card_id, card_type_id, user_id, comment_id from segchk_service_chk where provider_id = #{providerId} and store_id = #{storeId}
+        ) servicechk on servicechk.comment_id = comment.comment_id
+        left join
+        (
+        select card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}
+        ) card on card.card_type_id = servicechk.card_type_id
+        left join
+        (
+        select nick_name, user_id from segchk_user_wechat where provider_id = #{providerId}
+        ) wechat on wechat.user_id = servicechk.user_id
+        order by mod_time desc
+    </select>
+
+    <select id="selectSegchkStoreWebInfo" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebRespResult">
+        select store.store_name, store.store_phone, store.openid, store.icon_url, store.is_certified, chkc.chkcount, account.account, likecnt.like_count, if(store.with_msg=0, msgcnt.msgcount, 0) as msg_count  from
+        (select provider_id, store_id, store_name, store_phone, openid, icon_url, store_card, with_msg
+        , if(isnull(openid) || isnull(store_card), 0, 1) as is_certified
+        from segchk_store_basic_info where provider_id = #{providerId} and store_id = #{userId} and service_state = 0) store
+        left join
+        (select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} and store_id = #{userId}) chkc
+        on chkc.provider_id = store.provider_id and chkc.store_id = store.store_id
+        left join
+        (select store_id, account, provider_id from segchk_store_account where provider_id = #{providerId} and store_id = #{userId} order by mod_time desc limit 1) account on store.provider_id = account.provider_id and store.store_id = account.store_id
+        left join
+        (select provider_id, store_id, count(1) as like_count from segchk_user_likego where provider_id = #{providerId} and store_id = #{userId} and mgt_state = 0 and mod_time <![CDATA[ >=  ]]> NOW() - interval 7 day) likecnt on store.provider_id = likecnt.provider_id and store.store_id = likecnt.store_id
+        left join
+        (select provider_id, to_id, count(1) as msgcount from segchk_msg_detail where provider_id = #{providerId} and to_id = #{userId} and recv_level = 1 and (msg_flag = 1) and from_time <![CDATA[ >=  ]]> NOW() - interval 30 day) msgcnt on msgcnt.provider_id = store.provider_id and msgcnt.to_id = store.store_id;
+    </select>
+
+    <select id="selectSegchkStoreServiceList" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleWebRespResult">
+        select date_format( mod_time, '%Y%m' ) as static_month
+        , date_format(any_value(mod_time), '%Y-%m-01') as query_mon
+        , count(1) as static_count from segchk_service_chk where provider_id = #{providerId} and store_id = #{storeId} and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="staticMonth != null and staticMonth != ''"> #{staticMonth} - 1 </when>
+            <otherwise> 12 - 1 </otherwise>
+        </choose>
+        month group by date_format( mod_time, '%Y%m' ) order by date_format( mod_time, '%Y%m' ) desc
+    </select>
+
+    <select id="selectSegchkStoreSaleList" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleWebRespResult">
+        select date_format( mod_time, '%Y%m' ) as static_month
+        , date_format(any_value(mod_time), '%Y-%m-01') as query_mon
+        , count(1) as static_count from segchk_user_charge where provider_id = #{providerId} and store_id = #{storeId} and ret_flag <![CDATA[ >=  ]]> 1 and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="staticMonth != null and staticMonth != ''">#{staticMonth} - 1</when>
+            <otherwise>12 - 1</otherwise>
+        </choose>
+         month group by date_format( mod_time, '%Y%m' ) order by date_format( mod_time, '%Y%m' ) desc
+    </select>
+
+    <select id="selectSegchkStoreSaleDetails" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleDetailWebRespResult">
+        select charge.mod_time, charge.card_id, ifnull(cardmgt.card_type_name, '未知卡') as card_name from
+        (select store_id, card_id, card_type_id, provider_id, mod_time from segchk_user_charge where provider_id = #{providerId} and store_id = #{storeId} and ret_flag <![CDATA[ >=  ]]> 1 and date_format(mod_time, '%Y%m') = date_format(#{staticMonth}, '%Y%m') order by mod_time desc) charge
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) cardmgt on cardmgt.provider_id = charge.provider_id and cardmgt.card_type_id = charge.card_type_id
+        order by mod_time desc
+    </select>
+
+    <select id="selectSegchkStoreServiceDetails" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkServiceAndSaleDetailWebRespResult">
+        select chk.mod_time
+        , chk.card_id
+        , ifnull(cardmgt.card_type_name, '未知卡') as card_name
+        from
+        (select provider_id, card_id, store_id, card_type_id, mod_time from segchk_service_chk where provider_id = #{providerId} and store_id = #{storeId} and date_format(mod_time, '%Y%m') = date_format(#{staticMonth}, '%Y%m') order by mod_time desc) chk
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) cardmgt on cardmgt.provider_id = chk.provider_id and chk.card_type_id = cardmgt.card_type_id
+        order by mod_time desc
+    </select>
+
+    <select id="selectStoreCashList" parameterType="SegchkUserWebReq" resultMap="SegchkUserCashWebRespResult">
+        select cash
+        , mod_time, case when ret_flag = 0 then '未完成' else case when ret_flag = 1 then '成功' else '失败' end end as ret_flag from segchk_store_cash where provider_id = #{providerId} and store_id = #{userId} and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="phoneNo != null"> 3 - 1</when>
+            <otherwise>9-1</otherwise>
+        </choose>
+        month order by mod_time desc
+    </select>
+
+    <select id="selectStoreUserLikeGoList" parameterType="SegchkServiceAndSaleWebReq" resultMap="SegchkUserLikeGoWebRespResult">
+        select provider_id
+        , user_id, store_id,card_id, case card_type when 0 then '会员卡' when 1 then '赠卡' when 2 then '优惠券卡' end as card_name
+        , mod_time
+        , ( SELECT RIGHT(phone_no,4) FROM segchk_user_basic_info WHERE user_id = segchk_user_likego.user_id ) AS phone_no
+        , ( SELECT nick_name FROM segchk_user_wechat WHERE user_id = segchk_user_likego.user_id ) AS nick_name
+        from segchk_user_likego where provider_id = #{providerId} and store_id = #{storeId} and mgt_state = 0 and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="staticMonth != null">#{staticMonth} - 1</when>
+            <otherwise>2</otherwise>
+        </choose>
+        day order by mod_time desc;
+    </select>
+    
+    <select id="selectSegchkProviderBycode" parameterType="java.util.Map" resultType="java.util.HashMap">
+        select provider_id as providerId, aaa as provFlag
+        , if(aaa = 1, (
+        select district_name from segchk_district_info where district_id = #{defaultDistrict}
+        ), '') as provName
+        , wechatId, phoneNo
+        from
+        (select
+        provider_id
+        , if(District_id=#{districtId}, 0, 1) as aaa
+        , ifnull(wechat_id, '') as wechatId
+        , ifnull(phone_no, '') as phoneNo
+        from segchk_provider_mgt where (District_id = #{defaultDistrict} or District_id = #{districtId}) and flag_id = 0 order by aaa limit 1) a
+    </select>
+
+    <select id="selectSegchkCarouseStoreList" parameterType="SegchkCarouseMgt" resultMap="SegchkCarouseMgtResult">
+        <include refid="selectSegchkCarouseMgtVo1"/>
+        <where>
+            <if test="carouseId != null "> and carouse_id = #{carouseId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="storeCarousel != null  and storeCarousel != ''"> and store_carousel = #{storeCarousel}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="modTime != null "> and mod_time = #{modTime}</if>
+        </where>
+        order by sort_id asc
+    </select>
+
+
+    <select id="selectSegchkRecommenderStoreListWeb" parameterType="SegchkRecommenderStoreWebReq" resultMap="SegchkRecommenderStoreWebResult">
+        SELECT a.provider_id AS provider_id
+        , a.store_id AS store_id
+        , a.sort_id AS store_sort
+        , basic.store_name as store_name
+        , img.store_icon AS store_icon
+        , img.store_gificon AS store_gificon
+        , basic.store_lon AS store_lon
+        , basic.store_lat AS store_lat
+        , ifnull(chkc.chkcount, 0) AS chkcount
+        , ifnull(star.staravg, 0) AS staravg
+        , lable.lable_id AS lable_id
+        , ifnull(lable.sort_id, 0) AS lable_sort
+        , lable.type_id AS type_id
+        , lb.lable_name AS lable_name
+        , basic.user_dist AS user_dist
+        FROM
+        (
+        SELECT provider_id, store_id,sort_id FROM segchk_recommender_store where mgt_state=0 and provider_id = #{providerId}
+        ) a
+        left join (
+        select provider_id, store_id, store_icon, store_gificon from segchk_store_image where provider_id = #{providerId}
+        ) img on a.provider_id = img.provider_id and a.store_id = img.store_id
+        left join (
+        select provider_id, store_id, store_name,store_lon, store_lat
+        <choose>
+            <when test="userLon != null and userLon != '' and userLat != null and userLat != ''">, round(st_distance_sphere(point(#{userLon},#{userLat}), point(store_lon, store_lat))/1000, 2)</when>
+            <otherwise>, 0</otherwise>
+        </choose>
+        as user_dist from segchk_store_basic_info where service_state=0 and provider_id = #{providerId}
+        ) basic on a.store_id = basic.store_id and a.provider_id = basic.provider_id
+        left join (
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on a.store_id = chkc.store_id and a.provider_id = chkc.provider_id
+        left join (
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on a.provider_id = star.provider_id and a.store_id = star.store_id
+        left join (
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on a.provider_id = lable.provider_id and a.store_id = lable.store_id
+        left join (
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on a.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+        where 1 = 1
+        <if test="userDist != null and userDist != ''"> and basic.user_dist <![CDATA[ <=  ]]> #{userDist}</if>
+        <choose>
+            <when test="sortType == 1">order by chkcount desc, lable_sort asc</when>
+            <when test="sortType == 2">order by staravg desc, lable_sort asc</when>
+            <when test="sortType == 3">order by user_dist asc, lable_sort asc</when>
+            <otherwise>order by store_sort asc, lable_sort asc</otherwise>
+<!--            <otherwise>order by user_dist asc, lable_sort asc</otherwise>-->
+        </choose>
+
+    </select>
+
+    <select id="selectStoreOpenIdById" parameterType="long" resultMap="WeChatCustomerLinkResult">
+        select store_id as user_id, openid, provider_id from segchk_store_basic_info where store_id = #{storeId}
+    </select>
+
+    <select id="isCollectByUser" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1) from segchk_user_collect where
+        provider_id = #{providerId}
+        and user_id = #{userId}
+        and store_id = #{storeId}
+        and mgt_state = 0
+    </select>
+    <select id="selectSegchkStoreName" parameterType="string" resultType="java.lang.String">
+        select store_name from segchk_store_basic_info where store_id = #{storeId}
+    </select>
+    <select id="getVipCardFromLikego" resultType="java.lang.Long">
+        select if(card_type = 0, card_id, (select segchk_store_self_mgt.card_id from segchk_store_self_mgt where segchk_store_self_mgt.free_card_id = segchk_user_likego.card_id) ) from segchk_user_likego where likego_id = #{likegoId};
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkUserIndexMapper.xml b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkUserIndexMapper.xml
new file mode 100644
index 0000000..f81ab3f
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/segchk/SegchkUserIndexMapper.xml
@@ -0,0 +1,858 @@
+<?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.segchk.mapper.SegchkUserIndexMapper">
+    
+    <resultMap type="SegchkUserWebResp" id="SegchkUserWebRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="phoneNo" column="phone_no"/>
+        <result property="userName" column="user_name"/>
+        <result property="openid" column="openid"/>
+        <result property="districtName" column="district_name"/>
+        <result property="recommenderId" column="recommender_id"/>
+        <result property="recommenderLevel" column="recommender_level"/>
+        <result property="userIcon" column="user_icon"/>
+        <result property="iscertified" column="iscertified"/>
+        <result property="account" column="account"/>
+        <result property="chkCount" column="chk_count"/>
+        <result property="chargeCount" column="charge_count"/>
+        <result property="cashCount" column="cash_count"/>
+        <result property="msgCount" column="msg_count"/>
+        <result property="cardCount" column="card_count"/>
+        <result property="storeCardCount" column="store_card_count"/>
+        <result property="likegoCount" column="likego_count"/>
+    </resultMap>
+
+    <resultMap type="SegchkUserWebSCResp" id="SegchkUserWebSCRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="storeIcon" column="store_icon"/>
+        <result property="cardTypeId" column="card_type_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="chkServiceId" column="chk_service_id"/>
+        <result property="commentId" column="comment_id"/>
+        <result property="cardTypeName" column="card_type_name"/>
+        <result property="storeName" column="store_name"/>
+        <result property="chkSource" column="chk_source"/>
+    </resultMap>
+
+    <resultMap type="SegchkUserWebCardResp" id="SegchkUserWebCardRespResult">
+        <result property="storeId" column="store_id"/>
+        <result property="providerId" column="provider_id"/>
+        <result property="cardName" column="card_type_name"/>
+        <result property="storeName" column="store_name"/>
+        <result property="useCount" column="use_count"/>
+        <result property="leftCount" column="left_count"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="typeFlag" column="type_flag"/>
+        <result property="cardStatus" column="card_status"/>
+        <result property="cardContent" column="card_content"/>
+        <result property="bgUrl" column="bg_url"/>
+        <result property="contentColor" column="content_color"/>
+    </resultMap>
+
+    <resultMap type="SegchkUserCollectWebResp" id="SegchkUserCollectWebRespResult">
+        <result property="collectId" column="collect_id"/>
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="storeName" column="store_name"/>
+        <result property="storeIcon" column="store_icon"/>
+        <result property="serviceState" column="service_state"/>
+        <result property="storeLon" column="store_lon"/>
+        <result property="storeLat" column="store_lat"/>
+        <result property="chkCount" column="chk_count"/>
+        <result property="starAvg" column="star_avg"/>
+        <result property="modTime" column="mod_time"/>
+        <collection property="segchkRecommenderStoreLableWebList" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+    <resultMap type="SegchkUserLikeGoWebResp" id="SegchkUserLikeGoWebRespResult">
+        <result property="likegoId" column="likego_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="storeName" column="store_name"/>
+        <result property="storeIcon" column="store_icon"/>
+        <result property="serviceState" column="service_state"/>
+        <result property="storeLon" column="store_lon"/>
+        <result property="storeLat" column="store_lat"/>
+        <result property="chkCount" column="chk_count"/>
+        <result property="starAvg" column="star_avg"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="cardName" column="card_name"/>
+        <result property="qrCode" column="qr_code"/>
+        <collection property="segchkRecommenderStoreLableWebList" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+    <resultMap type="SegchkUserChargeWebResp" id="SegchkUserChargeWebRespResult">
+        <result property="charge" column="charge"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="retFlag" column="ret_flag"/>
+        <result property="cardName" column="card_type_name"/>
+    </resultMap>
+
+
+    <resultMap type="SegchkUserChargeCard" id="SegchkUserChargeCardResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="cardTypeId" column="card_type_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="cardTypeName" column="card_type_name"/>
+        <result property="hadBuy" column="had_buy"/>
+        <result property="buyCount" column="buy_count"/>
+        <result property="cardTypeValue" column="card_type_value"/>
+        <result property="canBuy" column="can_buy"/>
+        <result property="cardTypeChkcount" column="card_type_chkcount"/>
+        <result property="effectiveTime" column="effective_time"/>
+    </resultMap>
+
+    <resultMap type="SegchkUserCashWebResp" id="SegchkUserCashWebRespResult">
+        <result property="cash" column="cash"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="retFlag" column="ret_flag"/>
+    </resultMap>
+
+    <resultMap type="SegchkMsgWebResp" id="SegchkMsgWebRespResult">
+        <result property="msgType" column="msg_type"/>
+        <result property="msgContent" column="msg_content"/>
+        <result property="msgTitle" column="msg_title"/>
+        <result property="msgFlag" column="msg_flag"/>
+        <result property="fromTime" column="from_time"/>
+    </resultMap>
+
+    <resultMap type="SegchkServiceOrderWebReq" id="SegchkServiceOrderWebRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="lableId" column="lable_id"/>
+        <result property="typeId" column="type_id"/>
+        <result property="cardName" column="card_name"/>
+    </resultMap>
+
+    <resultMap type="SegchkServiceOrderChkResp" id="SegchkServiceOrderChkRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="lableId" column="lable_id"/>
+        <result property="typeId" column="type_id"/>
+        <result property="cardName" column="card_name"/>
+        <result property="leftCount" column="left_count"/>
+        <result property="isSupported" column="is_supported"/>
+    </resultMap>
+
+    <resultMap type="SegchkServiceOrderChkTestResp" id="SegchkServiceOrderChkTestRespResult">
+        <result property="providerId" column="provider_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="cardId" column="card_id"/>
+        <result property="cardType" column="card_type"/>
+        <result property="mgtState" column="mgt_state"/>
+        <result property="cardName" column="card_name"/>
+        <result property="totalCount" column="total_count"/>
+        <result property="hasLeftCount" column="has_left_count"/>
+        <result property="cardStatus" column="card_status"/>
+        <result property="canFree" column="can_free"/>
+        <result property="isExpire" column="is_expire"/>
+        <result property="modTime" column="effective_time"/>
+        <collection property="segchkRecommenderStoreLableWebList" javaType="java.util.List" resultMap="SegchkRecommenderStoreLableWebResult" />
+    </resultMap>
+
+    <resultMap type="SegchkRecommenderStoreLableWeb" id="SegchkRecommenderStoreLableWebResult">
+        <result property="lableId"        column="lable_id"       />
+        <result property="lableSortId"     column="lable_sort"    />
+        <result property="lableTypeId"  column="type_id" />
+        <result property="lableName"     column="lable_name"    />
+    </resultMap>
+
+    <resultMap id="SegchkUserLevelInfoResult" type="SegchkUserLevelInfo">
+        <result property="userId" column="user_id"/>
+        <result property="userLevel" column="user_level"/>
+        <result property="providerId" column="provider_id"/>
+    </resultMap>
+
+    <resultMap id="WeChatCustomerLinkResult" type="WeChatCustomerLink">
+        <result property="userId" column="user_id"/>
+        <result property="openId" column="openid"/>
+        <result property="providerId" column="provider_id"/>
+    </resultMap>
+
+    <resultMap id="SegchkChargeRewardResult" type="SegchkChargeReward">
+        <result property="cardTypeId" column="card_type_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="providerId" column="provider_id"/>
+        <result property="charge" column="charge"/>
+        <result property="accountUsed" column="account_used"/>
+        <result property="userRecommenders" column="user_recommenders"/>
+        <result property="recommendersLevel" column="recommenders_level"/>
+        <result property="totalChargeCount" column="total_charge_count"/>
+        <result property="reward" column="reward"/>
+        <result property="cardId" column="card_id"/>
+        <result property="useCount" column="use_count"/>
+        <result property="chkCount" column="chk_count"/>
+        <result property="chargeId" column="charge_id"/>
+    </resultMap>
+
+    <select id="selectSegchkUserWebInfo" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebRespResult">
+        select basic.user_id
+        , case when isnull(wechat.nick_name) then basic.phone_no else wechat.nick_name end as user_name
+        , basic.phone_no
+        , wechat.openid
+        , sdi.district_name
+        , suei.user_recommenders as recommender_id
+        , suei.recommenders_level as recommender_level
+        , case when isnull(basic.user_icon) then wechat.icon_url else basic.user_icon end as user_icon
+        , case when isnull(certify.IDcard) then 0 else 1 end as iscertified
+        , case when isnull(account.account) then 0.0 else account.account end as account
+        , case when isnull(chk.chkcount) then 0 else chk.chkcount end as chk_count
+        , case when isnull(charge.chargecount) then 0 else charge .chargecount end as charge_count
+        , case when isnull(cash.cashcount) then 0 else cash.cashcount end as cash_count
+        , case when isnull(msg.msgcount) then 0 else msg.msgcount end as msg_count
+        , case when isnull(card.cardcount) then 0 else card.cardcount end as card_count
+        , case when isnull(storecard.storecardcount) then 0 else storecard.storecardcount end as store_card_count
+        from
+        (select user_id, phone_no, user_icon, has_wechat, card_type_id, provider_id from segchk_user_basic_info where provider_id = #{providerId} and user_id = #{userId}) basic
+        left join
+        (select provider_id, user_id, openid, nick_name, icon_url, mod_time from segchk_user_wechat where provider_id = #{providerId} and user_id = #{userId}) wechat
+        on basic.user_id = wechat.user_id and basic.provider_id = wechat.provider_id
+        left join
+        (select IDcard, user_id, provider_id from segchk_user_certification_info where provider_id = #{providerId} and user_id = #{userId}) certify
+        on basic.user_id = certify.user_id and basic.provider_id = certify.provider_id
+        left join
+        (select account_id, user_id, account, provider_id from segchk_user_account where provider_id = #{providerId} and user_id = #{userId} order by account_id desc limit 1) account
+        on basic.user_id = account.user_id and basic.provider_id = account.provider_id
+        left join
+        (select provider_id, user_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} and user_id = #{userId} and DATE_FORMAT( mod_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) chk
+        on basic.user_id = chk.user_id and basic.provider_id = chk.provider_id
+        left join
+        (select provider_id, user_id, count(1) as chargecount from segchk_user_charge where provider_id = #{providerId} and user_id = #{userId} and DATE_FORMAT( mod_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) charge
+        on basic.user_id = charge.user_id and basic.provider_id = charge.provider_id
+        left join
+        (select provider_id, user_id, count(1) as cashcount from segchk_user_cash where provider_id = #{providerId} and user_id = #{userId} and DATE_FORMAT( mod_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) cash
+        on basic.user_id = cash.user_id and basic.provider_id = cash.provider_id
+        left join
+        (select to_id, provider_id, count(1) as msgcount from segchk_msg_detail where provider_id = #{providerId} and to_id = #{userId} and recv_level = 2 and msg_flag = 1) msg
+        on basic.user_id = msg.to_id and basic.provider_id = msg.provider_id
+        left join
+        (select user_id, provider_id, count(1) as cardcount from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId} and status = 0) card
+        on basic.user_id = card.user_id and basic.provider_id = card.provider_id
+        left join
+        (select provider_id, user_id, count(1) as storecardcount from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId} and type_id = 2) storecard
+        on basic.user_id = storecard.user_id and basic.provider_id = storecard.provider_id
+        left join
+        (select provider_id, District_id from segchk_provider_mgt where provider_id = #{providerId}) spm on basic.provider_id = spm.provider_id
+        left join
+        (select district_id, district_name from segchk_district_info) sdi on spm.District_id = sdi.district_id
+        left join
+        (select user_id, user_recommenders, recommenders_level, provider_id from segchk_user_ext_info where provider_id = #{providerId} and user_id = #{userId}) suei on suei.user_id = basic.user_id
+    </select>
+
+    <select id="selectUserServiceCHKList" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebSCRespResult">
+<!--        查找用户充值卡核消列表-->
+        select chkinfo.provider_id, chkinfo.card_id, chkinfo.store_id, storeimg.store_icon as store_icon, chkinfo.card_type_id, chkinfo.user_id, chkinfo.mod_time, chkinfo.chk_service_id, chkinfo.comment_id, provcard.card_type_name, storeinfo.store_name, 0 as chk_source from
+        (select provider_id, card_id, store_id, card_type_id, user_id, mod_time, chk_service_id, comment_id from segchk_service_chk where provider_id = #{providerId} and user_id = #{userId}) chkinfo
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) provcard on chkinfo.provider_id = provcard.provider_id and chkinfo.card_type_id = provcard.card_type_id
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) storeinfo on chkinfo.provider_id = storeinfo.provider_id and chkinfo.store_id = storeinfo.store_id
+        left join
+        (select provider_id, store_id, store_icon from segchk_store_image where provider_id = #{providerId}) storeimg
+        on storeinfo.provider_id = storeimg.provider_id and storeinfo.store_id = storeimg.store_id
+        union all
+<!--        查找用户赠卡，优惠券卡核消列表-->
+        select selfchkinfo.provider_id, selfchkinfo.card_id, selfchkinfo.store_id, storeimg.store_icon as store_icon, -1 as card_type_id, selfchkinfo.user_id, selfchkinfo.mod_time, selfchkinfo.chk_service_id, -1 as comment_id,
+        selfmgt.free_name as card_type_name, storeinfo.store_name
+        , case when selfmgt.type_id = 2 then 1 else 2 end as chk_source
+        from
+        (select provider_id, card_id, store_id, user_id, mod_time, chk_service_id from segchk_self_service_chk where provider_id = #{providerId} and user_id = #{userId}) selfchkinfo
+        left join
+        (select free_card_id, store_id, provider_id, user_id, card_id, lable_id, type_id, free_name from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId}) selfmgt on selfchkinfo.provider_id = selfmgt.provider_id and selfchkinfo.store_id = selfmgt.store_id and selfchkinfo.card_id = selfmgt.free_card_id and selfchkinfo.user_id = selfmgt.user_id
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) storeinfo
+        on storeinfo.provider_id = selfchkinfo.provider_id and storeinfo.store_id = selfchkinfo.store_id
+        left join
+        (select provider_id, store_id, store_icon from segchk_store_image where provider_id = #{providerId}) storeimg
+        on storeinfo.provider_id = storeimg.provider_id and storeinfo.store_id = storeimg.store_id
+        order by mod_time desc
+    </select>
+
+    <select id="selectUserCardList" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebCardRespResult">
+        select
+        card.effective_time
+        , card.use_count
+        , card.left_count
+        , provcard.card_type_name
+        , 0 as type_flag
+        , case when to_days(card.effective_time) <![CDATA[ <  ]]> to_days( current_date()) then '过期' else case when status != 0 then '无效' else '可用' end end as card_status
+        , ifnull(sci.img_url, '/img/experiencecard.png') as bg_url
+        , ifnull(sci.content_color, '000000') as content_color
+        from
+        (select card_id, card_type_id, user_id, provider_id, mod_time, effective_time, use_count, left_count, status from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId} and status = 0) card
+        left join
+        (select provider_id, card_type_id, card_type_name, card_type_value, effective_time, buy_count, card_type_chkcount from segchk_charge_card where provider_id = #{providerId}) provcard on card.provider_id = provcard.provider_id and card.card_type_id = provcard.card_type_id
+        left join
+<!--        关联卡的卡片id-->
+        (select * from segchk_card_img_ctl where provider_id = #{providerId} and type_id = 0) scic on card.card_type_id = scic.lable_id
+        left join
+        (select * from segchk_card_img where provider_id = #{providerId}) sci on scic.img_id = sci.id
+        order by effective_time desc;
+    </select>
+
+    <select id="selectUserPerformanceList" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebCardRespResult">
+        select
+        pserformance.store_id as store_id
+        , pserformance.provider_id
+        , effective_time
+        , card_type_name
+        , store_name
+        , left_count
+        , 1 as type_flag
+        , card_status
+        , ifnull(sci.img_url, '/img/storeself.png') as bg_url
+        , ifnull(sci.content_color, '764e11') as content_color
+        , card_content
+        from
+        (select
+        mod_time as effective_time
+        , store_id
+        , provider_id
+        , free_content as card_content
+        , left_count
+        , if(type_id = 2, free_name, '本店尊享') as card_type_name
+        , if(to_days(current_date) <![CDATA[ >  ]]> to_days(mod_time), '过期', '可用') as card_status
+        , type_id
+        , lable_id
+        from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId} and left_count <![CDATA[ >  ]]> 0 and status = 0) pserformance
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) store on store.provider_id = pserformance.provider_id and store.store_id = pserformance.store_id
+        left join
+        <!--        关联卡的卡片id-->
+        (select * from segchk_card_img_ctl where provider_id = #{providerId} and type_id <![CDATA[ !=  ]]> 0) scic on pserformance.lable_id = scic.lable_id and pserformance.type_id = scic.type_id
+        left join
+        (select * from segchk_card_img where provider_id = #{providerId}) sci on scic.img_id = sci.id
+        order by effective_time desc;
+    </select>
+
+    <select id="selectUserCollectList" parameterType="SegchkUserWebReq" resultMap="SegchkUserCollectWebRespResult">
+        select
+        collect.collect_id
+        , collect.provider_id
+<!--        #      , collect.user_id-->
+        , collect.store_id
+        , collect.mod_time
+        , storeinfo.store_name
+        , storeinfo.service_state
+        , storeinfo.store_lon
+        , storeinfo.store_lat
+        , img.store_icon as store_icon
+        , chkc.chkcount as chk_count
+        , star.staravg as star_avg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , lable.sort_id as sort_id
+        from
+        (select collect_id, provider_id, user_id, store_id, mod_time from segchk_user_collect where provider_id = #{providerId} and user_id = #{userId} and mgt_state = 0) collect
+        left join
+        (select provider_id, store_id, store_name, icon_url, service_state, state_flag, store_lon, store_lat from segchk_store_basic_info where provider_id = #{providerId}) storeinfo on collect.provider_id = storeinfo.provider_id and collect.store_id = storeinfo.store_id
+        left join (
+        select provider_id, store_id, store_icon from segchk_store_image where provider_id = #{providerId}
+        ) img on collect.provider_id = img.provider_id and collect.store_id = img.store_id
+        left join (
+<!--        #     查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on collect.store_id = chkc.store_id and collect.provider_id = chkc.provider_id
+        left join (
+<!--        #     查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on collect.provider_id = star.provider_id and collect.store_id = star.store_id
+        left join (
+<!--        #     查询商户所对应的标签-->
+        select provider_id, store_id, lable_id, sort_id, type_id, mgt_state from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on collect.provider_id = lable.provider_id and collect.store_id = lable.store_id
+        left join (
+<!--        #     从关键字，优惠表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on collect.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+        order by mod_time desc, sort_id asc;
+    </select>
+
+    <select id="selectUserLikGoList" parameterType="SegchkUserWebReq" resultMap="SegchkUserLikeGoWebRespResult">
+        select likego.likego_id
+        , likego.provider_id
+        , likego.user_id
+        , likego.store_id
+        , likego.mod_time
+        , likego.card_id
+        , likego.card_type
+        , if(likego.card_type = 0, vipcard.card_name, selfcard.card_name) as card_name
+        , if(vipcard.left_count = 0 || selfcard.left_count = 0, null, likego.QR_code) as qr_code
+        , storeinfo.store_name
+        , storeinfo.service_state
+        , storeinfo.store_lon
+        , storeinfo.store_lat
+        , img.store_icon as store_icon
+        , chkc.chkcount as chk_count
+        , star.staravg as star_avg
+        , lb.lable_id as lable_id
+        , lb.lable_name as lable_name
+        , lb.type_id as type_id
+        , lable.sort_id as sort_id from
+        (select * from segchk_user_likego where provider_id = #{providerId} and user_id = #{userId} and mgt_state = 0 and mod_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="userLevel == null"> 7 </when>
+            <otherwise> 60 </otherwise>
+        </choose>
+        day) likego
+        left join
+        (select * from segchk_store_basic_info where provider_id = #{providerId}) storeinfo on likego.provider_id = storeinfo.provider_id and likego.store_id = storeinfo.store_id
+        left join (
+        select * from segchk_store_image where provider_id = #{providerId}
+        ) img on likego.provider_id = img.provider_id and likego.store_id = img.store_id
+        left join (
+<!--        #     查询商户的累积核消次数-->
+        select provider_id, store_id, count(1) as chkcount from segchk_service_chk where provider_id = #{providerId} group by provider_id, store_id
+        ) chkc on likego.store_id = chkc.store_id and likego.provider_id = chkc.provider_id
+        left join (
+<!--        #     查询商户的最新累积评价-->
+        SELECT td.store_id,td.provider_id,convert(td.star_level/td.star_count,decimal(15,2)) as staravg FROM segchk_comment_acc td,(SELECT max(update_id) update_id FROM segchk_comment_acc where provider_id = #{providerId} GROUP BY provider_id, store_id) md where td.update_id = md.update_id) star on likego.provider_id = star.provider_id and likego.store_id = star.store_id
+        left join (
+<!--        #     查询商户所对应的标签-->
+        select * from segchk_store_lable_mgt where mgt_state=0 and provider_id = #{providerId}) lable
+        on likego.provider_id = lable.provider_id and likego.store_id = lable.store_id
+        left join (
+<!--        #     从关键字，优惠表中查找对应的标签名称-->
+        select * from
+        (select provider_id,keyword_id as lable_id,keyword_name as lable_name, 1 as type_id from segchk_keyword_lable where provider_id = #{providerId}) kw
+        union
+        (select provider_id, preference_id as lable_id, preference_name as lable_name, 2 as type_id from segchk_preference_lable where provider_id = #{providerId})
+        union
+        (select provider_id, card_type_id as lable_id, card_type_name as lable_name, 0 as type_id from segchk_charge_card where provider_id = #{providerId})
+        ) lb on likego.provider_id = lb.provider_id and lable.lable_id = lb.lable_id and lable.type_id = lb.type_id
+        left join
+        (select usevip.provider_id, usevip.user_id, usevip.card_id, usevip.left_count, segchk_charge_card.card_type_name as card_name from
+        (select * from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId}) usevip
+        left join segchk_charge_card on usevip.provider_id = segchk_charge_card.provider_id and usevip.card_type_id = segchk_charge_card.card_type_id) vipcard on likego.provider_id = vipcard.provider_id and likego.user_id = vipcard.user_id and likego.card_id = vipcard.card_id and likego.card_type = 0
+        left join
+        (select left_count, free_card_id, provider_id, user_id, free_name as card_name from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId}) selfcard on likego.provider_id = selfcard.provider_id and likego.user_id = selfcard.user_id and likego.card_id = selfcard.free_card_id and likego.card_type != 0
+        order by mod_time desc, sort_id asc;
+    </select>
+
+    <select id="selectUserChargeList" parameterType="SegchkUserWebReq" resultMap="SegchkUserChargeWebRespResult">
+        select charge.store_id, charge.charge, charge.account_used, charge.mod_time, charge.ret_flag, card.card_type_name
+        , storeinfo.store_name
+        from
+        (select provider_id, user_id, store_id, charge, account_used, card_id, card_type_id, mod_time, case when ret_flag = 0 then '未完成' else case when ret_flag <![CDATA[ >=  ]]> 1 then '成功' else '失败' end end as ret_flag from segchk_user_charge where provider_id = #{providerId} and user_id = #{userId}) charge
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) card
+        on charge.card_type_id = card.card_type_id and charge.provider_id = card.provider_id
+        left join
+        (select provider_id, store_id, store_name from segchk_store_basic_info where provider_id = #{providerId}) storeinfo
+        on storeinfo.provider_id = charge.provider_id and charge.store_id = storeinfo.store_id
+    </select>
+
+    <select id="selectUserCashList" parameterType="SegchkUserWebReq" resultMap="SegchkUserCashWebRespResult">
+        select cash
+        , mod_time, case when ret_flag = 0 then '未完成' else case when ret_flag = 1 then '成功' else '失败' end end as ret_flag from segchk_user_cash where provider_id = #{providerId} and user_id = #{userId};
+    </select>
+
+    <select id="selectUserMsgList" parameterType="SegchkUserWebReq" resultMap="SegchkMsgWebRespResult">
+        select to_id
+        , '系统消息' as msg_type, msg_content, msg_title, from_time, msg_flag from segchk_msg_detail where provider_id = #{providerId} and to_id = #{userId} and recv_level = #{userLevel} and (msg_flag = 1 or msg_flag = 2) and from_time <![CDATA[ >=  ]]> NOW() - interval
+        <choose>
+            <when test="remark == null"> 7 </when>
+            <otherwise>#{remark}</otherwise>
+        </choose>
+        day;
+    </select>
+
+    <select id="selectUserOrderPredCardListWebInfo" parameterType="SegchkServiceOrderWebReq" resultMap="SegchkServiceOrderWebRespResult">
+        select usercard.provider_id
+        , usercard.user_id
+        , if(isnull(usercard.store_id), storecard.store_id, usercard.store_id) as store_id
+        , if(usercard.type_id = 0 and storecard.chk_count <![CDATA[ <= ]]> ifnull(userchk.chk_count, 0), null,  usercard.card_id) as card_id
+--         , usercard.card_id
+        , usercard.lable_id
+        , usercard.type_id
+--         , usercard.left_count
+--         , storecard.chk_count
+        , if(usercard.type_id = 0, concat(provcard.card_type_name,'会员卡'), usercard.card_name ) as card_name
+<!--        #      , userchk.chk_count as had_chk_count from-->
+        from
+        (
+<!--        #     根据用户id，商家id查找会员卡(无商家id)和商家赠卡优惠券-->
+        select provider_id, user_id, null as store_id, card_id, card_type_id as lable_id, 0 as type_id, left_count, '会员卡' as card_name, 0 as vip_flag from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId} and left_count <![CDATA[ > ]]> 0 and status = 0 and to_days(effective_time) <![CDATA[ >= ]]> to_days(now())
+        union
+        select provider_id, user_id, store_id, free_card_id as card_id, lable_id, type_id, left_count, free_name as card_name, 1 as vip_flag from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId} and store_id = #{storeId} and status = 0 and left_count <![CDATA[ > ]]> 0  and to_days(mod_time) <![CDATA[ >= ]]> to_days(now())) usercard
+        left join
+
+<!--        # 根据商家标签管理得到该商户支持的充值卡及核消次数-->
+        (select store.provider_id, store.store_id, store.lable_id, store.type_id, case store.type_id when 0 then chkmgt.chk_count else 1 end as chk_count from
+        (select store_id, provider_id, lable_id, type_id from segchk_store_lable_mgt where provider_id = #{providerId} and store_id = #{storeId} and (type_id = 0 or type_id = 2) and mgt_state = 0) store
+        left join
+        (select provider_id, store_id, card_type_id as lable_id, chk_count from segchk_store_chk_mgt where provider_id = #{providerId} and store_id = #{storeId}) chkmgt on store.store_id = chkmgt.store_id and store.provider_id = chkmgt.provider_id and store.type_id = 0 and store.lable_id = chkmgt.lable_id) storecard
+        on usercard.provider_id = storecard.provider_id and ((usercard.type_id = 0 and usercard.lable_id = storecard.lable_id and storecard.type_id = usercard.type_id) or (usercard.type_id = 2 and usercard.store_id = storecard.store_id and storecard.type_id = usercard.type_id and usercard.lable_id = storecard.lable_id))
+        left join
+
+        (select provider_id, store_id, user_id, card_type_id as lable_id, card_id, count(1) as chk_count, 0 as type_id from segchk_service_chk where provider_id = #{providerId} and user_id = #{userId} group by provider_id, store_id, user_id, card_type_id, card_id) userchk
+        on usercard.provider_id = userchk.provider_id and usercard.user_id = userchk.user_id and storecard.store_id = userchk.store_id and usercard.lable_id = userchk.lable_id and usercard.type_id = userchk.type_id
+        left join
+        (select provider_id, card_type_id, card_type_name from segchk_charge_card where provider_id = #{providerId}) provcard
+        on provcard.provider_id = usercard.provider_id and usercard.type_id = 0 and usercard.lable_id = provcard.card_type_id
+
+<!--        where ((usercard.type_id = 2 and storecard.chk_count is not null and usercard.left_count <![CDATA[ > ]]> 0) or (usercard.type_id = 0 and storecard.chk_count <![CDATA[ > ]]> ifnull(userchk.chk_count, 0) and usercard.left_count <![CDATA[ > ]]> 0) or (usercard.type_id = 1 and usercard.left_count <![CDATA[ > ]]> 0))-->
+
+        where
+              1 = 1 and
+        (vip_flag = 0 or vip_flag = 1) and
+        (
+<!--        #       如果用户卡类型是2，则为优惠券卡，需要保证商家支持（storecard.chk_count非空）且用户卡有剩余使用次数，商家也可以不支持-->
+        (usercard.type_id = 2 and usercard.left_count <![CDATA[ > ]]> 0)
+<!--        #    用户卡类型是0，则为会员卡，则商家必须支持storecard.store_id 非空，商家支持的单卡核消次数必须大于该用户及该卡在该商家已经核消的次数，该用户的会员卡可用次数大于0-->
+        -- or (usercard.type_id = 0 and storecard.store_id is not null and storecard.chk_count <![CDATA[ > ]]>
+--         ifnull(userchk.chk_count, 0) and usercard.left_count <![CDATA[ > ]]> 0)
+            or usercard.type_id = 0
+        <!--        #    类型为1，则为商户赠卡，该卡剩余次数大于0-->
+        or (usercard.type_id = 1 and usercard.left_count <![CDATA[ > ]]> 0)
+        )
+    </select>
+
+    <select id="selecttest" parameterType="SegchkServiceOrderWebReq" resultMap="SegchkServiceOrderChkTestRespResult">
+        select * from
+        <choose>
+            <when test="typeId == 0">
+        (select free_card_id as card_id, provider_id, user_id, store_id from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId} and free_card_id = #{cardId}) a
+            </when>
+            <otherwise>
+        (select provider_id, card_id, null as store_id, user_id from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId} and card_id = #{cardId}) b
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="selectUserOrderPredInfo" parameterType="Long" resultMap="SegchkServiceOrderChkTestRespResult">
+        select likego.provider_id, likego.user_id, likego.store_id, likego.card_id, likego.card_type, likego.mgt_state
+<!--        #      赠卡时的信息-->
+        , sssm.free_name, sssm.free_count, sssm.left_count, sssm.status
+<!--        #      会员卡时的信息-->
+        , concat(scc.card_type_name,'会员卡') as free_name, suv.left_count, sscm.chk_count as free_count, ssc.had_chk_count, suv.status
+<!--        #      卡的有效期-->
+        , suv.effective_time
+<!--        #      该用户在该商家是否存在剩余次数大于1的赠卡（包括本卡），没有则为null,可以赠卡，否则不可以赠送-->
+        , sssm2.free_card_id
+<!--        #      商家可赠送的优惠券信息-->
+<!--        #      , sslm.lable_id, sslm.preference_name-->
+<!--        #      根据条件，输出想要的结果,如果sssm.free_name为空，则说明为会员卡核消，否则为赠卡（自定义卡，优惠券）-->
+        , if(isnull(sssm.free_name), concat(scc.card_type_name,'会员卡'), sssm.free_name) as card_name
+        , if(isnull(sssm.free_name), ifnull(sscm.chk_count, 0), sssm.free_count) as total_count
+        , if(isnull(sssm.free_name), ifnull(sscm.chk_count, 0) - ifnull(ssc.had_chk_count, 0), sssm.left_count) as has_left_count
+        , if(isnull(sssm.free_name), suv.status, sssm.status) as card_status
+        , if(isnull(sssm2.free_card_id), 0, 1) as can_free
+        , if(isnull(sssm2.free_card_id), sslm.lable_id, null) as lable_id
+        , if(isnull(sssm2.free_card_id), sslm.type_id, null) as type_id
+        , if(isnull(sssm2.free_card_id), sslm.preference_name, null) as lable_name
+        , if(isnull(sssm2.free_card_id), sslm.store_id, null) as lable_sort
+        , if(to_days(suv.effective_time) <![CDATA[ > ]]> to_days(curdate()), 0, 1) as is_expire
+        from
+<!--        # 首选根据likego的id，查出所使用的卡信息，商家信息，用户信息-->
+        (select provider_id, user_id, store_id, card_id, card_type, mgt_state from segchk_user_likego where likego_id = #{likegoId}) likego
+        left join
+<!--        #     当likego订单的卡类型为自定义卡或优惠券时从segchk_store_self_mgt中获取该卡的信息，卡剩余次数，卡名称，卡内容，状态-->
+        segchk_store_self_mgt sssm on likego.provider_id = sssm.provider_id and likego.card_id = sssm.free_card_id and likego.card_type != 0
+        left join
+<!--        #     当likego订单的卡类型为会员卡时。先从用户卡表中查出该卡的具体标签。如果是非会员卡时，则要查出该赠卡的有效期（通过赠卡与会员的绑定关系得到会员卡的有效期）-->
+        segchk_user_vip suv on (likego.card_type = 0 and likego.provider_id = suv.provider_id and likego.card_id = suv.card_id) or (likego.card_type != 0 and likego.provider_id = suv.provider_id and sssm.card_id = suv.card_id)
+        left join
+<!--        #     根据会员卡的卡类型标签查出该卡的名称-->
+        segchk_charge_card scc on likego.card_type = 0 and likego.provider_id = scc.provider_id and scc.card_type_id = suv.card_type_id
+        left join
+<!--        #     根据订单信息中商家id及会员卡查询商家对该会员卡支持核消的次数-->
+        segchk_store_chk_mgt sscm on likego.card_type = 0 and suv.card_type_id = sscm.card_type_id and likego.store_id = sscm.store_id and likego.provider_id = sscm.provider_id
+        left join
+<!--        #     根据该会员卡id，该商家id，汇总出该卡在该商家的已核消次数-->
+        (select provider_id, card_id, store_id, count(1) as had_chk_count from segchk_service_chk group by provider_id, card_id, store_id) ssc on likego.card_type = 0 and likego.card_id = ssc.card_id and likego.store_id = ssc.store_id and likego.provider_id = ssc.provider_id
+        left join
+<!--        #     根据用户id，商家id查询是否有未使用完的赠卡(非优惠券)，要求，剩余次数大于1（本次核查可能会将最后一次核消掉，则该商家可以继续给该用户赠卡）,只要有一张卡。就说明-->
+        (select user_id, store_id, provider_id, min(free_card_id) as free_card_id from segchk_store_self_mgt where type_id = 1 and left_count > 1 group by user_id, store_id, provider_id) sssm2 on sssm2.store_id = likego.store_id and sssm2.user_id = likego.user_id
+        left join
+<!--        #     根据商家id。查询该商家支持的优惠券信息。-->
+        (select a.provider_id, a.store_id, a.type_id, a.lable_id, b.preference_name from segchk_store_lable_mgt a left join segchk_preference_lable b on a.provider_id = b.provider_id and a.type_id = 2 and a.lable_id = b.preference_id where type_id = 2) sslm on likego.provider_id = sslm.provider_id and likego.store_id = sslm.store_id
+        order by sslm.store_id
+    </select>
+
+
+    <select id="selectSegchkUserChargePre" parameterType="SegchkUserWebReq" resultMap="SegchkUserChargeCardResult">
+        select
+        scc.provider_id
+        , scc.card_type_id
+        , scc.card_type_name
+        , suv.card_id
+        ,ifnull(suc.buycnt, 0) as had_buy
+        ,scc.buy_count
+        , scc.card_type_value
+        , if(isnull(subi.user_id), 3, if(scc.buy_count <![CDATA[ <= ]]> ifnull(suc.buycnt, 0), 2
+        , if(isnull(suv.card_id), 0,
+        if(suv.effective_time <![CDATA[ > ]]> NOW() and suv.left_count > 0 and suv.status = 0, 1, 0)
+        )))
+        as can_buy
+        , scc.card_type_chkcount
+        , scc.effective_time
+
+        from
+        (
+        select provider_id, card_type_id, card_type_name, card_type_value, effective_time, buy_count, card_type_chkcount from segchk_charge_card where provider_id = #{providerId}) scc
+        left join (
+<!--        #             通过用户基础信息表确定是否用户归属运营商-->
+        select provider_id, user_id from segchk_user_basic_info where provider_id = #{providerId} and user_id = #{userId}) subi
+        on subi.provider_id = scc.provider_id
+        left join
+        (
+        select provider_id, user_id, card_type_id, count(1) as buycnt from segchk_user_charge where provider_id = #{providerId} and user_id = #{userId} and ret_flag <![CDATA[ >=  ]]> 1 group by provider_id, user_id, card_type_id
+        ) suc
+        on suc.provider_id = scc.provider_id and suc.card_type_id = scc.card_type_id
+
+        left join
+        (
+        select card_id, card_type_id, user_id, provider_id, effective_time, left_count, status from segchk_user_vip where provider_id = #{providerId} and user_id = #{userId}
+        )suv
+        on scc.provider_id = suv.provider_id and scc.card_type_id = suv.card_type_id
+        order by card_type_id
+    </select>
+
+    <select id="selectUserLevelByMobile" parameterType="java.lang.String" resultMap="SegchkUserLevelInfoResult">
+        select * from
+
+        (select user_id, provider_id, 2 as user_level from segchk_user_basic_info where phone_no = #{phoneNo}) subi
+        union (
+        select store_id as user_id, provider_id,  1 as user_level from segchk_store_basic_info where store_phone = #{phoneNo}
+        )
+        union (
+        select provider_id as user_id, provider_id, 0 as user_level from segchk_provider_mgt where phone_no = #{phoneNo}
+        )
+    </select>
+
+    <select id="userIsExit" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select if(count(1) = 0 || isnull(count(1)), -1, 2) as ret from segchk_user_basic_info where user_id = #{userId} and provider_id = #{providerId}
+    </select>
+    <select id="storeIsExit" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select if(count(1) = 0 || isnull(count(1)), -1, 1) as ret from segchk_store_basic_info where store_id = #{userId} and provider_id = #{providerId}
+    </select>
+
+    <select id="providerIsExit" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select if(count(1) = 0 || isnull(count(1)), -1, 0) as ret from segchk_provider_mgt where provider_id = #{userId} and provider_id = #{providerId}
+    </select>
+    <select id="getUserWechatOpenId" parameterType="Long" resultMap="WeChatCustomerLinkResult">
+        select a.provider_id, a.user_id, b.openid from
+        (select * from segchk_user_basic_info where user_id = #{userId} ) a
+        left join (
+        select * from segchk_user_wechat where user_id = #{userId}
+        )b on a.user_id = b.user_id and a.provider_id = b.provider_id
+    </select>
+    <select id="selectSegchkUserName" parameterType="string" resultType="java.lang.String">
+        select conv(left(md5(phone_no), 5), 16, 10) from segchk_user_basic_info where user_id = #{userId}
+    </select>
+    <select id="recommenderIsExit" resultType="java.lang.Integer">
+        select if(isnull(recomid)
+<!--        #          如果空，说明推荐人信息不对或不存在,不在线,平台推荐，当前地区注册-->
+        , 0
+<!--        #     如果推荐人存在,判断推荐人与用户是否同地区,相同1，不同2-->
+        , if(x.curprov = c.provider_id, 1, 2)
+        ) as ret
+<!--        , x.curprov, c.provider_id-->
+        from
+        (
+<!--        #     将参数中的推荐人id，当前用户所在的地区运营商代码-->
+        select #{providerId} as curprov, #{recommondId} as recommender
+        ) x
+        left join
+        (
+<!--        #         根据推荐人id，角色查询三张信息表-->
+        (select user_id as recomid, 2 as level, provider_id
+        from segchk_user_basic_info
+        where user_id = #{recommondId})
+        union
+        (select store_id as recomid, 1 as level, provider_id
+        from segchk_store_basic_info
+        where store_id = #{recommondId} and service_state = 0)
+        union
+        (select provider_id as recomid, 0 as level, provider_id
+        from segchk_provider_mgt
+        where provider_id = #{recommondId} and flag_id = 0)
+        ) c
+        on c.recomid = x.recommender and c.level = #{recommondLevel}
+    </select>
+
+    <select id="selectSegchkRewardInfoForCharge" parameterType="java.util.Map" resultMap="SegchkChargeRewardResult">
+        select card_type_id
+        , user_id
+        , provider_id
+        , charge
+        , account_used
+        , user_recommenders
+        , recommenders_level
+        , total_charge_count
+<!--        #      , reward, card_commission-->
+        , if(recommenders_level = 1,
+        case when total_charge_count = 0 then card_commission
+        when total_charge_count = 1 then card_commission / 2
+        when total_charge_count = 2 then card_commission / 3
+        else 0.0 end
+        ,if(recommenders_level = 2,
+        case when total_charge_count = 0 then reward
+        when total_charge_count = 1 then reward / 2
+        when total_charge_count = 2 then reward / 3
+        else 0.0 end
+        , 0.0)) as reward
+        from
+        (select suc.card_type_id, suc.user_id, suc.provider_id, suc.charge, suc.account_used, user_recommenders, recommenders_level
+        , ifnull(total_charge_count, 0) as total_charge_count, from_type
+        , if(recommenders_level = 2, (select reward from segchk_user_reward_ctl where suc.provider_id = provider_id and from_id = from_type and to_id = suc.card_type_id), 0.0) as reward
+        , if(recommenders_level = 1 and !isnull(suei.store_status), (select card_commission from segchk_store_chk_mgt where store_id = user_recommenders and card_type_id = suc.card_type_id), 0.0) as card_commission
+        from
+        (select * from segchk_user_charge where charge_id = #{chargeId}) suc
+        left join
+        (select user_id
+        , user_recommenders, recommenders_level, provider_id, mod_time
+        , if(recommenders_level = 2, (
+<!--        #               当推荐人是用户时，获取推荐人卡类型-->
+        select ifnull(card_type_id, -1) as card_type_id from segchk_user_basic_info where user_id = user_recommenders
+        ), -1) as from_type
+        , if(recommenders_level = 1,
+        (select service_state from segchk_store_basic_info where provider_id = segchk_user_ext_info.provider_id and service_state = 0 and store_id = user_recommenders)
+        , null) as store_status
+
+        from segchk_user_ext_info where user_id = #{userId} and provider_id = #{providerId}) suei
+        on suei.user_id = suc.user_id
+        left join
+        (
+<!--        #     统计用户累积充值成功次数-->
+        select count(1) as total_charge_count, user_id from segchk_user_charge where user_id = #{userId} and ret_flag <![CDATA[ > ]]>0 and charge_id != #{chargeId}
+        ) succnt
+        on succnt.user_id = suc.user_id
+        ) ret
+    </select>
+    <select id="getCardInfo" parameterType="java.util.Map" resultType="java.util.HashMap">
+        select
+        suv.card_id as cardId
+        , suv.card_type_id as cardTypeId
+        , suv.user_id as userId
+        , suv.provider_id as providerId
+        , suv.use_count as useCount
+        , suc.charge_id as chargeId
+        , ifnull(ssc.chk_count, 0) as chkCount
+        from
+        (select * from segchk_user_vip where card_id = #{cardId}) suv
+        left join
+        (select * from segchk_user_charge where card_id = #{cardId} order by charge_id desc limit 1) suc on suv.card_id = suc.card_id
+        left join
+        (select count(1) as chk_count, card_id from segchk_service_chk where card_id = #{cardId} and store_id = #{storeId}) ssc on ssc.card_id = suv.card_id
+    </select>
+    <select id="selectSegchkRewardInfoForCheck" parameterType="java.util.Map" resultMap="SegchkChargeRewardResult">
+        select
+        suv.card_id as card_id
+        , suv.card_type_id as card_type_id
+        , suv.user_id as user_id
+        , suv.provider_id as provider_id
+        , suv.use_count as use_count
+        , suc.charge_id as charge_id
+        , suc.charge_count as total_charge_count
+        , ifnull(ssc.chk_count, 0) as chk_count
+        , suei.user_recommenders as user_recommenders
+        , suei.recommenders_level as recommenders_level
+        , sscm.card_commission as reward
+        from
+<!--        #      获取会员卡信息-->
+        (select * from segchk_user_vip where card_id = #{cardId}) suv
+        left join
+<!--        #     获取会员卡对应的充值id,充值必须成功，-->
+        (select charge_id, user_id, (select count(1) from segchk_user_charge where user_id = #{userId} and ret_flag <![CDATA[ > ]]> 0) as charge_count from segchk_user_charge where card_id = #{cardId} order by charge_id desc limit 1) suc on suv.user_id = suc.user_id
+        left join
+<!--        #     获取该会员卡在该商家的核消次数-->
+        (select count(1) as chk_count, card_id from segchk_service_chk where card_id = #{cardId} and store_id = #{storeId}) ssc on ssc.card_id = suv.card_id
+        left join
+<!--        #     获取该用户的推荐人-->
+        (select * from segchk_user_ext_info where user_id = #{userId}) suei on suv.user_id = suei.user_id
+        left join
+        (select * from segchk_store_chk_mgt where store_id = #{storeId}) sscm on suv.card_type_id = sscm.card_type_id;
+    </select>
+
+    <insert id="updateSegchkUserWechat" parameterType="SegchkUserWechat">
+        insert into segchk_user_wechat
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="openid != null and openid != ''">openid,</if>
+            <if test="unionId != null and unionId != ''">union_id,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url,</if>
+            mod_time,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="openid != null and openid != ''">#{openid},</if>
+            <if test="unionId != null and unionId != ''">#{unionId},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">#{iconUrl},</if>
+            now(),
+        </trim>
+        on duplicate key update
+        <trim prefix="" suffixOverrides=",">
+            <if test="providerId != null and providerId != ''">provider_id = #{providerId},</if>
+            <if test="openid != null and openid != ''">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url = #{iconUrl},</if>
+            mod_time = now(),
+        </trim>
+    </insert>
+    <insert id="addAccountByReward">
+        insert into segchk_user_account (user_id, account, provider_id, reward_id, charge_id, mod_time)
+
+        select suc.user_id, if(isnull(ssa.account), #{reward}, ssa.account + #{reward}) as account, provider_id, reward_id, charge_id, now()  from
+        (select
+        #{userRecommenders} as user_id
+        , #{rewardId} as reward_id
+        , #{chargeId} as charge_id
+        , #{providerId} as provider_id
+        ) suc
+        left join
+        (
+<!--        #         上一次的余额-->
+        select account, user_id from segchk_user_account where user_id = #{userRecommenders} order by account_id desc limit 1
+        ) ssa
+        on ssa.user_id = suc.user_id
+    </insert>
+
+    <update id="updateSegchkStoreWechat" parameterType="SegchkUserWechat">
+        update segchk_store_basic_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openid != null and openid != ''">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url = #{iconUrl},</if>
+            mod_time = now(),
+        </trim>
+        where store_id = #{userId} and provider_id = #{providerId}
+    </update>
+
+    <update id="updateSegchkProviderWechat" parameterType="SegchkUserWechat">
+        update segchk_provider_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openid != null and openid != ''">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="wechatId != null">wechat_id = #{wechatId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url = #{iconUrl},</if>
+            update_time = now(),
+        </trim>
+        where provider_id = #{providerId}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/AreaMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/AreaMapper.xml
new file mode 100644
index 0000000..cdac3e7
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/AreaMapper.xml
@@ -0,0 +1,272 @@
+<?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.setting.mapper.AreaMapper">
+
+
+    <resultMap id="province" type="com.ruoyi.setting.domain.LsProvince">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="sort" property="sort"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_time " property="createTime"/>
+        <result column="modify_time" property="modifyTime"/>
+        <result column="del_time" property="delTime"/>
+    </resultMap>
+
+    <resultMap id="city" type="com.ruoyi.setting.domain.LsCity">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="province_id" property="provinceId"/>
+        <result column="sort" property="sort"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_time " property="createTime"/>
+        <result column="modify_time" property="modifyTime"/>
+        <result column="del_time" property="delTime"/>
+    </resultMap>
+
+
+    <resultMap id="district" type="com.ruoyi.setting.domain.LsDistrict">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="city_id" property="cityId"/>
+        <result column="sort" property="sort"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_time " property="createTime"/>
+        <result column="modify_time" property="modifyTime"/>
+        <result column="del_time" property="delTime"/>
+    </resultMap>
+
+    <insert id="addProvince" parameterType="com.ruoyi.setting.domain.LsProvince">
+        insert into ls_province
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                name,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="modifyTime != null">
+                modify_time,
+            </if>
+            <if test="delTime != null">
+                del_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                #{name},
+            </if>
+            <if test="sort != null">
+                #{sort},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="modifyTime != null">
+                #{modifyTime},
+            </if>
+            <if test="delTime != null">
+                #{delTime},
+            </if>
+        </trim>
+    </insert>
+
+
+    <insert id="addCity" parameterType="com.ruoyi.setting.domain.LsCity">
+        insert into ls_city
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                name,
+            </if>
+            <if test="provinceId != null">
+                province_id,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="modifyTime != null">
+                modify_time,
+            </if>
+            <if test="delTime != null">
+                del_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                #{name},
+            </if>
+            <if test="provinceId != null">
+                #{provinceId},
+            </if>
+            <if test="sort != null">
+                #{sort},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="modifyTime != null">
+                #{modifyTime},
+            </if>
+            <if test="delTime != null">
+                #{delTime},
+            </if>
+        </trim>
+    </insert>
+
+
+    <insert id="addDistrict" parameterType="com.ruoyi.setting.domain.LsDistrict">
+        insert into ls_district
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                name,
+            </if>
+            <if test="cityId != null">
+                city_id,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="modifyTime != null">
+                modify_time,
+            </if>
+            <if test="delTime != null">
+                del_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">
+                #{name},
+            </if>
+            <if test="cityId != null">
+                #{cityId},
+            </if>
+            <if test="sort != null">
+                #{sort},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="modifyTime != null">
+                #{modifyTime},
+            </if>
+            <if test="delTime != null">
+                #{delTime},
+            </if>
+        </trim>
+    </insert>
+
+
+    <select id="queryAllProvinces" resultMap="province">
+        select * from ls_province where  del_flag = '0'  order by sort asc
+    </select>
+
+    <select id="queryCityByProvinceId" parameterType="java.lang.Long" resultMap="city">
+        select * from ls_city where  province_id = #{provinceId} order by sort asc
+    </select>
+
+
+    <select id="queryDistrictByCityId" parameterType="java.lang.Long" resultMap="district">
+        select * from ls_district where city_id = #{cityId}   order by sort asc
+    </select>
+
+
+    <update id="deleteProvinceById" parameterType="java.lang.Long">
+        update ls_province
+        set del_flag = '1',del_time = now()
+        where id = #{provinceId}
+    </update>
+
+    <update id="deleteCityById" parameterType="java.lang.Long">
+        update ls_city
+        set del_flag = '1',del_time = now()
+        where id = #{cityId}
+    </update>
+
+    <update id="deleteDistrictById" parameterType="java.lang.Long">
+        update ls_district
+        set del_flag = '1',del_time = now()
+        where id = #{districtId}
+    </update>
+
+    <select id="queryProvinceById" parameterType="java.lang.Long" resultMap="province">
+        select * from ls_province where id = #{id}
+    </select>
+
+    <select id="queryCityById" parameterType="java.lang.Long" resultMap="city">
+        select * from ls_city where id = #{id}
+    </select>
+    <select id="queryDistrictById" parameterType="java.lang.Long" resultMap="district">
+        select * from ls_district where id = #{id}
+    </select>
+
+    <update id="updateProvince" parameterType="com.ruoyi.setting.domain.LsProvince">
+        update ls_province
+        <set>
+            <if test="name != null">
+                name = #{name},
+            </if>
+            <if test="sort != null">
+                sort = #{sort},
+            </if>
+            modify_time = now()
+        </set>
+        where id = #{id}
+    </update>
+
+    <update id="updateCity" parameterType="com.ruoyi.setting.domain.LsCity">
+        update ls_city
+        <set>
+            <if test="name != null">
+                name = #{name},
+            </if>
+            <if test="sort != null">
+                sort = #{sort},
+            </if>
+            modify_time = now()
+        </set>
+        where id = #{id}
+    </update>
+    <update id="updateDistrict" parameterType="com.ruoyi.setting.domain.LsDistrict">
+        update ls_district
+        <set>
+            <if test="name != null">
+                name = #{name},
+            </if>
+            <if test="sort != null">
+                sort = #{sort},
+            </if>
+            modify_time = now()
+        </set>
+        where id = #{id}
+    </update>
+    <select id="queryCityIdByName" parameterType="java.lang.String" resultType="long">
+       select id from ls_city where name=#{cityName} limit 1
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/BaseInfoSetMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/BaseInfoSetMapper.xml
new file mode 100644
index 0000000..49a749b
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/BaseInfoSetMapper.xml
@@ -0,0 +1,62 @@
+<?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.setting.mapper.BaseInfoSetMapper">
+    <resultMap id="BaseResult" type="com.ruoyi.segchk.domain.BaseInfoSet">
+        <result column="id" property="id"/>
+        <result column="phone" property="phone"/>
+        <result column="logo" property="logo"/>
+        <result column="site_url" property="siteUrl"/>
+        <result column="site_name" property="siteName"/>
+        <result column="label_log" property="labelLog"/>
+        <result column="admin_logo" property="adminLogo"/>
+        <result column="captcha_open" property="captchaOpen"/>
+        <result column="site_login" property="siteLoginPic"/>
+        <result column="store_login" property="storeLoginPic"/>
+        <result column="site_register" property="siteRegisterPic"/>
+        <result column="store_register" property="storeRegisterPic"/>
+        <result column="copyright_info" property="copyrightInfo"/>
+        <result column="admin_index_logo" property="adminIndexLogo"/>
+        <result column="store_open_protocol" property="storeOpenProtocol"/>
+        <result column="register_protocol" property="siteRegisterProtocol"/>
+        <result column="user_privacy_agreement" property="userPrivacyAgreement"/>
+        <result column="vip_service_agreement" property="vipServiceAgreement"/>
+        <result column="store_register_protocol" property="storeRegisterProtocol"/>
+        <result column="store_spu_audit" property="storeSpuAudit"/>
+        <result column="member_price_status" property="memberPriceStatus"/>
+        <result column="crowdfunding_protocol" property="crowdFundingProtocol"/>
+        <result column="h5_call_back_domain" property="h5CallBackDomain"/>
+        <result column="pc_call_back_domain" property="pcCallBackDomain"/>
+
+    </resultMap>
+    <sql id="columnList">
+        id,phone,logo,site_url,site_name,label_log,admin_logo,captcha_open,site_login,store_login,site_register,store_register,copyright_info,admin_index_logo,
+        store_open_protocol,register_protocol
+        ,user_privacy_agreement,vip_service_agreement
+        ,store_register_protocol,store_spu_audit,member_price_status,crowdfunding_protocol,h5_call_back_domain,pc_call_back_domain
+    </sql>
+    <select id="queryBaseInfoSet" resultMap="BaseResult">
+        SELECT
+        <include refid="columnList"/>
+        FROM segchk_system_setting
+    </select>
+
+    <update id="editBaseInfoSetA" parameterType="com.ruoyi.segchk.domain.BaseInfoSet">
+        UPDATE segchk_system_setting SET
+        phone=#{phone},logo=#{logo},site_url=#{siteUrl},site_name=#{siteName},label_log=#{labelLog},admin_logo=#{adminLogo},
+        site_login=#{siteLoginPic},store_login=#{storeLoginPic},site_register=#{siteRegisterPic},store_register=#{storeRegisterPic},
+        copyright_info=#{copyrightInfo},admin_index_logo=#{adminIndexLogo},store_open_protocol=#{storeOpenProtocol},register_protocol=#{siteRegisterProtocol}
+        ,user_privacy_agreement=#{userPrivacyAgreement},
+        ,vip_service_agreement=#{vipServiceAgreement},
+        store_register_protocol=#{storeRegisterProtocol},crowdfunding_protocol=#{crowdFundingProtocol},
+        h5_call_back_domain=#{h5CallBackDomain},pc_call_back_domain=#{pcCallBackDomain}
+    </update>
+    <update id="editBaseInfoSetB" parameterType="com.ruoyi.segchk.domain.BaseInfoSet">
+        UPDATE segchk_system_setting SET captcha_open = #{captchaOpen}
+    </update>
+    <update id="setAuditSwitch" parameterType="java.lang.String">
+        UPDATE segchk_system_setting SET store_spu_audit = #{storeSpuAudit}
+    </update>
+    <update id="setMemberPriceStatus" parameterType="java.lang.String">
+        UPDATE segchk_system_setting SET member_price_status = #{memberPriceStatus}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsCityMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsCityMapper.xml
new file mode 100644
index 0000000..cc125f1
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsCityMapper.xml
@@ -0,0 +1,85 @@
+<?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.setting.mapper.LsCityMapper">
+
+    <resultMap type="LsCity" id="LsCityResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="provinceId" column="province_id"/>
+        <result property="sort" column="sort"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="delTime" column="del_time"/>
+    </resultMap>
+
+    <sql id="selectLsCityVo">
+        select id, name, province_id, sort, del_flag, create_time, modify_time, del_time from ls_city
+    </sql>
+
+    <select id="selectLsCityList" parameterType="LsCity" resultMap="LsCityResult">
+        <include refid="selectLsCityVo"/>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="provinceId != null ">and province_id = #{provinceId}</if>
+            <if test="sort != null ">and sort = #{sort}</if>
+            <if test="modifyTime != null ">and modify_time = #{modifyTime}</if>
+            <if test="delTime != null ">and del_time = #{delTime}</if>
+        </where>
+    </select>
+
+    <select id="selectLsCityById" parameterType="Long" resultMap="LsCityResult">
+        <include refid="selectLsCityVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsCity" parameterType="LsCity" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_city
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">name,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsCity" parameterType="LsCity">
+        update ls_city
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsCityById" parameterType="Long">
+        delete from ls_city where id = #{id}
+    </delete>
+
+    <delete id="deleteLsCityByIds" parameterType="String">
+        delete from ls_city where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsDistrictMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsDistrictMapper.xml
new file mode 100644
index 0000000..7543561
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsDistrictMapper.xml
@@ -0,0 +1,85 @@
+<?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.setting.mapper.LsDistrictMapper">
+
+    <resultMap type="LsDistrict" id="LsDistrictResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="cityId" column="city_id"/>
+        <result property="sort" column="sort"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="delTime" column="del_time"/>
+    </resultMap>
+
+    <sql id="selectLsDistrictVo">
+        select id, name, city_id, sort, del_flag, create_time, modify_time, del_time from ls_district
+    </sql>
+
+    <select id="selectLsDistrictList" parameterType="LsDistrict" resultMap="LsDistrictResult">
+        <include refid="selectLsDistrictVo"/>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="cityId != null ">and city_id = #{cityId}</if>
+            <if test="sort != null ">and sort = #{sort}</if>
+            <if test="modifyTime != null ">and modify_time = #{modifyTime}</if>
+            <if test="delTime != null ">and del_time = #{delTime}</if>
+        </where>
+    </select>
+
+    <select id="selectLsDistrictById" parameterType="Long" resultMap="LsDistrictResult">
+        <include refid="selectLsDistrictVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsDistrict" parameterType="LsDistrict" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_district
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">name,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsDistrict" parameterType="LsDistrict">
+        update ls_district
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsDistrictById" parameterType="Long">
+        delete from ls_district where id = #{id}
+    </delete>
+
+    <delete id="deleteLsDistrictByIds" parameterType="String">
+        delete from ls_district where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsEmailSettingMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsEmailSettingMapper.xml
new file mode 100644
index 0000000..8e8f2fe
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsEmailSettingMapper.xml
@@ -0,0 +1,83 @@
+<?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.setting.mapper.LsEmailSettingMapper">
+
+    <resultMap type="LsEmailSetting" id="LsEmailSettingResult">
+        <result property="id" column="id"/>
+        <result property="senderMail" column="sender_mail"/>
+        <result property="senderName" column="sender_name"/>
+        <result property="smtpServer" column="smtp_server"/>
+        <result property="smtpPort" column="smtp_port"/>
+        <result property="username" column="username"/>
+        <result property="password" column="password"/>
+    </resultMap>
+
+    <sql id="selectLsEmailSettingVo">
+        select id, sender_mail, sender_name, smtp_server, smtp_port, username, password from ls_email_setting
+    </sql>
+
+    <select id="selectLsEmailSettingList" parameterType="LsEmailSetting" resultMap="LsEmailSettingResult">
+        <include refid="selectLsEmailSettingVo"/>
+        <where>
+            <if test="senderMail != null  and senderMail != ''">and sender_mail = #{senderMail}</if>
+            <if test="senderName != null  and senderName != ''">and sender_name like concat('%', #{senderName}, '%')
+            </if>
+            <if test="smtpServer != null  and smtpServer != ''">and smtp_server = #{smtpServer}</if>
+            <if test="smtpPort != null ">and smtp_port = #{smtpPort}</if>
+            <if test="username != null  and username != ''">and username like concat('%', #{username}, '%')</if>
+            <if test="password != null  and password != ''">and password = #{password}</if>
+        </where>
+    </select>
+
+    <select id="selectLsEmailSettingById" parameterType="Long" resultMap="LsEmailSettingResult">
+        <include refid="selectLsEmailSettingVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsEmailSetting" parameterType="LsEmailSetting" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_email_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="senderMail != null and senderMail != ''">sender_mail,</if>
+            <if test="senderName != null and senderName != ''">sender_name,</if>
+            <if test="smtpServer != null and smtpServer != ''">smtp_server,</if>
+            <if test="smtpPort != null">smtp_port,</if>
+            <if test="username != null and username != ''">username,</if>
+            <if test="password != null and password != ''">password,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="senderMail != null and senderMail != ''">#{senderMail},</if>
+            <if test="senderName != null and senderName != ''">#{senderName},</if>
+            <if test="smtpServer != null and smtpServer != ''">#{smtpServer},</if>
+            <if test="smtpPort != null">#{smtpPort},</if>
+            <if test="username != null and username != ''">#{username},</if>
+            <if test="password != null and password != ''">#{password},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsEmailSetting" parameterType="LsEmailSetting">
+        update ls_email_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="senderMail != null and senderMail != ''">sender_mail = #{senderMail},</if>
+            <if test="senderName != null and senderName != ''">sender_name = #{senderName},</if>
+            <if test="smtpServer != null and smtpServer != ''">smtp_server = #{smtpServer},</if>
+            <if test="smtpPort != null">smtp_port = #{smtpPort},</if>
+            <if test="username != null and username != ''">username = #{username},</if>
+            <if test="password != null and password != ''">password = #{password},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsEmailSettingById" parameterType="Long">
+        delete from ls_email_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteLsEmailSettingByIds" parameterType="String">
+        delete from ls_email_setting where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsProvinceMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsProvinceMapper.xml
new file mode 100644
index 0000000..ff7e269
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsProvinceMapper.xml
@@ -0,0 +1,80 @@
+<?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.setting.mapper.LsProvinceMapper">
+
+    <resultMap type="LsProvince" id="LsProvinceResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="sort" column="sort"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="delTime" column="del_time"/>
+    </resultMap>
+
+    <sql id="selectLsProvinceVo">
+        select id, name, sort, del_flag, create_time, modify_time, del_time from ls_province
+    </sql>
+
+    <select id="selectLsProvinceList" parameterType="LsProvince" resultMap="LsProvinceResult">
+        <include refid="selectLsProvinceVo"/>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="sort != null ">and sort = #{sort}</if>
+            <if test="modifyTime != null ">and modify_time = #{modifyTime}</if>
+            <if test="delTime != null ">and del_time = #{delTime}</if>
+        </where>
+    </select>
+
+    <select id="selectLsProvinceById" parameterType="Long" resultMap="LsProvinceResult">
+        <include refid="selectLsProvinceVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsProvince" parameterType="LsProvince" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_province
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsProvince" parameterType="LsProvince">
+        update ls_province
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsProvinceById" parameterType="Long">
+        delete from ls_province where id = #{id}
+    </delete>
+
+    <delete id="deleteLsProvinceByIds" parameterType="String">
+        delete from ls_province where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsSmsSettingMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsSmsSettingMapper.xml
new file mode 100644
index 0000000..de42d01
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsSmsSettingMapper.xml
@@ -0,0 +1,116 @@
+<?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.setting.mapper.LsSmsSettingMapper">
+
+    <resultMap type="LsSmsSetting" id="LsSmsSettingResult">
+        <result property="id" column="id"/>
+        <result property="secret" column="secret"/>
+        <result property="url" column="url"/>
+        <result property="sign" column="sign"/>
+        <result property="templateId" column="template_id"/>
+        <result property="writeoffTemplateId" column="writeoff_template_id"/>
+        <result property="virtualOrderTemplateId" column="virtual_order_template_id"/>
+        <result property="key" column="key"/>
+        <result property="auditTemplateId" column="audit_template_id"/>
+        <result property="settlementTemplateId" column="settlement_template_id"/>
+        <result property="withdrawTemplateId" column="withdraw_template_id"/>
+        <result property="withdrawTemplateId" column="withdraw_template_id"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+    <sql id="selectLsSmsSettingVo">
+        select id, secret, url, sign, template_id, writeoff_template_id, virtual_order_template_id, `key`, audit_template_id, settlement_template_id, withdraw_template_id, status from segchk_sms_setting
+    </sql>
+
+    <select id="selectLsSmsSettingList" parameterType="LsSmsSetting" resultMap="LsSmsSettingResult">
+        <include refid="selectLsSmsSettingVo"/>
+        <where>
+            <if test="secret != null  and secret != ''">and secret = #{secret}</if>
+            <if test="url != null  and url != ''">and url = #{url}</if>
+            <if test="sign != null  and sign != ''">and sign = #{sign}</if>
+            <if test="templateId != null  and templateId != ''">and template_id = #{templateId}</if>
+            <if test="writeoffTemplateId != null  and writeoffTemplateId != ''">and writeoff_template_id =
+                #{writeoffTemplateId}
+            </if>
+            <if test="virtualOrderTemplateId != null  and virtualOrderTemplateId != ''">and virtual_order_template_id =
+                #{virtualOrderTemplateId}
+            </if>
+            <if test="key != null  and key != ''">and key = #{key}</if>
+            <if test="auditTemplateId != null  and auditTemplateId != ''">and audit_template_id = #{auditTemplateId}
+            </if>
+            <if test="settlementTemplateId != null  and settlementTemplateId != ''">and settlement_template_id =
+                #{settlementTemplateId}
+            </if>
+            <if test="withdrawTemplateId != null  and withdrawTemplateId != ''">and withdraw_template_id =
+                #{withdrawTemplateId}
+            </if>
+            <if test="status != null and status != ''">and status =
+                #{status}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectLsSmsSettingById" parameterType="Long" resultMap="LsSmsSettingResult">
+        <include refid="selectLsSmsSettingVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsSmsSetting" parameterType="LsSmsSetting" useGeneratedKeys="true" keyProperty="id">
+        insert into segchk_sms_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="secret != null and secret != ''">secret,</if>
+            <if test="url != null">url,</if>
+            <if test="sign != null">sign,</if>
+            <if test="templateId != null">template_id,</if>
+            <if test="writeoffTemplateId != null">writeoff_template_id,</if>
+            <if test="virtualOrderTemplateId != null">virtual_order_template_id,</if>
+            <if test="key != null">key,</if>
+            <if test="auditTemplateId != null">audit_template_id,</if>
+            <if test="settlementTemplateId != null">settlement_template_id,</if>
+            <if test="withdrawTemplateId != null">withdraw_template_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="secret != null and secret != ''">#{secret},</if>
+            <if test="url != null">#{url},</if>
+            <if test="sign != null">#{sign},</if>
+            <if test="templateId != null">#{templateId},</if>
+            <if test="writeoffTemplateId != null">#{writeoffTemplateId},</if>
+            <if test="virtualOrderTemplateId != null">#{virtualOrderTemplateId},</if>
+            <if test="key != null">#{key},</if>
+            <if test="auditTemplateId != null">#{auditTemplateId},</if>
+            <if test="settlementTemplateId != null">#{settlementTemplateId},</if>
+            <if test="withdrawTemplateId != null">#{withdrawTemplateId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsSmsSetting" parameterType="LsSmsSetting">
+        update segchk_sms_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="secret != null and secret != ''">secret = #{secret},</if>
+            <if test="url != null">url = #{url},</if>
+            <if test="sign != null">sign = #{sign},</if>
+            <if test="templateId != null">template_id = #{templateId},</if>
+            <if test="writeoffTemplateId != null">writeoff_template_id = #{writeoffTemplateId},</if>
+            <if test="virtualOrderTemplateId != null">virtual_order_template_id = #{virtualOrderTemplateId},</if>
+            <if test="key != null">key = #{key},</if>
+            <if test="auditTemplateId != null">audit_template_id = #{auditTemplateId},</if>
+            <if test="settlementTemplateId != null">settlement_template_id = #{settlementTemplateId},</if>
+            <if test="withdrawTemplateId != null">withdraw_template_id = #{withdrawTemplateId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsSmsSettingById" parameterType="Long">
+        delete from segchk_sms_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteLsSmsSettingByIds" parameterType="String">
+        delete from segchk_sms_setting where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsStationLetterMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsStationLetterMapper.xml
new file mode 100644
index 0000000..17e1e03
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsStationLetterMapper.xml
@@ -0,0 +1,120 @@
+<?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.setting.mapper.LsStationLetterMapper">
+
+    <resultMap type="LsStationLetter" id="LsStationLetterResult">
+        <result property="id" column="id"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="isRead" column="is_read"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <sql id="selectLsStationLetterVo">
+        select id, customer_id, title, content, is_read, del_flag, create_time from ls_station_letter
+    </sql>
+    <insert id="addStationLetters" parameterType="LsStationLetter">
+        insert into ls_station_letter
+
+        (customer_id,title, content, is_read, del_flag,create_time)
+        values
+        <foreach collection="list" item="stationLetter" index="index" separator=",">
+            (
+            #{stationLetter.customerId},
+            #{stationLetter.title},
+            #{stationLetter.content},
+            '0',
+            '0',
+            now()
+            )
+        </foreach>
+    </insert>
+
+    <select id="queryStationLettersByCustomerId" parameterType="java.util.Map" resultMap="LsStationLetterResult">
+        select * from ls_station_letter
+        where  customer_id = #{customerId}
+        order by create_time desc
+        limit #{startRowNum},#{pageSize}
+    </select>
+
+    <select id="queryStationLettersCountByCustomerId" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1) from ls_station_letter
+        where  customer_id = #{customerId}
+    </select>
+
+    <update id="deleteStationLetters" parameterType="java.lang.Long">
+        UPDATE ls_station_letter SET del_flag = '1' WHERE id = #{id}
+    </update>
+
+    <update id="updateStationLettersIsRead" parameterType="java.lang.Long">
+        UPDATE ls_station_letter SET is_read = '1' WHERE id = #{id} and  customer_id = #{customerId}
+    </update>
+
+    <select id="unReadNum" parameterType="java.lang.Long" resultType="java.lang.Integer">
+           select count(1) from ls_station_letter
+        where  customer_id = #{customerId} and is_read = '0'
+    </select>
+    <select id="selectLsStationLetterList" parameterType="LsStationLetter" resultMap="LsStationLetterResult">
+        <include refid="selectLsStationLetterVo"/>
+        <where>
+            <if test="customerId != null ">and customer_id = #{customerId}</if>
+            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="content != null  and content != ''">and content = #{content}</if>
+            <if test="isRead != null  and isRead != ''">and is_read = #{isRead}</if>
+        </where>
+    </select>
+
+    <select id="selectLsStationLetterById" parameterType="Long" resultMap="LsStationLetterResult">
+        <include refid="selectLsStationLetterVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsStationLetter" parameterType="LsStationLetter" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_station_letter
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="customerId != null">customer_id,</if>
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null and content != ''">content,</if>
+            <if test="isRead != null and isRead != ''">is_read,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="customerId != null">#{customerId},</if>
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null and content != ''">#{content},</if>
+            <if test="isRead != null and isRead != ''">#{isRead},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsStationLetter" parameterType="LsStationLetter">
+        update ls_station_letter
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null and content != ''">content = #{content},</if>
+            <if test="isRead != null and isRead != ''">is_read = #{isRead},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsStationLetterById" parameterType="Long">
+        delete from ls_station_letter where id = #{id}
+    </delete>
+
+    <delete id="deleteLsStationLetterByIds" parameterType="String">
+        delete from ls_station_letter where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsSystemSeoMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsSystemSeoMapper.xml
new file mode 100644
index 0000000..298201c
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsSystemSeoMapper.xml
@@ -0,0 +1,72 @@
+<?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.setting.mapper.LsSystemSeoMapper">
+
+    <resultMap type="LsSystemSeo" id="LsSystemSeoResult">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="keyWord" column="key_word"/>
+        <result property="seoDesc" column="seo_desc"/>
+        <result property="isOpen" column="is_open"/>
+    </resultMap>
+
+    <sql id="selectLsSystemSeoVo">
+        select id, title, key_word, seo_desc, is_open from ls_system_seo
+    </sql>
+
+    <select id="selectLsSystemSeoList" parameterType="LsSystemSeo" resultMap="LsSystemSeoResult">
+        <include refid="selectLsSystemSeoVo"/>
+        <where>
+            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="keyWord != null  and keyWord != ''">and key_word = #{keyWord}</if>
+            <if test="seoDesc != null  and seoDesc != ''">and seo_desc = #{seoDesc}</if>
+            <if test="isOpen != null  and isOpen != ''">and is_open = #{isOpen}</if>
+        </where>
+    </select>
+
+    <select id="selectLsSystemSeoById" parameterType="Long" resultMap="LsSystemSeoResult">
+        <include refid="selectLsSystemSeoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsSystemSeo" parameterType="LsSystemSeo" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_system_seo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="keyWord != null">key_word,</if>
+            <if test="seoDesc != null">seo_desc,</if>
+            <if test="isOpen != null">is_open,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="keyWord != null">#{keyWord},</if>
+            <if test="seoDesc != null">#{seoDesc},</if>
+            <if test="isOpen != null">#{isOpen},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsSystemSeo" parameterType="LsSystemSeo">
+        update ls_system_seo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="keyWord != null">key_word = #{keyWord},</if>
+            <if test="seoDesc != null">seo_desc = #{seoDesc},</if>
+            <if test="isOpen != null">is_open = #{isOpen},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsSystemSeoById" parameterType="Long">
+        delete from ls_system_seo where id = #{id}
+    </delete>
+
+    <delete id="deleteLsSystemSeoByIds" parameterType="String">
+        delete from ls_system_seo where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/LsWxCustomerLinkMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/LsWxCustomerLinkMapper.xml
new file mode 100644
index 0000000..30ccebd
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/LsWxCustomerLinkMapper.xml
@@ -0,0 +1,72 @@
+<?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.setting.mapper.LsWxCustomerLinkMapper">
+
+    <resultMap type="LsWxCustomerLink" id="LsWxCustomerLinkResult">
+        <result property="id" column="id"/>
+        <result property="wxUnionId" column="wx_union_id"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="wxOpenId" column="wx_open_id"/>
+        <result property="wxAppletOpenId" column="wx_applet_open_id"/>
+    </resultMap>
+
+    <sql id="selectLsWxCustomerLinkVo">
+        select id, wx_union_id, customer_id, wx_open_id, wx_applet_open_id from ls_wx_customer_link
+    </sql>
+
+    <select id="selectLsWxCustomerLinkList" parameterType="LsWxCustomerLink" resultMap="LsWxCustomerLinkResult">
+        <include refid="selectLsWxCustomerLinkVo"/>
+        <where>
+            <if test="wxUnionId != null  and wxUnionId != ''">and wx_union_id = #{wxUnionId}</if>
+            <if test="customerId != null ">and customer_id = #{customerId}</if>
+            <if test="wxOpenId != null  and wxOpenId != ''">and wx_open_id = #{wxOpenId}</if>
+            <if test="wxAppletOpenId != null  and wxAppletOpenId != ''">and wx_applet_open_id = #{wxAppletOpenId}</if>
+        </where>
+    </select>
+
+    <select id="selectLsWxCustomerLinkById" parameterType="Long" resultMap="LsWxCustomerLinkResult">
+        <include refid="selectLsWxCustomerLinkVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsWxCustomerLink" parameterType="LsWxCustomerLink" useGeneratedKeys="true" keyProperty="id">
+        insert into ls_wx_customer_link
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="wxUnionId != null">wx_union_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="wxOpenId != null">wx_open_id,</if>
+            <if test="wxAppletOpenId != null">wx_applet_open_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="wxUnionId != null">#{wxUnionId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="wxOpenId != null">#{wxOpenId},</if>
+            <if test="wxAppletOpenId != null">#{wxAppletOpenId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsWxCustomerLink" parameterType="LsWxCustomerLink">
+        update ls_wx_customer_link
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="wxUnionId != null">wx_union_id = #{wxUnionId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="wxOpenId != null">wx_open_id = #{wxOpenId},</if>
+            <if test="wxAppletOpenId != null">wx_applet_open_id = #{wxAppletOpenId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsWxCustomerLinkById" parameterType="Long">
+        delete from ls_wx_customer_link where id = #{id}
+    </delete>
+
+    <delete id="deleteLsWxCustomerLinkByIds" parameterType="String">
+        delete from ls_wx_customer_link where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/OssMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/OssMapper.xml
new file mode 100644
index 0000000..ae48799
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/OssMapper.xml
@@ -0,0 +1,48 @@
+<?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.setting.mapper.OssMapper">
+
+    <resultMap id="ossSetting" type="com.ruoyi.setting.bean.OssSetting">
+        <id column="id" property="id"/>
+        <id column="access_key_id" property="accessKeyId"/>
+        <id column="access_key_secret" property="accessKeySecret"/>
+        <id column="bucket_name" property="bucketName"/>
+        <id column="address" property="address"/>
+        <id column="end_point" property="endPoint"/>
+        <id column="style_name" property="styleName"/>
+        <id column="prefix" property="prefix"/>
+
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                access_key_id,
+                access_key_secret,
+                bucket_name,
+                end_point,
+                style_name,
+                prefix,
+                address
+    </sql>
+
+
+    <select id="queryOssSetting" resultMap="ossSetting">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_aliyun_oss_setting limit 1
+    </select>
+
+    <update id="updateOss" parameterType="com.ruoyi.setting.bean.OssSetting">
+        update ls_aliyun_oss_setting
+        <set>
+            <if test='null != accessKeyId'>access_key_id = #{accessKeyId},</if>
+            <if test='null != accessKeySecret'>access_key_secret = #{accessKeySecret},</if>
+            <if test='null != bucketName'>bucket_name = #{bucketName},</if>
+            <if test='null != endPoint'>end_point = #{endPoint},</if>
+            <if test='null != styleName'>style_name = #{styleName},</if>
+            <if test='null != prefix'>prefix = #{prefix},</if>
+            <if test='null != address'>address = #{address},</if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/SCommunityBuySettingMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/SCommunityBuySettingMapper.xml
new file mode 100644
index 0000000..c8029c9
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/SCommunityBuySettingMapper.xml
@@ -0,0 +1,81 @@
+<?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.setting.mapper.SCommunityBuySettingMapper">
+
+    <resultMap type="SCommunityBuySetting" id="SCommunityBuySettingResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="audit" column="audit"/>
+        <result property="smsAuditNotice" column="sms_audit_notice"/>
+        <result property="smsPayNotice" column="sms_pay_notice"/>
+        <result property="smsCommissionNotice" column="sms_commission_notice"/>
+    </resultMap>
+
+    <sql id="selectSCommunityBuySettingVo">
+        select id, name, audit, sms_audit_notice, sms_pay_notice, sms_commission_notice from s_community_buy_setting
+    </sql>
+
+    <select id="selectSCommunityBuySettingList" parameterType="SCommunityBuySetting"
+            resultMap="SCommunityBuySettingResult">
+        <include refid="selectSCommunityBuySettingVo"/>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="audit != null  and audit != ''">and audit = #{audit}</if>
+            <if test="smsAuditNotice != null  and smsAuditNotice != ''">and sms_audit_notice = #{smsAuditNotice}</if>
+            <if test="smsPayNotice != null  and smsPayNotice != ''">and sms_pay_notice = #{smsPayNotice}</if>
+            <if test="smsCommissionNotice != null  and smsCommissionNotice != ''">and sms_commission_notice =
+                #{smsCommissionNotice}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSCommunityBuySettingById" parameterType="Long" resultMap="SCommunityBuySettingResult">
+        <include refid="selectSCommunityBuySettingVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSCommunityBuySetting" parameterType="SCommunityBuySetting" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into s_community_buy_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="audit != null">audit,</if>
+            <if test="smsAuditNotice != null">sms_audit_notice,</if>
+            <if test="smsPayNotice != null">sms_pay_notice,</if>
+            <if test="smsCommissionNotice != null">sms_commission_notice,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="audit != null">#{audit},</if>
+            <if test="smsAuditNotice != null">#{smsAuditNotice},</if>
+            <if test="smsPayNotice != null">#{smsPayNotice},</if>
+            <if test="smsCommissionNotice != null">#{smsCommissionNotice},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSCommunityBuySetting" parameterType="SCommunityBuySetting">
+        update s_community_buy_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="audit != null">audit = #{audit},</if>
+            <if test="smsAuditNotice != null">sms_audit_notice = #{smsAuditNotice},</if>
+            <if test="smsPayNotice != null">sms_pay_notice = #{smsPayNotice},</if>
+            <if test="smsCommissionNotice != null">sms_commission_notice = #{smsCommissionNotice},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSCommunityBuySettingById" parameterType="Long">
+        delete from s_community_buy_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteSCommunityBuySettingByIds" parameterType="String">
+        delete from s_community_buy_setting where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/mapper/setting/SegchkPaySettingMapper.xml b/ruoyi-segchk/src/main/resources/mapper/setting/SegchkPaySettingMapper.xml
new file mode 100644
index 0000000..4cd8ec1
--- /dev/null
+++ b/ruoyi-segchk/src/main/resources/mapper/setting/SegchkPaySettingMapper.xml
@@ -0,0 +1,88 @@
+<?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.setting.mapper.SegchkPaySettingMapper">
+
+    <resultMap type="SegchkPaySetting" id="SegchkPaySettingResult">
+        <result property="id" column="id"/>
+        <result property="codetype" column="codeType"/>
+        <result property="columnName" column="column_name"/>
+        <result property="columnValue" column="column_value"/>
+        <result property="providerId" column="provider_id"/>
+    </resultMap>
+
+    <sql id="selectLsPaySettingVo">
+        select id, codeType, column_name, column_value, provider_id from segchk_pay_setting
+    </sql>
+
+    <select id="selectLsPaySettingList" parameterType="SegchkPaySetting" resultMap="SegchkPaySettingResult">
+        <include refid="selectLsPaySettingVo"/>
+        <where>
+            <if test="codetype != null  and codetype != ''">and codeType = #{codetype}</if>
+            <if test="columnName != null  and columnName != ''">and column_name like concat('%', #{columnName}, '%')
+            </if>
+            <if test="columnValue != null  and columnValue != ''">and column_value = #{columnValue}</if>
+        </where>
+    </select>
+
+    <select id="selectLsPaySettingById" parameterType="Long" resultMap="SegchkPaySettingResult">
+        <include refid="selectLsPaySettingVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLsPaySetting" parameterType="SegchkPaySetting" useGeneratedKeys="true" keyProperty="id">
+        insert into segchk_pay_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="codetype != null and codetype != ''">codeType,</if>
+            <if test="columnName != null and columnName != ''">column_name,</if>
+            <if test="columnValue != null and columnValue != ''">column_value,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="codetype != null and codetype != ''">#{codetype},</if>
+            <if test="columnName != null and columnName != ''">#{columnName},</if>
+            <if test="columnValue != null and columnValue != ''">#{columnValue},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLsPaySetting" parameterType="SegchkPaySetting">
+        update segchk_pay_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="codetype != null and codetype != ''">codeType = #{codetype},</if>
+            <if test="columnName != null and columnName != ''">column_name = #{columnName},</if>
+            <if test="columnValue != null and columnValue != ''">column_value = #{columnValue},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLsPaySettingById" parameterType="Long">
+        delete from segchk_pay_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteLsPaySettingByIds" parameterType="String">
+        delete from segchk_pay_setting where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <resultMap id="BaseResult" type="com.ruoyi.setting.bean.PaySet">
+        <result column="id" property="id"/>
+        <result column="codeType" property="codeType"/>
+        <result column="column_name" property="columnName"/>
+        <result column="column_value" property="columnValue"/>
+    </resultMap>
+    <select id="queryPaySet" resultMap="BaseResult">
+        SELECT id,codeType,`column_name`,column_value FROM segchk_pay_setting
+    </select>
+    <delete id="deletePaySet" parameterType="java.lang.String">
+        DELETE  FROM segchk_pay_setting WHERE codeType=#{codeType}
+    </delete>
+    <insert id="addPaySet" parameterType="com.ruoyi.setting.bean.PaySet">
+        INSERT INTO segchk_pay_setting (codeType,`column_name`,column_value) VALUES
+        <foreach collection="list" index="index" item="paySet" separator=",">
+            (
+            #{paySet.codeType},#{paySet.columnName},#{paySet.columnValue}
+            )
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-segchk/src/main/resources/templates/posters/bg.jpg b/ruoyi-segchk/src/main/resources/templates/posters/bg.jpg
new file mode 100644
index 0000000..ad7c1e6
Binary files /dev/null and b/ruoyi-segchk/src/main/resources/templates/posters/bg.jpg differ
diff --git a/ruoyi-segchk/src/main/resources/templates/posters/bigtitle.jpg b/ruoyi-segchk/src/main/resources/templates/posters/bigtitle.jpg
new file mode 100644
index 0000000..1700fb0
Binary files /dev/null and b/ruoyi-segchk/src/main/resources/templates/posters/bigtitle.jpg differ
diff --git a/ruoyi-segchk/src/main/resources/templates/posters/checkret1.png b/ruoyi-segchk/src/main/resources/templates/posters/checkret1.png
new file mode 100644
index 0000000..25569f3
Binary files /dev/null and b/ruoyi-segchk/src/main/resources/templates/posters/checkret1.png differ
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
new file mode 100644
index 0000000..aed5d47
--- /dev/null
+++ b/ruoyi-system/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+<!--        <relativePath>../pom.xml</relativePath>-->
+
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-system</artifactId>
+
+    <description>
+        system系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/BaseInfoSet.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/BaseInfoSet.java
new file mode 100644
index 0000000..8c0dcd5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/BaseInfoSet.java
@@ -0,0 +1,354 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * 基本信息设置实体类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+@Repository
+public class BaseInfoSet implements Serializable {
+
+    /**
+     * 序列化id
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    private long id;
+    /**
+     * 前端地址
+     */
+    private String siteUrl;
+    /**
+     * 网站名称
+     */
+    private String siteName;
+    /**
+     * 网站LOGO(前端搜索页旁边和店铺登陆页)
+     */
+    private String logo;
+    /**
+     * pc端，admin端，store端标签图片
+     */
+    private String labelLog;
+    /**
+     * pc端登录背景图片
+     */
+    private String siteLoginPic;
+    /**
+     * pc端注册背景图片
+     */
+    private String siteRegisterPic;
+    /**
+     * 店铺端登录图片
+     */
+    private String storeLoginPic;
+    /**
+     * 店铺端注册图片
+     */
+    private String storeRegisterPic;
+    /**
+     * 后台版权信息（admin和store底部）
+     */
+    private String copyrightInfo;
+    /**
+     * 注册协议（pc端）
+     */
+    private String siteRegisterProtocol;
+
+
+
+    /** 用户隐私协议 */
+    private String userPrivacyAgreement;
+
+    /** vip会员服务协议 */
+    private String vipServiceAgreement;
+    /**
+     * 店铺端注册协议
+     */
+    private String storeRegisterProtocol;
+    /**
+     * 开店协议
+     */
+    private String storeOpenProtocol;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * admin端登录logo
+     */
+    private String adminLogo;
+    /**
+     * admin端首页logo
+     */
+    private String adminIndexLogo;
+    /**
+     * 是否开启验证码   0 开启 1 不开启 默认0
+     */
+    private String captchaOpen;
+    /**
+     * 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     */
+    private String storeSpuAudit;
+    /**
+     * 会员等级启用状态  0 启用 1 不启用 默认0
+     */
+    private String memberPriceStatus;
+    /**
+     * 众筹协议
+     */
+    private String crowdFundingProtocol;
+    /**
+     * h5域名
+     */
+    private String h5CallBackDomain;
+    /**
+     * 前端地址
+     */
+    private String pcCallBackDomain;
+
+    public BaseInfoSet() {
+    }
+
+    /**
+     * 判断会员价是否启用
+     *
+     * @return 启用返回true, 否则返回false
+     */
+    @JsonIgnore
+    public boolean isMemberPriceOpen() {
+        return "0".equals(this.memberPriceStatus);
+    }
+
+    /**
+     * 判断店铺商品是否需要审核
+     *
+     * @return 需要返回true  不需要返回false
+     */
+    @JsonIgnore
+    public boolean isSpuNeedAudit() {
+        return "0".equals(this.storeSpuAudit);
+    }
+
+    /**
+     * 处理图片地址
+     */
+    public void dealPicUrl() {
+        if (!StringUtils.isEmpty(labelLog) && labelLog.contains(":")) {
+            labelLog = labelLog.substring(labelLog.indexOf(":") + 1);
+        }
+    }
+
+    /**
+     * 返回网站地址，末端加 "/"
+     */
+    public String getSiteUrlWithBias() {
+        if (StringUtils.isEmpty(this.siteUrl)) {
+            return null;
+        }
+        return this.siteUrl.endsWith("/") ? this.siteUrl : this.siteUrl + "/";
+    }
+
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getSiteUrl() {
+        return siteUrl;
+    }
+
+    public void setSiteUrl(String siteUrl) {
+        this.siteUrl = siteUrl;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getLabelLog() {
+        return labelLog;
+    }
+
+    public void setLabelLog(String labelLog) {
+        this.labelLog = labelLog;
+    }
+
+    public String getSiteLoginPic() {
+        return siteLoginPic;
+    }
+
+    public void setSiteLoginPic(String siteLoginPic) {
+        this.siteLoginPic = siteLoginPic;
+    }
+
+    public String getSiteRegisterPic() {
+        return siteRegisterPic;
+    }
+
+    public void setSiteRegisterPic(String siteRegisterPic) {
+        this.siteRegisterPic = siteRegisterPic;
+    }
+
+    public String getStoreLoginPic() {
+        return storeLoginPic;
+    }
+
+    public void setStoreLoginPic(String storeLoginPic) {
+        this.storeLoginPic = storeLoginPic;
+    }
+
+    public String getStoreRegisterPic() {
+        return storeRegisterPic;
+    }
+
+    public void setStoreRegisterPic(String storeRegisterPic) {
+        this.storeRegisterPic = storeRegisterPic;
+    }
+
+    public String getCopyrightInfo() {
+        return copyrightInfo;
+    }
+
+    public void setCopyrightInfo(String copyrightInfo) {
+        this.copyrightInfo = copyrightInfo;
+    }
+
+    public String getSiteRegisterProtocol() {
+        return siteRegisterProtocol;
+    }
+
+    public void setSiteRegisterProtocol(String siteRegisterProtocol) {
+        this.siteRegisterProtocol = siteRegisterProtocol;
+    }
+
+    public String getStoreRegisterProtocol() {
+        return storeRegisterProtocol;
+    }
+
+    public void setStoreRegisterProtocol(String storeRegisterProtocol) {
+        this.storeRegisterProtocol = storeRegisterProtocol;
+    }
+
+    public String getStoreOpenProtocol() {
+        return storeOpenProtocol;
+    }
+
+    public void setStoreOpenProtocol(String storeOpenProtocol) {
+        this.storeOpenProtocol = storeOpenProtocol;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAdminLogo() {
+        return adminLogo;
+    }
+
+    public void setAdminLogo(String adminLogo) {
+        this.adminLogo = adminLogo;
+    }
+
+    public String getAdminIndexLogo() {
+        return adminIndexLogo;
+    }
+
+    public void setAdminIndexLogo(String adminIndexLogo) {
+        this.adminIndexLogo = adminIndexLogo;
+    }
+
+    public String getCaptchaOpen() {
+        return captchaOpen;
+    }
+
+    public void setCaptchaOpen(String captchaOpen) {
+        this.captchaOpen = captchaOpen;
+    }
+
+    public String getStoreSpuAudit() {
+        return storeSpuAudit;
+    }
+
+    public void setStoreSpuAudit(String storeSpuAudit) {
+        this.storeSpuAudit = storeSpuAudit;
+    }
+
+    public String getMemberPriceStatus() {
+        return memberPriceStatus;
+    }
+
+    public void setMemberPriceStatus(String memberPriceStatus) {
+        this.memberPriceStatus = memberPriceStatus;
+    }
+
+    public String getCrowdFundingProtocol() {
+        return crowdFundingProtocol;
+    }
+
+    public void setCrowdFundingProtocol(String crowdFundingProtocol) {
+        this.crowdFundingProtocol = crowdFundingProtocol;
+    }
+
+    public String getH5CallBackDomain() {
+        return h5CallBackDomain;
+    }
+
+    public void setH5CallBackDomain(String h5CallBackDomain) {
+        this.h5CallBackDomain = h5CallBackDomain;
+    }
+
+    public String getPcCallBackDomain() {
+        return pcCallBackDomain;
+    }
+
+    public void setPcCallBackDomain(String pcCallBackDomain) {
+        this.pcCallBackDomain = pcCallBackDomain;
+    }
+
+    public String getUserPrivacyAgreement() {
+        return userPrivacyAgreement;
+    }
+
+    public void setUserPrivacyAgreement(String userPrivacyAgreement) {
+        this.userPrivacyAgreement = userPrivacyAgreement;
+    }
+
+    public String getVipServiceAgreement() {
+        return vipServiceAgreement;
+    }
+
+    public void setVipServiceAgreement(String vipServiceAgreement) {
+        this.vipServiceAgreement = vipServiceAgreement;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkBaseInfoSet.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkBaseInfoSet.java
new file mode 100644
index 0000000..27b5ab3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkBaseInfoSet.java
@@ -0,0 +1,328 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * 基本信息设置实体类
+ *
+ * @author 魔金商城 on 2017/5/17.
+ */
+@Repository
+public class SegchkBaseInfoSet implements Serializable {
+
+    /**
+     * 序列化id
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    private long id;
+    /**
+     * 前端地址
+     */
+    private String siteUrl;
+    /**
+     * 网站名称
+     */
+    private String siteName;
+    /**
+     * 网站LOGO(前端搜索页旁边和店铺登陆页)
+     */
+    private String logo;
+    /**
+     * pc端，admin端，store端标签图片
+     */
+    private String labelLog;
+    /**
+     * pc端登录背景图片
+     */
+    private String siteLoginPic;
+    /**
+     * pc端注册背景图片
+     */
+    private String siteRegisterPic;
+    /**
+     * 店铺端登录图片
+     */
+    private String storeLoginPic;
+    /**
+     * 店铺端注册图片
+     */
+    private String storeRegisterPic;
+    /**
+     * 后台版权信息（admin和store底部）
+     */
+    private String copyrightInfo;
+    /**
+     * 注册协议（pc端）
+     */
+    private String siteRegisterProtocol;
+    /**
+     * 店铺端注册协议
+     */
+    private String storeRegisterProtocol;
+    /**
+     * 开店协议
+     */
+    private String storeOpenProtocol;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * admin端登录logo
+     */
+    private String adminLogo;
+    /**
+     * admin端首页logo
+     */
+    private String adminIndexLogo;
+    /**
+     * 是否开启验证码   0 开启 1 不开启 默认0
+     */
+    private String captchaOpen;
+    /**
+     * 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     */
+    private String storeSpuAudit;
+    /**
+     * 会员等级启用状态  0 启用 1 不启用 默认0
+     */
+    private String memberPriceStatus;
+    /**
+     * 众筹协议
+     */
+    private String crowdFundingProtocol;
+    /**
+     * h5域名
+     */
+    private String h5CallBackDomain;
+    /**
+     * 前端地址
+     */
+    private String pcCallBackDomain;
+
+    public SegchkBaseInfoSet() {
+    }
+
+    /**
+     * 判断会员价是否启用
+     *
+     * @return 启用返回true, 否则返回false
+     */
+    @JsonIgnore
+    public boolean isMemberPriceOpen() {
+        return "0".equals(this.memberPriceStatus);
+    }
+
+    /**
+     * 判断店铺商品是否需要审核
+     *
+     * @return 需要返回true  不需要返回false
+     */
+    @JsonIgnore
+    public boolean isSpuNeedAudit() {
+        return "0".equals(this.storeSpuAudit);
+    }
+
+    /**
+     * 处理图片地址
+     */
+    public void dealPicUrl() {
+        if (!StringUtils.isEmpty(labelLog) && labelLog.contains(":")) {
+            labelLog = labelLog.substring(labelLog.indexOf(":") + 1);
+        }
+    }
+
+    /**
+     * 返回网站地址，末端加 "/"
+     */
+    public String getSiteUrlWithBias() {
+        if (StringUtils.isEmpty(this.siteUrl)) {
+            return null;
+        }
+        return this.siteUrl.endsWith("/") ? this.siteUrl : this.siteUrl + "/";
+    }
+
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getSiteUrl() {
+        return siteUrl;
+    }
+
+    public void setSiteUrl(String siteUrl) {
+        this.siteUrl = siteUrl;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getLabelLog() {
+        return labelLog;
+    }
+
+    public void setLabelLog(String labelLog) {
+        this.labelLog = labelLog;
+    }
+
+    public String getSiteLoginPic() {
+        return siteLoginPic;
+    }
+
+    public void setSiteLoginPic(String siteLoginPic) {
+        this.siteLoginPic = siteLoginPic;
+    }
+
+    public String getSiteRegisterPic() {
+        return siteRegisterPic;
+    }
+
+    public void setSiteRegisterPic(String siteRegisterPic) {
+        this.siteRegisterPic = siteRegisterPic;
+    }
+
+    public String getStoreLoginPic() {
+        return storeLoginPic;
+    }
+
+    public void setStoreLoginPic(String storeLoginPic) {
+        this.storeLoginPic = storeLoginPic;
+    }
+
+    public String getStoreRegisterPic() {
+        return storeRegisterPic;
+    }
+
+    public void setStoreRegisterPic(String storeRegisterPic) {
+        this.storeRegisterPic = storeRegisterPic;
+    }
+
+    public String getCopyrightInfo() {
+        return copyrightInfo;
+    }
+
+    public void setCopyrightInfo(String copyrightInfo) {
+        this.copyrightInfo = copyrightInfo;
+    }
+
+    public String getSiteRegisterProtocol() {
+        return siteRegisterProtocol;
+    }
+
+    public void setSiteRegisterProtocol(String siteRegisterProtocol) {
+        this.siteRegisterProtocol = siteRegisterProtocol;
+    }
+
+    public String getStoreRegisterProtocol() {
+        return storeRegisterProtocol;
+    }
+
+    public void setStoreRegisterProtocol(String storeRegisterProtocol) {
+        this.storeRegisterProtocol = storeRegisterProtocol;
+    }
+
+    public String getStoreOpenProtocol() {
+        return storeOpenProtocol;
+    }
+
+    public void setStoreOpenProtocol(String storeOpenProtocol) {
+        this.storeOpenProtocol = storeOpenProtocol;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAdminLogo() {
+        return adminLogo;
+    }
+
+    public void setAdminLogo(String adminLogo) {
+        this.adminLogo = adminLogo;
+    }
+
+    public String getAdminIndexLogo() {
+        return adminIndexLogo;
+    }
+
+    public void setAdminIndexLogo(String adminIndexLogo) {
+        this.adminIndexLogo = adminIndexLogo;
+    }
+
+    public String getCaptchaOpen() {
+        return captchaOpen;
+    }
+
+    public void setCaptchaOpen(String captchaOpen) {
+        this.captchaOpen = captchaOpen;
+    }
+
+    public String getStoreSpuAudit() {
+        return storeSpuAudit;
+    }
+
+    public void setStoreSpuAudit(String storeSpuAudit) {
+        this.storeSpuAudit = storeSpuAudit;
+    }
+
+    public String getMemberPriceStatus() {
+        return memberPriceStatus;
+    }
+
+    public void setMemberPriceStatus(String memberPriceStatus) {
+        this.memberPriceStatus = memberPriceStatus;
+    }
+
+    public String getCrowdFundingProtocol() {
+        return crowdFundingProtocol;
+    }
+
+    public void setCrowdFundingProtocol(String crowdFundingProtocol) {
+        this.crowdFundingProtocol = crowdFundingProtocol;
+    }
+
+    public String getH5CallBackDomain() {
+        return h5CallBackDomain;
+    }
+
+    public void setH5CallBackDomain(String h5CallBackDomain) {
+        this.h5CallBackDomain = h5CallBackDomain;
+    }
+
+    public String getPcCallBackDomain() {
+        return pcCallBackDomain;
+    }
+
+    public void setPcCallBackDomain(String pcCallBackDomain) {
+        this.pcCallBackDomain = pcCallBackDomain;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCarouseMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCarouseMgt.java
new file mode 100644
index 0000000..144704e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCarouseMgt.java
@@ -0,0 +1,125 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg首页轮播图管理对象 segchk_carouse_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkCarouseMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 轮播图id */
+    @Excel(name = "轮播图id")
+    private Long carouseId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家轮播图1路径，默认用于首页推荐轮播图 */
+    @Excel(name = "商家轮播图1路径，默认用于首页推荐轮播图")
+    private String storeCarousel;
+
+    /** 管理状态，0有效，-1失效 */
+    @Excel(name = "管理状态，0有效，-1失效")
+    private Integer mgtState;
+
+    /** 排序id */
+    @Excel(name = "排序id")
+    private Integer sortId;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setCarouseId(Long carouseId) 
+    {
+        this.carouseId = carouseId;
+    }
+
+    public Long getCarouseId() 
+    {
+        return carouseId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setStoreCarousel(String storeCarousel) 
+    {
+        this.storeCarousel = storeCarousel;
+    }
+
+    public String getStoreCarousel() 
+    {
+        return storeCarousel;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+    public void setSortId(Integer sortId) 
+    {
+        this.sortId = sortId;
+    }
+
+    public Integer getSortId() 
+    {
+        return sortId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("carouseId", getCarouseId())
+            .append("providerId", getProviderId())
+            .append("storeId", getStoreId())
+            .append("storeCarousel", getStoreCarousel())
+            .append("mgtState", getMgtState())
+            .append("sortId", getSortId())
+            .append("modTime", getModTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeCard.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeCard.java
new file mode 100644
index 0000000..72b2c3c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeCard.java
@@ -0,0 +1,123 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg充值卡管理对象 segchk_charge_card
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkChargeCard extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long cardTypeId;
+
+    /** 卡类型名称(9.9,99,199,299) */
+    @Excel(name = "卡类型名称(9.9,99,199,299)")
+    private String cardTypeName;
+
+    /** 卡面额 */
+    @Excel(name = "卡面额")
+    private BigDecimal cardTypeValue;
+
+    /** 有效期时长 */
+    @Excel(name = "有效期时长")
+    private Integer effectiveTime;
+
+    /** 可购买次数 */
+    @Excel(name = "可购买次数")
+    private Integer buyCount;
+
+    /** 卡类型总核消次数 */
+    @Excel(name = "卡类型总核消次数")
+    private Integer cardTypeChkcount;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setCardTypeName(String cardTypeName) 
+    {
+        this.cardTypeName = cardTypeName;
+    }
+
+    public String getCardTypeName() 
+    {
+        return cardTypeName;
+    }
+    public void setCardTypeValue(BigDecimal cardTypeValue) 
+    {
+        this.cardTypeValue = cardTypeValue;
+    }
+
+    public BigDecimal getCardTypeValue() 
+    {
+        return cardTypeValue;
+    }
+    public void setEffectiveTime(Integer effectiveTime) 
+    {
+        this.effectiveTime = effectiveTime;
+    }
+
+    public Integer getEffectiveTime() 
+    {
+        return effectiveTime;
+    }
+    public void setBuyCount(Integer buyCount) 
+    {
+        this.buyCount = buyCount;
+    }
+
+    public Integer getBuyCount() 
+    {
+        return buyCount;
+    }
+    public void setCardTypeChkcount(Integer cardTypeChkcount) 
+    {
+        this.cardTypeChkcount = cardTypeChkcount;
+    }
+
+    public Integer getCardTypeChkcount() 
+    {
+        return cardTypeChkcount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("cardTypeId", getCardTypeId())
+            .append("cardTypeName", getCardTypeName())
+            .append("cardTypeValue", getCardTypeValue())
+            .append("effectiveTime", getEffectiveTime())
+            .append("buyCount", getBuyCount())
+            .append("cardTypeChkcount", getCardTypeChkcount())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java
new file mode 100644
index 0000000..0b221a0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkChargeRet.java
@@ -0,0 +1,47 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg充值卡管理对象 segchk_charge_card
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkChargeRet extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 充值id */
+    @Excel(name = "充值id")
+    private Long chargeId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkChargeRet{" +
+                "chargeId=" + chargeId +
+                ", cardId=" + cardId +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCommentAcc.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCommentAcc.java
new file mode 100644
index 0000000..b3ef66c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkCommentAcc.java
@@ -0,0 +1,124 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家累积评价对象 segchk_comment_acc
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkCommentAcc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 更新id，全表唯一 */
+    @Excel(name = "更新id，全表唯一")
+    private Long updateId;
+
+    /** 评价次数 */
+    @Excel(name = "评价次数")
+    private Long starCount;
+
+    /** 评价总分 */
+    @Excel(name = "评价总分")
+    private Long starLevel;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 评价id */
+    @Excel(name = "评价id")
+    private Long commentId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setUpdateId(Long updateId) 
+    {
+        this.updateId = updateId;
+    }
+
+    public Long getUpdateId() 
+    {
+        return updateId;
+    }
+    public void setStarCount(Long starCount) 
+    {
+        this.starCount = starCount;
+    }
+
+    public Long getStarCount() 
+    {
+        return starCount;
+    }
+    public void setStarLevel(Long starLevel) 
+    {
+        this.starLevel = starLevel;
+    }
+
+    public Long getStarLevel() 
+    {
+        return starLevel;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    public Long getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Long commentId) {
+        this.commentId = commentId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkCommentAcc{" +
+                "updateId=" + updateId +
+                ", starCount=" + starCount +
+                ", starLevel=" + starLevel +
+                ", storeId=" + storeId +
+                ", providerId=" + providerId +
+                ", commentId=" + commentId +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkDistrictInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkDistrictInfo.java
new file mode 100644
index 0000000..214341a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkDistrictInfo.java
@@ -0,0 +1,80 @@
+package com.ruoyi.segchk.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg行政区域代码对象 segchk_district_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkDistrictInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 行政区代码 */
+    @Excel(name = "行政区代码")
+    private Integer districtId;
+
+    /** 行政区名称 */
+    @Excel(name = "行政区名称")
+    private String districtName;
+
+    /** 归属行政区代码 */
+    @Excel(name = "归属行政区代码")
+    private Integer districtParent;
+
+    /** 行政区等级,0省直辖市，1地市，2县区 */
+    @Excel(name = "行政区等级,0省直辖市，1地市，2县区")
+    private Integer districtLevel;
+
+    public void setDistrictId(Integer districtId) 
+    {
+        this.districtId = districtId;
+    }
+
+    public Integer getDistrictId() 
+    {
+        return districtId;
+    }
+    public void setDistrictName(String districtName) 
+    {
+        this.districtName = districtName;
+    }
+
+    public String getDistrictName() 
+    {
+        return districtName;
+    }
+    public void setDistrictParent(Integer districtParent) 
+    {
+        this.districtParent = districtParent;
+    }
+
+    public Integer getDistrictParent() 
+    {
+        return districtParent;
+    }
+    public void setDistrictLevel(Integer districtLevel) 
+    {
+        this.districtLevel = districtLevel;
+    }
+
+    public Integer getDistrictLevel() 
+    {
+        return districtLevel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("districtId", getDistrictId())
+            .append("districtName", getDistrictName())
+            .append("districtParent", getDistrictParent())
+            .append("districtLevel", getDistrictLevel())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkKeywordLable.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkKeywordLable.java
new file mode 100644
index 0000000..c0417bb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkKeywordLable.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg关键字管理对象 segchk_keyword_lable
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkKeywordLable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 关键字id */
+    @Excel(name = "关键字id")
+    private Long keywordId;
+
+    /** 卡类型名称(如：餐饮，美容美发，洗车等) */
+    @Excel(name = "卡类型名称(如：餐饮，美容美发，洗车等)")
+    private String keywordName;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 关键字图片地址 */
+    @Excel(name = "关键字图片地址")
+    private String keywordUrl;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setKeywordId(Long keywordId) 
+    {
+        this.keywordId = keywordId;
+    }
+
+    public Long getKeywordId() 
+    {
+        return keywordId;
+    }
+    public void setKeywordName(String keywordName) 
+    {
+        this.keywordName = keywordName;
+    }
+
+    public String getKeywordName() 
+    {
+        return keywordName;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setKeywordUrl(String keywordUrl) 
+    {
+        this.keywordUrl = keywordUrl;
+    }
+
+    public String getKeywordUrl() 
+    {
+        return keywordUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("keywordId", getKeywordId())
+            .append("keywordName", getKeywordName())
+            .append("modTime", getModTime())
+            .append("keywordUrl", getKeywordUrl())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLableMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLableMgt.java
new file mode 100644
index 0000000..1f36860
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLableMgt.java
@@ -0,0 +1,148 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg首页标签管理对象 segchk_lable_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkLableMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 管理id，全局唯一 */
+    private Long mgtId;
+
+    /** 运营商id，全局唯一 */
+    private Long providerId;
+
+    /** 卡类型id */
+    private Long cardTypeId;
+
+    /** 卡类型名称(9.9,99,199,299) */
+    @Excel(name = "卡类型名称(9.9,99,199,299)")
+    private String cardTypeName;
+
+    /** 管理状态，0有效，-1失效 */
+    @Excel(name = "管理状态，0有效，-1失效")
+    private Integer mgtState;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 展示序号（首页根据此id进行顺序展示） */
+    @Excel(name = "展示序号", readConverterExp = "首=页根据此id进行顺序展示")
+    private Integer sortId;
+
+    /** 标签标识 0来自类型卡，1来自商家关键字 */
+    private Integer lableFlag;
+
+    /** 标签图标路径 */
+    @Excel(name = "标签图标路径")
+    private String iconUrl;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setCardTypeName(String cardTypeName) 
+    {
+        this.cardTypeName = cardTypeName;
+    }
+
+    public String getCardTypeName() 
+    {
+        return cardTypeName;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setSortId(Integer sortId) 
+    {
+        this.sortId = sortId;
+    }
+
+    public Integer getSortId() 
+    {
+        return sortId;
+    }
+    public void setLableFlag(Integer lableFlag) 
+    {
+        this.lableFlag = lableFlag;
+    }
+
+    public Integer getLableFlag() 
+    {
+        return lableFlag;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("mgtId", getMgtId())
+            .append("providerId", getProviderId())
+            .append("cardTypeId", getCardTypeId())
+            .append("cardTypeName", getCardTypeName())
+            .append("mgtState", getMgtState())
+            .append("modTime", getModTime())
+            .append("sortId", getSortId())
+            .append("lableFlag", getLableFlag())
+            .append("iconUrl", getIconUrl())
+            .toString();
+    }
+
+    public Long getMgtId() {
+        return mgtId;
+    }
+
+    public void setMgtId(Long mgtId) {
+        this.mgtId = mgtId;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLogionDetail.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLogionDetail.java
new file mode 100644
index 0000000..dc9aa69
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkLogionDetail.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg登录记录对象 segchk_logion_detail
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkLogionDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 登录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登录时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date logionTime;
+
+    /** 用户等级，0运营商，1商家，2vip会员，3普通会员 */
+    @Excel(name = "用户等级，0运营商，1商家，2vip会员，3普通会员")
+    private String userLevel;
+
+    /** 登录id */
+    @Excel(name = "登录id")
+    private Long loginId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setLogionTime(Date logionTime) 
+    {
+        this.logionTime = logionTime;
+    }
+
+    public Date getLogionTime() 
+    {
+        return logionTime;
+    }
+    public void setUserLevel(String userLevel) 
+    {
+        this.userLevel = userLevel;
+    }
+
+    public String getUserLevel() 
+    {
+        return userLevel;
+    }
+    public void setLoginId(Long loginId) 
+    {
+        this.loginId = loginId;
+    }
+
+    public Long getLoginId() 
+    {
+        return loginId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("logionTime", getLogionTime())
+            .append("userLevel", getUserLevel())
+            .append("loginId", getLoginId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgDetail.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgDetail.java
new file mode 100644
index 0000000..f81c77f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgDetail.java
@@ -0,0 +1,181 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg消息记录对象 segchk_msg_detail
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkMsgDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 源id */
+    @Excel(name = "源id")
+    private Long fromId;
+
+    /** 目标id */
+    @Excel(name = "目标id")
+    private Long toId;
+
+    /** 消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息 */
+    @Excel(name = "消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息")
+    private String msgType;
+
+    /** 消息内容 */
+    @Excel(name = "消息内容")
+    private String msgContent;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String msgTitle;
+
+    /** 发送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fromTime;
+
+    /** 接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date getTime;
+
+    /** 消息id */
+    private Long msgId;
+
+    /** 消息状态，0未发送，1，未读，2已读，3删除 */
+    @Excel(name = "消息状态，0未发送，1，未读，2已读，3删除")
+    private String msgFlag;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 接收人等级，0运营商，1商家，2会员 */
+    @Excel(name = "接收人等级，0运营商，1商家，2会员")
+    private String recvLevel;
+
+    public void setFromId(Long fromId) 
+    {
+        this.fromId = fromId;
+    }
+
+    public Long getFromId() 
+    {
+        return fromId;
+    }
+    public void setToId(Long toId) 
+    {
+        this.toId = toId;
+    }
+
+    public Long getToId() 
+    {
+        return toId;
+    }
+    public void setMsgType(String msgType) 
+    {
+        this.msgType = msgType;
+    }
+
+    public String getMsgType() 
+    {
+        return msgType;
+    }
+    public void setMsgContent(String msgContent) 
+    {
+        this.msgContent = msgContent;
+    }
+
+    public String getMsgContent() 
+    {
+        return msgContent;
+    }
+    public void setMsgTitle(String msgTitle) 
+    {
+        this.msgTitle = msgTitle;
+    }
+
+    public String getMsgTitle() 
+    {
+        return msgTitle;
+    }
+    public void setFromTime(Date fromTime) 
+    {
+        this.fromTime = fromTime;
+    }
+
+    public Date getFromTime() 
+    {
+        return fromTime;
+    }
+    public void setGetTime(Date getTime) 
+    {
+        this.getTime = getTime;
+    }
+
+    public Date getGetTime() 
+    {
+        return getTime;
+    }
+    public void setMsgId(Long msgId) 
+    {
+        this.msgId = msgId;
+    }
+
+    public Long getMsgId() 
+    {
+        return msgId;
+    }
+    public void setMsgFlag(String msgFlag) 
+    {
+        this.msgFlag = msgFlag;
+    }
+
+    public String getMsgFlag() 
+    {
+        return msgFlag;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setRecvLevel(String recvLevel) 
+    {
+        this.recvLevel = recvLevel;
+    }
+
+    public String getRecvLevel() 
+    {
+        return recvLevel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fromId", getFromId())
+            .append("toId", getToId())
+            .append("msgType", getMsgType())
+            .append("msgContent", getMsgContent())
+            .append("msgTitle", getMsgTitle())
+            .append("fromTime", getFromTime())
+            .append("getTime", getGetTime())
+            .append("msgId", getMsgId())
+            .append("msgFlag", getMsgFlag())
+            .append("providerId", getProviderId())
+            .append("recvLevel", getRecvLevel())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java
new file mode 100644
index 0000000..d477638
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkMsgWebResp.java
@@ -0,0 +1,91 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkMsgWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息 */
+    @Excel(name = "消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息")
+    private String msgType;
+
+    /** 消息内容 */
+    @Excel(name = "消息内容")
+    private String msgContent;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String msgTitle;
+
+
+    /** 消息状态，0未发送，1，未读，2已读，3删除 */
+    @Excel(name = "消息状态，0未发送，1，未读，2已读，3删除")
+    private String msgFlag;
+
+    /** 接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date fromTime;
+
+    public String getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(String msgType) {
+        this.msgType = msgType;
+    }
+
+    public String getMsgContent() {
+        return msgContent;
+    }
+
+    public void setMsgContent(String msgContent) {
+        this.msgContent = msgContent;
+    }
+
+    public String getMsgTitle() {
+        return msgTitle;
+    }
+
+    public void setMsgTitle(String msgTitle) {
+        this.msgTitle = msgTitle;
+    }
+
+    public String getMsgFlag() {
+        return msgFlag;
+    }
+
+    public void setMsgFlag(String msgFlag) {
+        this.msgFlag = msgFlag;
+    }
+
+    public Date getFromTime() {
+        return fromTime;
+    }
+
+    public void setFromTime(Date fromTime) {
+        this.fromTime = fromTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkMsgWebResp{" +
+                "msgType='" + msgType + '\'' +
+                ", msgContent='" + msgContent + '\'' +
+                ", msgTitle='" + msgTitle + '\'' +
+                ", msgFlag='" + msgFlag + '\'' +
+                ", fromTime=" + fromTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkPreferenceLable.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkPreferenceLable.java
new file mode 100644
index 0000000..93ba27a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkPreferenceLable.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg优惠管理对象 segchk_preference_lable
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkPreferenceLable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 优惠id */
+    @Excel(name = "优惠id")
+    private Long preferenceId;
+
+    /** 优惠名称(团购，打折等) */
+    @Excel(name = "优惠名称(团购，打折等)")
+    private String preferenceName;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 优惠图片地址 */
+    @Excel(name = "优惠图片地址")
+    private String preferenceUrl;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setPreferenceId(Long preferenceId) 
+    {
+        this.preferenceId = preferenceId;
+    }
+
+    public Long getPreferenceId() 
+    {
+        return preferenceId;
+    }
+    public void setPreferenceName(String preferenceName) 
+    {
+        this.preferenceName = preferenceName;
+    }
+
+    public String getPreferenceName() 
+    {
+        return preferenceName;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setPreferenceUrl(String preferenceUrl) 
+    {
+        this.preferenceUrl = preferenceUrl;
+    }
+
+    public String getPreferenceUrl() 
+    {
+        return preferenceUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("preferenceId", getPreferenceId())
+            .append("preferenceName", getPreferenceName())
+            .append("modTime", getModTime())
+            .append("preferenceUrl", getPreferenceUrl())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkProviderMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkProviderMgt.java
new file mode 100644
index 0000000..29efd6a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkProviderMgt.java
@@ -0,0 +1,181 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg运营商管理对象 segchk_provider_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkProviderMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 小程序的openid */
+    @Excel(name = "小程序的openid")
+    private String openid;
+
+    /** 微信的联合登录id */
+    @Excel(name = "微信的联合登录id")
+    private String unionId;
+
+    /** 微信号 */
+    @Excel(name = "微信号")
+    private String wechatId;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    private String nickName;
+
+    /** 头像地址 */
+    @Excel(name = "头像地址")
+    private String iconUrl;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phoneNo;
+
+    /** 状态，0正常，1失效，2删除 */
+    @Excel(name = "状态，0正常，1失效，2删除")
+    private Integer flagId;
+
+    /** 区县行政代码 */
+    @Excel(name = "区县行政代码")
+    private Integer districtId;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delTime;
+
+    /** seg首页标签管理信息 */
+    private List<SegchkLableMgt> segchkLableMgtList;
+
+    public void setOpenid(String openid) 
+    {
+        this.openid = openid;
+    }
+
+    public String getOpenid() 
+    {
+        return openid;
+    }
+    public void setUnionId(String unionId) 
+    {
+        this.unionId = unionId;
+    }
+
+    public String getUnionId() 
+    {
+        return unionId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setPhoneNo(String phoneNo) 
+    {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getPhoneNo() 
+    {
+        return phoneNo;
+    }
+    public void setFlagId(Integer flagId) 
+    {
+        this.flagId = flagId;
+    }
+
+    public Integer getFlagId() 
+    {
+        return flagId;
+    }
+    public void setDistrictId(Integer districtId) 
+    {
+        this.districtId = districtId;
+    }
+
+    public Integer getDistrictId() 
+    {
+        return districtId;
+    }
+    public void setDelTime(Date delTime) 
+    {
+        this.delTime = delTime;
+    }
+
+    public Date getDelTime() 
+    {
+        return delTime;
+    }
+
+    public List<SegchkLableMgt> getSegchkLableMgtList()
+    {
+        return segchkLableMgtList;
+    }
+
+    public void setSegchkLableMgtList(List<SegchkLableMgt> segchkLableMgtList)
+    {
+        this.segchkLableMgtList = segchkLableMgtList;
+    }
+
+    public String getWechatId() {
+        return wechatId;
+    }
+
+    public void setWechatId(String wechatId) {
+        this.wechatId = wechatId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkProviderMgt{" +
+                "openid='" + openid + '\'' +
+                ", unionId='" + unionId + '\'' +
+                ", wechatId='" + wechatId + '\'' +
+                ", providerId=" + providerId +
+                ", nickName='" + nickName + '\'' +
+                ", iconUrl='" + iconUrl + '\'' +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", flagId=" + flagId +
+                ", districtId=" + districtId +
+                ", delTime=" + delTime +
+                ", segchkLableMgtList=" + segchkLableMgtList +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStore.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStore.java
new file mode 100644
index 0000000..e8f5f29
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStore.java
@@ -0,0 +1,111 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg首页推荐商户对象 segchk_recommender_store
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkRecommenderStore extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 管理状态，0有效，-1失效 */
+    @Excel(name = "管理状态，0有效，-1失效")
+    private Integer mgtState;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 展示序号（首页根据此id进行顺序展示） */
+    @Excel(name = "展示序号", readConverterExp = "首=页根据此id进行顺序展示")
+    private Integer sortId;
+
+    /** id，全表唯一 */
+    @Excel(name = "id，全表唯一")
+    private Long recommenderId;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setSortId(Integer sortId) 
+    {
+        this.sortId = sortId;
+    }
+
+    public Integer getSortId() 
+    {
+        return sortId;
+    }
+    public void setRecommenderId(Long recommenderId) 
+    {
+        this.recommenderId = recommenderId;
+    }
+
+    public Long getRecommenderId() 
+    {
+        return recommenderId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("storeId", getStoreId())
+            .append("mgtState", getMgtState())
+            .append("modTime", getModTime())
+            .append("sortId", getSortId())
+            .append("recommenderId", getRecommenderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreLableWeb.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreLableWeb.java
new file mode 100644
index 0000000..fc462d6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreLableWeb.java
@@ -0,0 +1,87 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkRecommenderStoreLableWeb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 商户标签id */
+    @Excel(name = "商户标签id")
+    private Integer lableId;
+
+    /** 商户标签显示顺序id */
+    @Excel(name = "商户标签显示顺序id")
+    private Integer lableSortId;
+
+    /** 商户标签类型id */
+    @Excel(name = "商户标签类型id")
+    private Integer lableTypeId;
+
+    /** 商户标签名称 */
+    @Excel(name = "商户标签名称")
+    private String lableName;
+
+    /** 标签图片 */
+    @Excel(name = "标签图片")
+    private String lablePic;
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public Integer getLableSortId() {
+        return lableSortId;
+    }
+
+    public void setLableSortId(Integer lableSortId) {
+        this.lableSortId = lableSortId;
+    }
+
+    public Integer getLableTypeId() {
+        return lableTypeId;
+    }
+
+    public void setLableTypeId(Integer lableTypeId) {
+        this.lableTypeId = lableTypeId;
+    }
+
+    public String getLableName() {
+        return lableName;
+    }
+
+    public void setLableName(String lableName) {
+        this.lableName = lableName;
+    }
+
+    public String getLablePic() {
+        return lablePic;
+    }
+
+    public void setLablePic(String lablePic) {
+        this.lablePic = lablePic;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkRecommenderStoreLableWeb{" +
+                "lableId=" + lableId +
+                ", lableSortId=" + lableSortId +
+                ", lableTypeId=" + lableTypeId +
+                ", lableName='" + lableName + '\'' +
+                ", lablePic='" + lablePic + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebReq.java
new file mode 100644
index 0000000..65291be
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebReq.java
@@ -0,0 +1,89 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkRecommenderStoreWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 排序类型 */
+    @Excel(name = "排序类型")
+    private Integer sortType;
+
+
+    /** 用户经度 */
+    @Excel(name = "用户经度")
+    private BigDecimal userLon;
+
+    /** 用户纬度 */
+    @Excel(name = "用户纬度")
+    private BigDecimal userLat;
+
+    /** 用户距离限制 */
+    @Excel(name = "用户距离限制")
+    private BigDecimal userDist;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Integer getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(Integer sortType) {
+        this.sortType = sortType;
+    }
+
+    public BigDecimal getUserLon() {
+        return userLon;
+    }
+
+    public void setUserLon(BigDecimal userLon) {
+        this.userLon = userLon;
+    }
+
+    public BigDecimal getUserLat() {
+        return userLat;
+    }
+
+    public void setUserLat(BigDecimal userLat) {
+        this.userLat = userLat;
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkRecommenderStoreWebReq{" +
+                "providerId=" + providerId +
+                ", sortType=" + sortType +
+                ", userLon=" + userLon +
+                ", userLat=" + userLat +
+                ", userDist=" + userDist +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java
new file mode 100644
index 0000000..85d54ab
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkRecommenderStoreWebResp.java
@@ -0,0 +1,182 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkRecommenderStoreWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商户显示序号 */
+    @Excel(name = "商户显示序号")
+    private Integer storeSort;
+
+    /** 商户列表模式时的图标 */
+    @Excel(name = "商户列表模式时的图标")
+    private String storeIcon;
+
+    /** 商户的大图标 */
+    @Excel(name = "商户的大图标")
+    private String storeGificon;
+
+    /** 商户经度 */
+    @Excel(name = "商户经度")
+    private BigDecimal storeLon;
+
+    /** 商户纬度 */
+    @Excel(name = "商户纬度")
+    private BigDecimal storeLat;
+
+    /** 商户累积核消次数 */
+    @Excel(name = "商户累积核消次数")
+    private Integer chkCount;
+
+    /** 商户平均星评 */
+    @Excel(name = "商户平均星评")
+    private BigDecimal starAvg;
+
+    /** 用户距离 */
+    @Excel(name = "用户距离")
+    private BigDecimal userDist;
+
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> lables;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreSort() {
+        return storeSort;
+    }
+
+    public void setStoreSort(Integer storeSort) {
+        this.storeSort = storeSort;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public String getStoreGificon() {
+        return storeGificon;
+    }
+
+    public void setStoreGificon(String storeGificon) {
+        this.storeGificon = storeGificon;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Integer getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Integer chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getLables() {
+        return lables;
+    }
+
+    public void setLables(List<SegchkRecommenderStoreLableWeb> lables) {
+        this.lables = lables;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkRecommenderStoreWebResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName=" + storeName +
+                ", storeSort=" + storeSort +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", storeGificon='" + storeGificon + '\'' +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", lables=" + lables +
+                ", userDist=" + userDist +
+                '}';
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSalerInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSalerInfo.java
new file mode 100644
index 0000000..a82dacb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSalerInfo.java
@@ -0,0 +1,125 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg销售人员信息对象 segchk_saler_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkSalerInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 销售人员id */
+    @Excel(name = "销售人员id")
+    private Integer salerId;
+
+    /** 销售人员姓名 */
+    @Excel(name = "销售人员姓名")
+    private String salerName;
+
+    /** 销售人员电话 */
+    @Excel(name = "销售人员电话")
+    private String salerPhone;
+
+    /** 销售人员身份证号 */
+    @Excel(name = "销售人员身份证号")
+    private String salerCard;
+
+    /** 销售人员状态，0工作，1非工作状态，2删除 */
+    @Excel(name = "销售人员状态，0工作，1非工作状态，2删除")
+    private Integer salerState;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setSalerId(Integer salerId) 
+    {
+        this.salerId = salerId;
+    }
+
+    public Integer getSalerId() 
+    {
+        return salerId;
+    }
+    public void setSalerName(String salerName) 
+    {
+        this.salerName = salerName;
+    }
+
+    public String getSalerName() 
+    {
+        return salerName;
+    }
+    public void setSalerPhone(String salerPhone) 
+    {
+        this.salerPhone = salerPhone;
+    }
+
+    public String getSalerPhone() 
+    {
+        return salerPhone;
+    }
+    public void setSalerCard(String salerCard) 
+    {
+        this.salerCard = salerCard;
+    }
+
+    public String getSalerCard() 
+    {
+        return salerCard;
+    }
+    public void setSalerState(Integer salerState) 
+    {
+        this.salerState = salerState;
+    }
+
+    public Integer getSalerState() 
+    {
+        return salerState;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .append("salerId", getSalerId())
+            .append("salerName", getSalerName())
+            .append("salerPhone", getSalerPhone())
+            .append("salerCard", getSalerCard())
+            .append("salerState", getSalerState())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSelfServiceChk.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSelfServiceChk.java
new file mode 100644
index 0000000..81265c1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSelfServiceChk.java
@@ -0,0 +1,111 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg自定义卡核消记录对象 segchk_self_service_chk
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkSelfServiceChk extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 会员卡号id，全局惟一 */
+    @Excel(name = "会员卡号id，全局惟一")
+    private Long cardId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 核消id，全表唯一 */
+    @Excel(name = "核消id，全表唯一")
+    private Long chkServiceId;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setChkServiceId(Long chkServiceId) 
+    {
+        this.chkServiceId = chkServiceId;
+    }
+
+    public Long getChkServiceId() 
+    {
+        return chkServiceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("cardId", getCardId())
+            .append("storeId", getStoreId())
+            .append("userId", getUserId())
+            .append("modTime", getModTime())
+            .append("chkServiceId", getChkServiceId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java
new file mode 100644
index 0000000..4cfe77a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleDetailWebResp.java
@@ -0,0 +1,90 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleDetailWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 会员卡号 */
+    @Excel(name = "会员卡号")
+    private Long cardId;
+
+    /** 卡类型名称 */
+    @Excel(name = "卡类型名称")
+    private String cardName;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 统计结果 */
+    @Excel(name = "统计结果")
+    private Long staticCount;
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Long getStaticCount() {
+        return staticCount;
+    }
+
+    public void setStaticCount(Long staticCount) {
+        this.staticCount = staticCount;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleDetailWebResp{" +
+                "modTime=" + modTime +
+                ", cardId=" + cardId +
+                ", cardName='" + cardName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", staticCount=" + staticCount +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java
new file mode 100644
index 0000000..a1ebce6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebReq.java
@@ -0,0 +1,98 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 统计等级，0按月统计，1按月查询统计 */
+    @Excel(name = "统计等级")
+    private Integer staticLevel;
+
+    /** 统计月份，只在staticLevel为1时有效,0时为统计的月数 */
+    @Excel(name = "统计月份")
+    private String staticMonth;
+
+    /** 用户身份，0运营商，1商家 */
+    @Excel(name = "用户身份")
+    private Integer userLevel;
+
+    /** 数据源选择，0核消，1售卡 */
+    @Excel(name = "数据源选择")
+    private Integer srcFlag;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStaticLevel() {
+        return staticLevel;
+    }
+
+    public void setStaticLevel(Integer staticLevel) {
+        this.staticLevel = staticLevel;
+    }
+
+    public String getStaticMonth() {
+        return staticMonth;
+    }
+
+    public void setStaticMonth(String staticMonth) {
+        this.staticMonth = staticMonth;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleWebReq{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", staticLevel='" + staticLevel + '\'' +
+                ", staticMonth='" + staticMonth + '\'' +
+                ", userLevel=" + userLevel +
+                '}';
+    }
+
+    public Integer getSrcFlag() {
+        return srcFlag;
+    }
+
+    public void setSrcFlag(Integer srcFlag) {
+        this.srcFlag = srcFlag;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java
new file mode 100644
index 0000000..245db7b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceAndSaleWebResp.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceAndSaleWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 统计月份，只在staticLevel为1时有效 */
+    @Excel(name = "统计月份")
+    private String staticMonth;
+
+    /** staticMonth与staticMonth同义，只是为yyyy-mm-01使用查询具备详单时使用 */
+    @Excel(name = "统计月份")
+    private String queryMon;
+
+    /** 统计结果 */
+    @Excel(name = "统计结果")
+    private Long staticCount;
+
+    public String getStaticMonth() {
+        return staticMonth;
+    }
+
+    public void setStaticMonth(String staticMonth) {
+        this.staticMonth = staticMonth;
+    }
+
+    public Long getStaticCount() {
+        return staticCount;
+    }
+
+    public void setStaticCount(Long staticCount) {
+        this.staticCount = staticCount;
+    }
+
+    public String getQueryMon() {
+        return queryMon;
+    }
+
+    public void setQueryMon(String queryMon) {
+        this.queryMon = queryMon;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceAndSaleWebResp{" +
+                "staticMonth='" + staticMonth + '\'' +
+                ", queryMon='" + queryMon + '\'' +
+                ", staticCount=" + staticCount +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceChk.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceChk.java
new file mode 100644
index 0000000..0922d80
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceChk.java
@@ -0,0 +1,139 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg核消记录对象 segchk_service_chk
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkServiceChk extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 会员卡号id，全局惟一 */
+    @Excel(name = "会员卡号id，全局惟一")
+    private Long cardId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 会员卡类型，0--9块9，1---99 */
+    @Excel(name = "会员卡类型，0--9块9，1---99")
+    private Long cardTypeId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 核消id，全表唯一 */
+    @Excel(name = "核消id，全表唯一")
+    private Long chkServiceId;
+
+    /** 评价id */
+    @Excel(name = "评价id")
+    private Long commentId;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setChkServiceId(Long chkServiceId) 
+    {
+        this.chkServiceId = chkServiceId;
+    }
+
+    public Long getChkServiceId() 
+    {
+        return chkServiceId;
+    }
+    public void setCommentId(Long commentId) 
+    {
+        this.commentId = commentId;
+    }
+
+    public Long getCommentId() 
+    {
+        return commentId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("cardId", getCardId())
+            .append("storeId", getStoreId())
+            .append("cardTypeId", getCardTypeId())
+            .append("userId", getUserId())
+            .append("modTime", getModTime())
+            .append("chkServiceId", getChkServiceId())
+            .append("commentId", getCommentId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceComment.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceComment.java
new file mode 100644
index 0000000..f3f38b0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceComment.java
@@ -0,0 +1,111 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg评价记录对象 segchk_service_comment
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkServiceComment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 评价id */
+    @Excel(name = "评价id")
+    private Long commentId;
+
+    /** 星级评价 */
+    @Excel(name = "星级评价")
+    private Integer starLevel;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String contentText;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    public void setCommentId(Long commentId) 
+    {
+        this.commentId = commentId;
+    }
+
+    public Long getCommentId() 
+    {
+        return commentId;
+    }
+    public void setStarLevel(Integer starLevel) 
+    {
+        this.starLevel = starLevel;
+    }
+
+    public Integer getStarLevel() 
+    {
+        return starLevel;
+    }
+    public void setContentText(String contentText) 
+    {
+        this.contentText = contentText;
+    }
+
+    public String getContentText() 
+    {
+        return contentText;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("commentId", getCommentId())
+            .append("starLevel", getStarLevel())
+            .append("contentText", getContentText())
+            .append("modTime", getModTime())
+            .append("providerId", getProviderId())
+            .append("storeId", getStoreId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java
new file mode 100644
index 0000000..e3b70a2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentUserReq.java
@@ -0,0 +1,89 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg评价记录对象 SegchkServiceCommentUserReq
+ * 
+ * @author yinzhiying
+ * @date 2021-07-30
+ */
+public class SegchkServiceCommentUserReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 评价id */
+    private Long commentId;
+
+    /** 星级评价 */
+    @Excel(name = "星级评价")
+    private Integer starLevel;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String contentText;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 核消id，全表唯一 */
+    @Excel(name = "核消id，全表唯一")
+    private Long chkServiceId;
+
+    public Long getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Long commentId) {
+        this.commentId = commentId;
+    }
+
+    public Integer getStarLevel() {
+        return starLevel;
+    }
+
+    public void setStarLevel(Integer starLevel) {
+        this.starLevel = starLevel;
+    }
+
+    public String getContentText() {
+        return contentText;
+    }
+
+    public void setContentText(String contentText) {
+        this.contentText = contentText;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getChkServiceId() {
+        return chkServiceId;
+    }
+
+    public void setChkServiceId(Long chkServiceId) {
+        this.chkServiceId = chkServiceId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceCommentUserReq{" +
+                "commentId=" + commentId +
+                ", starLevel=" + starLevel +
+                ", contentText='" + contentText + '\'' +
+                ", modTime=" + modTime +
+                ", chkServiceId=" + chkServiceId +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java
new file mode 100644
index 0000000..6efaa49
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceCommentWebResp.java
@@ -0,0 +1,116 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg评价记录对象 segchk_service_comment
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceCommentWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 星级评价 */
+    @Excel(name = "星级评价")
+    private Integer starLevel;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String contentText;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 充值卡id */
+    @Excel(name = "充值卡名称")
+    private String cardName;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private String userName;
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStarLevel() {
+        return starLevel;
+    }
+
+    public void setStarLevel(Integer starLevel) {
+        this.starLevel = starLevel;
+    }
+
+    public String getContentText() {
+        return contentText;
+    }
+
+    public void setContentText(String contentText) {
+        this.contentText = contentText;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceCommentWebResp{" +
+                "storeId=" + storeId +
+                ", starLevel=" + starLevel +
+                ", contentText='" + contentText + '\'' +
+                ", modTime=" + modTime +
+                ", providerId=" + providerId +
+                ", cardName='" + cardName + '\'' +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java
new file mode 100644
index 0000000..a33f110
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkResp.java
@@ -0,0 +1,138 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceOrderChkResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    /** 会员卡或优惠券下的标签id */
+    @Excel(name = "会员卡或优惠券下的标签id")
+    private Integer lableId;
+
+    /** 卡类型 0 会员卡，1赠卡，2优惠券 */
+    @Excel(name = "卡类型")
+    private Integer typeId;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 剩余次数 */
+    @Excel(name = "卡名称")
+    private Integer leftCount;
+
+    /** 是否支持 */
+    @Excel(name = "是否支持")
+    private Integer isSupported;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public Integer getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Integer leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Integer getIsSupported() {
+        return isSupported;
+    }
+
+    public void setIsSupported(Integer isSupported) {
+        this.isSupported = isSupported;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceOrderChkResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", userId=" + userId +
+                ", cardId=" + cardId +
+                ", lableId=" + lableId +
+                ", typeId=" + typeId +
+                ", cardName='" + cardName + '\'' +
+                ", leftCount=" + leftCount +
+                ", isSupported=" + isSupported +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkTestResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkTestResp.java
new file mode 100644
index 0000000..90bee67
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderChkTestResp.java
@@ -0,0 +1,222 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * seg用户核消确认信息对象 SegchkServiceOrderChkTestResp
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceOrderChkTestResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 预约单id */
+    @Excel(name = "预约单id")
+    private Long likegoId;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 我想去订单核消卡id */
+    @Excel(name = "我想去订单核消卡id")
+    private Long cardId;
+
+    /** 我想去订单核消卡类型id，0会员卡，1自定义卡，2赠卡 */
+    @Excel(name = "我想去订单核消卡类型id")
+    private Integer cardType;
+
+    /** 我想去订单状态 */
+    @Excel(name = "我想去订单状态")
+    private Integer mgtState;
+
+    /** 我想去订单核消卡名称 */
+    @Excel(name = "我想去订单核消卡名称")
+    private String cardName;
+
+    /** 我想去订单核消卡可使用次数 */
+    @Excel(name = "我想去订单核消卡可使用次数")
+    private Integer totalCount;
+
+    /** 我想去订单核消卡剩余次数 */
+    @Excel(name = "我想去订单核消卡剩余次数")
+    private Integer hasLeftCount;
+
+    /** 我想去订单核消卡状态 */
+    @Excel(name = "我想去订单核消卡状态")
+    private Integer cardStatus;
+
+    /** 是否可赠送卡0可赠，1已有 */
+    @Excel(name = "卡id")
+    private Integer canFree;
+
+    /** 是否过期 0未过期，1过期 */
+    @Excel(name = "是否过期")
+    private Integer isExpire;
+
+    /** 有效期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 商户可赠优惠券标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(Integer cardType) {
+        this.cardType = cardType;
+    }
+
+    public Integer getMgtState() {
+        return mgtState;
+    }
+
+    public void setMgtState(Integer mgtState) {
+        this.mgtState = mgtState;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Integer getHasLeftCount() {
+        return hasLeftCount;
+    }
+
+    public void setHasLeftCount(Integer hasLeftCount) {
+        this.hasLeftCount = hasLeftCount;
+    }
+
+    public Integer getCardStatus() {
+        return cardStatus;
+    }
+
+    public void setCardStatus(Integer cardStatus) {
+        this.cardStatus = cardStatus;
+    }
+
+    public Integer getCanFree() {
+        return canFree;
+    }
+
+    public void setCanFree(Integer canFree) {
+        this.canFree = canFree;
+    }
+
+    public Integer getIsExpire() {
+        return isExpire;
+    }
+
+    public void setIsExpire(Integer isExpire) {
+        this.isExpire = isExpire;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceOrderChkTestResp{" +
+                "likegoId=" + likegoId +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", userId=" + userId +
+                ", cardId=" + cardId +
+                ", cardType=" + cardType +
+                ", mgtState=" + mgtState +
+                ", cardName='" + cardName + '\'' +
+                ", totalCount=" + totalCount +
+                ", hasLeftCount=" + hasLeftCount +
+                ", cardStatus=" + cardStatus +
+                ", canFree=" + canFree +
+                ", isExpire=" + isExpire +
+                ", modTime=" + modTime +
+                ", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
+                '}';
+    }
+
+    public Long getLikegoId() {
+        return likegoId;
+    }
+
+    public void setLikegoId(Long likegoId) {
+        this.likegoId = likegoId;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java
new file mode 100644
index 0000000..f12f38b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkServiceOrderWebReq.java
@@ -0,0 +1,112 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkServiceOrderWebReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 商户id */
+    @Excel(name = "商户id")
+    private Long storeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 卡id */
+    @Excel(name = "卡id")
+    private Long cardId;
+
+    /** 会员卡或优惠券下的标签id */
+    @Excel(name = "会员卡或优惠券下的标签id")
+    private Integer lableId;
+
+    /** 卡类型 0 会员卡，1赠卡，2优惠券 */
+    @Excel(name = "卡类型")
+    private Integer typeId;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getLableId() {
+        return lableId;
+    }
+
+    public void setLableId(Integer lableId) {
+        this.lableId = lableId;
+    }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkServiceOrderWebReq{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", userId=" + userId +
+                ", cardId=" + cardId +
+                ", lableId=" + lableId +
+                ", typeId=" + typeId +
+                ", cardName='" + cardName + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSmsDetail.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSmsDetail.java
new file mode 100644
index 0000000..980020a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSmsDetail.java
@@ -0,0 +1,95 @@
+package com.ruoyi.segchk.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg短信记录对象 segchk_sms_detail
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkSmsDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String phoneNo;
+
+    /** 验证码 */
+    @Excel(name = "验证码")
+    private String validateCode;
+
+    /** 标识，0已发送，1已验证 */
+    @Excel(name = "标识，0已发送，1已验证")
+    private String flag;
+
+    /** 短信码id */
+    @Excel(name = "短信码id")
+    private Long shortMsgId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setPhoneNo(String phoneNo) 
+    {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getPhoneNo() 
+    {
+        return phoneNo;
+    }
+    public void setValidateCode(String validateCode) 
+    {
+        this.validateCode = validateCode;
+    }
+
+    public String getValidateCode() 
+    {
+        return validateCode;
+    }
+    public void setFlag(String flag) 
+    {
+        this.flag = flag;
+    }
+
+    public String getFlag() 
+    {
+        return flag;
+    }
+    public void setShortMsgId(Long shortMsgId) 
+    {
+        this.shortMsgId = shortMsgId;
+    }
+
+    public Long getShortMsgId() 
+    {
+        return shortMsgId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("phoneNo", getPhoneNo())
+            .append("createTime", getCreateTime())
+            .append("validateCode", getValidateCode())
+            .append("flag", getFlag())
+            .append("shortMsgId", getShortMsgId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreAccount.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreAccount.java
new file mode 100644
index 0000000..7a05880
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreAccount.java
@@ -0,0 +1,154 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商户余额信息对象 segchk_store_account
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreAccount extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 余额 */
+    @Excel(name = "余额")
+    private BigDecimal account;
+
+    /** 余额类型 */
+    @Excel(name = "余额类型")
+    private String accountType;
+
+    /** 余额id */
+    @Excel(name = "余额id")
+    private Long accountId;
+
+    /** 奖励id */
+    @Excel(name = "奖励id")
+    private Long rewardId;
+
+    /** 充值id */
+    @Excel(name = "充值id")
+    private Long chargeId;
+
+    /** 充值id */
+    @Excel(name = "充值id")
+    private Long cashId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setAccount(BigDecimal account) 
+    {
+        this.account = account;
+    }
+
+    public BigDecimal getAccount() 
+    {
+        return account;
+    }
+    public void setAccountType(String accountType) 
+    {
+        this.accountType = accountType;
+    }
+
+    public String getAccountType() 
+    {
+        return accountType;
+    }
+    public void setAccountId(Long accountId) 
+    {
+        this.accountId = accountId;
+    }
+
+    public Long getAccountId() 
+    {
+        return accountId;
+    }
+    public void setRewardId(Long rewardId) 
+    {
+        this.rewardId = rewardId;
+    }
+
+    public Long getRewardId() 
+    {
+        return rewardId;
+    }
+    public void setChargeId(Long chargeId) 
+    {
+        this.chargeId = chargeId;
+    }
+
+    public Long getChargeId() 
+    {
+        return chargeId;
+    }
+    public void setCashId(Long cashId) 
+    {
+        this.cashId = cashId;
+    }
+
+    public Long getCashId() 
+    {
+        return cashId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("storeId", getStoreId())
+            .append("account", getAccount())
+            .append("accountType", getAccountType())
+            .append("accountId", getAccountId())
+            .append("rewardId", getRewardId())
+            .append("chargeId", getChargeId())
+            .append("cashId", getCashId())
+            .append("modTime", getModTime())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfo.java
new file mode 100644
index 0000000..d1a8d9a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfo.java
@@ -0,0 +1,414 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家基础信息对象 segchk_store_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreBasicInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家电话 */
+    @Excel(name = "商家电话")
+    private String storePhone;
+
+    /** 微信唯一识别号，用于转账等 */
+    @Excel(name = "微信唯一识别号，用于转账等")
+    private String openid;
+
+    /** 微信的联合登录id */
+    @Excel(name = "微信的联合登录id")
+    private String unionId;
+
+    /** 商家微信昵称 */
+    @Excel(name = "商家微信昵称")
+    private String nickName;
+
+    /** 商家微信头像 */
+    @Excel(name = "商家微信头像")
+    private String iconUrl;
+
+    /** 服务状态，0在线，1下线 */
+    @Excel(name = "服务状态，0在线，1下线")
+    private String serviceState;
+
+    /** 销售id */
+    @Excel(name = "销售id")
+    private Integer salerId;
+
+    /** 合同日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date effectiveDate;
+
+    /** 商家执照编号 */
+    @Excel(name = "商家执照编号")
+    private String storeCorporation;
+
+    /** 商家地址 */
+    @Excel(name = "商家地址")
+    private String storeAddr;
+
+    /** 商家法人身份证 */
+    @Excel(name = "商家法人身份证")
+    private String storeCard;
+
+    /** 是否发送通知消息，0发送，1不发送 */
+    @Excel(name = "是否发送通知消息，0发送，1不发送")
+    private String withMsg;
+
+    /** 提现额门限 */
+    @Excel(name = "提现额门限")
+    private BigDecimal cashThreshold;
+
+    /** 提现到账日期，0当天到账，n--N个工作日后到账 */
+    @Excel(name = "提现到账日期，0当天到账，n--N个工作日后到账")
+    private Integer cashDay;
+
+    /** 下线平均星评门限 */
+    @Excel(name = "下线平均星评门限")
+    private BigDecimal serviceDownThreshold;
+
+    /** 是否人工干预，0自动，1人工 */
+    @Excel(name = "是否人工干预，0自动，1人工")
+    private String stateFlag;
+
+    /** 商家经度 */
+    @Excel(name = "商家经度")
+    private BigDecimal storeLon;
+
+    /** 商家纬度 */
+    @Excel(name = "商家纬度")
+    private BigDecimal storeLat;
+
+    /** 商家运营时间 */
+    @Excel(name = "商家运营时间")
+    private String onService;
+
+    /** 商家描述详情 */
+    @Excel(name = "商家描述详情")
+    private String detail;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** seg商家图片信息信息 */
+    private List<SegchkStoreImage> segchkStoreImageList;
+
+    /** seg商家核消卡管理信息 */
+    private List<SegchkStoreChkMgt> segchkStoreChkMgtList;
+
+    /** seg商家标签管理信息 */
+    private List<SegchkStoreLableMgt> segchkStoreLableMgtList;
+
+    /** seg商家密码管理信息 */
+    private List<SegchkStoreSecurity> segchkStoreSecurityList;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setStoreName(String storeName) 
+    {
+        this.storeName = storeName;
+    }
+
+    public String getStoreName() 
+    {
+        return storeName;
+    }
+    public void setStorePhone(String storePhone) 
+    {
+        this.storePhone = storePhone;
+    }
+
+    public String getStorePhone() 
+    {
+        return storePhone;
+    }
+    public void setOpenid(String openid) 
+    {
+        this.openid = openid;
+    }
+
+    public String getOpenid() 
+    {
+        return openid;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setServiceState(String serviceState) 
+    {
+        this.serviceState = serviceState;
+    }
+
+    public String getServiceState() 
+    {
+        return serviceState;
+    }
+    public void setSalerId(Integer salerId) 
+    {
+        this.salerId = salerId;
+    }
+
+    public Integer getSalerId() 
+    {
+        return salerId;
+    }
+    public void setEffectiveDate(Date effectiveDate) 
+    {
+        this.effectiveDate = effectiveDate;
+    }
+
+    public Date getEffectiveDate() 
+    {
+        return effectiveDate;
+    }
+    public void setStoreCorporation(String storeCorporation) 
+    {
+        this.storeCorporation = storeCorporation;
+    }
+
+    public String getStoreCorporation() 
+    {
+        return storeCorporation;
+    }
+    public void setStoreAddr(String storeAddr) 
+    {
+        this.storeAddr = storeAddr;
+    }
+
+    public String getStoreAddr() 
+    {
+        return storeAddr;
+    }
+    public void setStoreCard(String storeCard) 
+    {
+        this.storeCard = storeCard;
+    }
+
+    public String getStoreCard() 
+    {
+        return storeCard;
+    }
+    public void setWithMsg(String withMsg) 
+    {
+        this.withMsg = withMsg;
+    }
+
+    public String getWithMsg() 
+    {
+        return withMsg;
+    }
+    public void setCashThreshold(BigDecimal cashThreshold) 
+    {
+        this.cashThreshold = cashThreshold;
+    }
+
+    public BigDecimal getCashThreshold() 
+    {
+        return cashThreshold;
+    }
+    public void setCashDay(Integer cashDay) 
+    {
+        this.cashDay = cashDay;
+    }
+
+    public Integer getCashDay() 
+    {
+        return cashDay;
+    }
+    public void setServiceDownThreshold(BigDecimal serviceDownThreshold) 
+    {
+        this.serviceDownThreshold = serviceDownThreshold;
+    }
+
+    public BigDecimal getServiceDownThreshold() 
+    {
+        return serviceDownThreshold;
+    }
+    public void setStateFlag(String stateFlag) 
+    {
+        this.stateFlag = stateFlag;
+    }
+
+    public String getStateFlag() 
+    {
+        return stateFlag;
+    }
+    public void setStoreLon(BigDecimal storeLon) 
+    {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLon() 
+    {
+        return storeLon;
+    }
+    public void setStoreLat(BigDecimal storeLat) 
+    {
+        this.storeLat = storeLat;
+    }
+
+    public BigDecimal getStoreLat() 
+    {
+        return storeLat;
+    }
+    public void setOnService(String onService) 
+    {
+        this.onService = onService;
+    }
+
+    public String getOnService() 
+    {
+        return onService;
+    }
+    public void setDetail(String detail) 
+    {
+        this.detail = detail;
+    }
+
+    public String getDetail() 
+    {
+        return detail;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    public List<SegchkStoreImage> getSegchkStoreImageList()
+    {
+        return segchkStoreImageList;
+    }
+
+    public void setSegchkStoreImageList(List<SegchkStoreImage> segchkStoreImageList)
+    {
+        this.segchkStoreImageList = segchkStoreImageList;
+    }
+
+    public List<SegchkStoreChkMgt> getSegchkStoreChkMgtList() {
+        return segchkStoreChkMgtList;
+    }
+
+    public void setSegchkStoreChkMgtList(List<SegchkStoreChkMgt> segchkStoreChkMgtList) {
+        this.segchkStoreChkMgtList = segchkStoreChkMgtList;
+    }
+
+    public List<SegchkStoreLableMgt> getSegchkStoreLableMgtList() {
+        return segchkStoreLableMgtList;
+    }
+
+    public void setSegchkStoreLableMgtList(List<SegchkStoreLableMgt> segchkStoreLableMgtList) {
+        this.segchkStoreLableMgtList = segchkStoreLableMgtList;
+    }
+
+    public List<SegchkStoreSecurity> getSegchkStoreSecurityList() {
+        return segchkStoreSecurityList;
+    }
+
+    public void setSegchkStoreSecurityList(List<SegchkStoreSecurity> segchkStoreSecurityList) {
+        this.segchkStoreSecurityList = segchkStoreSecurityList;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkStoreBasicInfo{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", storePhone='" + storePhone + '\'' +
+                ", openid='" + openid + '\'' +
+                ", unionId='" + unionId + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", iconUrl='" + iconUrl + '\'' +
+                ", serviceState='" + serviceState + '\'' +
+                ", salerId=" + salerId +
+                ", effectiveDate=" + effectiveDate +
+                ", storeCorporation='" + storeCorporation + '\'' +
+                ", storeAddr='" + storeAddr + '\'' +
+                ", storeCard='" + storeCard + '\'' +
+                ", withMsg='" + withMsg + '\'' +
+                ", cashThreshold=" + cashThreshold +
+                ", cashDay=" + cashDay +
+                ", serviceDownThreshold=" + serviceDownThreshold +
+                ", stateFlag='" + stateFlag + '\'' +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", onService='" + onService + '\'' +
+                ", detail='" + detail + '\'' +
+                ", modTime=" + modTime +
+                ", segchkStoreImageList=" + segchkStoreImageList +
+                ", segchkStoreChkMgtList=" + segchkStoreChkMgtList +
+                ", segchkStoreLableMgtList=" + segchkStoreLableMgtList +
+                ", segchkStoreSecurityList=" + segchkStoreSecurityList +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCash.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCash.java
new file mode 100644
index 0000000..a51c602
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCash.java
@@ -0,0 +1,139 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商户户提现记录对象 segchk_store_cash
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreCash extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 提现额 */
+    @Excel(name = "提现额")
+    private BigDecimal cash;
+
+    /** 提现类型 */
+    @Excel(name = "提现类型")
+    private String cashType;
+
+    /** 提现id，全表唯一 */
+    @Excel(name = "提现id，全表唯一")
+    private Long cashId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 提现结果，0未完成，1成功，2失败 */
+    @Excel(name = "提现结果，0未完成，1成功，2失败")
+    private String retFlag;
+
+    /** 关联的余额id */
+    @Excel(name = "关联的余额id")
+    private String accountId;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCash(BigDecimal cash) 
+    {
+        this.cash = cash;
+    }
+
+    public BigDecimal getCash() 
+    {
+        return cash;
+    }
+    public void setCashType(String cashType) 
+    {
+        this.cashType = cashType;
+    }
+
+    public String getCashType() 
+    {
+        return cashType;
+    }
+    public void setCashId(Long cashId) 
+    {
+        this.cashId = cashId;
+    }
+
+    public Long getCashId() 
+    {
+        return cashId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRetFlag(String retFlag) 
+    {
+        this.retFlag = retFlag;
+    }
+
+    public String getRetFlag() 
+    {
+        return retFlag;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkStoreCash{" +
+                "storeId=" + storeId +
+                ", cash=" + cash +
+                ", cashType='" + cashType + '\'' +
+                ", cashId=" + cashId +
+                ", providerId=" + providerId +
+                ", modTime=" + modTime +
+                ", retFlag='" + retFlag + '\'' +
+                ", accountId='" + accountId + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCharge.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCharge.java
new file mode 100644
index 0000000..aae4fcb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreCharge.java
@@ -0,0 +1,126 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商户充值记录对象 segchk_store_charge
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreCharge extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 充值额 */
+    @Excel(name = "充值额")
+    private BigDecimal charge;
+
+    /** 充值类型 */
+    @Excel(name = "充值类型")
+    private String chargeType;
+
+    /** 充值id，全表唯一 */
+    @Excel(name = "充值id，全表唯一")
+    private Long chargeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 结果，0未完成，1成功，2失败 */
+    @Excel(name = "结果，0未完成，1成功，2失败")
+    private String retFlag;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCharge(BigDecimal charge) 
+    {
+        this.charge = charge;
+    }
+
+    public BigDecimal getCharge() 
+    {
+        return charge;
+    }
+    public void setChargeType(String chargeType) 
+    {
+        this.chargeType = chargeType;
+    }
+
+    public String getChargeType() 
+    {
+        return chargeType;
+    }
+    public void setChargeId(Long chargeId) 
+    {
+        this.chargeId = chargeId;
+    }
+
+    public Long getChargeId() 
+    {
+        return chargeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRetFlag(String retFlag) 
+    {
+        this.retFlag = retFlag;
+    }
+
+    public String getRetFlag() 
+    {
+        return retFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("storeId", getStoreId())
+            .append("charge", getCharge())
+            .append("chargeType", getChargeType())
+            .append("chargeId", getChargeId())
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .append("retFlag", getRetFlag())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreChkMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreChkMgt.java
new file mode 100644
index 0000000..720a404
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreChkMgt.java
@@ -0,0 +1,137 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家核消卡管理对象 segchk_store_chk_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreChkMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long cardTypeId;
+
+    /** 该商家针对该类型卡可核消次数 */
+    @Excel(name = "该商家针对该类型卡可核消次数")
+    private Integer chkCount;
+
+    /** 该商家针对该类型卡每月可售卡量 */
+    @Excel(name = "该商家针对该类型卡每月可售卡量")
+    private Integer saleCount;
+
+    /** 售卡奖励 */
+    @Excel(name = "售卡奖励")
+    private BigDecimal cardCommission;
+
+    /** 对应销售人员奖励 */
+    @Excel(name = "对应销售人员奖励")
+    private BigDecimal salerCommission;
+
+    /** 商家核消信息管理id */
+    @Excel(name = "商家核消信息管理id")
+    private Integer mgtId;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setChkCount(Integer chkCount) 
+    {
+        this.chkCount = chkCount;
+    }
+
+    public Integer getChkCount() 
+    {
+        return chkCount;
+    }
+    public void setSaleCount(Integer saleCount) 
+    {
+        this.saleCount = saleCount;
+    }
+
+    public Integer getSaleCount() 
+    {
+        return saleCount;
+    }
+    public void setCardCommission(BigDecimal cardCommission) 
+    {
+        this.cardCommission = cardCommission;
+    }
+
+    public BigDecimal getCardCommission() 
+    {
+        return cardCommission;
+    }
+    public void setSalerCommission(BigDecimal salerCommission) 
+    {
+        this.salerCommission = salerCommission;
+    }
+
+    public BigDecimal getSalerCommission() 
+    {
+        return salerCommission;
+    }
+    public void setMgtId(Integer mgtId) 
+    {
+        this.mgtId = mgtId;
+    }
+
+    public Integer getMgtId() 
+    {
+        return mgtId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("storeId", getStoreId())
+            .append("cardTypeId", getCardTypeId())
+            .append("chkCount", getChkCount())
+            .append("saleCount", getSaleCount())
+            .append("cardCommission", getCardCommission())
+            .append("salerCommission", getSalerCommission())
+            .append("mgtId", getMgtId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreImage.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreImage.java
new file mode 100644
index 0000000..7f6ff99
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreImage.java
@@ -0,0 +1,265 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家图片信息对象 segchk_store_image
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreImage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家营业执照图1路径 */
+    @Excel(name = "商家营业执照图1路径")
+    private String storeCertificate1;
+
+    /** 商家营业执照图2路径 */
+    @Excel(name = "商家营业执照图2路径")
+    private String storeCertificate2;
+
+    /** 商家图标路径，用于在商家列表中显示 */
+    @Excel(name = "商家图标路径，用于在商家列表中显示")
+    private String storeIcon;
+
+    /** 商家大图标路径，用于在商家列表中显示 */
+    @Excel(name = "商家大图标路径，用于在商家列表中显示")
+    private String storeGificon;
+
+    /** 商家轮播图1路径，默认用于首页推荐轮播图 */
+    @Excel(name = "商家轮播图1路径，默认用于首页推荐轮播图")
+    private String storeCarousel1;
+
+    /** 商家轮播图2路径 */
+    @Excel(name = "商家轮播图2路径")
+    private String storeCarousel2;
+
+    /** 商家轮播图3路径 */
+    @Excel(name = "商家轮播图3路径")
+    private String storeCarousel3;
+
+    /** 商家轮播图4路径 */
+    @Excel(name = "商家轮播图4路径")
+    private String storeCarousel4;
+
+    /** 商家轮播图5路径 */
+    @Excel(name = "商家轮播图5路径")
+    private String storeCarousel5;
+
+    /** 商家轮播图6路径 */
+    @Excel(name = "商家轮播图6路径")
+    private String storeCarousel6;
+
+    /** 商家环境图1 */
+    @Excel(name = "商家环境图1")
+    private String storeEnv1;
+
+    /** 商家环境图2 */
+    @Excel(name = "商家环境图2")
+    private String storeEnv2;
+
+    /** 商家环境图3 */
+    @Excel(name = "商家环境图3")
+    private String storeEnv3;
+
+    /** 商家环境图4 */
+    @Excel(name = "商家环境图4")
+    private String storeEnv4;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setStoreCertificate1(String storeCertificate1) 
+    {
+        this.storeCertificate1 = storeCertificate1;
+    }
+
+    public String getStoreCertificate1() 
+    {
+        return storeCertificate1;
+    }
+    public void setStoreCertificate2(String storeCertificate2) 
+    {
+        this.storeCertificate2 = storeCertificate2;
+    }
+
+    public String getStoreCertificate2() 
+    {
+        return storeCertificate2;
+    }
+    public void setStoreIcon(String storeIcon) 
+    {
+        this.storeIcon = storeIcon;
+    }
+
+    public String getStoreIcon() 
+    {
+        return storeIcon;
+    }
+    public void setStoreGificon(String storeGificon) 
+    {
+        this.storeGificon = storeGificon;
+    }
+
+    public String getStoreGificon() 
+    {
+        return storeGificon;
+    }
+    public void setStoreCarousel1(String storeCarousel1) 
+    {
+        this.storeCarousel1 = storeCarousel1;
+    }
+
+    public String getStoreCarousel1() 
+    {
+        return storeCarousel1;
+    }
+    public void setStoreCarousel2(String storeCarousel2) 
+    {
+        this.storeCarousel2 = storeCarousel2;
+    }
+
+    public String getStoreCarousel2() 
+    {
+        return storeCarousel2;
+    }
+    public void setStoreCarousel3(String storeCarousel3) 
+    {
+        this.storeCarousel3 = storeCarousel3;
+    }
+
+    public String getStoreCarousel3() 
+    {
+        return storeCarousel3;
+    }
+    public void setStoreCarousel4(String storeCarousel4) 
+    {
+        this.storeCarousel4 = storeCarousel4;
+    }
+
+    public String getStoreCarousel4() 
+    {
+        return storeCarousel4;
+    }
+    public void setStoreCarousel5(String storeCarousel5) 
+    {
+        this.storeCarousel5 = storeCarousel5;
+    }
+
+    public String getStoreCarousel5() 
+    {
+        return storeCarousel5;
+    }
+    public void setStoreCarousel6(String storeCarousel6) 
+    {
+        this.storeCarousel6 = storeCarousel6;
+    }
+
+    public String getStoreCarousel6() 
+    {
+        return storeCarousel6;
+    }
+    public void setStoreEnv1(String storeEnv1) 
+    {
+        this.storeEnv1 = storeEnv1;
+    }
+
+    public String getStoreEnv1() 
+    {
+        return storeEnv1;
+    }
+    public void setStoreEnv2(String storeEnv2) 
+    {
+        this.storeEnv2 = storeEnv2;
+    }
+
+    public String getStoreEnv2() 
+    {
+        return storeEnv2;
+    }
+    public void setStoreEnv3(String storeEnv3) 
+    {
+        this.storeEnv3 = storeEnv3;
+    }
+
+    public String getStoreEnv3() 
+    {
+        return storeEnv3;
+    }
+    public void setStoreEnv4(String storeEnv4) 
+    {
+        this.storeEnv4 = storeEnv4;
+    }
+
+    public String getStoreEnv4() 
+    {
+        return storeEnv4;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("storeId", getStoreId())
+            .append("storeCertificate1", getStoreCertificate1())
+            .append("storeCertificate2", getStoreCertificate2())
+            .append("storeIcon", getStoreIcon())
+            .append("storeGificon", getStoreGificon())
+            .append("storeCarousel1", getStoreCarousel1())
+            .append("storeCarousel2", getStoreCarousel2())
+            .append("storeCarousel3", getStoreCarousel3())
+            .append("storeCarousel4", getStoreCarousel4())
+            .append("storeCarousel5", getStoreCarousel5())
+            .append("storeCarousel6", getStoreCarousel6())
+            .append("storeEnv1", getStoreEnv1())
+            .append("storeEnv2", getStoreEnv2())
+            .append("storeEnv3", getStoreEnv3())
+            .append("storeEnv4", getStoreEnv4())
+            .append("modTime", getModTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java
new file mode 100644
index 0000000..8dd6873
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreIndexWebResp.java
@@ -0,0 +1,209 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg返回首页推荐商户对象 segchk_recommender_storeweb
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkStoreIndexWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家状态 */
+    @Excel(name = "商家状态")
+    private String serviceState;
+
+    /** 商户显示序号 */
+    @Excel(name = "商户显示序号")
+    private Integer storeSort;
+
+    /** 商户列表模式时的图标 */
+    @Excel(name = "商户列表模式时的图标")
+    private String storeIcon;
+
+    /** 商户的大图标 */
+    @Excel(name = "商户的大图标")
+    private String storeGificon;
+
+    /** 商户经度 */
+    @Excel(name = "商户经度")
+    private BigDecimal storeLon;
+
+    /** 商户纬度 */
+    @Excel(name = "商户纬度")
+    private BigDecimal storeLat;
+
+    /** 用户距离 */
+    @Excel(name = "用户距离")
+    private BigDecimal userDist;
+
+    /** 商户累积核消次数 */
+    @Excel(name = "商户累积核消次数")
+    private Integer chkCount;
+
+    /** 商户平均星评 */
+    @Excel(name = "商户平均星评")
+    private BigDecimal starAvg;
+
+    /** 在线状态 */
+    @Excel(name = "对应的销售id")
+    private Integer salerId;
+
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> lables;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreSort() {
+        return storeSort;
+    }
+
+    public void setStoreSort(Integer storeSort) {
+        this.storeSort = storeSort;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public String getStoreGificon() {
+        return storeGificon;
+    }
+
+    public void setStoreGificon(String storeGificon) {
+        this.storeGificon = storeGificon;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Integer getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Integer chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getLables() {
+        return lables;
+    }
+
+    public void setLables(List<SegchkRecommenderStoreLableWeb> lables) {
+        this.lables = lables;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+
+    public String getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(String serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public Integer getSalerId() {
+        return salerId;
+    }
+
+    public void setSalerId(Integer salerId) {
+        this.salerId = salerId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkStoreIndexWebResp{" +
+                "providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", serviceState='" + serviceState + '\'' +
+                ", storeSort=" + storeSort +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", storeGificon='" + storeGificon + '\'' +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", salerId=" + salerId +
+                ", lables=" + lables +
+                ", userDist=" + userDist +
+                '}';
+    }
+
+    public BigDecimal getUserDist() {
+        return userDist;
+    }
+
+    public void setUserDist(BigDecimal userDist) {
+        this.userDist = userDist;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreLableMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreLableMgt.java
new file mode 100644
index 0000000..42c6421
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreLableMgt.java
@@ -0,0 +1,139 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家标签管理对象 segchk_store_lable_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreLableMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 标签id */
+    @Excel(name = "标签id")
+    private Long lableId;
+
+    /** 显示顺序id */
+    @Excel(name = "显示顺序id")
+    private Integer sortId;
+
+    /** 标签来源id，0关键字，1优惠标签 */
+    @Excel(name = "标签来源id，0关键字，1优惠标签")
+    private Integer typeId;
+
+    /** 管理状态，0有效，-1失效 */
+    @Excel(name = "管理状态，0有效，-1失效")
+    private Integer mgtState;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 商家核消信息管理id */
+    @Excel(name = "商家核消信息管理id")
+    private Integer mgtId;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setLableId(Long lableId) 
+    {
+        this.lableId = lableId;
+    }
+
+    public Long getLableId() 
+    {
+        return lableId;
+    }
+    public void setSortId(Integer sortId) 
+    {
+        this.sortId = sortId;
+    }
+
+    public Integer getSortId() 
+    {
+        return sortId;
+    }
+    public void setTypeId(Integer typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public Integer getTypeId() 
+    {
+        return typeId;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setMgtId(Integer mgtId) 
+    {
+        this.mgtId = mgtId;
+    }
+
+    public Integer getMgtId() 
+    {
+        return mgtId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("storeId", getStoreId())
+            .append("providerId", getProviderId())
+            .append("lableId", getLableId())
+            .append("sortId", getSortId())
+            .append("typeId", getTypeId())
+            .append("mgtState", getMgtState())
+            .append("modTime", getModTime())
+            .append("mgtId", getMgtId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreReward.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreReward.java
new file mode 100644
index 0000000..91c76ce
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreReward.java
@@ -0,0 +1,140 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商户奖励对象 segchk_store_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreReward extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 奖励额 */
+    @Excel(name = "奖励额")
+    private BigDecimal reward;
+
+    /** 奖励类型 */
+    @Excel(name = "奖励类型")
+    private String rewardType;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private Long rewardCardId;
+
+    /** 奖励卡类型，0--9块9卡，1--99卡 */
+    @Excel(name = "奖励卡类型，0--9块9卡，1--99卡")
+    private Long rewardCardTypeId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 奖励id号，全表唯一 */
+    @Excel(name = "奖励id号，全表唯一")
+    private Long rewardId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setReward(BigDecimal reward) 
+    {
+        this.reward = reward;
+    }
+
+    public BigDecimal getReward() 
+    {
+        return reward;
+    }
+    public void setRewardType(String rewardType) 
+    {
+        this.rewardType = rewardType;
+    }
+
+    public String getRewardType() 
+    {
+        return rewardType;
+    }
+    public void setRewardCardId(Long rewardCardId) 
+    {
+        this.rewardCardId = rewardCardId;
+    }
+
+    public Long getRewardCardId() 
+    {
+        return rewardCardId;
+    }
+    public void setRewardCardTypeId(Long rewardCardTypeId) 
+    {
+        this.rewardCardTypeId = rewardCardTypeId;
+    }
+
+    public Long getRewardCardTypeId() 
+    {
+        return rewardCardTypeId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRewardId(Long rewardId) 
+    {
+        this.rewardId = rewardId;
+    }
+
+    public Long getRewardId() 
+    {
+        return rewardId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("storeId", getStoreId())
+            .append("reward", getReward())
+            .append("rewardType", getRewardType())
+            .append("rewardCardId", getRewardCardId())
+            .append("rewardCardTypeId", getRewardCardTypeId())
+            .append("modTime", getModTime())
+            .append("rewardId", getRewardId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSecurity.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSecurity.java
new file mode 100644
index 0000000..a86727d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSecurity.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商户密码对象 segchk_store_security
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreSecurity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 密码 */
+    @Excel(name = "密码")
+    private String passwd;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 密码id，全表唯一 */
+    @Excel(name = "密码id，全表唯一")
+    private Long pwdId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setPasswd(String passwd) 
+    {
+        this.passwd = passwd;
+    }
+
+    public String getPasswd() 
+    {
+        return passwd;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setPwdId(Long pwdId) 
+    {
+        this.pwdId = pwdId;
+    }
+
+    public Long getPwdId() 
+    {
+        return pwdId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("storeId", getStoreId())
+            .append("passwd", getPasswd())
+            .append("modTime", getModTime())
+            .append("pwdId", getPwdId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSelfMgt.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSelfMgt.java
new file mode 100644
index 0000000..144144d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreSelfMgt.java
@@ -0,0 +1,209 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg商家自定义卡管理对象 segchk_store_self_mgt
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkStoreSelfMgt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 赠卡id */
+    @Excel(name = "赠卡id")
+    private Long freeCardId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 会员卡号id，全局惟一 */
+    @Excel(name = "会员卡号id，全局惟一")
+    private Long cardId;
+
+    /** 标签id，只在优惠标签时有效 */
+    @Excel(name = "标签id，只在优惠标签时有效")
+    private Long lableId;
+
+    /** 标签来源id，0自定义卡，2优惠标签 */
+    @Excel(name = "标签来源id，0自定义卡，2优惠标签")
+    private Integer typeId;
+
+    /** 权益次数 */
+    @Excel(name = "权益次数")
+    private Integer freeCount;
+
+    /** 权益卡名称 */
+    @Excel(name = "权益卡名称")
+    private String freeName;
+
+    /** 权益内容 */
+    @Excel(name = "权益内容")
+    private String freeContent;
+
+    /** 剩余权益次数 */
+    @Excel(name = "剩余权益次数")
+    private Integer leftCount;
+
+    /** 状态，0正常，1过期 */
+    @Excel(name = "状态，0正常，1过期")
+    private String status;
+
+    public void setFreeCardId(Long freeCardId) 
+    {
+        this.freeCardId = freeCardId;
+    }
+
+    public Long getFreeCardId() 
+    {
+        return freeCardId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setLableId(Long lableId) 
+    {
+        this.lableId = lableId;
+    }
+
+    public Long getLableId() 
+    {
+        return lableId;
+    }
+    public void setTypeId(Integer typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public Integer getTypeId() 
+    {
+        return typeId;
+    }
+    public void setFreeCount(Integer freeCount) 
+    {
+        this.freeCount = freeCount;
+    }
+
+    public Integer getFreeCount() 
+    {
+        return freeCount;
+    }
+    public void setFreeName(String freeName) 
+    {
+        this.freeName = freeName;
+    }
+
+    public String getFreeName() 
+    {
+        return freeName;
+    }
+    public void setFreeContent(String freeContent) 
+    {
+        this.freeContent = freeContent;
+    }
+
+    public String getFreeContent() 
+    {
+        return freeContent;
+    }
+    public void setLeftCount(Integer leftCount) 
+    {
+        this.leftCount = leftCount;
+    }
+
+    public Integer getLeftCount() 
+    {
+        return leftCount;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("freeCardId", getFreeCardId())
+            .append("modTime", getModTime())
+            .append("storeId", getStoreId())
+            .append("providerId", getProviderId())
+            .append("userId", getUserId())
+            .append("cardId", getCardId())
+            .append("lableId", getLableId())
+            .append("typeId", getTypeId())
+            .append("freeCount", getFreeCount())
+            .append("freeName", getFreeName())
+            .append("freeContent", getFreeContent())
+            .append("leftCount", getLeftCount())
+            .append("status", getStatus())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSystemSetting.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSystemSetting.java
new file mode 100644
index 0000000..1c52ece
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkSystemSetting.java
@@ -0,0 +1,357 @@
+package com.ruoyi.segchk.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 系统设置对象 segchk_system_setting
+ * 
+ * @author yinzhiying
+ * @date 2021-10-27
+ */
+public class SegchkSystemSetting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 前端地址 */
+    @Excel(name = "前端地址")
+    private String siteUrl;
+
+    /** 网站名称 */
+    @Excel(name = "网站名称")
+    private String siteName;
+
+    /** 网站LOGO(前端搜索页旁边和店铺登陆页) */
+    @Excel(name = "网站LOGO(前端搜索页旁边和店铺登陆页)")
+    private String logo;
+
+    /** pc端，admin端，store端标签图片 */
+    @Excel(name = "pc端，admin端，store端标签图片")
+    private String labelLog;
+
+    /** pc端登录背景图片 */
+    @Excel(name = "pc端登录背景图片")
+    private String siteLogin;
+
+    /** pc端注册背景图片 */
+    @Excel(name = "pc端注册背景图片")
+    private String siteRegister;
+
+    /** 店铺端登录图片 */
+    @Excel(name = "店铺端登录图片")
+    private String storeLogin;
+
+    /** 店铺端注册图片 */
+    @Excel(name = "店铺端注册图片")
+    private String storeRegister;
+
+    /** 版权信息（pc和store底部） */
+    @Excel(name = "版权信息", readConverterExp = "p=c和store底部")
+    private String copyrightInfo;
+
+    /** 注册协议（pc端） */
+    @Excel(name = "注册协议", readConverterExp = "p=c端")
+    private String registerProtocol;
+
+    /** 用户隐私协议 */
+    @Excel(name = "用户隐私协议", readConverterExp = "p=c端")
+    private String userPrivacyAgreement;
+
+    /** vip会员服务协议 */
+    @Excel(name = "vip会员服务协议", readConverterExp = "p=c端")
+    private String vipServiceAgreement;
+
+    /** 店铺端注册协议 */
+    @Excel(name = "店铺端注册协议")
+    private String storeRegisterProtocol;
+
+    /** 店铺端开店协议 */
+    @Excel(name = "店铺端开店协议")
+    private String storeOpenProtocol;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** admin端登录logo */
+    @Excel(name = "admin端登录logo")
+    private String adminLogo;
+
+    /** admin端首页logo */
+    @Excel(name = "admin端首页logo")
+    private String adminIndexLogo;
+
+    /** 是否开启验证码   0 开启 1 不开启 默认0  */
+    @Excel(name = "是否开启验证码   0 开启 1 不开启 默认0 ")
+    private String captchaOpen;
+
+    /** 店铺商品审核开关  0 需要审核 1 不需要 默认0  */
+    @Excel(name = "店铺商品审核开关  0 需要审核 1 不需要 默认0 ")
+    private String storeSpuAudit;
+
+    /** 会员价开关状态 0开启 1不开启 默认0 */
+    @Excel(name = "会员价开关状态 0开启 1不开启 默认0")
+    private String memberPriceStatus;
+
+    /** 众筹协议 */
+    @Excel(name = "众筹协议")
+    private String crowdfundingProtocol;
+
+    /** h5域名 */
+    @Excel(name = "h5域名")
+    private String h5CallBackDomain;
+
+    /** pc域名 */
+    @Excel(name = "pc域名")
+    private String pcCallBackDomain;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSiteUrl(String siteUrl) 
+    {
+        this.siteUrl = siteUrl;
+    }
+
+    public String getSiteUrl() 
+    {
+        return siteUrl;
+    }
+    public void setSiteName(String siteName) 
+    {
+        this.siteName = siteName;
+    }
+
+    public String getSiteName() 
+    {
+        return siteName;
+    }
+    public void setLogo(String logo) 
+    {
+        this.logo = logo;
+    }
+
+    public String getLogo() 
+    {
+        return logo;
+    }
+    public void setLabelLog(String labelLog) 
+    {
+        this.labelLog = labelLog;
+    }
+
+    public String getLabelLog() 
+    {
+        return labelLog;
+    }
+    public void setSiteLogin(String siteLogin) 
+    {
+        this.siteLogin = siteLogin;
+    }
+
+    public String getSiteLogin() 
+    {
+        return siteLogin;
+    }
+    public void setSiteRegister(String siteRegister) 
+    {
+        this.siteRegister = siteRegister;
+    }
+
+    public String getSiteRegister() 
+    {
+        return siteRegister;
+    }
+    public void setStoreLogin(String storeLogin) 
+    {
+        this.storeLogin = storeLogin;
+    }
+
+    public String getStoreLogin() 
+    {
+        return storeLogin;
+    }
+    public void setStoreRegister(String storeRegister) 
+    {
+        this.storeRegister = storeRegister;
+    }
+
+    public String getStoreRegister() 
+    {
+        return storeRegister;
+    }
+    public void setCopyrightInfo(String copyrightInfo) 
+    {
+        this.copyrightInfo = copyrightInfo;
+    }
+
+    public String getCopyrightInfo() 
+    {
+        return copyrightInfo;
+    }
+    public void setRegisterProtocol(String registerProtocol) 
+    {
+        this.registerProtocol = registerProtocol;
+    }
+
+    public String getRegisterProtocol() 
+    {
+        return registerProtocol;
+    }
+    public void setStoreRegisterProtocol(String storeRegisterProtocol) 
+    {
+        this.storeRegisterProtocol = storeRegisterProtocol;
+    }
+
+    public String getStoreRegisterProtocol() 
+    {
+        return storeRegisterProtocol;
+    }
+    public void setStoreOpenProtocol(String storeOpenProtocol) 
+    {
+        this.storeOpenProtocol = storeOpenProtocol;
+    }
+
+    public String getStoreOpenProtocol() 
+    {
+        return storeOpenProtocol;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setAdminLogo(String adminLogo) 
+    {
+        this.adminLogo = adminLogo;
+    }
+
+    public String getAdminLogo() 
+    {
+        return adminLogo;
+    }
+    public void setAdminIndexLogo(String adminIndexLogo) 
+    {
+        this.adminIndexLogo = adminIndexLogo;
+    }
+
+    public String getAdminIndexLogo() 
+    {
+        return adminIndexLogo;
+    }
+    public void setCaptchaOpen(String captchaOpen) 
+    {
+        this.captchaOpen = captchaOpen;
+    }
+
+    public String getCaptchaOpen() 
+    {
+        return captchaOpen;
+    }
+    public void setStoreSpuAudit(String storeSpuAudit) 
+    {
+        this.storeSpuAudit = storeSpuAudit;
+    }
+
+    public String getStoreSpuAudit() 
+    {
+        return storeSpuAudit;
+    }
+    public void setMemberPriceStatus(String memberPriceStatus) 
+    {
+        this.memberPriceStatus = memberPriceStatus;
+    }
+
+    public String getMemberPriceStatus() 
+    {
+        return memberPriceStatus;
+    }
+    public void setCrowdfundingProtocol(String crowdfundingProtocol) 
+    {
+        this.crowdfundingProtocol = crowdfundingProtocol;
+    }
+
+    public String getCrowdfundingProtocol() 
+    {
+        return crowdfundingProtocol;
+    }
+    public void setH5CallBackDomain(String h5CallBackDomain) 
+    {
+        this.h5CallBackDomain = h5CallBackDomain;
+    }
+
+    public String getH5CallBackDomain() 
+    {
+        return h5CallBackDomain;
+    }
+    public void setPcCallBackDomain(String pcCallBackDomain) 
+    {
+        this.pcCallBackDomain = pcCallBackDomain;
+    }
+
+    public String getPcCallBackDomain() 
+    {
+        return pcCallBackDomain;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("siteUrl", getSiteUrl())
+            .append("siteName", getSiteName())
+            .append("logo", getLogo())
+            .append("labelLog", getLabelLog())
+            .append("siteLogin", getSiteLogin())
+            .append("siteRegister", getSiteRegister())
+            .append("storeLogin", getStoreLogin())
+            .append("storeRegister", getStoreRegister())
+            .append("copyrightInfo", getCopyrightInfo())
+            .append("registerProtocol", getRegisterProtocol())
+            .append("userPrivacyAgreement", getUserPrivacyAgreement())
+            .append("vipServiceAgreement", getVipServiceAgreement())
+            .append("storeRegisterProtocol", getStoreRegisterProtocol())
+            .append("storeOpenProtocol", getStoreOpenProtocol())
+            .append("phone", getPhone())
+            .append("adminLogo", getAdminLogo())
+            .append("adminIndexLogo", getAdminIndexLogo())
+            .append("captchaOpen", getCaptchaOpen())
+            .append("storeSpuAudit", getStoreSpuAudit())
+            .append("memberPriceStatus", getMemberPriceStatus())
+            .append("crowdfundingProtocol", getCrowdfundingProtocol())
+            .append("h5CallBackDomain", getH5CallBackDomain())
+            .append("pcCallBackDomain", getPcCallBackDomain())
+            .toString();
+    }
+
+    public String getUserPrivacyAgreement() {
+        return userPrivacyAgreement;
+    }
+
+    public void setUserPrivacyAgreement(String userPrivacyAgreement) {
+        this.userPrivacyAgreement = userPrivacyAgreement;
+    }
+
+    public String getVipServiceAgreement() {
+        return vipServiceAgreement;
+    }
+
+    public void setVipServiceAgreement(String vipServiceAgreement) {
+        this.vipServiceAgreement = vipServiceAgreement;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccount.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccount.java
new file mode 100644
index 0000000..ccd1e71
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccount.java
@@ -0,0 +1,137 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户余额信息对象 segchk_user_account
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserAccount extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 余额 */
+    @Excel(name = "余额")
+    private BigDecimal account;
+
+    /** 余额类型 */
+    @Excel(name = "余额类型")
+    private String accountType;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 余额id */
+    @Excel(name = "余额id")
+    private Long accountId;
+
+    /** 奖励id号 */
+    @Excel(name = "奖励id号")
+    private Long rewardId;
+
+    /** 充值id */
+    @Excel(name = "充值id")
+    private Long chargeId;
+
+    /** 提现id */
+    @Excel(name = "提现id")
+    private Long cashId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAccount(BigDecimal account) 
+    {
+        this.account = account;
+    }
+
+    public BigDecimal getAccount() 
+    {
+        return account;
+    }
+    public void setAccountType(String accountType) 
+    {
+        this.accountType = accountType;
+    }
+
+    public String getAccountType() 
+    {
+        return accountType;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setAccountId(Long accountId) 
+    {
+        this.accountId = accountId;
+    }
+
+    public Long getAccountId() 
+    {
+        return accountId;
+    }
+    public void setRewardId(Long rewardId) 
+    {
+        this.rewardId = rewardId;
+    }
+
+    public Long getRewardId() 
+    {
+        return rewardId;
+    }
+    public void setChargeId(Long chargeId) 
+    {
+        this.chargeId = chargeId;
+    }
+
+    public Long getChargeId() 
+    {
+        return chargeId;
+    }
+    public void setCashId(Long cashId) 
+    {
+        this.cashId = cashId;
+    }
+
+    public Long getCashId() 
+    {
+        return cashId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("account", getAccount())
+            .append("accountType", getAccountType())
+            .append("providerId", getProviderId())
+            .append("accountId", getAccountId())
+            .append("rewardId", getRewardId())
+            .append("chargeId", getChargeId())
+            .append("cashId", getCashId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java
new file mode 100644
index 0000000..b2c4024
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserAccountCheck.java
@@ -0,0 +1,76 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户余额信息对象 segchk_user_account
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserAccountCheck extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 余额 */
+    @Excel(name = "余额")
+    private BigDecimal account;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 余额id */
+    @Excel(name = "余额id")
+    private Long accountId;
+
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public BigDecimal getAccount() {
+        return account;
+    }
+
+    public void setAccount(BigDecimal account) {
+        this.account = account;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserAccountCheck{" +
+                "userId=" + userId +
+                ", account=" + account +
+                ", providerId=" + providerId +
+                ", accountId=" + accountId +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserBasicInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserBasicInfo.java
new file mode 100644
index 0000000..3f674ca
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserBasicInfo.java
@@ -0,0 +1,123 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户基本信息对象 segchk_user_basic_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserBasicInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 用户手机号 */
+    @Excel(name = "用户手机号")
+    private String phoneNo;
+
+    /** 用户头像，与微信头像一致 */
+    @Excel(name = "用户头像，与微信头像一致")
+    private String userIcon;
+
+    /** 是否绑定微信 */
+    @Excel(name = "是否绑定微信")
+    private String hasWechat;
+
+    /** 卡类型id,NULL普通用户，其他，不同vip卡 */
+    @Excel(name = "卡类型id,NULL普通用户，其他，不同vip卡")
+    private Long cardTypeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** seg用户实名认证信息信息 */
+    private List<SegchkUserCertificationInfo> segchkUserCertificationInfoList;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPhoneNo(String phoneNo) 
+    {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getPhoneNo() 
+    {
+        return phoneNo;
+    }
+    public void setUserIcon(String userIcon) 
+    {
+        this.userIcon = userIcon;
+    }
+
+    public String getUserIcon() 
+    {
+        return userIcon;
+    }
+    public void setHasWechat(String hasWechat) 
+    {
+        this.hasWechat = hasWechat;
+    }
+
+    public String getHasWechat() 
+    {
+        return hasWechat;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    public List<SegchkUserCertificationInfo> getSegchkUserCertificationInfoList()
+    {
+        return segchkUserCertificationInfoList;
+    }
+
+    public void setSegchkUserCertificationInfoList(List<SegchkUserCertificationInfo> segchkUserCertificationInfoList)
+    {
+        this.segchkUserCertificationInfoList = segchkUserCertificationInfoList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("phoneNo", getPhoneNo())
+            .append("userIcon", getUserIcon())
+            .append("hasWechat", getHasWechat())
+            .append("cardTypeId", getCardTypeId())
+            .append("providerId", getProviderId())
+            .append("segchkUserCertificationInfoList", getSegchkUserCertificationInfoList())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCash.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCash.java
new file mode 100644
index 0000000..41e4fc8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCash.java
@@ -0,0 +1,139 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户提现记录对象 segchk_user_cash
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserCash extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 提现额 */
+    @Excel(name = "提现额")
+    private BigDecimal cash;
+
+    /** 提现类型 */
+    @Excel(name = "提现类型")
+    private String cashType;
+
+    /** 提现id，全表唯一 */
+    @Excel(name = "提现id，全表唯一")
+    private Long cashId;
+
+    /** 余额id */
+    @Excel(name = "余额id，")
+    private Long accountId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 结果，0未完成，1成功，2失败 */
+    @Excel(name = "结果，0未完成，1成功，2失败")
+    private Integer retFlag;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setCash(BigDecimal cash) 
+    {
+        this.cash = cash;
+    }
+
+    public BigDecimal getCash() 
+    {
+        return cash;
+    }
+    public void setCashType(String cashType) 
+    {
+        this.cashType = cashType;
+    }
+
+    public String getCashType() 
+    {
+        return cashType;
+    }
+    public void setCashId(Long cashId) 
+    {
+        this.cashId = cashId;
+    }
+
+    public Long getCashId() 
+    {
+        return cashId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRetFlag(Integer retFlag) 
+    {
+        this.retFlag = retFlag;
+    }
+
+    public Integer getRetFlag() 
+    {
+        return retFlag;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCash{" +
+                "userId=" + userId +
+                ", cash=" + cash +
+                ", cashType='" + cashType + '\'' +
+                ", cashId=" + cashId +
+                ", accountId=" + accountId +
+                ", providerId=" + providerId +
+                ", modTime=" + modTime +
+                ", retFlag=" + retFlag +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsReq.java
new file mode 100644
index 0000000..cddc18c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsReq.java
@@ -0,0 +1,124 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * seg用户提现记录对象 segchk_user_cash
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCashOpsReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 提现额 */
+    @Excel(name = "提现额")
+    private BigDecimal cash;
+
+    /** 提现id，全表唯一 */
+    @Excel(name = "提现id，全表唯一")
+    private Long cashId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户身份，0运营商，1商家，2用户 */
+    @Excel(name = "用户身份")
+    private int userLevel;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 结果，0未完成，1成功，2失败 */
+    @Excel(name = "结果，0未完成，1成功，2失败")
+    private Integer retFlag;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setCash(BigDecimal cash) 
+    {
+        this.cash = cash;
+    }
+
+    public Long getCashId() 
+    {
+        return cashId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRetFlag(Integer retFlag) 
+    {
+        this.retFlag = retFlag;
+    }
+
+    public Integer getRetFlag() 
+    {
+        return retFlag;
+    }
+
+    public BigDecimal getCash() {
+        return cash;
+    }
+
+    public void setCashId(Long cashId) {
+        this.cashId = cashId;
+    }
+
+    public int getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(int userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCashOpsReq{" +
+                "userId=" + userId +
+                ", cash=" + cash +
+                ", cashId=" + cashId +
+                ", providerId=" + providerId +
+                ", userLevel=" + userLevel +
+                ", modTime=" + modTime +
+                ", retFlag=" + retFlag +
+                ", code=" + getSearchValue() +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java
new file mode 100644
index 0000000..76f541d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashOpsResp.java
@@ -0,0 +1,49 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户提现记录对象 segchk_user_cash
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCashOpsResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 提现额 */
+    @Excel(name = "提现额")
+    private BigDecimal account;
+
+    /** 提现id，全表唯一 */
+    @Excel(name = "提现id，全表唯一")
+    private Long cashId;
+
+    public BigDecimal getAccount() {
+        return account;
+    }
+
+    public void setAccount(BigDecimal account) {
+        this.account = account;
+    }
+
+    public Long getCashId() {
+        return cashId;
+    }
+
+    public void setCashId(Long cashId) {
+        this.cashId = cashId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCashOpsResp{" +
+                "account=" + account +
+                ", cashId=" + cashId +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java
new file mode 100644
index 0000000..2390fee
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCashWebResp.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCashWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal cash;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private String retFlag;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+
+    public BigDecimal getCash() {
+        return cash;
+    }
+
+    public void setCash(BigDecimal cash) {
+        this.cash = cash;
+    }
+
+    public String getRetFlag() {
+        return retFlag;
+    }
+
+    public void setRetFlag(String retFlag) {
+        this.retFlag = retFlag;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCashWebResp{" +
+                "cash=" + cash +
+                ", retFlag='" + retFlag + '\'' +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCertificationInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCertificationInfo.java
new file mode 100644
index 0000000..9a7d7fe
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCertificationInfo.java
@@ -0,0 +1,139 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户实名认证信息对象 segchk_user_certification_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserCertificationInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 身份证信息id，全表唯一 */
+    @Excel(name = "身份证信息id，全表唯一")
+    private Long usercardId;
+
+    /** 用户真实姓名 */
+    @Excel(name = "用户真实姓名")
+    private String userName;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idcard;
+
+    /** 身份证正面照片路径 */
+    @Excel(name = "身份证正面照片路径")
+    private String card1;
+
+    /** 身份证反面照片路径 */
+    @Excel(name = "身份证反面照片路径")
+    private String card2;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setUsercardId(Long usercardId) 
+    {
+        this.usercardId = usercardId;
+    }
+
+    public Long getUsercardId() 
+    {
+        return usercardId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setIdcard(String idcard) 
+    {
+        this.idcard = idcard;
+    }
+
+    public String getIdcard() 
+    {
+        return idcard;
+    }
+    public void setCard1(String card1) 
+    {
+        this.card1 = card1;
+    }
+
+    public String getCard1() 
+    {
+        return card1;
+    }
+    public void setCard2(String card2) 
+    {
+        this.card2 = card2;
+    }
+
+    public String getCard2() 
+    {
+        return card2;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("usercardId", getUsercardId())
+            .append("userName", getUserName())
+            .append("userId", getUserId())
+            .append("providerId", getProviderId())
+            .append("idcard", getIdcard())
+            .append("card1", getCard1())
+            .append("card2", getCard2())
+            .append("modTime", getModTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCharge.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCharge.java
new file mode 100644
index 0000000..ac57e1a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCharge.java
@@ -0,0 +1,182 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户充值记录对象 segchk_user_charge
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserCharge extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 充值额 */
+    @Excel(name = "充值额")
+    private BigDecimal charge;
+
+    /** 使用的余额部分 */
+    @Excel(name = "使用的余额部分")
+    private BigDecimal accountUsed;
+
+    /** 会员卡号id，全局惟一 */
+    @Excel(name = "会员卡号id，全局惟一")
+    private Long cardId;
+
+    /** 会员卡类型，0--9块9，1---99 */
+    @Excel(name = "会员卡类型，0--9块9，1---99")
+    private Long cardTypeId;
+
+    /** 充值类型 */
+    @Excel(name = "充值类型")
+    private String chargeType;
+
+    /** 充值id，全表唯一 */
+    @Excel(name = "充值id，全表唯一")
+    private Long chargeId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 结果，0未完成，1成功，2失败 */
+    @Excel(name = "结果，0未完成，1成功，2失败")
+    private Integer retFlag;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCharge(BigDecimal charge) 
+    {
+        this.charge = charge;
+    }
+
+    public BigDecimal getCharge() 
+    {
+        return charge;
+    }
+    public void setAccountUsed(BigDecimal accountUsed) 
+    {
+        this.accountUsed = accountUsed;
+    }
+
+    public BigDecimal getAccountUsed() 
+    {
+        return accountUsed;
+    }
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setChargeType(String chargeType) 
+    {
+        this.chargeType = chargeType;
+    }
+
+    public String getChargeType() 
+    {
+        return chargeType;
+    }
+    public void setChargeId(Long chargeId) 
+    {
+        this.chargeId = chargeId;
+    }
+
+    public Long getChargeId() 
+    {
+        return chargeId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRetFlag(Integer retFlag) 
+    {
+        this.retFlag = retFlag;
+    }
+
+    public Integer getRetFlag() 
+    {
+        return retFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("storeId", getStoreId())
+            .append("charge", getCharge())
+            .append("accountUsed", getAccountUsed())
+            .append("cardId", getCardId())
+            .append("cardTypeId", getCardTypeId())
+            .append("chargeType", getChargeType())
+            .append("chargeId", getChargeId())
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .append("retFlag", getRetFlag())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java
new file mode 100644
index 0000000..b27b0eb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeCard.java
@@ -0,0 +1,153 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * seg用户充值可选卡对象 SegchkUserChargeCard
+ * 
+ * @author yinzhiying
+ * @date 2021-07-30
+ */
+public class SegchkUserChargeCard extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long cardTypeId;
+
+    /** 会员卡id */
+    @Excel(name = "会员卡id")
+    private Long cardId;
+
+    /** 会员卡名称 */
+    @Excel(name = "会员卡名称")
+    private String cardTypeName;
+
+    /** 已购买次数 */
+    @Excel(name = "已购买次数")
+    private Integer hadBuy;
+
+    /** 可购买次数 */
+    @Excel(name = "可购买次数")
+    private Integer buyCount;
+
+    /** 会员卡面值 */
+    @Excel(name = "会员卡面值")
+    private BigDecimal cardTypeValue;
+
+    /** 是否可以购买，0可，1有卡正在使用，2购买次数超限 */
+    @Excel(name = "是否可以购买")
+    private Integer canBuy;
+
+    /** 会员卡权益次数 */
+    @Excel(name = "会员卡权益次数")
+    private Integer cardTypeChkcount;
+
+    /** 会员卡有效天数 */
+    @Excel(name = "会员卡有效天数")
+    private Integer effectiveTime;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(Long cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardTypeName() {
+        return cardTypeName;
+    }
+
+    public void setCardTypeName(String cardTypeName) {
+        this.cardTypeName = cardTypeName;
+    }
+
+    public Integer getHadBuy() {
+        return hadBuy;
+    }
+
+    public void setHadBuy(Integer hadBuy) {
+        this.hadBuy = hadBuy;
+    }
+
+    public Integer getBuyCount() {
+        return buyCount;
+    }
+
+    public void setBuyCount(Integer buyCount) {
+        this.buyCount = buyCount;
+    }
+
+    public BigDecimal getCardTypeValue() {
+        return cardTypeValue;
+    }
+
+    public void setCardTypeValue(BigDecimal cardTypeValue) {
+        this.cardTypeValue = cardTypeValue;
+    }
+
+    public Integer getCanBuy() {
+        return canBuy;
+    }
+
+    public void setCanBuy(Integer canBuy) {
+        this.canBuy = canBuy;
+    }
+
+    public Integer getCardTypeChkcount() {
+        return cardTypeChkcount;
+    }
+
+    public void setCardTypeChkcount(Integer cardTypeChkcount) {
+        this.cardTypeChkcount = cardTypeChkcount;
+    }
+
+    public Integer getEffectiveTime() {
+        return effectiveTime;
+    }
+
+    public void setEffectiveTime(Integer effectiveTime) {
+        this.effectiveTime = effectiveTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserChargeCard{" +
+                "providerId=" + providerId +
+                ", cardTypeId=" + cardTypeId +
+                ", cardId=" + cardId +
+                ", cardTypeName='" + cardTypeName + '\'' +
+                ", hadBuy=" + hadBuy +
+                ", buyCount=" + buyCount +
+                ", cardTypeValue=" + cardTypeValue +
+                ", canBuy=" + canBuy +
+                ", cardTypeChkcount=" + cardTypeChkcount +
+                ", effectiveTime=" + effectiveTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java
new file mode 100644
index 0000000..201c238
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserChargeWebResp.java
@@ -0,0 +1,78 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserChargeWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal charge;
+
+    /** 奖励类型 */
+    @Excel(name = "奖励类型")
+    private String cardName;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private String retFlag;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+    public BigDecimal getCharge() {
+        return charge;
+    }
+
+    public void setCharge(BigDecimal charge) {
+        this.charge = charge;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getRetFlag() {
+        return retFlag;
+    }
+
+    public void setRetFlag(String retFlag) {
+        this.retFlag = retFlag;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserChargeWebResp{" +
+                "charge=" + charge +
+                ", cardName='" + cardName + '\'' +
+                ", retFlag=" + retFlag +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollect.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollect.java
new file mode 100644
index 0000000..a17b13f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollect.java
@@ -0,0 +1,131 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户收藏记录对象 segchk_user_collect
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserCollect extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 收藏id */
+    @Excel(name = "收藏id")
+    private Long collectId;
+
+    /** 收藏类型，0商家，1商品 */
+    @Excel(name = "收藏类型，0商家，1商品")
+    private String collectType;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 管理状态，0有效，1失效 */
+    @Excel(name = "管理状态，0有效，1失效")
+    private Integer mgtState;
+
+    public void setCollectId(Long collectId) 
+    {
+        this.collectId = collectId;
+    }
+
+    public Long getCollectId() 
+    {
+        return collectId;
+    }
+    public void setCollectType(String collectType) 
+    {
+        this.collectType = collectType;
+    }
+
+    public String getCollectType() 
+    {
+        return collectType;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("collectId", getCollectId())
+            .append("collectType", getCollectType())
+            .append("providerId", getProviderId())
+            .append("userId", getUserId())
+            .append("storeId", getStoreId())
+            .append("modTime", getModTime())
+            .append("mgtState", getMgtState())
+            .toString();
+    }
+
+    public boolean isValid() {
+        return ObjectUtils.isNotEmpty(this.providerId)
+               && ObjectUtils.isNotEmpty(this.userId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java
new file mode 100644
index 0000000..259ca96
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollectWebResp.java
@@ -0,0 +1,185 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * seg会员卡对象 segchk_user_vip
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserCollectWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 收藏id */
+    @Excel(name = "收藏id")
+    private Long collectId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id */
+    @Excel(name = "商家id，全局惟一")
+    private Long storeId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 商家图标 */
+    @Excel(name = "会员卡类型，0--9块9，1---99")
+    private String storeIcon;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long serviceState;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal storeLon;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal storeLat;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long chkCount;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal starAvg;
+
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public Long getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(Long collectId) {
+        this.collectId = collectId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public Long getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(Long serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserCollectWebResp{" +
+                "collectId=" + collectId +
+                ", providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", serviceState=" + serviceState +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", modTime=" + modTime +
+                ", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserExtInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserExtInfo.java
new file mode 100644
index 0000000..a0f7695
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserExtInfo.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户扩展信息对象 segchk_user_ext_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserExtInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 推荐人id（用户id或商家id或运营商id） */
+    @Excel(name = "推荐人id", readConverterExp = "用=户id或商家id或运营商id")
+    private Long userRecommenders;
+
+    /** 推荐人等级，0运营商，1商家，2vip会员，3普通会员 */
+    @Excel(name = "推荐人等级，0运营商，1商家，2vip会员，3普通会员")
+    private String recommendersLevel;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUserRecommenders(Long userRecommenders) 
+    {
+        this.userRecommenders = userRecommenders;
+    }
+
+    public Long getUserRecommenders() 
+    {
+        return userRecommenders;
+    }
+    public void setRecommendersLevel(String recommendersLevel) 
+    {
+        this.recommendersLevel = recommendersLevel;
+    }
+
+    public String getRecommendersLevel() 
+    {
+        return recommendersLevel;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("userRecommenders", getUserRecommenders())
+            .append("recommendersLevel", getRecommendersLevel())
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLevelInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLevelInfo.java
new file mode 100644
index 0000000..dce2c19
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLevelInfo.java
@@ -0,0 +1,77 @@
+package com.ruoyi.segchk.domain;
+
+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.List;
+
+/**
+ * seg用户角色信息对象 SegchkUserLevelInfo
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserLevelInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 用户角色 */
+    @Excel(name = "用户角色")
+    private Long userLevel;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** token */
+    @Excel(name = "token")
+    private String token;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Long userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserLevelInfo{" +
+                "userId=" + userId +
+                ", userLevel=" + userLevel +
+                ", providerId=" + providerId +
+                ", token='" + token + '\'' +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java
new file mode 100644
index 0000000..c2fde46
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikeGoWebResp.java
@@ -0,0 +1,237 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * seg会员卡对象 segchk_user_vip
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserLikeGoWebResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 想去id */
+    @Excel(name = "想去id")
+    private Long likegoId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 商家id */
+    @Excel(name = "商家id，全局惟一")
+    private Long storeId;
+
+    /** 会员卡id */
+    @Excel(name = "会员卡id，充值卡或自定义卡")
+    private Long cardId;
+
+    /** 用户id */
+    @Excel(name = "用户id，全局惟一")
+    private Long userId;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    private String cardName;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
+    /** 商家小图标 */
+    @Excel(name = "商家小图标")
+    private String storeIcon;
+
+    /** 商家服务状态，是否在线 */
+    @Excel(name = "商家服务状态")
+    private Long serviceState;
+
+    /** 商家经度 */
+    @Excel(name = "商家经度")
+    private BigDecimal storeLon;
+
+    /** 商家纬度 */
+    @Excel(name = "商家纬度")
+    private BigDecimal storeLat;
+
+    /** 商家累积核次数 */
+    @Excel(name = "商家累积核次数")
+    private Long chkCount;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private BigDecimal starAvg;
+
+
+    /** 预约时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "预约时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
+    private Date modTime;
+
+    /** 商户标签列表 */
+    @Valid
+    private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
+
+    public Long getLikegoId() {
+        return likegoId;
+    }
+
+    public void setLikegoId(Long likegoId) {
+        this.likegoId = likegoId;
+    }
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    public Long getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(Long serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public BigDecimal getStoreLon() {
+        return storeLon;
+    }
+
+    public void setStoreLon(BigDecimal storeLon) {
+        this.storeLon = storeLon;
+    }
+
+    public BigDecimal getStoreLat() {
+        return storeLat;
+    }
+
+    public void setStoreLat(BigDecimal storeLat) {
+        this.storeLat = storeLat;
+    }
+
+    public Long getChkCount() {
+        return chkCount;
+    }
+
+    public void setChkCount(Long chkCount) {
+        this.chkCount = chkCount;
+    }
+
+    public BigDecimal getStarAvg() {
+        return starAvg;
+    }
+
+    public void setStarAvg(BigDecimal starAvg) {
+        this.starAvg = starAvg;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public List<SegchkRecommenderStoreLableWeb> getSegchkRecommenderStoreLableWebList() {
+        return segchkRecommenderStoreLableWebList;
+    }
+
+    public void setSegchkRecommenderStoreLableWebList(List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList) {
+        this.segchkRecommenderStoreLableWebList = segchkRecommenderStoreLableWebList;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserLikeGoWebResp{" +
+                "likegoId=" + likegoId +
+                ", providerId=" + providerId +
+                ", storeId=" + storeId +
+                ", cardId=" + cardId +
+                ", userId=" + userId +
+                ", storeName='" + storeName + '\'' +
+                ", cardName='" + cardName + '\'' +
+                ", qrCode='" + qrCode + '\'' +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", serviceState=" + serviceState +
+                ", storeLon=" + storeLon +
+                ", storeLat=" + storeLat +
+                ", chkCount=" + chkCount +
+                ", starAvg=" + starAvg +
+                ", modTime=" + modTime +
+                ", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikego.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikego.java
new file mode 100644
index 0000000..a3685ea
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserLikego.java
@@ -0,0 +1,153 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户想去记录对象 segchk_user_likego
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserLikego extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 想去id */
+    @Excel(name = "想去id")
+    private Long likegoId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 商家id，全局唯一 */
+    @Excel(name = "商家id，全局唯一")
+    private Long storeId;
+
+    /** 用户计划使用的卡号 */
+    @Excel(name = "用户计划使用的卡号")
+    private Long cardId;
+
+    /** 卡类型id，0充值卡，1商家赠卡，2优惠券卡 */
+    @Excel(name = "卡类型id，0充值卡，1商家赠卡，2优惠券卡")
+    private Integer cardType;
+
+    /** 预约二维码 */
+    @Excel(name = "预约二维码")
+    private String qrCode;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 管理状态，0有效，1失效，2已使用 */
+    @Excel(name = "管理状态，0有效，1失效，2已使用")
+    private Integer mgtState;
+
+    public void setLikegoId(Long likegoId) 
+    {
+        this.likegoId = likegoId;
+    }
+
+    public Long getLikegoId() 
+    {
+        return likegoId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setStoreId(Long storeId) 
+    {
+        this.storeId = storeId;
+    }
+
+    public Long getStoreId() 
+    {
+        return storeId;
+    }
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setCardType(Integer cardType) 
+    {
+        this.cardType = cardType;
+    }
+
+    public Integer getCardType() 
+    {
+        return cardType;
+    }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setMgtState(Integer mgtState) 
+    {
+        this.mgtState = mgtState;
+    }
+
+    public Integer getMgtState() 
+    {
+        return mgtState;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("likegoId", getLikegoId())
+            .append("providerId", getProviderId())
+            .append("userId", getUserId())
+            .append("storeId", getStoreId())
+            .append("cardId", getCardId())
+            .append("cardType", getCardType())
+            .append("qrCode", getQrCode())
+            .append("modTime", getModTime())
+            .append("mgtState", getMgtState())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserReward.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserReward.java
new file mode 100644
index 0000000..1dd2f1d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserReward.java
@@ -0,0 +1,140 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户奖励对象 segchk_user_reward
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserReward extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 奖励额 */
+    @Excel(name = "奖励额")
+    private BigDecimal reward;
+
+    /** 奖励类型 */
+    @Excel(name = "奖励类型")
+    private String rewardType;
+
+    /** 奖励卡号 */
+    @Excel(name = "奖励卡号")
+    private Long rewardCardId;
+
+    /** 奖励卡类型id */
+    @Excel(name = "奖励卡类型id")
+    private Long rewardCardTypeId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 奖励id号，全表唯一 */
+    @Excel(name = "奖励id号，全表唯一")
+    private Long rewardId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setReward(BigDecimal reward) 
+    {
+        this.reward = reward;
+    }
+
+    public BigDecimal getReward() 
+    {
+        return reward;
+    }
+    public void setRewardType(String rewardType) 
+    {
+        this.rewardType = rewardType;
+    }
+
+    public String getRewardType() 
+    {
+        return rewardType;
+    }
+    public void setRewardCardId(Long rewardCardId) 
+    {
+        this.rewardCardId = rewardCardId;
+    }
+
+    public Long getRewardCardId() 
+    {
+        return rewardCardId;
+    }
+    public void setRewardCardTypeId(Long rewardCardTypeId) 
+    {
+        this.rewardCardTypeId = rewardCardTypeId;
+    }
+
+    public Long getRewardCardTypeId() 
+    {
+        return rewardCardTypeId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setRewardId(Long rewardId) 
+    {
+        this.rewardId = rewardId;
+    }
+
+    public Long getRewardId() 
+    {
+        return rewardId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("reward", getReward())
+            .append("rewardType", getRewardType())
+            .append("rewardCardId", getRewardCardId())
+            .append("rewardCardTypeId", getRewardCardTypeId())
+            .append("modTime", getModTime())
+            .append("rewardId", getRewardId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserRewardCtl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserRewardCtl.java
new file mode 100644
index 0000000..a4701ce
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserRewardCtl.java
@@ -0,0 +1,112 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg会员推荐控制对象 segchk_user_reward_ctl
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserRewardCtl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 控制id */
+    @Excel(name = "控制id")
+    private Integer rewardCtlId;
+
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long providerId;
+
+    /** 卡类型id，-1,普通用户，其他会员卡类型id */
+    @Excel(name = "卡类型id，-1,普通用户，其他会员卡类型id")
+    private Long fromId;
+
+    /** 奖励额 */
+    @Excel(name = "奖励额")
+    private BigDecimal reward;
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long toId;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setRewardCtlId(Integer rewardCtlId) 
+    {
+        this.rewardCtlId = rewardCtlId;
+    }
+
+    public Integer getRewardCtlId() 
+    {
+        return rewardCtlId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setFromId(Long fromId) 
+    {
+        this.fromId = fromId;
+    }
+
+    public Long getFromId() 
+    {
+        return fromId;
+    }
+    public void setReward(BigDecimal reward) 
+    {
+        this.reward = reward;
+    }
+
+    public BigDecimal getReward() 
+    {
+        return reward;
+    }
+    public void setToId(Long toId) 
+    {
+        this.toId = toId;
+    }
+
+    public Long getToId() 
+    {
+        return toId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("rewardCtlId", getRewardCtlId())
+            .append("providerId", getProviderId())
+            .append("fromId", getFromId())
+            .append("reward", getReward())
+            .append("toId", getToId())
+            .append("modTime", getModTime())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSecurity.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSecurity.java
new file mode 100644
index 0000000..71dd916
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSecurity.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户密码对象 segchk_user_security
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserSecurity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 密码 */
+    @Excel(name = "密码")
+    private String passwd;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 密码id，全表唯一 */
+    @Excel(name = "密码id，全表唯一")
+    private Long pwdId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPasswd(String passwd) 
+    {
+        this.passwd = passwd;
+    }
+
+    public String getPasswd() 
+    {
+        return passwd;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setPwdId(Long pwdId) 
+    {
+        this.pwdId = pwdId;
+    }
+
+    public Long getPwdId() 
+    {
+        return pwdId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("passwd", getPasswd())
+            .append("modTime", getModTime())
+            .append("pwdId", getPwdId())
+            .append("providerId", getProviderId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java
new file mode 100644
index 0000000..60658e6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserSetInfoReq.java
@@ -0,0 +1,104 @@
+package com.ruoyi.segchk.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户修改信息对象 SegchkUserSetInfoReq
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserSetInfoReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 密码 */
+    @Excel(name = "密码")
+    private String passwd;
+
+    /** 密码id，全表唯一 */
+    @Excel(name = "密码id，全表唯一")
+    private Long pwdId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户手机号 */
+    @Excel(name = "用户手机号")
+    private String phoneNo;
+
+    /** 用户等级 */
+    @Excel(name = "用户等级")
+    private Integer userLevel;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPasswd(String passwd) 
+    {
+        this.passwd = passwd;
+    }
+
+    public void setPwdId(Long pwdId) 
+    {
+        this.pwdId = pwdId;
+    }
+
+    public Long getPwdId() 
+    {
+        return pwdId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+
+    public String getPasswd() {
+        return passwd;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public Integer getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(Integer userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserSetInfoReq{" +
+                "userId=" + userId +
+                ", passwd='" + passwd + '\'' +
+                ", pwdId=" + pwdId +
+                ", providerId=" + providerId +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", userLevel=" + userLevel +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserVip.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserVip.java
new file mode 100644
index 0000000..599e695
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserVip.java
@@ -0,0 +1,154 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg会员卡对象 segchk_user_vip
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserVip extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 会员卡号id，全局惟一 */
+    @Excel(name = "会员卡号id，全局惟一")
+    private Long cardId;
+
+    /** 会员卡类型，0--9块9，1---99 */
+    @Excel(name = "会员卡类型，0--9块9，1---99")
+    private Long cardTypeId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date effectiveTime;
+
+    /** 使用次数 */
+    @Excel(name = "使用次数")
+    private Integer useCount;
+
+    /** 剩余次数 */
+    @Excel(name = "剩余次数")
+    private Integer leftCount;
+
+    /** 状态，0正常，1过期 */
+    @Excel(name = "状态，0正常，1过期")
+    private String status;
+
+    public void setCardId(Long cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public Long getCardId() 
+    {
+        return cardId;
+    }
+    public void setCardTypeId(Long cardTypeId) 
+    {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getCardTypeId() 
+    {
+        return cardTypeId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setEffectiveTime(Date effectiveTime) 
+    {
+        this.effectiveTime = effectiveTime;
+    }
+
+    public Date getEffectiveTime() 
+    {
+        return effectiveTime;
+    }
+    public void setUseCount(Integer useCount) 
+    {
+        this.useCount = useCount;
+    }
+
+    public Integer getUseCount() 
+    {
+        return useCount;
+    }
+    public void setLeftCount(Integer leftCount) 
+    {
+        this.leftCount = leftCount;
+    }
+
+    public Integer getLeftCount() 
+    {
+        return leftCount;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("cardId", getCardId())
+            .append("cardTypeId", getCardTypeId())
+            .append("userId", getUserId())
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .append("effectiveTime", getEffectiveTime())
+            .append("useCount", getUseCount())
+            .append("leftCount", getLeftCount())
+            .append("status", getStatus())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebSCResp.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebSCResp.java
new file mode 100644
index 0000000..6de73e9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebSCResp.java
@@ -0,0 +1,184 @@
+package com.ruoyi.segchk.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * seg用户核消列表对象 SegchkUserWebSCResp
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public class SegchkUserWebSCResp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+
+    /** 卡号id */
+    @Excel(name = "卡号id")
+    private Long cardId;
+
+    /** 商家id */
+    @Excel(name = "商家id")
+    private Long storeId;
+
+    /** 商家图标 */
+    @Excel(name = "商家图标")
+    private String storeIcon;
+
+
+    /** 卡类型id */
+    @Excel(name = "卡类型id")
+    private Long cardTypeId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 核消id */
+    @Excel(name = "核消id")
+    private Long chkServiceId;
+
+    /** 评论id */
+    @Excel(name = "评论id")
+    private Long commentId;
+
+    /** 卡类型名称 */
+    @Excel(name = "卡类型名称")
+    private String cardTypeName;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String storeName;
+
+    /** 卡来源，0充值卡，1优惠券，2商家自定义卡 */
+    @Excel(name = "卡来源")
+    private Integer chkSource;
+
+    public Long getProviderId() {
+        return providerId;
+    }
+
+    public void setProviderId(Long providerId) {
+        this.providerId = providerId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getCardTypeId() {
+        return cardTypeId;
+    }
+
+    public void setCardTypeId(Long cardTypeId) {
+        this.cardTypeId = cardTypeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Long getChkServiceId() {
+        return chkServiceId;
+    }
+
+    public void setChkServiceId(Long chkServiceId) {
+        this.chkServiceId = chkServiceId;
+    }
+
+    public Long getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Long commentId) {
+        this.commentId = commentId;
+    }
+
+    public String getCardTypeName() {
+        return cardTypeName;
+    }
+
+    public void setCardTypeName(String cardTypeName) {
+        this.cardTypeName = cardTypeName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getChkSource() {
+        return chkSource;
+    }
+
+    public void setChkSource(Integer chkSource) {
+        this.chkSource = chkSource;
+    }
+
+    public String getStoreIcon() {
+        return storeIcon;
+    }
+
+    public void setStoreIcon(String storeIcon) {
+        this.storeIcon = storeIcon;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserWebSCResp{" +
+                "providerId=" + providerId +
+                ", cardId=" + cardId +
+                ", storeId=" + storeId +
+                ", storeIcon='" + storeIcon + '\'' +
+                ", cardTypeId=" + cardTypeId +
+                ", userId=" + userId +
+                ", modTime=" + modTime +
+                ", chkServiceId=" + chkServiceId +
+                ", commentId=" + commentId +
+                ", cardTypeName='" + cardTypeName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", chkSource=" + chkSource +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWechat.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWechat.java
new file mode 100644
index 0000000..367f408
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserWechat.java
@@ -0,0 +1,124 @@
+package com.ruoyi.segchk.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg用户微信信息对象 segchk_user_wechat
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkUserWechat extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 用户id，全局唯一 */
+    @Excel(name = "用户id，全局唯一")
+    private Long userId;
+
+    /** 微信唯一识别号，用于转账等 */
+    @Excel(name = "微信唯一识别号，用于转账等")
+    private String openid;
+
+    /** 微信的联合登录id */
+    @Excel(name = "微信的联合登录id")
+    private String unionId;
+
+    /** 微信昵称 */
+    @Excel(name = "微信昵称")
+    private String nickName;
+
+    /** 微信头像 */
+    @Excel(name = "微信头像")
+    private String iconUrl;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setOpenid(String openid) 
+    {
+        this.openid = openid;
+    }
+
+    public String getOpenid() 
+    {
+        return openid;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    @Override
+    public String toString() {
+        return "SegchkUserWechat{" +
+                "providerId=" + providerId +
+                ", userId=" + userId +
+                ", openid='" + openid + '\'' +
+                ", unionId='" + unionId + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", iconUrl='" + iconUrl + '\'' +
+                ", modTime=" + modTime +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkVipSetInfo.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkVipSetInfo.java
new file mode 100644
index 0000000..18f80b8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkVipSetInfo.java
@@ -0,0 +1,140 @@
+package com.ruoyi.segchk.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * seg会员卡设置对象 segchk_vip_set_info
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public class SegchkVipSetInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 运营商id，全局唯一 */
+    @Excel(name = "运营商id，全局唯一")
+    private Long providerId;
+
+    /** 创建或修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建或修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 提现额门限 */
+    @Excel(name = "提现额门限")
+    private BigDecimal cashThrehold;
+
+    /** 提现到账日期，0当天到账，n--N个工作日后到账 */
+    @Excel(name = "提现到账日期，0当天到账，n--N个工作日后到账")
+    private Integer cashDay;
+
+    /** 是否允许自助续费,0允许，1禁止 */
+    @Excel(name = "是否允许自助续费,0允许，1禁止")
+    private String selfCharge;
+
+    /** 有效期提醒时间，天 */
+    @Excel(name = "有效期提醒时间，天")
+    private Integer effectiveRemind;
+
+    /** 模板id，全表唯一 */
+    @Excel(name = "模板id，全表唯一")
+    private Integer modeId;
+
+    /** 激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态 */
+    @Excel(name = "激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态")
+    private String activeFlag;
+
+    public void setProviderId(Long providerId) 
+    {
+        this.providerId = providerId;
+    }
+
+    public Long getProviderId() 
+    {
+        return providerId;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setCashThrehold(BigDecimal cashThrehold) 
+    {
+        this.cashThrehold = cashThrehold;
+    }
+
+    public BigDecimal getCashThrehold() 
+    {
+        return cashThrehold;
+    }
+    public void setCashDay(Integer cashDay) 
+    {
+        this.cashDay = cashDay;
+    }
+
+    public Integer getCashDay() 
+    {
+        return cashDay;
+    }
+    public void setSelfCharge(String selfCharge) 
+    {
+        this.selfCharge = selfCharge;
+    }
+
+    public String getSelfCharge() 
+    {
+        return selfCharge;
+    }
+    public void setEffectiveRemind(Integer effectiveRemind) 
+    {
+        this.effectiveRemind = effectiveRemind;
+    }
+
+    public Integer getEffectiveRemind() 
+    {
+        return effectiveRemind;
+    }
+    public void setModeId(Integer modeId) 
+    {
+        this.modeId = modeId;
+    }
+
+    public Integer getModeId() 
+    {
+        return modeId;
+    }
+    public void setActiveFlag(String activeFlag) 
+    {
+        this.activeFlag = activeFlag;
+    }
+
+    public String getActiveFlag() 
+    {
+        return activeFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("providerId", getProviderId())
+            .append("modTime", getModTime())
+            .append("cashThrehold", getCashThrehold())
+            .append("cashDay", getCashDay())
+            .append("selfCharge", getSelfCharge())
+            .append("effectiveRemind", getEffectiveRemind())
+            .append("modeId", getModeId())
+            .append("activeFlag", getActiveFlag())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCarouseMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCarouseMgtMapper.java
new file mode 100644
index 0000000..d574066
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCarouseMgtMapper.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkCarouseMgt;
+
+/**
+ * seg首页轮播图管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkCarouseMgtMapper 
+{
+    /**
+     * 查询seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return seg首页轮播图管理
+     */
+    public SegchkCarouseMgt selectSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    /**
+     * 查询seg首页轮播图管理列表
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return seg首页轮播图管理集合
+     */
+    public List<SegchkCarouseMgt> selectSegchkCarouseMgtList(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 新增seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int insertSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 修改seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int updateSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 删除seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    /**
+     * 批量删除seg首页轮播图管理
+     * 
+     * @param carouseIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseIds(Long[] carouseIds);
+
+    public int deleteSegchkCarouseMgtByStoreIds(Long[] storeIds);
+
+    public int updateSegchkCarouseMgtSortBatch(List<HashMap<String, String>> collect);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkChargeCardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkChargeCardMapper.java
new file mode 100644
index 0000000..4b3726b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkChargeCardMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkChargeCard;
+
+/**
+ * seg充值卡管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkChargeCardMapper 
+{
+    /**
+     * 查询seg充值卡管理
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return seg充值卡管理
+     */
+    public SegchkChargeCard selectSegchkChargeCardBycardTypeId(Long cardTypeId);
+
+    /**
+     * 查询seg充值卡管理列表
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return seg充值卡管理集合
+     */
+    public List<SegchkChargeCard> selectSegchkChargeCardList(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 新增seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    public int insertSegchkChargeCard(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 修改seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    public int updateSegchkChargeCard(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 删除seg充值卡管理
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkChargeCardByCardTypeId(Long cardTypeId);
+
+    /**
+     * 批量删除seg充值卡管理
+     * 
+     * @param cardTypeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkChargeCardByCardTypeIds(String[] cardTypeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCommentAccMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCommentAccMapper.java
new file mode 100644
index 0000000..de3e187
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkCommentAccMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkCommentAcc;
+
+/**
+ * seg商家累积评价Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkCommentAccMapper 
+{
+    /**
+     * 查询seg商家累积评价
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return seg商家累积评价
+     */
+    public SegchkCommentAcc selectSegchkCommentAccByUpdateId(Long updateId);
+
+    /**
+     * 查询seg商家累积评价列表
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return seg商家累积评价集合
+     */
+    public List<SegchkCommentAcc> selectSegchkCommentAccList(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 新增seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    public int insertSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 修改seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    public int updateSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 删除seg商家累积评价
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return 结果
+     */
+    public int deleteSegchkCommentAccByUpdateId(Long updateId);
+
+    /**
+     * 批量删除seg商家累积评价
+     * 
+     * @param updateIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkCommentAccByUpdateIds(Long[] updateIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkDistrictInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkDistrictInfoMapper.java
new file mode 100644
index 0000000..e0b3dd8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkDistrictInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkDistrictInfo;
+
+/**
+ * seg行政区域代码Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkDistrictInfoMapper 
+{
+    /**
+     * 查询seg行政区域代码
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return seg行政区域代码
+     */
+    public SegchkDistrictInfo selectSegchkDistrictInfoByDistrictId(Integer districtId);
+
+    /**
+     * 查询seg行政区域代码列表
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return seg行政区域代码集合
+     */
+    public List<SegchkDistrictInfo> selectSegchkDistrictInfoList(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 新增seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    public int insertSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 修改seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    public int updateSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 删除seg行政区域代码
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return 结果
+     */
+    public int deleteSegchkDistrictInfoByDistrictId(Integer districtId);
+
+    /**
+     * 批量删除seg行政区域代码
+     * 
+     * @param districtIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkDistrictInfoByDistrictIds(Integer[] districtIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexCarouseMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexCarouseMapper.java
new file mode 100644
index 0000000..1c4c099
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexCarouseMapper.java
@@ -0,0 +1,62 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.SegchkCarouseMgt;
+
+import java.util.List;
+
+/**
+ * seg首页轮播图管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkIndexCarouseMapper
+{
+    /**
+     * 查询seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return seg首页轮播图管理
+     */
+    public SegchkCarouseMgt selectSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    /**
+     * 查询seg首页轮播图管理列表
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return seg首页轮播图管理集合
+     */
+    public List<SegchkCarouseMgt> selectSegchkCarouseMgtList(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 新增seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int insertSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 修改seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int updateSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 删除seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    /**
+     * 批量删除seg首页轮播图管理
+     * 
+     * @param carouseIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseIds(Long[] carouseIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexStoreAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexStoreAccountMapper.java
new file mode 100644
index 0000000..6e4c8cb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexStoreAccountMapper.java
@@ -0,0 +1,79 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.SegchkStoreAccount;
+import com.ruoyi.segchk.domain.SegchkStoreCash;
+
+import java.util.List;
+
+/**
+ * seg商户余额信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface SegchkIndexStoreAccountMapper
+{
+    /**
+     * 查询seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息ID
+     * @return seg商户余额信息
+     */
+    public SegchkStoreAccount selectSegchkStoreAccountById(Long accountId);
+
+    /**
+     * 查询seg商户余额信息列表
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return seg商户余额信息集合
+     */
+    public List<SegchkStoreAccount> selectSegchkStoreAccountList(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 新增seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int insertSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 修改seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int updateSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 删除seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountById(Long accountId);
+
+    /**
+     * 批量删除seg商户余额信息
+     * 
+     * @param accountIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByIds(String[] accountIds);
+
+    /**
+     * 根据提现记录，更新商户余额记录
+     *
+     * @param segchkStoreCash 提现记录
+     * @return 结果
+     */
+    public int insertSegchkStoreAccountByCash(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 根据提现id，删除相关商家余额记录
+     *
+     * @param segchkStoreCash 提现记录
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByCash(SegchkStoreCash segchkStoreCash);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserAccountMapper.java
new file mode 100644
index 0000000..673457f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserAccountMapper.java
@@ -0,0 +1,112 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * seg用户余额信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface SegchkIndexUserAccountMapper
+{
+    /**
+     * 查询seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息ID
+     * @return seg用户余额信息
+     */
+    public SegchkUserAccount selectSegchkUserAccountById(Long accountId);
+
+    /**
+     * 查询seg用户余额信息列表
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return seg用户余额信息集合
+     */
+    public List<SegchkUserAccount> selectSegchkUserAccountList(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 新增seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int insertSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 修改seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int updateSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 删除seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息ID
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountById(Long accountId);
+
+    /**
+     * 批量删除seg用户余额信息
+     * 
+     * @param accountIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByIds(String[] accountIds);
+
+
+    /**
+     * 根据用户要充值的金额与账号余额对比并返回结果
+     *
+     * @param segchkUserAccountCheck 用户充值使用余额信息
+     * @return 结果
+     */
+    public BigDecimal checkSegchkUserAccount(SegchkUserAccountCheck segchkUserAccountCheck);
+
+    /**
+     * 根据用户要充值的金额更新用户余额
+     *
+     * @param segchkUserAccountCheck 用户充值使用余额信息
+     * @return 结果
+     */
+    public int updateSegchkUserAccountBycharge(SegchkUserAccountCheck segchkUserAccountCheck);
+
+    /**
+     * 当用户充值失败时，则需要根据充值id，将用户中的对应余额记录删除
+     *
+     * @param segchkUserCharge 用户充值使用余额信息
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByCharge(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 根据用户id(或者商户id)，运营商id，用户身份查询用户余额
+     *
+     * @param segchkUserCashOpsReq 用户请示信息体
+     * @return 结果
+     */
+    public SegchkUserCashOpsResp selectSegchkUserAccountForCash(SegchkUserCashOpsReq segchkUserCashOpsReq);
+
+    /**
+     * 根据提现，重新计算用户最新全额
+     *
+     * @param segchkUserCash 用户请示信息体
+     * @return 结果
+     */
+    public int insertSegchkStoreAccountByCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 根据提现id，删除相应的余额记录
+     *
+     * @param segchkUserCash 用户请示信息体
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByCash(SegchkUserCash segchkUserCash);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserVipMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserVipMapper.java
new file mode 100644
index 0000000..333ceea
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkIndexUserVipMapper.java
@@ -0,0 +1,39 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.SegchkChargeRet;
+import com.ruoyi.segchk.domain.SegchkUserVip;
+
+import java.util.List;
+
+/**
+ * seg会员卡Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface SegchkIndexUserVipMapper
+{
+    /**
+     * 针对单张卡进行核消
+     *
+     * @param cardId 需要删除的数据ID
+     * @return 结果
+     */
+    public int updateSegchkUserVipCheck(Long cardId);
+
+    /**
+     * 根据充值卡id，获取充值记录相关信息，插入生成会员卡
+     *
+     * @param segchkChargeRet 充值id
+     * @return 结果
+     */
+    public int insertSegchkUserVipByCharge(SegchkChargeRet segchkChargeRet);
+
+    /**
+     * 根据用户信息返回用户身份
+     *
+     * @param phoneno 用户信息
+     * @return 更新结果
+     */
+    public int selectUserLevel(String phoneno);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkKeywordLableMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkKeywordLableMapper.java
new file mode 100644
index 0000000..74bfe81
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkKeywordLableMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkKeywordLable;
+
+/**
+ * seg关键字管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkKeywordLableMapper 
+{
+    /**
+     * 查询seg关键字管理
+     * 
+     * @param keywordId seg关键字管理主键
+     * @return seg关键字管理
+     */
+    public SegchkKeywordLable selectSegchkKeywordLableByKeywordId(Long keywordId);
+
+    /**
+     * 查询seg关键字管理列表
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return seg关键字管理集合
+     */
+    public List<SegchkKeywordLable> selectSegchkKeywordLableList(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 新增seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    public int insertSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 修改seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    public int updateSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 删除seg关键字管理
+     * 
+     * @param providerId seg关键字管理主键
+     * @return 结果
+     */
+    public int deleteSegchkKeywordLableByProviderId(Long providerId);
+
+    /**
+     * 批量删除seg关键字管理
+     * 
+     * @param keywordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkKeywordLableByKeywordIds(Long[] keywordIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLableMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLableMgtMapper.java
new file mode 100644
index 0000000..336fb34
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLableMgtMapper.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+
+/**
+ * seg首页标签管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkLableMgtMapper 
+{
+    /**
+     * 查询seg首页标签管理
+     * 
+     * @param providerId seg首页标签管理主键
+     * @return seg首页标签管理
+     */
+    public SegchkLableMgt selectSegchkLableMgtByMgtId(Long providerId);
+
+    /**
+     * 查询seg首页标签管理列表
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return seg首页标签管理集合
+     */
+    public List<SegchkLableMgt> selectSegchkLableMgtList(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 新增seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    public int insertSegchkLableMgt(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 修改seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    public int updateSegchkLableMgt(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 删除seg首页标签管理
+     * 
+     * @param providerId seg首页标签管理主键
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByMgtId(Long providerId);
+
+    /**
+     * 批量删除seg首页标签管理
+     * 
+     * @param mgtIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByMgtIds(Long[] mgtIds);
+
+    public int deleteSegchkLableMgtByCardTypeIds(Map<String, Object> params);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLogionDetailMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLogionDetailMapper.java
new file mode 100644
index 0000000..4307fa2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkLogionDetailMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkLogionDetail;
+
+/**
+ * seg登录记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkLogionDetailMapper 
+{
+    /**
+     * 查询seg登录记录
+     * 
+     * @param loginId seg登录记录主键
+     * @return seg登录记录
+     */
+    public SegchkLogionDetail selectSegchkLogionDetailByLoginId(Long loginId);
+
+    /**
+     * 查询seg登录记录列表
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return seg登录记录集合
+     */
+    public List<SegchkLogionDetail> selectSegchkLogionDetailList(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 新增seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    public int insertSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 修改seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    public int updateSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 删除seg登录记录
+     * 
+     * @param loginId seg登录记录主键
+     * @return 结果
+     */
+    public int deleteSegchkLogionDetailByLoginId(Long loginId);
+
+    /**
+     * 批量删除seg登录记录
+     * 
+     * @param loginIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkLogionDetailByLoginIds(Long[] loginIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkMsgDetailMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkMsgDetailMapper.java
new file mode 100644
index 0000000..79d24ce
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkMsgDetailMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkMsgDetail;
+
+/**
+ * seg消息记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkMsgDetailMapper 
+{
+    /**
+     * 查询seg消息记录
+     * 
+     * @param msgId seg消息记录主键
+     * @return seg消息记录
+     */
+    public SegchkMsgDetail selectSegchkMsgDetailByMsgId(Long msgId);
+
+    /**
+     * 查询seg消息记录列表
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return seg消息记录集合
+     */
+    public List<SegchkMsgDetail> selectSegchkMsgDetailList(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 新增seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    public int insertSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 修改seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    public int updateSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 删除seg消息记录
+     * 
+     * @param msgId seg消息记录主键
+     * @return 结果
+     */
+    public int deleteSegchkMsgDetailByMsgId(Long msgId);
+
+    /**
+     * 批量删除seg消息记录
+     * 
+     * @param msgIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkMsgDetailByMsgIds(Long[] msgIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkPreferenceLableMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkPreferenceLableMapper.java
new file mode 100644
index 0000000..8ae4315
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkPreferenceLableMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkPreferenceLable;
+
+/**
+ * seg优惠管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkPreferenceLableMapper 
+{
+    /**
+     * 查询seg优惠管理
+     * 
+     * @param preferenceId seg优惠管理主键
+     * @return seg优惠管理
+     */
+    public SegchkPreferenceLable selectSegchkPreferenceLableByPreferenceId(Long preferenceId);
+
+    /**
+     * 查询seg优惠管理列表
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return seg优惠管理集合
+     */
+    public List<SegchkPreferenceLable> selectSegchkPreferenceLableList(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 新增seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    public int insertSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 修改seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    public int updateSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 删除seg优惠管理
+     * 
+     * @param providerId seg优惠管理主键
+     * @return 结果
+     */
+    public int deleteSegchkPreferenceLableByProviderId(Long providerId);
+
+    /**
+     * 批量删除seg优惠管理
+     * 
+     * @param preferenceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkPreferenceLableByPreferenceIds(Long[] preferenceIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderMgtMapper.java
new file mode 100644
index 0000000..8fb01fc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderMgtMapper.java
@@ -0,0 +1,92 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkProviderMgt;
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+
+/**
+ * seg运营商管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkProviderMgtMapper 
+{
+    /**
+     * 查询seg运营商管理
+     * 
+     * @param providerId seg运营商管理主键
+     * @return seg运营商管理
+     */
+    public SegchkProviderMgt selectSegchkProviderMgtByProviderId(Long providerId);
+
+    /**
+     * 查询seg运营商管理列表
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return seg运营商管理集合
+     */
+    public List<SegchkProviderMgt> selectSegchkProviderMgtList(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 新增seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    public int insertSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 修改seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    public int updateSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 删除seg运营商管理
+     * 
+     * @param providerId seg运营商管理主键
+     * @return 结果
+     */
+    public int deleteSegchkProviderMgtByProviderId(Long providerId);
+
+    /**
+     * 批量删除seg运营商管理
+     * 
+     * @param providerIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkProviderMgtByProviderIds(Long[] providerIds);
+
+    /**
+     * 批量删除seg首页标签管理
+     * 
+     * @param providerIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByProviderIds(Long[] providerIds);
+    
+    /**
+     * 批量新增seg首页标签管理
+     * 
+     * @param segchkLableMgtList seg首页标签管理列表
+     * @return 结果
+     */
+    public int batchSegchkLableMgt(List<SegchkLableMgt> segchkLableMgtList);
+    
+
+    /**
+     * 通过seg运营商管理主键删除seg首页标签管理信息
+     * 
+     * @param providerId seg运营商管理ID
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByProviderId(Long providerId);
+
+    HashMap<String, Object> getCustomService(Long providerId);
+
+    Long getProviderIdByPhoneNo(String phonenumber);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderIndexMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderIndexMapper.java
new file mode 100644
index 0000000..8b5542b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderIndexMapper.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.mapper;
+
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebReq;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebResp;
+
+import java.util.List;
+
+/**
+ * seg首页推荐商户Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface SegchkRecommenderIndexMapper
+{
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return seg首页推荐商户
+     */
+    public SegchkRecommenderStore selectSegchkRecommenderStoreById(Long recommenderId);
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户集合
+     */
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 删除seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreById(Long recommenderId);
+
+    /**
+     * 批量删除seg首页推荐商户
+     * 
+     * @param recommenderIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByIds(String[] recommenderIds);
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderStoreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderStoreMapper.java
new file mode 100644
index 0000000..5bfd732
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkRecommenderStoreMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+
+/**
+ * seg首页推荐商户Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkRecommenderStoreMapper 
+{
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return seg首页推荐商户
+     */
+    public SegchkRecommenderStore selectSegchkRecommenderStoreByRecommenderId(Long recommenderId);
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户集合
+     */
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 删除seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByRecommenderId(Long recommenderId);
+
+    /**
+     * 批量删除seg首页推荐商户
+     * 
+     * @param recommenderIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByRecommenderIds(Long[] recommenderIds);
+
+    public int deleteSegchkRecommenderStoreByStoreIds(Long[] storeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSalerInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSalerInfoMapper.java
new file mode 100644
index 0000000..4886d06
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSalerInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSalerInfo;
+
+/**
+ * seg销售人员信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkSalerInfoMapper 
+{
+    /**
+     * 查询seg销售人员信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return seg销售人员信息
+     */
+    public SegchkSalerInfo selectSegchkSalerInfoBySalerId(Integer salerId);
+
+    /**
+     * 查询seg销售人员信息列表
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return seg销售人员信息集合
+     */
+    public List<SegchkSalerInfo> selectSegchkSalerInfoList(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 新增seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    public int insertSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 修改seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    public int updateSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 删除seg销售人员信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return 结果
+     */
+    public int deleteSegchkSalerInfoBySalerId(Integer salerId);
+
+    /**
+     * 批量删除seg销售人员信息
+     * 
+     * @param salerIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSalerInfoBySalerIds(Integer[] salerIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSelfServiceChkMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSelfServiceChkMapper.java
new file mode 100644
index 0000000..f692b1e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSelfServiceChkMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSelfServiceChk;
+
+/**
+ * seg自定义卡核消记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkSelfServiceChkMapper 
+{
+    /**
+     * 查询seg自定义卡核消记录
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return seg自定义卡核消记录
+     */
+    public SegchkSelfServiceChk selectSegchkSelfServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 查询seg自定义卡核消记录列表
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return seg自定义卡核消记录集合
+     */
+    public List<SegchkSelfServiceChk> selectSegchkSelfServiceChkList(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 新增seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    public int insertSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 修改seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    public int updateSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 删除seg自定义卡核消记录
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return 结果
+     */
+    public int deleteSegchkSelfServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 批量删除seg自定义卡核消记录
+     * 
+     * @param chkServiceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSelfServiceChkByChkServiceIds(Long[] chkServiceIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceChkMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceChkMapper.java
new file mode 100644
index 0000000..df90a9d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceChkMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkServiceChk;
+
+/**
+ * seg核消记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkServiceChkMapper 
+{
+    /**
+     * 查询seg核消记录
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return seg核消记录
+     */
+    public SegchkServiceChk selectSegchkServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 查询seg核消记录列表
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return seg核消记录集合
+     */
+    public List<SegchkServiceChk> selectSegchkServiceChkList(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 新增seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    public int insertSegchkServiceChk(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 修改seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    public int updateSegchkServiceChk(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 删除seg核消记录
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return 结果
+     */
+    public int deleteSegchkServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 批量删除seg核消记录
+     * 
+     * @param chkServiceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkServiceChkByChkServiceIds(Long[] chkServiceIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceCommentMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceCommentMapper.java
new file mode 100644
index 0000000..7ece367
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkServiceCommentMapper.java
@@ -0,0 +1,71 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkServiceComment;
+import com.ruoyi.segchk.domain.SegchkServiceCommentUserReq;
+
+/**
+ * seg评价记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkServiceCommentMapper 
+{
+    /**
+     * 查询seg评价记录
+     * 
+     * @param commentId seg评价记录主键
+     * @return seg评价记录
+     */
+    public SegchkServiceComment selectSegchkServiceCommentByCommentId(Long commentId);
+
+    /**
+     * 查询seg评价记录列表
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return seg评价记录集合
+     */
+    public List<SegchkServiceComment> selectSegchkServiceCommentList(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 新增seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    public int insertSegchkServiceComment(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 修改seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    public int updateSegchkServiceComment(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 删除seg评价记录
+     * 
+     * @param commentId seg评价记录主键
+     * @return 结果
+     */
+    public int deleteSegchkServiceCommentByCommentId(Long commentId);
+
+    /**
+     * 批量删除seg评价记录
+     * 
+     * @param commentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkServiceCommentByCommentIds(Long[] commentIds);
+
+
+    /**
+     * 根据用户评价及核消id，新增用户评价
+     *
+     * @param segchkServiceCommentUserReq 用户评价实体
+     * @return 结果
+     */
+    public int insertSegchkServiceCommentByChk(SegchkServiceCommentUserReq segchkServiceCommentUserReq);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSmsDetailMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSmsDetailMapper.java
new file mode 100644
index 0000000..7afdde7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSmsDetailMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSmsDetail;
+
+/**
+ * seg短信记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkSmsDetailMapper 
+{
+    /**
+     * 查询seg短信记录
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return seg短信记录
+     */
+    public SegchkSmsDetail selectSegchkSmsDetailByShortMsgId(Long shortMsgId);
+
+    /**
+     * 查询seg短信记录列表
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return seg短信记录集合
+     */
+    public List<SegchkSmsDetail> selectSegchkSmsDetailList(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 新增seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    public int insertSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 修改seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    public int updateSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 删除seg短信记录
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return 结果
+     */
+    public int deleteSegchkSmsDetailByShortMsgId(Long shortMsgId);
+
+    /**
+     * 批量删除seg短信记录
+     * 
+     * @param shortMsgIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSmsDetailByShortMsgIds(Long[] shortMsgIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreAccountMapper.java
new file mode 100644
index 0000000..35be856
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreAccountMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreAccount;
+
+/**
+ * seg商户余额信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreAccountMapper 
+{
+    /**
+     * 查询seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return seg商户余额信息
+     */
+    public SegchkStoreAccount selectSegchkStoreAccountByAccountId(Long accountId);
+
+    /**
+     * 查询seg商户余额信息列表
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return seg商户余额信息集合
+     */
+    public List<SegchkStoreAccount> selectSegchkStoreAccountList(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 新增seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int insertSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 修改seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int updateSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 删除seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByAccountId(Long accountId);
+
+    /**
+     * 批量删除seg商户余额信息
+     * 
+     * @param accountIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByAccountIds(Long[] accountIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreBasicInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreBasicInfoMapper.java
new file mode 100644
index 0000000..c29e601
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreBasicInfoMapper.java
@@ -0,0 +1,168 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+
+import com.ruoyi.segchk.domain.*;
+
+/**
+ * seg商家基础信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreBasicInfoMapper 
+{
+    /**
+     * 查询seg商家基础信息
+     * 
+     * @param storeId seg商家基础信息主键
+     * @return seg商家基础信息
+     */
+    public SegchkStoreBasicInfo selectSegchkStoreBasicInfoByStoreId(Long storeId);
+
+    /**
+     * 查询seg商家基础信息列表
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return seg商家基础信息集合
+     */
+    public List<SegchkStoreBasicInfo> selectSegchkStoreBasicInfoList(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 新增seg商家基础信息
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int insertSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 修改seg商家基础信息
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int updateSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 删除seg商家基础信息
+     * 
+     * @param storeId seg商家基础信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreBasicInfoByStoreId(Long storeId);
+
+    /**
+     * 批量删除seg商家基础信息
+     * 
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreBasicInfoByStoreIds(Long[] storeIds);
+
+    /**
+     * 批量删除seg商家图片信息
+     * 
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreIds(Long[] storeIds);
+
+    /**
+     * 批量删除seg商家核消管理信息
+     *
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByStoreIds(Long[] storeIds);
+
+    /**
+     * 批量删除seg商家标签管理信息
+     *
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByStoreIds(Long[] storeIds);
+
+    /**
+     * 批量删除seg商家标签管理信息
+     *
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByStoreIds(Long[] storeIds);
+    
+    /**
+     * 批量新增seg商家图片信息
+     * 
+     * @param segchkStoreImageList seg商家图片信息列表
+     * @return 结果
+     */
+    public int batchSegchkStoreImage(List<SegchkStoreImage> segchkStoreImageList);
+
+    /**
+     * 批量新增seg商家图片信息
+     *
+     * @param segchkStoreChkMgtList seg商家图片信息列表
+     * @return 结果
+     */
+    public int batchSegchkStoreChkMgt(List<SegchkStoreChkMgt> segchkStoreChkMgtList);
+
+    /**
+     * 批量新增seg商家图片信息
+     *
+     * @param segchkStoreLableMgtList seg商家图片信息列表
+     * @return 结果
+     */
+    public int batchSegchkStoreLableMgt(List<SegchkStoreLableMgt> segchkStoreLableMgtList);
+
+    /**
+     * 批量新增seg商家密码信息
+     *
+     * @param segchkStoreSecurityList seg商家图片信息列表
+     * @return 结果
+     */
+    public int batchSegchkStoreSecurity(List<SegchkStoreSecurity> segchkStoreSecurityList);
+    
+
+    /**
+     * 通过seg商家基础信息主键删除seg商家图片信息信息
+     * 
+     * @param storeId seg商家基础信息ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreId(Long storeId);
+    /**
+     * 通过seg商家基础信息主键删除seg商家核消管理信息信息
+     *
+     * @param storeId seg商家基础信息ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByStoreId(Long storeId);
+    /**
+     * 通过seg商家基础信息主键删除seg商家标签管理信息信息
+     *
+     * @param storeId seg商家基础信息ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByStoreId(Long storeId);
+    /**
+     * 通过seg商家基础信息主键删除seg商家标签管理信息信息
+     *
+     * @param storeId seg商家基础信息ID
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByStoreId(Long storeId);
+
+    /**
+     * 修改seg商家服务状态
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int updateSegchkStoreServiceStatus(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    public Long selectStoreIdByPhone(String phone);
+
+    int updateSegchkStoreDetail(SegchkStoreBasicInfo segchkStoreBasicInfo);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreCashMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreCashMapper.java
new file mode 100644
index 0000000..4c84eb3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreCashMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreCash;
+
+/**
+ * seg商户户提现记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreCashMapper 
+{
+    /**
+     * 查询seg商户户提现记录
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return seg商户户提现记录
+     */
+    public SegchkStoreCash selectSegchkStoreCashByCashId(Long cashId);
+
+    /**
+     * 查询seg商户户提现记录列表
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return seg商户户提现记录集合
+     */
+    public List<SegchkStoreCash> selectSegchkStoreCashList(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 新增seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    public int insertSegchkStoreCash(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 修改seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    public int updateSegchkStoreCash(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 删除seg商户户提现记录
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreCashByCashId(Long cashId);
+
+    /**
+     * 批量删除seg商户户提现记录
+     * 
+     * @param cashIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreCashByCashIds(Long[] cashIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChargeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChargeMapper.java
new file mode 100644
index 0000000..586538d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChargeMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreCharge;
+
+/**
+ * seg商户充值记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreChargeMapper 
+{
+    /**
+     * 查询seg商户充值记录
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return seg商户充值记录
+     */
+    public SegchkStoreCharge selectSegchkStoreChargeByChargeId(Long chargeId);
+
+    /**
+     * 查询seg商户充值记录列表
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return seg商户充值记录集合
+     */
+    public List<SegchkStoreCharge> selectSegchkStoreChargeList(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 新增seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    public int insertSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 修改seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    public int updateSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 删除seg商户充值记录
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreChargeByChargeId(Long chargeId);
+
+    /**
+     * 批量删除seg商户充值记录
+     * 
+     * @param chargeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreChargeByChargeIds(Long[] chargeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChkMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChkMgtMapper.java
new file mode 100644
index 0000000..16ee2a8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreChkMgtMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreChkMgt;
+
+/**
+ * seg商家核消卡管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreChkMgtMapper 
+{
+    /**
+     * 查询seg商家核消卡管理
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return seg商家核消卡管理
+     */
+    public SegchkStoreChkMgt selectSegchkStoreChkMgtByMgtId(Integer mgtId);
+
+    /**
+     * 查询seg商家核消卡管理列表
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return seg商家核消卡管理集合
+     */
+    public List<SegchkStoreChkMgt> selectSegchkStoreChkMgtList(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 新增seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    public int insertSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 修改seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    public int updateSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 删除seg商家核消卡管理
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByMgtId(Integer mgtId);
+
+    /**
+     * 批量删除seg商家核消卡管理
+     * 
+     * @param mgtIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByMgtIds(Integer[] mgtIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreImageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreImageMapper.java
new file mode 100644
index 0000000..68eae8d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreImageMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreImage;
+
+/**
+ * seg商家图片信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreImageMapper 
+{
+    /**
+     * 查询seg商家图片信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return seg商家图片信息
+     */
+    public SegchkStoreImage selectSegchkStoreImageByStoreId(Long storeId);
+
+    /**
+     * 查询seg商家图片信息列表
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return seg商家图片信息集合
+     */
+    public List<SegchkStoreImage> selectSegchkStoreImageList(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 新增seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    public int insertSegchkStoreImage(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 修改seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    public int updateSegchkStoreImage(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 删除seg商家图片信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreId(Long storeId);
+
+    /**
+     * 批量删除seg商家图片信息
+     * 
+     * @param storeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreIds(Long[] storeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreLableMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreLableMgtMapper.java
new file mode 100644
index 0000000..df5ac0e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreLableMgtMapper.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.domain.SegchkStoreLableMgt;
+
+/**
+ * seg商家标签管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreLableMgtMapper 
+{
+    /**
+     * 查询seg商家标签管理
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return seg商家标签管理
+     */
+    public SegchkStoreLableMgt selectSegchkStoreLableMgtByMgtId(Integer mgtId);
+
+    /**
+     * 查询seg商家标签管理列表
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return seg商家标签管理集合
+     */
+    public List<SegchkStoreLableMgt> selectSegchkStoreLableMgtList(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 新增seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    public int insertSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 修改seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    public int updateSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 删除seg商家标签管理
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByMgtId(Integer mgtId);
+
+    /**
+     * 批量删除seg商家标签管理
+     * 
+     * @param mgtIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByMgtIds(Integer[] mgtIds);
+
+    int deleteSegchkStoreLableMgtByCardTypeIds(Map<String, Object> paramsMap);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreRewardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreRewardMapper.java
new file mode 100644
index 0000000..1adaacc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreRewardMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreReward;
+
+/**
+ * seg商户奖励Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreRewardMapper 
+{
+    /**
+     * 查询seg商户奖励
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return seg商户奖励
+     */
+    public SegchkStoreReward selectSegchkStoreRewardByRewardId(Long rewardId);
+
+    /**
+     * 查询seg商户奖励列表
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return seg商户奖励集合
+     */
+    public List<SegchkStoreReward> selectSegchkStoreRewardList(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 新增seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    public int insertSegchkStoreReward(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 修改seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    public int updateSegchkStoreReward(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 删除seg商户奖励
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreRewardByRewardId(Long rewardId);
+
+    /**
+     * 批量删除seg商户奖励
+     * 
+     * @param rewardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreRewardByRewardIds(Long[] rewardIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSecurityMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSecurityMapper.java
new file mode 100644
index 0000000..1f486e8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSecurityMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreSecurity;
+
+/**
+ * seg商户密码Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreSecurityMapper 
+{
+    /**
+     * 查询seg商户密码
+     * 
+     * @param pwdId seg商户密码主键
+     * @return seg商户密码
+     */
+    public SegchkStoreSecurity selectSegchkStoreSecurityByPwdId(Long pwdId);
+
+    /**
+     * 查询seg商户密码列表
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return seg商户密码集合
+     */
+    public List<SegchkStoreSecurity> selectSegchkStoreSecurityList(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 新增seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    public int insertSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 修改seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    public int updateSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 删除seg商户密码
+     * 
+     * @param pwdId seg商户密码主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByPwdId(Long pwdId);
+
+    /**
+     * 批量删除seg商户密码
+     * 
+     * @param pwdIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByPwdIds(Long[] pwdIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSelfMgtMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSelfMgtMapper.java
new file mode 100644
index 0000000..b49c0ff
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreSelfMgtMapper.java
@@ -0,0 +1,69 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreSelfMgt;
+
+/**
+ * seg商家自定义卡管理Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkStoreSelfMgtMapper 
+{
+    /**
+     * 查询seg商家自定义卡管理
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return seg商家自定义卡管理
+     */
+    public SegchkStoreSelfMgt selectSegchkStoreSelfMgtByFreeCardId(Long freeCardId);
+
+    /**
+     * 查询seg商家自定义卡管理列表
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return seg商家自定义卡管理集合
+     */
+    public List<SegchkStoreSelfMgt> selectSegchkStoreSelfMgtList(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 新增seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    public int insertSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 修改seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    public int updateSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 删除seg商家自定义卡管理
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreSelfMgtByFreeCardId(Long freeCardId);
+
+    /**
+     * 批量删除seg商家自定义卡管理
+     * 
+     * @param freeCardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreSelfMgtByFreeCardIds(Long[] freeCardIds);
+
+    /**
+     * 针对单张卡进行核消
+     *
+     * @param cardId 需要删除的数据ID
+     * @return 结果
+     */
+    public int updateSegchkUserVipCheck(Long cardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSystemSettingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSystemSettingMapper.java
new file mode 100644
index 0000000..d9d328e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkSystemSettingMapper.java
@@ -0,0 +1,108 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkBaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkSystemSetting;
+
+/**
+ * 系统设置Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-10-27
+ */
+public interface SegchkSystemSettingMapper 
+{
+    /**
+     * 查询系统设置
+     * 
+     * @param id 系统设置主键
+     * @return 系统设置
+     */
+    public SegchkSystemSetting selectSegchkSystemSettingById(Long id);
+
+    /**
+     * 查询系统设置列表
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 系统设置集合
+     */
+    public List<SegchkSystemSetting> selectSegchkSystemSettingList(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 新增系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    public int insertSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 修改系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    public int updateSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 删除系统设置
+     * 
+     * @param id 系统设置主键
+     * @return 结果
+     */
+    public int deleteSegchkSystemSettingById(Long id);
+
+    /**
+     * 批量删除系统设置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSystemSettingByIds(Long[] ids);
+
+    /**
+     * 查询基本信息设置
+     *
+     * @return 基本信息设置实体类
+     */
+
+    BaseInfoSet queryBaseInfoSet();
+
+    /**
+     * 编辑基本信息
+     *
+     * @param baseInfoSet 信息实体类
+     * @return 编辑返回码
+     */
+
+    int editBaseInfoSetA(BaseInfoSet baseInfoSet);
+
+    /**
+     * 编辑高级信息
+     *
+     * @param baseInfoSet 信息实体类
+     * @return 编辑返回码
+     */
+
+    int editBaseInfoSetB(BaseInfoSet baseInfoSet);
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+
+    int setAuditSwitch(String storeSpuAudit);
+
+    /**
+     * 设置审核开关
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+
+    int setMemberPriceStatus(String memberPriceStatus);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserAccountMapper.java
new file mode 100644
index 0000000..9f241d1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserAccountMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserAccount;
+
+/**
+ * seg用户余额信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserAccountMapper 
+{
+    /**
+     * 查询seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return seg用户余额信息
+     */
+    public SegchkUserAccount selectSegchkUserAccountByAccountId(Long accountId);
+
+    /**
+     * 查询seg用户余额信息列表
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return seg用户余额信息集合
+     */
+    public List<SegchkUserAccount> selectSegchkUserAccountList(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 新增seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int insertSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 修改seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int updateSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 删除seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByAccountId(Long accountId);
+
+    /**
+     * 批量删除seg用户余额信息
+     * 
+     * @param accountIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByAccountIds(Long[] accountIds);
+
+    public int insertSegchkUserAccountBuyCharge(SegchkUserAccount segchkUserAccount);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserBasicInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserBasicInfoMapper.java
new file mode 100644
index 0000000..5367a27
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserBasicInfoMapper.java
@@ -0,0 +1,87 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+
+/**
+ * seg用户基本信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserBasicInfoMapper 
+{
+    /**
+     * 查询seg用户基本信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return seg用户基本信息
+     */
+    public SegchkUserBasicInfo selectSegchkUserBasicInfoByUserId(Long userId);
+
+    /**
+     * 查询seg用户基本信息列表
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return seg用户基本信息集合
+     */
+    public List<SegchkUserBasicInfo> selectSegchkUserBasicInfoList(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 新增seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    public int insertSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 修改seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    public int updateSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 删除seg用户基本信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserBasicInfoByUserId(Long userId);
+
+    /**
+     * 批量删除seg用户基本信息
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserBasicInfoByUserIds(Long[] userIds);
+
+    /**
+     * 批量删除seg用户实名认证信息
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUserIds(Long[] userIds);
+    
+    /**
+     * 批量新增seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfoList seg用户实名认证信息列表
+     * @return 结果
+     */
+    public int batchSegchkUserCertificationInfo(List<SegchkUserCertificationInfo> segchkUserCertificationInfoList);
+    
+
+    /**
+     * 通过seg用户基本信息主键删除seg用户实名认证信息信息
+     * 
+     * @param userId seg用户基本信息ID
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUserId(Long userId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCashMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCashMapper.java
new file mode 100644
index 0000000..b2abccc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCashMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCash;
+
+/**
+ * seg用户提现记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserCashMapper 
+{
+    /**
+     * 查询seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return seg用户提现记录
+     */
+    public SegchkUserCash selectSegchkUserCashByCashId(Long cashId);
+
+    /**
+     * 查询seg用户提现记录列表
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return seg用户提现记录集合
+     */
+    public List<SegchkUserCash> selectSegchkUserCashList(SegchkUserCash segchkUserCash);
+
+    /**
+     * 新增seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int insertSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 修改seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int updateSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 删除seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashId(Long cashId);
+
+    /**
+     * 批量删除seg用户提现记录
+     * 
+     * @param cashIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashIds(Long[] cashIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCertificationInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCertificationInfoMapper.java
new file mode 100644
index 0000000..2e96fb8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCertificationInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+
+/**
+ * seg用户实名认证信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserCertificationInfoMapper 
+{
+    /**
+     * 查询seg用户实名认证信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return seg用户实名认证信息
+     */
+    public SegchkUserCertificationInfo selectSegchkUserCertificationInfoByUsercardId(Long usercardId);
+
+    /**
+     * 查询seg用户实名认证信息列表
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return seg用户实名认证信息集合
+     */
+    public List<SegchkUserCertificationInfo> selectSegchkUserCertificationInfoList(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 新增seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    public int insertSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 修改seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    public int updateSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 删除seg用户实名认证信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUsercardId(Long usercardId);
+
+    /**
+     * 批量删除seg用户实名认证信息
+     * 
+     * @param usercardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUsercardIds(Long[] usercardIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserChargeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserChargeMapper.java
new file mode 100644
index 0000000..25107a5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserChargeMapper.java
@@ -0,0 +1,71 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCharge;
+
+/**
+ * seg用户充值记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserChargeMapper 
+{
+    /**
+     * 查询seg用户充值记录
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return seg用户充值记录
+     */
+    public SegchkUserCharge selectSegchkUserChargeByChargeId(Long chargeId);
+
+    /**
+     * 查询seg用户充值记录列表
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return seg用户充值记录集合
+     */
+    public List<SegchkUserCharge> selectSegchkUserChargeList(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 新增seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    public int insertSegchkUserCharge(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 修改seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    public int updateSegchkUserCharge(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 删除seg用户充值记录
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserChargeByChargeId(Long chargeId);
+
+    /**
+     * 批量删除seg用户充值记录
+     * 
+     * @param chargeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserChargeByChargeIds(Long[] chargeIds);
+
+    /**
+     * 根据充值id，结果状态进行充值更新
+     *
+     * @param segchkUserCharge 充值实体
+     * @return 结果
+     */
+    public int updateSegchkUserChargeByRet(SegchkUserCharge segchkUserCharge);
+
+    int addSegchkUserChargeWithRecommend(SegchkUserCharge segchkUserCharge);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCollectMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCollectMapper.java
new file mode 100644
index 0000000..f2142b1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserCollectMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+
+/**
+ * seg用户收藏记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserCollectMapper 
+{
+    /**
+     * 查询seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return seg用户收藏记录
+     */
+    public SegchkUserCollect selectSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 查询seg用户收藏记录列表
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return seg用户收藏记录集合
+     */
+    public List<SegchkUserCollect> selectSegchkUserCollectList(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 新增seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int insertSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 修改seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int updateSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 删除seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 批量删除seg用户收藏记录
+     * 
+     * @param collectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectIds(Long[] collectIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserExtInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserExtInfoMapper.java
new file mode 100644
index 0000000..367bc1e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserExtInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserExtInfo;
+
+/**
+ * seg用户扩展信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserExtInfoMapper 
+{
+    /**
+     * 查询seg用户扩展信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return seg用户扩展信息
+     */
+    public SegchkUserExtInfo selectSegchkUserExtInfoByUserId(Long userId);
+
+    /**
+     * 查询seg用户扩展信息列表
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return seg用户扩展信息集合
+     */
+    public List<SegchkUserExtInfo> selectSegchkUserExtInfoList(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 新增seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    public int insertSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 修改seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    public int updateSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 删除seg用户扩展信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserExtInfoByUserId(Long userId);
+
+    /**
+     * 批量删除seg用户扩展信息
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserExtInfoByUserIds(Long[] userIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserLikegoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserLikegoMapper.java
new file mode 100644
index 0000000..bb0ff52
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserLikegoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+
+/**
+ * seg用户想去记录Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserLikegoMapper 
+{
+    /**
+     * 查询seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return seg用户想去记录
+     */
+    public SegchkUserLikego selectSegchkUserLikegoByLikegoId(Long likegoId);
+
+    /**
+     * 查询seg用户想去记录列表
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return seg用户想去记录集合
+     */
+    public List<SegchkUserLikego> selectSegchkUserLikegoList(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 新增seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int insertSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 修改seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int updateSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 删除seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoId(Long likegoId);
+
+    /**
+     * 批量删除seg用户想去记录
+     * 
+     * @param likegoIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoIds(Long[] likegoIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardCtlMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardCtlMapper.java
new file mode 100644
index 0000000..6894cbe
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardCtlMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserRewardCtl;
+
+/**
+ * seg会员推荐控制Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserRewardCtlMapper 
+{
+    /**
+     * 查询seg会员推荐控制
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return seg会员推荐控制
+     */
+    public SegchkUserRewardCtl selectSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId);
+
+    /**
+     * 查询seg会员推荐控制列表
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return seg会员推荐控制集合
+     */
+    public List<SegchkUserRewardCtl> selectSegchkUserRewardCtlList(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 新增seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    public int insertSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 修改seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    public int updateSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 删除seg会员推荐控制
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId);
+
+    /**
+     * 批量删除seg会员推荐控制
+     * 
+     * @param rewardCtlIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardCtlByRewardCtlIds(Integer[] rewardCtlIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardMapper.java
new file mode 100644
index 0000000..560ede7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserRewardMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserReward;
+
+/**
+ * seg用户奖励Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserRewardMapper 
+{
+    /**
+     * 查询seg用户奖励
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return seg用户奖励
+     */
+    public SegchkUserReward selectSegchkUserRewardByRewardId(Long rewardId);
+
+    /**
+     * 查询seg用户奖励列表
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return seg用户奖励集合
+     */
+    public List<SegchkUserReward> selectSegchkUserRewardList(SegchkUserReward segchkUserReward);
+
+    /**
+     * 新增seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    public int insertSegchkUserReward(SegchkUserReward segchkUserReward);
+
+    /**
+     * 修改seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    public int updateSegchkUserReward(SegchkUserReward segchkUserReward);
+
+    /**
+     * 删除seg用户奖励
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardByRewardId(Long rewardId);
+
+    /**
+     * 批量删除seg用户奖励
+     * 
+     * @param rewardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardByRewardIds(Long[] rewardIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserSecurityMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserSecurityMapper.java
new file mode 100644
index 0000000..41cdcf0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserSecurityMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserSecurity;
+
+/**
+ * seg用户密码Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserSecurityMapper 
+{
+    /**
+     * 查询seg用户密码
+     * 
+     * @param pwdId seg用户密码主键
+     * @return seg用户密码
+     */
+    public SegchkUserSecurity selectSegchkUserSecurityByPwdId(Long pwdId);
+
+    /**
+     * 查询seg用户密码列表
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return seg用户密码集合
+     */
+    public List<SegchkUserSecurity> selectSegchkUserSecurityList(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 新增seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    public int insertSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 修改seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    public int updateSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 删除seg用户密码
+     * 
+     * @param pwdId seg用户密码主键
+     * @return 结果
+     */
+    public int deleteSegchkUserSecurityByPwdId(Long pwdId);
+
+    /**
+     * 批量删除seg用户密码
+     * 
+     * @param pwdIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserSecurityByPwdIds(Long[] pwdIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserVipMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserVipMapper.java
new file mode 100644
index 0000000..4e5c1ad
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserVipMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserVip;
+
+/**
+ * seg会员卡Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserVipMapper 
+{
+    /**
+     * 查询seg会员卡
+     * 
+     * @param cardId seg会员卡主键
+     * @return seg会员卡
+     */
+    public SegchkUserVip selectSegchkUserVipByCardId(Long cardId);
+
+    /**
+     * 查询seg会员卡列表
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return seg会员卡集合
+     */
+    public List<SegchkUserVip> selectSegchkUserVipList(SegchkUserVip segchkUserVip);
+
+    /**
+     * 新增seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    public int insertSegchkUserVip(SegchkUserVip segchkUserVip);
+
+    /**
+     * 修改seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    public int updateSegchkUserVip(SegchkUserVip segchkUserVip);
+
+    /**
+     * 删除seg会员卡
+     * 
+     * @param cardId seg会员卡主键
+     * @return 结果
+     */
+    public int deleteSegchkUserVipByCardId(Long cardId);
+
+    /**
+     * 批量删除seg会员卡
+     * 
+     * @param cardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserVipByCardIds(Long[] cardIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserWechatMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserWechatMapper.java
new file mode 100644
index 0000000..1421093
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkUserWechatMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+
+/**
+ * seg用户微信信息Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkUserWechatMapper 
+{
+    /**
+     * 查询seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return seg用户微信信息
+     */
+    public SegchkUserWechat selectSegchkUserWechatByUserId(Long userId);
+
+    /**
+     * 查询seg用户微信信息列表
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return seg用户微信信息集合
+     */
+    public List<SegchkUserWechat> selectSegchkUserWechatList(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 新增seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int insertSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 修改seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 删除seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserId(Long userId);
+
+    /**
+     * 批量删除seg用户微信信息
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserIds(Long[] userIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkVipSetInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkVipSetInfoMapper.java
new file mode 100644
index 0000000..ad61e6f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/mapper/SegchkVipSetInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.mapper;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkVipSetInfo;
+
+/**
+ * seg会员卡设置Mapper接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface SegchkVipSetInfoMapper 
+{
+    /**
+     * 查询seg会员卡设置
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return seg会员卡设置
+     */
+    public SegchkVipSetInfo selectSegchkVipSetInfoByModeId(Integer modeId);
+
+    /**
+     * 查询seg会员卡设置列表
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return seg会员卡设置集合
+     */
+    public List<SegchkVipSetInfo> selectSegchkVipSetInfoList(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 新增seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    public int insertSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 修改seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    public int updateSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 删除seg会员卡设置
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return 结果
+     */
+    public int deleteSegchkVipSetInfoByModeId(Integer modeId);
+
+    /**
+     * 批量删除seg会员卡设置
+     * 
+     * @param modeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSegchkVipSetInfoByModeIds(Integer[] modeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCarouseMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCarouseMgtService.java
new file mode 100644
index 0000000..d5b6677
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCarouseMgtService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkCarouseMgt;
+
+/**
+ * seg首页轮播图管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkCarouseMgtService 
+{
+    /**
+     * 查询seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return seg首页轮播图管理
+     */
+    public SegchkCarouseMgt selectSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    /**
+     * 查询seg首页轮播图管理列表
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return seg首页轮播图管理集合
+     */
+    public List<SegchkCarouseMgt> selectSegchkCarouseMgtList(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 新增seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int insertSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 修改seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    public int updateSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt);
+
+    /**
+     * 批量删除seg首页轮播图管理
+     * 
+     * @param carouseIds 需要删除的seg首页轮播图管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseIds(Long[] carouseIds);
+
+    /**
+     * 删除seg首页轮播图管理信息
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return 结果
+     */
+    public int deleteSegchkCarouseMgtByCarouseId(Long carouseId);
+
+    public int deleteSegchkCarouseMgtByStoreIds(Long[] storeIds);
+
+    public int updateSegchkCarouseMgtSort(String[] sortInfos);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkChargeCardService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkChargeCardService.java
new file mode 100644
index 0000000..d940d6c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkChargeCardService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkChargeCard;
+
+/**
+ * seg充值卡管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkChargeCardService 
+{
+    /**
+     * 查询seg充值卡管理
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return seg充值卡管理
+     */
+    public SegchkChargeCard selectSegchkChargeCardByCardTypeId(Long cardTypeId);
+
+    /**
+     * 查询seg充值卡管理列表
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return seg充值卡管理集合
+     */
+    public List<SegchkChargeCard> selectSegchkChargeCardList(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 新增seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    public int insertSegchkChargeCard(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 修改seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    public int updateSegchkChargeCard(SegchkChargeCard segchkChargeCard);
+
+    /**
+     * 批量删除seg充值卡管理
+     * 
+     * @param cardTypeIds 需要删除的seg充值卡管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkChargeCardByCardTypeIds(String[] cardTypeIds);
+
+    /**
+     * 删除seg充值卡管理信息
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkChargeCardByCardTypeId(Long cardTypeId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCommentAccService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCommentAccService.java
new file mode 100644
index 0000000..c616ffe
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkCommentAccService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkCommentAcc;
+
+/**
+ * seg商家累积评价Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkCommentAccService 
+{
+    /**
+     * 查询seg商家累积评价
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return seg商家累积评价
+     */
+    public SegchkCommentAcc selectSegchkCommentAccByUpdateId(Long updateId);
+
+    /**
+     * 查询seg商家累积评价列表
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return seg商家累积评价集合
+     */
+    public List<SegchkCommentAcc> selectSegchkCommentAccList(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 新增seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    public int insertSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 修改seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    public int updateSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc);
+
+    /**
+     * 批量删除seg商家累积评价
+     * 
+     * @param updateIds 需要删除的seg商家累积评价主键集合
+     * @return 结果
+     */
+    public int deleteSegchkCommentAccByUpdateIds(Long[] updateIds);
+
+    /**
+     * 删除seg商家累积评价信息
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return 结果
+     */
+    public int deleteSegchkCommentAccByUpdateId(Long updateId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkDistrictInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkDistrictInfoService.java
new file mode 100644
index 0000000..ac72f6d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkDistrictInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkDistrictInfo;
+
+/**
+ * seg行政区域代码Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkDistrictInfoService 
+{
+    /**
+     * 查询seg行政区域代码
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return seg行政区域代码
+     */
+    public SegchkDistrictInfo selectSegchkDistrictInfoByDistrictId(Integer districtId);
+
+    /**
+     * 查询seg行政区域代码列表
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return seg行政区域代码集合
+     */
+    public List<SegchkDistrictInfo> selectSegchkDistrictInfoList(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 新增seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    public int insertSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 修改seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    public int updateSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo);
+
+    /**
+     * 批量删除seg行政区域代码
+     * 
+     * @param districtIds 需要删除的seg行政区域代码主键集合
+     * @return 结果
+     */
+    public int deleteSegchkDistrictInfoByDistrictIds(Integer[] districtIds);
+
+    /**
+     * 删除seg行政区域代码信息
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return 结果
+     */
+    public int deleteSegchkDistrictInfoByDistrictId(Integer districtId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkKeywordLableService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkKeywordLableService.java
new file mode 100644
index 0000000..f4b4bc3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkKeywordLableService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkKeywordLable;
+
+/**
+ * seg关键字管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkKeywordLableService 
+{
+    /**
+     * 查询seg关键字管理
+     * 
+     * @param keywordId seg关键字管理主键
+     * @return seg关键字管理
+     */
+    public SegchkKeywordLable selectSegchkKeywordLableByKeywordId(Long keywordId);
+
+    /**
+     * 查询seg关键字管理列表
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return seg关键字管理集合
+     */
+    public List<SegchkKeywordLable> selectSegchkKeywordLableList(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 新增seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    public int insertSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 修改seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    public int updateSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable);
+
+    /**
+     * 批量删除seg关键字管理
+     * 
+     * @param keywordIds 需要删除的seg关键字管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkKeywordLableByKeywordIds(Long[] keywordIds);
+
+    /**
+     * 删除seg关键字管理信息
+     * 
+     * @param providerId seg关键字管理主键
+     * @return 结果
+     */
+    public int deleteSegchkKeywordLableByProviderId(Long providerId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLableMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLableMgtService.java
new file mode 100644
index 0000000..d052966
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLableMgtService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+
+/**
+ * seg首页标签管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkLableMgtService 
+{
+    /**
+     * 查询seg首页标签管理
+     * 
+     * @param mgtId seg首页标签管理主键
+     * @return seg首页标签管理
+     */
+    public SegchkLableMgt selectSegchkLableMgtByMgtId(Long mgtId);
+
+    /**
+     * 查询seg首页标签管理列表
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return seg首页标签管理集合
+     */
+    public List<SegchkLableMgt> selectSegchkLableMgtList(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 新增seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    public int insertSegchkLableMgt(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 修改seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    public int updateSegchkLableMgt(SegchkLableMgt segchkLableMgt);
+
+    /**
+     * 批量删除seg首页标签管理
+     * 
+     * @param mgtIds 需要删除的seg首页标签管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByProviderIds(Long[] mgtIds);
+
+    /**
+     * 删除seg首页标签管理信息
+     * 
+     * @param mgtId seg首页标签管理主键
+     * @return 结果
+     */
+    public int deleteSegchkLableMgtByProviderId(Long mgtId);
+
+    public int deleteSegchkLableMgtByCardTypeIds(Map<String, Object> paramsMap);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLogionDetailService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLogionDetailService.java
new file mode 100644
index 0000000..95c8254
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkLogionDetailService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkLogionDetail;
+
+/**
+ * seg登录记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkLogionDetailService 
+{
+    /**
+     * 查询seg登录记录
+     * 
+     * @param loginId seg登录记录主键
+     * @return seg登录记录
+     */
+    public SegchkLogionDetail selectSegchkLogionDetailByLoginId(Long loginId);
+
+    /**
+     * 查询seg登录记录列表
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return seg登录记录集合
+     */
+    public List<SegchkLogionDetail> selectSegchkLogionDetailList(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 新增seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    public int insertSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 修改seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    public int updateSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail);
+
+    /**
+     * 批量删除seg登录记录
+     * 
+     * @param loginIds 需要删除的seg登录记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkLogionDetailByLoginIds(Long[] loginIds);
+
+    /**
+     * 删除seg登录记录信息
+     * 
+     * @param loginId seg登录记录主键
+     * @return 结果
+     */
+    public int deleteSegchkLogionDetailByLoginId(Long loginId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkMsgDetailService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkMsgDetailService.java
new file mode 100644
index 0000000..751eff0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkMsgDetailService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkMsgDetail;
+
+/**
+ * seg消息记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkMsgDetailService 
+{
+    /**
+     * 查询seg消息记录
+     * 
+     * @param msgId seg消息记录主键
+     * @return seg消息记录
+     */
+    public SegchkMsgDetail selectSegchkMsgDetailByMsgId(Long msgId);
+
+    /**
+     * 查询seg消息记录列表
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return seg消息记录集合
+     */
+    public List<SegchkMsgDetail> selectSegchkMsgDetailList(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 新增seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    public int insertSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 修改seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    public int updateSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail);
+
+    /**
+     * 批量删除seg消息记录
+     * 
+     * @param msgIds 需要删除的seg消息记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkMsgDetailByMsgIds(Long[] msgIds);
+
+    /**
+     * 删除seg消息记录信息
+     * 
+     * @param msgId seg消息记录主键
+     * @return 结果
+     */
+    public int deleteSegchkMsgDetailByMsgId(Long msgId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkPreferenceLableService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkPreferenceLableService.java
new file mode 100644
index 0000000..4ba8a15
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkPreferenceLableService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkPreferenceLable;
+
+/**
+ * seg优惠管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkPreferenceLableService 
+{
+    /**
+     * 查询seg优惠管理
+     * 
+     * @param preferenceId seg优惠管理主键
+     * @return seg优惠管理
+     */
+    public SegchkPreferenceLable selectSegchkPreferenceLableByPreferenceId(Long preferenceId);
+
+    /**
+     * 查询seg优惠管理列表
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return seg优惠管理集合
+     */
+    public List<SegchkPreferenceLable> selectSegchkPreferenceLableList(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 新增seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    public int insertSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 修改seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    public int updateSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable);
+
+    /**
+     * 批量删除seg优惠管理
+     * 
+     * @param preferenceIds 需要删除的seg优惠管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkPreferenceLableByPreferenceIds(Long[] preferenceIds);
+
+    /**
+     * 删除seg优惠管理信息
+     * 
+     * @param providerId seg优惠管理主键
+     * @return 结果
+     */
+    public int deleteSegchkPreferenceLableByProviderId(Long providerId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkProviderMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkProviderMgtService.java
new file mode 100644
index 0000000..6fba952
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkProviderMgtService.java
@@ -0,0 +1,66 @@
+package com.ruoyi.segchk.service;
+
+import java.util.HashMap;
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkProviderMgt;
+
+/**
+ * seg运营商管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkProviderMgtService 
+{
+    /**
+     * 查询seg运营商管理
+     * 
+     * @param providerId seg运营商管理主键
+     * @return seg运营商管理
+     */
+    public SegchkProviderMgt selectSegchkProviderMgtByProviderId(Long providerId);
+
+    /**
+     * 查询seg运营商管理列表
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return seg运营商管理集合
+     */
+    public List<SegchkProviderMgt> selectSegchkProviderMgtList(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 新增seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    public int insertSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 修改seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    public int updateSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt);
+
+    /**
+     * 批量删除seg运营商管理
+     * 
+     * @param providerIds 需要删除的seg运营商管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkProviderMgtByProviderIds(Long[] providerIds);
+
+    /**
+     * 删除seg运营商管理信息
+     * 
+     * @param providerId seg运营商管理主键
+     * @return 结果
+     */
+    public int deleteSegchkProviderMgtByProviderId(Long providerId);
+
+    HashMap<String, Object> getCustomService(Long providerId);
+
+    Long getProviderIdByPhoneNo(String phonenumber);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderIndexService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderIndexService.java
new file mode 100644
index 0000000..41df076
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderIndexService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.service;
+
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebReq;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebResp;
+
+import java.util.List;
+
+/**
+ * seg首页推荐商户Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+public interface ISegchkRecommenderIndexService
+{
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return seg首页推荐商户
+     */
+    public SegchkRecommenderStore selectSegchkRecommenderStoreById(Long recommenderId);
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户集合
+     */
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 批量删除seg首页推荐商户
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByIds(String ids);
+
+    /**
+     * 删除seg首页推荐商户信息
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreById(Long recommenderId);
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderStoreService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderStoreService.java
new file mode 100644
index 0000000..26c0912
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkRecommenderStoreService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+
+/**
+ * seg首页推荐商户Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkRecommenderStoreService 
+{
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return seg首页推荐商户
+     */
+    public SegchkRecommenderStore selectSegchkRecommenderStoreByRecommenderId(Long recommenderId);
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户集合
+     */
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore);
+
+    /**
+     * 批量删除seg首页推荐商户
+     * 
+     * @param recommenderIds 需要删除的seg首页推荐商户主键集合
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByRecommenderIds(Long[] recommenderIds);
+
+    /**
+     * 删除seg首页推荐商户信息
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return 结果
+     */
+    public int deleteSegchkRecommenderStoreByRecommenderId(Long recommenderId);
+
+    public int deleteSegchkRecommenderStoreByStoreIds(Long[] storeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSalerInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSalerInfoService.java
new file mode 100644
index 0000000..a17ef24
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSalerInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSalerInfo;
+
+/**
+ * seg销售人员信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkSalerInfoService 
+{
+    /**
+     * 查询seg销售人员信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return seg销售人员信息
+     */
+    public SegchkSalerInfo selectSegchkSalerInfoBySalerId(Integer salerId);
+
+    /**
+     * 查询seg销售人员信息列表
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return seg销售人员信息集合
+     */
+    public List<SegchkSalerInfo> selectSegchkSalerInfoList(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 新增seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    public int insertSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 修改seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    public int updateSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo);
+
+    /**
+     * 批量删除seg销售人员信息
+     * 
+     * @param salerIds 需要删除的seg销售人员信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSalerInfoBySalerIds(Integer[] salerIds);
+
+    /**
+     * 删除seg销售人员信息信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return 结果
+     */
+    public int deleteSegchkSalerInfoBySalerId(Integer salerId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSelfServiceChkService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSelfServiceChkService.java
new file mode 100644
index 0000000..35d1f1f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSelfServiceChkService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSelfServiceChk;
+
+/**
+ * seg自定义卡核消记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkSelfServiceChkService 
+{
+    /**
+     * 查询seg自定义卡核消记录
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return seg自定义卡核消记录
+     */
+    public SegchkSelfServiceChk selectSegchkSelfServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 查询seg自定义卡核消记录列表
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return seg自定义卡核消记录集合
+     */
+    public List<SegchkSelfServiceChk> selectSegchkSelfServiceChkList(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 新增seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    public int insertSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 修改seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    public int updateSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk);
+
+    /**
+     * 批量删除seg自定义卡核消记录
+     * 
+     * @param chkServiceIds 需要删除的seg自定义卡核消记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSelfServiceChkByChkServiceIds(Long[] chkServiceIds);
+
+    /**
+     * 删除seg自定义卡核消记录信息
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return 结果
+     */
+    public int deleteSegchkSelfServiceChkByChkServiceId(Long chkServiceId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceChkService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceChkService.java
new file mode 100644
index 0000000..b073dcf
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceChkService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkServiceChk;
+
+/**
+ * seg核消记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkServiceChkService 
+{
+    /**
+     * 查询seg核消记录
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return seg核消记录
+     */
+    public SegchkServiceChk selectSegchkServiceChkByChkServiceId(Long chkServiceId);
+
+    /**
+     * 查询seg核消记录列表
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return seg核消记录集合
+     */
+    public List<SegchkServiceChk> selectSegchkServiceChkList(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 新增seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    public int insertSegchkServiceChk(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 修改seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    public int updateSegchkServiceChk(SegchkServiceChk segchkServiceChk);
+
+    /**
+     * 批量删除seg核消记录
+     * 
+     * @param chkServiceIds 需要删除的seg核消记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkServiceChkByChkServiceIds(Long[] chkServiceIds);
+
+    /**
+     * 删除seg核消记录信息
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return 结果
+     */
+    public int deleteSegchkServiceChkByChkServiceId(Long chkServiceId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceCommentService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceCommentService.java
new file mode 100644
index 0000000..f932d3e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkServiceCommentService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkServiceComment;
+
+/**
+ * seg评价记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkServiceCommentService 
+{
+    /**
+     * 查询seg评价记录
+     * 
+     * @param commentId seg评价记录主键
+     * @return seg评价记录
+     */
+    public SegchkServiceComment selectSegchkServiceCommentByCommentId(Long commentId);
+
+    /**
+     * 查询seg评价记录列表
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return seg评价记录集合
+     */
+    public List<SegchkServiceComment> selectSegchkServiceCommentList(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 新增seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    public int insertSegchkServiceComment(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 修改seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    public int updateSegchkServiceComment(SegchkServiceComment segchkServiceComment);
+
+    /**
+     * 批量删除seg评价记录
+     * 
+     * @param commentIds 需要删除的seg评价记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkServiceCommentByCommentIds(Long[] commentIds);
+
+    /**
+     * 删除seg评价记录信息
+     * 
+     * @param commentId seg评价记录主键
+     * @return 结果
+     */
+    public int deleteSegchkServiceCommentByCommentId(Long commentId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSmsDetailService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSmsDetailService.java
new file mode 100644
index 0000000..8b8ebe5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSmsDetailService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkSmsDetail;
+
+/**
+ * seg短信记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkSmsDetailService 
+{
+    /**
+     * 查询seg短信记录
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return seg短信记录
+     */
+    public SegchkSmsDetail selectSegchkSmsDetailByShortMsgId(Long shortMsgId);
+
+    /**
+     * 查询seg短信记录列表
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return seg短信记录集合
+     */
+    public List<SegchkSmsDetail> selectSegchkSmsDetailList(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 新增seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    public int insertSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 修改seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    public int updateSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail);
+
+    /**
+     * 批量删除seg短信记录
+     * 
+     * @param shortMsgIds 需要删除的seg短信记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSmsDetailByShortMsgIds(Long[] shortMsgIds);
+
+    /**
+     * 删除seg短信记录信息
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return 结果
+     */
+    public int deleteSegchkSmsDetailByShortMsgId(Long shortMsgId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreAccountService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreAccountService.java
new file mode 100644
index 0000000..9b8aa12
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreAccountService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreAccount;
+
+/**
+ * seg商户余额信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreAccountService 
+{
+    /**
+     * 查询seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return seg商户余额信息
+     */
+    public SegchkStoreAccount selectSegchkStoreAccountByAccountId(Long accountId);
+
+    /**
+     * 查询seg商户余额信息列表
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return seg商户余额信息集合
+     */
+    public List<SegchkStoreAccount> selectSegchkStoreAccountList(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 新增seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int insertSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 修改seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    public int updateSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount);
+
+    /**
+     * 批量删除seg商户余额信息
+     * 
+     * @param accountIds 需要删除的seg商户余额信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByAccountIds(Long[] accountIds);
+
+    /**
+     * 删除seg商户余额信息信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreAccountByAccountId(Long accountId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreBasicInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreBasicInfoService.java
new file mode 100644
index 0000000..9769b64
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreBasicInfoService.java
@@ -0,0 +1,73 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreBasicInfo;
+
+/**
+ * seg商家基础信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreBasicInfoService 
+{
+    /**
+     * 查询seg商家基础信息
+     * 
+     * @param storeId seg商家基础信息主键
+     * @return seg商家基础信息
+     */
+    public SegchkStoreBasicInfo selectSegchkStoreBasicInfoByStoreId(Long storeId);
+
+    /**
+     * 查询seg商家基础信息列表
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return seg商家基础信息集合
+     */
+    public List<SegchkStoreBasicInfo> selectSegchkStoreBasicInfoList(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 新增seg商家基础信息
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int insertSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 修改seg商家基础信息
+     * 
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int updateSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    /**
+     * 批量删除seg商家基础信息
+     * 
+     * @param storeIds 需要删除的seg商家基础信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreBasicInfoByStoreIds(Long[] storeIds);
+
+    /**
+     * 删除seg商家基础信息信息
+     * 
+     * @param storeId seg商家基础信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreBasicInfoByStoreId(Long storeId);
+
+    /**
+     * 修改seg商家服务状态
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    public int updateSegchkStoreServiceStatus(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+    int updateSegchkStoreDetail(SegchkStoreBasicInfo segchkStoreBasicInfo);
+
+//    int addSegchkStoreVR();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreCashService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreCashService.java
new file mode 100644
index 0000000..0c17912
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreCashService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreCash;
+
+/**
+ * seg商户户提现记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreCashService 
+{
+    /**
+     * 查询seg商户户提现记录
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return seg商户户提现记录
+     */
+    public SegchkStoreCash selectSegchkStoreCashByCashId(Long cashId);
+
+    /**
+     * 查询seg商户户提现记录列表
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return seg商户户提现记录集合
+     */
+    public List<SegchkStoreCash> selectSegchkStoreCashList(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 新增seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    public int insertSegchkStoreCash(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 修改seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    public int updateSegchkStoreCash(SegchkStoreCash segchkStoreCash);
+
+    /**
+     * 批量删除seg商户户提现记录
+     * 
+     * @param cashIds 需要删除的seg商户户提现记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreCashByCashIds(Long[] cashIds);
+
+    /**
+     * 删除seg商户户提现记录信息
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreCashByCashId(Long cashId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChargeService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChargeService.java
new file mode 100644
index 0000000..391803b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChargeService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreCharge;
+
+/**
+ * seg商户充值记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreChargeService 
+{
+    /**
+     * 查询seg商户充值记录
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return seg商户充值记录
+     */
+    public SegchkStoreCharge selectSegchkStoreChargeByChargeId(Long chargeId);
+
+    /**
+     * 查询seg商户充值记录列表
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return seg商户充值记录集合
+     */
+    public List<SegchkStoreCharge> selectSegchkStoreChargeList(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 新增seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    public int insertSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 修改seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    public int updateSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge);
+
+    /**
+     * 批量删除seg商户充值记录
+     * 
+     * @param chargeIds 需要删除的seg商户充值记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreChargeByChargeIds(Long[] chargeIds);
+
+    /**
+     * 删除seg商户充值记录信息
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreChargeByChargeId(Long chargeId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChkMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChkMgtService.java
new file mode 100644
index 0000000..22448a2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreChkMgtService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreChkMgt;
+
+/**
+ * seg商家核消卡管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreChkMgtService 
+{
+    /**
+     * 查询seg商家核消卡管理
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return seg商家核消卡管理
+     */
+    public SegchkStoreChkMgt selectSegchkStoreChkMgtByMgtId(Integer mgtId);
+
+    /**
+     * 查询seg商家核消卡管理列表
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return seg商家核消卡管理集合
+     */
+    public List<SegchkStoreChkMgt> selectSegchkStoreChkMgtList(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 新增seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    public int insertSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 修改seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    public int updateSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt);
+
+    /**
+     * 批量删除seg商家核消卡管理
+     * 
+     * @param mgtIds 需要删除的seg商家核消卡管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByMgtIds(Integer[] mgtIds);
+
+    /**
+     * 删除seg商家核消卡管理信息
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreChkMgtByMgtId(Integer mgtId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreImageService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreImageService.java
new file mode 100644
index 0000000..2b68610
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreImageService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreImage;
+
+/**
+ * seg商家图片信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreImageService 
+{
+    /**
+     * 查询seg商家图片信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return seg商家图片信息
+     */
+    public SegchkStoreImage selectSegchkStoreImageByStoreId(Long storeId);
+
+    /**
+     * 查询seg商家图片信息列表
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return seg商家图片信息集合
+     */
+    public List<SegchkStoreImage> selectSegchkStoreImageList(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 新增seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    public int insertSegchkStoreImage(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 修改seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    public int updateSegchkStoreImage(SegchkStoreImage segchkStoreImage);
+
+    /**
+     * 批量删除seg商家图片信息
+     * 
+     * @param storeIds 需要删除的seg商家图片信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreIds(Long[] storeIds);
+
+    /**
+     * 删除seg商家图片信息信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreImageByStoreId(Long storeId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreLableMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreLableMgtService.java
new file mode 100644
index 0000000..eac6719
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreLableMgtService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.domain.SegchkStoreLableMgt;
+
+/**
+ * seg商家标签管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreLableMgtService 
+{
+    /**
+     * 查询seg商家标签管理
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return seg商家标签管理
+     */
+    public SegchkStoreLableMgt selectSegchkStoreLableMgtByMgtId(Integer mgtId);
+
+    /**
+     * 查询seg商家标签管理列表
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return seg商家标签管理集合
+     */
+    public List<SegchkStoreLableMgt> selectSegchkStoreLableMgtList(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 新增seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    public int insertSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 修改seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    public int updateSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt);
+
+    /**
+     * 批量删除seg商家标签管理
+     * 
+     * @param mgtIds 需要删除的seg商家标签管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByMgtIds(Integer[] mgtIds);
+
+    /**
+     * 删除seg商家标签管理信息
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreLableMgtByMgtId(Integer mgtId);
+
+    public int deleteSegchkStoreLableMgtByCardTypeIds(Map<String, Object> paramsMap);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreRewardService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreRewardService.java
new file mode 100644
index 0000000..43f6dc6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreRewardService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreReward;
+
+/**
+ * seg商户奖励Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreRewardService 
+{
+    /**
+     * 查询seg商户奖励
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return seg商户奖励
+     */
+    public SegchkStoreReward selectSegchkStoreRewardByRewardId(Long rewardId);
+
+    /**
+     * 查询seg商户奖励列表
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return seg商户奖励集合
+     */
+    public List<SegchkStoreReward> selectSegchkStoreRewardList(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 新增seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    public int insertSegchkStoreReward(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 修改seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    public int updateSegchkStoreReward(SegchkStoreReward segchkStoreReward);
+
+    /**
+     * 批量删除seg商户奖励
+     * 
+     * @param rewardIds 需要删除的seg商户奖励主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreRewardByRewardIds(Long[] rewardIds);
+
+    /**
+     * 删除seg商户奖励信息
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreRewardByRewardId(Long rewardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSecurityService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSecurityService.java
new file mode 100644
index 0000000..e9c5071
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSecurityService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreSecurity;
+
+/**
+ * seg商户密码Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreSecurityService 
+{
+    /**
+     * 查询seg商户密码
+     * 
+     * @param pwdId seg商户密码主键
+     * @return seg商户密码
+     */
+    public SegchkStoreSecurity selectSegchkStoreSecurityByPwdId(Long pwdId);
+
+    /**
+     * 查询seg商户密码列表
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return seg商户密码集合
+     */
+    public List<SegchkStoreSecurity> selectSegchkStoreSecurityList(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 新增seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    public int insertSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 修改seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    public int updateSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity);
+
+    /**
+     * 批量删除seg商户密码
+     * 
+     * @param pwdIds 需要删除的seg商户密码主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByPwdIds(Long[] pwdIds);
+
+    /**
+     * 删除seg商户密码信息
+     * 
+     * @param pwdId seg商户密码主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreSecurityByPwdId(Long pwdId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSelfMgtService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSelfMgtService.java
new file mode 100644
index 0000000..35bf4c8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkStoreSelfMgtService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkStoreSelfMgt;
+
+/**
+ * seg商家自定义卡管理Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkStoreSelfMgtService 
+{
+    /**
+     * 查询seg商家自定义卡管理
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return seg商家自定义卡管理
+     */
+    public SegchkStoreSelfMgt selectSegchkStoreSelfMgtByFreeCardId(Long freeCardId);
+
+    /**
+     * 查询seg商家自定义卡管理列表
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return seg商家自定义卡管理集合
+     */
+    public List<SegchkStoreSelfMgt> selectSegchkStoreSelfMgtList(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 新增seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    public int insertSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 修改seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    public int updateSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt);
+
+    /**
+     * 批量删除seg商家自定义卡管理
+     * 
+     * @param freeCardIds 需要删除的seg商家自定义卡管理主键集合
+     * @return 结果
+     */
+    public int deleteSegchkStoreSelfMgtByFreeCardIds(Long[] freeCardIds);
+
+    /**
+     * 删除seg商家自定义卡管理信息
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return 结果
+     */
+    public int deleteSegchkStoreSelfMgtByFreeCardId(Long freeCardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSystemSettingService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSystemSettingService.java
new file mode 100644
index 0000000..2ee670b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkSystemSettingService.java
@@ -0,0 +1,103 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkBaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkSystemSetting;
+
+/**
+ * 系统设置Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-10-27
+ */
+public interface ISegchkSystemSettingService 
+{
+    /**
+     * 查询系统设置
+     * 
+     * @param id 系统设置主键
+     * @return 系统设置
+     */
+    public SegchkSystemSetting selectSegchkSystemSettingById(Long id);
+
+    /**
+     * 查询系统设置列表
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 系统设置集合
+     */
+    public List<SegchkSystemSetting> selectSegchkSystemSettingList(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 新增系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    public int insertSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 修改系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    public int updateSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting);
+
+    /**
+     * 批量删除系统设置
+     * 
+     * @param ids 需要删除的系统设置主键集合
+     * @return 结果
+     */
+    public int deleteSegchkSystemSettingByIds(Long[] ids);
+
+    /**
+     * 删除系统设置信息
+     * 
+     * @param id 系统设置主键
+     * @return 结果
+     */
+    public int deleteSegchkSystemSettingById(Long id);
+
+    /**
+     * 查询基本信息和高级信息设置
+     *
+     * @return 基本信息设置实体类
+     */
+    BaseInfoSet queryBaseInfoSet();
+
+    /**
+     * 编辑基本信息和高级信息
+     *
+     * @param baseInfoSet 基本信息实体类
+     * @param type        1 基本信息 0高级信息
+     * @return -1编辑失败 1编辑成功 0编辑失败
+     */
+    int editBaseInfoSet(BaseInfoSet baseInfoSet, int type);
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+    int setAuditSwitch(String storeSpuAudit);
+
+    /**
+     * 设置会员价启用状态
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+    int setMemberPriceStatus(String memberPriceStatus);
+
+    /**
+     * 判断单品是否需要审核
+     *
+     * @return 需要审核返回true  不需要返回false
+     */
+    boolean isSkuNeedAudit();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserAccountService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserAccountService.java
new file mode 100644
index 0000000..cd65f06
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserAccountService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserAccount;
+
+/**
+ * seg用户余额信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserAccountService 
+{
+    /**
+     * 查询seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return seg用户余额信息
+     */
+    public SegchkUserAccount selectSegchkUserAccountByAccountId(Long accountId);
+
+    /**
+     * 查询seg用户余额信息列表
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return seg用户余额信息集合
+     */
+    public List<SegchkUserAccount> selectSegchkUserAccountList(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 新增seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int insertSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 修改seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    public int updateSegchkUserAccount(SegchkUserAccount segchkUserAccount);
+
+    /**
+     * 批量删除seg用户余额信息
+     * 
+     * @param accountIds 需要删除的seg用户余额信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByAccountIds(Long[] accountIds);
+
+    /**
+     * 删除seg用户余额信息信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserAccountByAccountId(Long accountId);
+
+    public int insertSegchkUserAccountBuyCharge(SegchkUserAccount segchkUserAccount);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserBasicInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserBasicInfoService.java
new file mode 100644
index 0000000..ed1b4bb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserBasicInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+
+/**
+ * seg用户基本信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserBasicInfoService 
+{
+    /**
+     * 查询seg用户基本信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return seg用户基本信息
+     */
+    public SegchkUserBasicInfo selectSegchkUserBasicInfoByUserId(Long userId);
+
+    /**
+     * 查询seg用户基本信息列表
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return seg用户基本信息集合
+     */
+    public List<SegchkUserBasicInfo> selectSegchkUserBasicInfoList(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 新增seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    public int insertSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 修改seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    public int updateSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo);
+
+    /**
+     * 批量删除seg用户基本信息
+     * 
+     * @param userIds 需要删除的seg用户基本信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserBasicInfoByUserIds(Long[] userIds);
+
+    /**
+     * 删除seg用户基本信息信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserBasicInfoByUserId(Long userId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java
new file mode 100644
index 0000000..b35123b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCashService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCash;
+
+/**
+ * seg用户提现记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserCashService 
+{
+    /**
+     * 查询seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return seg用户提现记录
+     */
+    public SegchkUserCash selectSegchkUserCashByCashId(Long cashId);
+
+    /**
+     * 查询seg用户提现记录列表
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return seg用户提现记录集合
+     */
+    public List<SegchkUserCash> selectSegchkUserCashList(SegchkUserCash segchkUserCash);
+
+    /**
+     * 新增seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int insertSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 修改seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    public int updateSegchkUserCash(SegchkUserCash segchkUserCash);
+
+    /**
+     * 批量删除seg用户提现记录
+     * 
+     * @param cashIds 需要删除的seg用户提现记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashIds(Long[] cashIds);
+
+    /**
+     * 删除seg用户提现记录信息
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCashByCashId(Long cashId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCertificationInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCertificationInfoService.java
new file mode 100644
index 0000000..07685b3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCertificationInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+
+/**
+ * seg用户实名认证信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserCertificationInfoService 
+{
+    /**
+     * 查询seg用户实名认证信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return seg用户实名认证信息
+     */
+    public SegchkUserCertificationInfo selectSegchkUserCertificationInfoByUsercardId(Long usercardId);
+
+    /**
+     * 查询seg用户实名认证信息列表
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return seg用户实名认证信息集合
+     */
+    public List<SegchkUserCertificationInfo> selectSegchkUserCertificationInfoList(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 新增seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    public int insertSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 修改seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    public int updateSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo);
+
+    /**
+     * 批量删除seg用户实名认证信息
+     * 
+     * @param usercardIds 需要删除的seg用户实名认证信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUsercardIds(Long[] usercardIds);
+
+    /**
+     * 删除seg用户实名认证信息信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCertificationInfoByUsercardId(Long usercardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserChargeService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserChargeService.java
new file mode 100644
index 0000000..15c03fc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserChargeService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCharge;
+
+/**
+ * seg用户充值记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserChargeService 
+{
+    /**
+     * 查询seg用户充值记录
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return seg用户充值记录
+     */
+    public SegchkUserCharge selectSegchkUserChargeByChargeId(Long chargeId);
+
+    /**
+     * 查询seg用户充值记录列表
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return seg用户充值记录集合
+     */
+    public List<SegchkUserCharge> selectSegchkUserChargeList(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 新增seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    public int insertSegchkUserCharge(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 修改seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    public int updateSegchkUserCharge(SegchkUserCharge segchkUserCharge);
+
+    /**
+     * 批量删除seg用户充值记录
+     * 
+     * @param chargeIds 需要删除的seg用户充值记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserChargeByChargeIds(Long[] chargeIds);
+
+    /**
+     * 删除seg用户充值记录信息
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserChargeByChargeId(Long chargeId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java
new file mode 100644
index 0000000..2e5986c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserCollectService.java
@@ -0,0 +1,69 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+
+/**
+ * seg用户收藏记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserCollectService 
+{
+    /**
+     * 查询seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return seg用户收藏记录
+     */
+    public SegchkUserCollect selectSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 查询seg用户收藏记录列表
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return seg用户收藏记录集合
+     */
+    public List<SegchkUserCollect> selectSegchkUserCollectList(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 新增seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int insertSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 修改seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    public int updateSegchkUserCollect(SegchkUserCollect segchkUserCollect);
+
+    /**
+     * 批量删除seg用户收藏记录
+     * 
+     * @param collectIds 需要删除的seg用户收藏记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectIds(Long[] collectIds);
+
+    /**
+     * 删除seg用户收藏记录信息
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByCollectId(Long collectId);
+
+    /**
+     * 批量删除seg用户收藏记录
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSegchkUserCollectByIds(String ids);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserExtInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserExtInfoService.java
new file mode 100644
index 0000000..369e112
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserExtInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserExtInfo;
+
+/**
+ * seg用户扩展信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserExtInfoService 
+{
+    /**
+     * 查询seg用户扩展信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return seg用户扩展信息
+     */
+    public SegchkUserExtInfo selectSegchkUserExtInfoByUserId(Long userId);
+
+    /**
+     * 查询seg用户扩展信息列表
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return seg用户扩展信息集合
+     */
+    public List<SegchkUserExtInfo> selectSegchkUserExtInfoList(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 新增seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    public int insertSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 修改seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    public int updateSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo);
+
+    /**
+     * 批量删除seg用户扩展信息
+     * 
+     * @param userIds 需要删除的seg用户扩展信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserExtInfoByUserIds(Long[] userIds);
+
+    /**
+     * 删除seg用户扩展信息信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserExtInfoByUserId(Long userId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java
new file mode 100644
index 0000000..8ad5c8c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserLikegoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+
+/**
+ * seg用户想去记录Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserLikegoService 
+{
+    /**
+     * 查询seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return seg用户想去记录
+     */
+    public SegchkUserLikego selectSegchkUserLikegoByLikegoId(Long likegoId);
+
+    /**
+     * 查询seg用户想去记录列表
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return seg用户想去记录集合
+     */
+    public List<SegchkUserLikego> selectSegchkUserLikegoList(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 新增seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int insertSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 修改seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    public int updateSegchkUserLikego(SegchkUserLikego segchkUserLikego);
+
+    /**
+     * 批量删除seg用户想去记录
+     * 
+     * @param likegoIds 需要删除的seg用户想去记录主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoIds(Long[] likegoIds);
+
+    /**
+     * 删除seg用户想去记录信息
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return 结果
+     */
+    public int deleteSegchkUserLikegoByLikegoId(Long likegoId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardCtlService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardCtlService.java
new file mode 100644
index 0000000..67fb6cd
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardCtlService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserRewardCtl;
+
+/**
+ * seg会员推荐控制Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserRewardCtlService 
+{
+    /**
+     * 查询seg会员推荐控制
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return seg会员推荐控制
+     */
+    public SegchkUserRewardCtl selectSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId);
+
+    /**
+     * 查询seg会员推荐控制列表
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return seg会员推荐控制集合
+     */
+    public List<SegchkUserRewardCtl> selectSegchkUserRewardCtlList(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 新增seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    public int insertSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 修改seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    public int updateSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl);
+
+    /**
+     * 批量删除seg会员推荐控制
+     * 
+     * @param rewardCtlIds 需要删除的seg会员推荐控制主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardCtlByRewardCtlIds(Integer[] rewardCtlIds);
+
+    /**
+     * 删除seg会员推荐控制信息
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardService.java
new file mode 100644
index 0000000..61c85a3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserRewardService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserReward;
+
+/**
+ * seg用户奖励Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserRewardService 
+{
+    /**
+     * 查询seg用户奖励
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return seg用户奖励
+     */
+    public SegchkUserReward selectSegchkUserRewardByRewardId(Long rewardId);
+
+    /**
+     * 查询seg用户奖励列表
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return seg用户奖励集合
+     */
+    public List<SegchkUserReward> selectSegchkUserRewardList(SegchkUserReward segchkUserReward);
+
+    /**
+     * 新增seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    public int insertSegchkUserReward(SegchkUserReward segchkUserReward);
+
+    /**
+     * 修改seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    public int updateSegchkUserReward(SegchkUserReward segchkUserReward);
+
+    /**
+     * 批量删除seg用户奖励
+     * 
+     * @param rewardIds 需要删除的seg用户奖励主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardByRewardIds(Long[] rewardIds);
+
+    /**
+     * 删除seg用户奖励信息
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return 结果
+     */
+    public int deleteSegchkUserRewardByRewardId(Long rewardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserSecurityService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserSecurityService.java
new file mode 100644
index 0000000..ef78da0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserSecurityService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserSecurity;
+
+/**
+ * seg用户密码Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserSecurityService 
+{
+    /**
+     * 查询seg用户密码
+     * 
+     * @param pwdId seg用户密码主键
+     * @return seg用户密码
+     */
+    public SegchkUserSecurity selectSegchkUserSecurityByPwdId(Long pwdId);
+
+    /**
+     * 查询seg用户密码列表
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return seg用户密码集合
+     */
+    public List<SegchkUserSecurity> selectSegchkUserSecurityList(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 新增seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    public int insertSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 修改seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    public int updateSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity);
+
+    /**
+     * 批量删除seg用户密码
+     * 
+     * @param pwdIds 需要删除的seg用户密码主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserSecurityByPwdIds(Long[] pwdIds);
+
+    /**
+     * 删除seg用户密码信息
+     * 
+     * @param pwdId seg用户密码主键
+     * @return 结果
+     */
+    public int deleteSegchkUserSecurityByPwdId(Long pwdId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserVipService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserVipService.java
new file mode 100644
index 0000000..9f623ce
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserVipService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserVip;
+
+/**
+ * seg会员卡Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserVipService 
+{
+    /**
+     * 查询seg会员卡
+     * 
+     * @param cardId seg会员卡主键
+     * @return seg会员卡
+     */
+    public SegchkUserVip selectSegchkUserVipByCardId(Long cardId);
+
+    /**
+     * 查询seg会员卡列表
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return seg会员卡集合
+     */
+    public List<SegchkUserVip> selectSegchkUserVipList(SegchkUserVip segchkUserVip);
+
+    /**
+     * 新增seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    public int insertSegchkUserVip(SegchkUserVip segchkUserVip);
+
+    /**
+     * 修改seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    public int updateSegchkUserVip(SegchkUserVip segchkUserVip);
+
+    /**
+     * 批量删除seg会员卡
+     * 
+     * @param cardIds 需要删除的seg会员卡主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserVipByCardIds(Long[] cardIds);
+
+    /**
+     * 删除seg会员卡信息
+     * 
+     * @param cardId seg会员卡主键
+     * @return 结果
+     */
+    public int deleteSegchkUserVipByCardId(Long cardId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java
new file mode 100644
index 0000000..f5ede79
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkUserWechatService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+
+/**
+ * seg用户微信信息Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkUserWechatService 
+{
+    /**
+     * 查询seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return seg用户微信信息
+     */
+    public SegchkUserWechat selectSegchkUserWechatByUserId(Long userId);
+
+    /**
+     * 查询seg用户微信信息列表
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return seg用户微信信息集合
+     */
+    public List<SegchkUserWechat> selectSegchkUserWechatList(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 新增seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int insertSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 修改seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat);
+
+    /**
+     * 批量删除seg用户微信信息
+     * 
+     * @param userIds 需要删除的seg用户微信信息主键集合
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserIds(Long[] userIds);
+
+    /**
+     * 删除seg用户微信信息信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return 结果
+     */
+    public int deleteSegchkUserWechatByUserId(Long userId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkVipSetInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkVipSetInfoService.java
new file mode 100644
index 0000000..8ec1266
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/ISegchkVipSetInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.segchk.service;
+
+import java.util.List;
+import com.ruoyi.segchk.domain.SegchkVipSetInfo;
+
+/**
+ * seg会员卡设置Service接口
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+public interface ISegchkVipSetInfoService 
+{
+    /**
+     * 查询seg会员卡设置
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return seg会员卡设置
+     */
+    public SegchkVipSetInfo selectSegchkVipSetInfoByModeId(Integer modeId);
+
+    /**
+     * 查询seg会员卡设置列表
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return seg会员卡设置集合
+     */
+    public List<SegchkVipSetInfo> selectSegchkVipSetInfoList(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 新增seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    public int insertSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 修改seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    public int updateSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo);
+
+    /**
+     * 批量删除seg会员卡设置
+     * 
+     * @param modeIds 需要删除的seg会员卡设置主键集合
+     * @return 结果
+     */
+    public int deleteSegchkVipSetInfoByModeIds(Integer[] modeIds);
+
+    /**
+     * 删除seg会员卡设置信息
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return 结果
+     */
+    public int deleteSegchkVipSetInfoByModeId(Integer modeId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCarouseMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCarouseMgtServiceImpl.java
new file mode 100644
index 0000000..60a9077
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCarouseMgtServiceImpl.java
@@ -0,0 +1,116 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkCarouseMgtMapper;
+import com.ruoyi.segchk.domain.SegchkCarouseMgt;
+import com.ruoyi.segchk.service.ISegchkCarouseMgtService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * seg首页轮播图管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkCarouseMgtServiceImpl implements ISegchkCarouseMgtService 
+{
+    @Autowired
+    private SegchkCarouseMgtMapper segchkCarouseMgtMapper;
+
+    /**
+     * 查询seg首页轮播图管理
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public SegchkCarouseMgt selectSegchkCarouseMgtByCarouseId(Long carouseId)
+    {
+        return segchkCarouseMgtMapper.selectSegchkCarouseMgtByCarouseId(carouseId);
+    }
+
+    /**
+     * 查询seg首页轮播图管理列表
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return seg首页轮播图管理
+     */
+    @Override
+    public List<SegchkCarouseMgt> selectSegchkCarouseMgtList(SegchkCarouseMgt segchkCarouseMgt)
+    {
+        return segchkCarouseMgtMapper.selectSegchkCarouseMgtList(segchkCarouseMgt);
+    }
+
+    /**
+     * 新增seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt)
+    {
+        return segchkCarouseMgtMapper.insertSegchkCarouseMgt(segchkCarouseMgt);
+    }
+
+    /**
+     * 修改seg首页轮播图管理
+     * 
+     * @param segchkCarouseMgt seg首页轮播图管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkCarouseMgt(SegchkCarouseMgt segchkCarouseMgt)
+    {
+        return segchkCarouseMgtMapper.updateSegchkCarouseMgt(segchkCarouseMgt);
+    }
+
+    /**
+     * 批量删除seg首页轮播图管理
+     * 
+     * @param carouseIds 需要删除的seg首页轮播图管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkCarouseMgtByCarouseIds(Long[] carouseIds)
+    {
+        return segchkCarouseMgtMapper.deleteSegchkCarouseMgtByCarouseIds(carouseIds);
+    }
+
+    /**
+     * 删除seg首页轮播图管理信息
+     * 
+     * @param carouseId seg首页轮播图管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkCarouseMgtByCarouseId(Long carouseId)
+    {
+        return segchkCarouseMgtMapper.deleteSegchkCarouseMgtByCarouseId(carouseId);
+    }
+
+    @Override
+    public int deleteSegchkCarouseMgtByStoreIds(Long[] storeIds) {
+        return segchkCarouseMgtMapper.deleteSegchkCarouseMgtByStoreIds(storeIds);
+    }
+
+    @Override
+    @Transactional
+    public int updateSegchkCarouseMgtSort(String[] sortInfos) {
+        List<HashMap<String, String>> collect = Arrays.stream(sortInfos).map(v -> {
+            String[] split = v.split(":", -1);
+            return new HashMap<String, String>() {{
+                put("carouseId", split[0]);
+                put("sortId", split[1]);
+            }};
+        }).collect(Collectors.toList());
+        return segchkCarouseMgtMapper.updateSegchkCarouseMgtSortBatch(collect);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkChargeCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkChargeCardServiceImpl.java
new file mode 100644
index 0000000..9d377c6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkChargeCardServiceImpl.java
@@ -0,0 +1,125 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.service.ISegchkLableMgtService;
+import com.ruoyi.segchk.service.ISegchkStoreLableMgtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkChargeCardMapper;
+import com.ruoyi.segchk.domain.SegchkChargeCard;
+import com.ruoyi.segchk.service.ISegchkChargeCardService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * seg充值卡管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkChargeCardServiceImpl implements ISegchkChargeCardService 
+{
+    @Autowired
+    private SegchkChargeCardMapper segchkChargeCardMapper;
+
+    @Autowired
+    private ISegchkLableMgtService segchkLableMgtService;
+
+    @Autowired
+    private ISegchkStoreLableMgtService segchkStoreLableMgtService;
+    /**
+     * 查询seg充值卡管理
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return seg充值卡管理
+     */
+    @Override
+    public SegchkChargeCard selectSegchkChargeCardByCardTypeId(Long cardTypeId)
+    {
+        return segchkChargeCardMapper.selectSegchkChargeCardBycardTypeId(cardTypeId);
+    }
+
+    /**
+     * 查询seg充值卡管理列表
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return seg充值卡管理
+     */
+    @Override
+    public List<SegchkChargeCard> selectSegchkChargeCardList(SegchkChargeCard segchkChargeCard)
+    {
+        return segchkChargeCardMapper.selectSegchkChargeCardList(segchkChargeCard);
+    }
+
+    /**
+     * 新增seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkChargeCard(SegchkChargeCard segchkChargeCard)
+    {
+        /*if(ObjectUtils.isEmpty(segchkChargeCard.getCardTypeId())) {
+            SegchkChargeCard segchkChargeCard1 = new SegchkChargeCard();
+            segchkChargeCard1.setProviderId(segchkChargeCard.getProviderId());
+            List<SegchkChargeCard> segchkChargeCards = segchkChargeCardMapper.selectSegchkChargeCardList(segchkChargeCard1);
+            int carttypeid = ObjectUtils.isEmpty(segchkChargeCards) ? -1 :
+                    (segchkChargeCards.stream().mapToInt(v -> v.getCardTypeId().intValue()).max().getAsInt());
+            segchkChargeCard.setCardTypeId(Long.valueOf(carttypeid) + 1);
+        }*/
+        return segchkChargeCardMapper.insertSegchkChargeCard(segchkChargeCard);
+    }
+
+    /**
+     * 修改seg充值卡管理
+     * 
+     * @param segchkChargeCard seg充值卡管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkChargeCard(SegchkChargeCard segchkChargeCard)
+    {
+        return segchkChargeCardMapper.updateSegchkChargeCard(segchkChargeCard);
+    }
+
+    /**
+     * 批量删除seg充值卡管理
+     * 
+     * @param cardTypeIds 需要删除的seg充值卡管理主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteSegchkChargeCardByCardTypeIds(String[] cardTypeIds)
+    {
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("cardTypeIds", cardTypeIds);
+        paramsMap.put("typeId", 0);
+        segchkLableMgtService.deleteSegchkLableMgtByCardTypeIds(paramsMap);
+        segchkStoreLableMgtService.deleteSegchkStoreLableMgtByCardTypeIds(paramsMap);
+        return segchkChargeCardMapper.deleteSegchkChargeCardByCardTypeIds(cardTypeIds);
+    }
+
+    /**
+     * 删除seg充值卡管理信息
+     * 
+     * @param cardTypeId seg充值卡管理主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteSegchkChargeCardByCardTypeId(Long cardTypeId)
+    {
+        String[] cardTypeIds = new String[]{cardTypeId.toString()};
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("cardTypeIds", cardTypeIds);
+        paramsMap.put("typeId", 0);
+        segchkLableMgtService.deleteSegchkLableMgtByCardTypeIds(paramsMap);
+        segchkStoreLableMgtService.deleteSegchkStoreLableMgtByCardTypeIds(paramsMap);
+        return segchkChargeCardMapper.deleteSegchkChargeCardByCardTypeId(cardTypeId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCommentAccServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCommentAccServiceImpl.java
new file mode 100644
index 0000000..634c6dc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkCommentAccServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkCommentAccMapper;
+import com.ruoyi.segchk.domain.SegchkCommentAcc;
+import com.ruoyi.segchk.service.ISegchkCommentAccService;
+
+/**
+ * seg商家累积评价Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkCommentAccServiceImpl implements ISegchkCommentAccService 
+{
+    @Autowired
+    private SegchkCommentAccMapper segchkCommentAccMapper;
+
+    /**
+     * 查询seg商家累积评价
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return seg商家累积评价
+     */
+    @Override
+    public SegchkCommentAcc selectSegchkCommentAccByUpdateId(Long updateId)
+    {
+        return segchkCommentAccMapper.selectSegchkCommentAccByUpdateId(updateId);
+    }
+
+    /**
+     * 查询seg商家累积评价列表
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return seg商家累积评价
+     */
+    @Override
+    public List<SegchkCommentAcc> selectSegchkCommentAccList(SegchkCommentAcc segchkCommentAcc)
+    {
+        return segchkCommentAccMapper.selectSegchkCommentAccList(segchkCommentAcc);
+    }
+
+    /**
+     * 新增seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc)
+    {
+        return segchkCommentAccMapper.insertSegchkCommentAcc(segchkCommentAcc);
+    }
+
+    /**
+     * 修改seg商家累积评价
+     * 
+     * @param segchkCommentAcc seg商家累积评价
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkCommentAcc(SegchkCommentAcc segchkCommentAcc)
+    {
+        return segchkCommentAccMapper.updateSegchkCommentAcc(segchkCommentAcc);
+    }
+
+    /**
+     * 批量删除seg商家累积评价
+     * 
+     * @param updateIds 需要删除的seg商家累积评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkCommentAccByUpdateIds(Long[] updateIds)
+    {
+        return segchkCommentAccMapper.deleteSegchkCommentAccByUpdateIds(updateIds);
+    }
+
+    /**
+     * 删除seg商家累积评价信息
+     * 
+     * @param updateId seg商家累积评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkCommentAccByUpdateId(Long updateId)
+    {
+        return segchkCommentAccMapper.deleteSegchkCommentAccByUpdateId(updateId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkDistrictInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkDistrictInfoServiceImpl.java
new file mode 100644
index 0000000..7a17b62
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkDistrictInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkDistrictInfoMapper;
+import com.ruoyi.segchk.domain.SegchkDistrictInfo;
+import com.ruoyi.segchk.service.ISegchkDistrictInfoService;
+
+/**
+ * seg行政区域代码Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkDistrictInfoServiceImpl implements ISegchkDistrictInfoService 
+{
+    @Autowired
+    private SegchkDistrictInfoMapper segchkDistrictInfoMapper;
+
+    /**
+     * 查询seg行政区域代码
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return seg行政区域代码
+     */
+    @Override
+    public SegchkDistrictInfo selectSegchkDistrictInfoByDistrictId(Integer districtId)
+    {
+        return segchkDistrictInfoMapper.selectSegchkDistrictInfoByDistrictId(districtId);
+    }
+
+    /**
+     * 查询seg行政区域代码列表
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return seg行政区域代码
+     */
+    @Override
+    public List<SegchkDistrictInfo> selectSegchkDistrictInfoList(SegchkDistrictInfo segchkDistrictInfo)
+    {
+        return segchkDistrictInfoMapper.selectSegchkDistrictInfoList(segchkDistrictInfo);
+    }
+
+    /**
+     * 新增seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo)
+    {
+        return segchkDistrictInfoMapper.insertSegchkDistrictInfo(segchkDistrictInfo);
+    }
+
+    /**
+     * 修改seg行政区域代码
+     * 
+     * @param segchkDistrictInfo seg行政区域代码
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkDistrictInfo(SegchkDistrictInfo segchkDistrictInfo)
+    {
+        return segchkDistrictInfoMapper.updateSegchkDistrictInfo(segchkDistrictInfo);
+    }
+
+    /**
+     * 批量删除seg行政区域代码
+     * 
+     * @param districtIds 需要删除的seg行政区域代码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkDistrictInfoByDistrictIds(Integer[] districtIds)
+    {
+        return segchkDistrictInfoMapper.deleteSegchkDistrictInfoByDistrictIds(districtIds);
+    }
+
+    /**
+     * 删除seg行政区域代码信息
+     * 
+     * @param districtId seg行政区域代码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkDistrictInfoByDistrictId(Integer districtId)
+    {
+        return segchkDistrictInfoMapper.deleteSegchkDistrictInfoByDistrictId(districtId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkKeywordLableServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkKeywordLableServiceImpl.java
new file mode 100644
index 0000000..ea96efb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkKeywordLableServiceImpl.java
@@ -0,0 +1,111 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.service.ISegchkLableMgtService;
+import com.ruoyi.segchk.service.ISegchkStoreLableMgtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkKeywordLableMapper;
+import com.ruoyi.segchk.domain.SegchkKeywordLable;
+import com.ruoyi.segchk.service.ISegchkKeywordLableService;
+
+/**
+ * seg关键字管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkKeywordLableServiceImpl implements ISegchkKeywordLableService 
+{
+    @Autowired
+    private SegchkKeywordLableMapper segchkKeywordLableMapper;
+
+    @Autowired
+    private ISegchkLableMgtService segchkLableMgtService;
+
+
+    @Autowired
+    private ISegchkStoreLableMgtService segchkStoreLableMgtService;
+    /**
+     * 查询seg关键字管理
+     * 
+     * @param keywordId seg关键字管理主键
+     * @return seg关键字管理
+     */
+    @Override
+    public SegchkKeywordLable selectSegchkKeywordLableByKeywordId(Long keywordId)
+    {
+        return segchkKeywordLableMapper.selectSegchkKeywordLableByKeywordId(keywordId);
+    }
+
+    /**
+     * 查询seg关键字管理列表
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return seg关键字管理
+     */
+    @Override
+    public List<SegchkKeywordLable> selectSegchkKeywordLableList(SegchkKeywordLable segchkKeywordLable)
+    {
+        return segchkKeywordLableMapper.selectSegchkKeywordLableList(segchkKeywordLable);
+    }
+
+    /**
+     * 新增seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable)
+    {
+        return segchkKeywordLableMapper.insertSegchkKeywordLable(segchkKeywordLable);
+    }
+
+    /**
+     * 修改seg关键字管理
+     * 
+     * @param segchkKeywordLable seg关键字管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkKeywordLable(SegchkKeywordLable segchkKeywordLable)
+    {
+        return segchkKeywordLableMapper.updateSegchkKeywordLable(segchkKeywordLable);
+    }
+
+    /**
+     * 批量删除seg关键字管理
+     * 
+     * @param keywordIds 需要删除的seg关键字管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkKeywordLableByKeywordIds(Long[] keywordIds)
+    {
+//        String[] cardTypeIds = new String[]{keywordIds.toString()};
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("cardTypeIds", keywordIds);
+        paramsMap.put("typeId", 1);
+        segchkLableMgtService.deleteSegchkLableMgtByCardTypeIds(paramsMap);
+        segchkStoreLableMgtService.deleteSegchkStoreLableMgtByCardTypeIds(paramsMap);
+        return segchkKeywordLableMapper.deleteSegchkKeywordLableByKeywordIds(keywordIds);
+    }
+
+    /**
+     * 删除seg关键字管理信息
+     * 
+     * @param providerId seg关键字管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkKeywordLableByProviderId(Long providerId)
+    {
+
+        return segchkKeywordLableMapper.deleteSegchkKeywordLableByProviderId(providerId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLableMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLableMgtServiceImpl.java
new file mode 100644
index 0000000..ef41da3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLableMgtServiceImpl.java
@@ -0,0 +1,106 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkLableMgtMapper;
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+import com.ruoyi.segchk.service.ISegchkLableMgtService;
+
+/**
+ * seg首页标签管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkLableMgtServiceImpl implements ISegchkLableMgtService 
+{
+    @Autowired
+    private SegchkLableMgtMapper segchkLableMgtMapper;
+
+    private static final Logger logger = LoggerFactory.getLogger(SegchkLableMgtServiceImpl.class);
+    /**
+     * 查询seg首页标签管理
+     * 
+     * @param mgtId seg首页标签管理主键
+     * @return seg首页标签管理
+     */
+    @Override
+    public SegchkLableMgt selectSegchkLableMgtByMgtId(Long mgtId)
+    {
+        return segchkLableMgtMapper.selectSegchkLableMgtByMgtId(mgtId);
+    }
+
+    /**
+     * 查询seg首页标签管理列表
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return seg首页标签管理
+     */
+    @Override
+    public List<SegchkLableMgt> selectSegchkLableMgtList(SegchkLableMgt segchkLableMgt)
+    {
+        return segchkLableMgtMapper.selectSegchkLableMgtList(segchkLableMgt);
+    }
+
+    /**
+     * 新增seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkLableMgt(SegchkLableMgt segchkLableMgt)
+    {
+        return segchkLableMgtMapper.insertSegchkLableMgt(segchkLableMgt);
+    }
+
+    /**
+     * 修改seg首页标签管理
+     * 
+     * @param segchkLableMgt seg首页标签管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkLableMgt(SegchkLableMgt segchkLableMgt)
+    {
+        return segchkLableMgtMapper.updateSegchkLableMgt(segchkLableMgt);
+    }
+
+    /**
+     * 批量删除seg首页标签管理
+     * 
+     * @param mgtIds 需要删除的seg首页标签管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkLableMgtByProviderIds(Long[] mgtIds)
+    {
+        return segchkLableMgtMapper.deleteSegchkLableMgtByMgtIds(mgtIds);
+    }
+
+    /**
+     * 删除seg首页标签管理信息
+     * 
+     * @param mgtId seg首页标签管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkLableMgtByProviderId(Long mgtId)
+    {
+        return segchkLableMgtMapper.deleteSegchkLableMgtByMgtId(mgtId);
+    }
+
+    @Override
+    public int deleteSegchkLableMgtByCardTypeIds(Map<String, Object> paramsMap) {
+        int ret = segchkLableMgtMapper.deleteSegchkLableMgtByCardTypeIds(paramsMap);
+        logger.debug("deleteSegchkLableMgtByCardTypeIds res: {} \t with: {}", ret, paramsMap.toString());
+        return ret;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLogionDetailServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLogionDetailServiceImpl.java
new file mode 100644
index 0000000..9339674
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkLogionDetailServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkLogionDetailMapper;
+import com.ruoyi.segchk.domain.SegchkLogionDetail;
+import com.ruoyi.segchk.service.ISegchkLogionDetailService;
+
+/**
+ * seg登录记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkLogionDetailServiceImpl implements ISegchkLogionDetailService 
+{
+    @Autowired
+    private SegchkLogionDetailMapper segchkLogionDetailMapper;
+
+    /**
+     * 查询seg登录记录
+     * 
+     * @param loginId seg登录记录主键
+     * @return seg登录记录
+     */
+    @Override
+    public SegchkLogionDetail selectSegchkLogionDetailByLoginId(Long loginId)
+    {
+        return segchkLogionDetailMapper.selectSegchkLogionDetailByLoginId(loginId);
+    }
+
+    /**
+     * 查询seg登录记录列表
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return seg登录记录
+     */
+    @Override
+    public List<SegchkLogionDetail> selectSegchkLogionDetailList(SegchkLogionDetail segchkLogionDetail)
+    {
+        return segchkLogionDetailMapper.selectSegchkLogionDetailList(segchkLogionDetail);
+    }
+
+    /**
+     * 新增seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail)
+    {
+        return segchkLogionDetailMapper.insertSegchkLogionDetail(segchkLogionDetail);
+    }
+
+    /**
+     * 修改seg登录记录
+     * 
+     * @param segchkLogionDetail seg登录记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkLogionDetail(SegchkLogionDetail segchkLogionDetail)
+    {
+        return segchkLogionDetailMapper.updateSegchkLogionDetail(segchkLogionDetail);
+    }
+
+    /**
+     * 批量删除seg登录记录
+     * 
+     * @param loginIds 需要删除的seg登录记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkLogionDetailByLoginIds(Long[] loginIds)
+    {
+        return segchkLogionDetailMapper.deleteSegchkLogionDetailByLoginIds(loginIds);
+    }
+
+    /**
+     * 删除seg登录记录信息
+     * 
+     * @param loginId seg登录记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkLogionDetailByLoginId(Long loginId)
+    {
+        return segchkLogionDetailMapper.deleteSegchkLogionDetailByLoginId(loginId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkMsgDetailServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkMsgDetailServiceImpl.java
new file mode 100644
index 0000000..123bd6b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkMsgDetailServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkMsgDetailMapper;
+import com.ruoyi.segchk.domain.SegchkMsgDetail;
+import com.ruoyi.segchk.service.ISegchkMsgDetailService;
+
+/**
+ * seg消息记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkMsgDetailServiceImpl implements ISegchkMsgDetailService 
+{
+    @Autowired
+    private SegchkMsgDetailMapper segchkMsgDetailMapper;
+
+    /**
+     * 查询seg消息记录
+     * 
+     * @param msgId seg消息记录主键
+     * @return seg消息记录
+     */
+    @Override
+    public SegchkMsgDetail selectSegchkMsgDetailByMsgId(Long msgId)
+    {
+        return segchkMsgDetailMapper.selectSegchkMsgDetailByMsgId(msgId);
+    }
+
+    /**
+     * 查询seg消息记录列表
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return seg消息记录
+     */
+    @Override
+    public List<SegchkMsgDetail> selectSegchkMsgDetailList(SegchkMsgDetail segchkMsgDetail)
+    {
+        return segchkMsgDetailMapper.selectSegchkMsgDetailList(segchkMsgDetail);
+    }
+
+    /**
+     * 新增seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail)
+    {
+        return segchkMsgDetailMapper.insertSegchkMsgDetail(segchkMsgDetail);
+    }
+
+    /**
+     * 修改seg消息记录
+     * 
+     * @param segchkMsgDetail seg消息记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkMsgDetail(SegchkMsgDetail segchkMsgDetail)
+    {
+        return segchkMsgDetailMapper.updateSegchkMsgDetail(segchkMsgDetail);
+    }
+
+    /**
+     * 批量删除seg消息记录
+     * 
+     * @param msgIds 需要删除的seg消息记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkMsgDetailByMsgIds(Long[] msgIds)
+    {
+        return segchkMsgDetailMapper.deleteSegchkMsgDetailByMsgIds(msgIds);
+    }
+
+    /**
+     * 删除seg消息记录信息
+     * 
+     * @param msgId seg消息记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkMsgDetailByMsgId(Long msgId)
+    {
+        return segchkMsgDetailMapper.deleteSegchkMsgDetailByMsgId(msgId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkPreferenceLableServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkPreferenceLableServiceImpl.java
new file mode 100644
index 0000000..ef8f11c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkPreferenceLableServiceImpl.java
@@ -0,0 +1,110 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.segchk.service.ISegchkLableMgtService;
+import com.ruoyi.segchk.service.ISegchkStoreLableMgtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkPreferenceLableMapper;
+import com.ruoyi.segchk.domain.SegchkPreferenceLable;
+import com.ruoyi.segchk.service.ISegchkPreferenceLableService;
+
+/**
+ * seg优惠管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkPreferenceLableServiceImpl implements ISegchkPreferenceLableService 
+{
+    @Autowired
+    private SegchkPreferenceLableMapper segchkPreferenceLableMapper;
+
+    @Autowired
+    private ISegchkLableMgtService segchkLableMgtService;
+
+    @Autowired
+    private ISegchkStoreLableMgtService segchkStoreLableMgtService;
+
+    /**
+     * 查询seg优惠管理
+     * 
+     * @param preferenceId seg优惠管理主键
+     * @return seg优惠管理
+     */
+    @Override
+    public SegchkPreferenceLable selectSegchkPreferenceLableByPreferenceId(Long preferenceId)
+    {
+        return segchkPreferenceLableMapper.selectSegchkPreferenceLableByPreferenceId(preferenceId);
+    }
+
+    /**
+     * 查询seg优惠管理列表
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return seg优惠管理
+     */
+    @Override
+    public List<SegchkPreferenceLable> selectSegchkPreferenceLableList(SegchkPreferenceLable segchkPreferenceLable)
+    {
+        return segchkPreferenceLableMapper.selectSegchkPreferenceLableList(segchkPreferenceLable);
+    }
+
+    /**
+     * 新增seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable)
+    {
+        return segchkPreferenceLableMapper.insertSegchkPreferenceLable(segchkPreferenceLable);
+    }
+
+    /**
+     * 修改seg优惠管理
+     * 
+     * @param segchkPreferenceLable seg优惠管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkPreferenceLable(SegchkPreferenceLable segchkPreferenceLable)
+    {
+        return segchkPreferenceLableMapper.updateSegchkPreferenceLable(segchkPreferenceLable);
+    }
+
+    /**
+     * 批量删除seg优惠管理
+     * 
+     * @param preferenceIds 需要删除的seg优惠管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkPreferenceLableByPreferenceIds(Long[] preferenceIds)
+    {
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("cardTypeIds", preferenceIds);
+        paramsMap.put("typeId", 2);
+        segchkLableMgtService.deleteSegchkLableMgtByCardTypeIds(paramsMap);
+
+        segchkStoreLableMgtService.deleteSegchkStoreLableMgtByCardTypeIds(paramsMap);
+        return segchkPreferenceLableMapper.deleteSegchkPreferenceLableByPreferenceIds(preferenceIds);
+    }
+
+    /**
+     * 删除seg优惠管理信息
+     * 
+     * @param providerId seg优惠管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkPreferenceLableByProviderId(Long providerId)
+    {
+        return segchkPreferenceLableMapper.deleteSegchkPreferenceLableByProviderId(providerId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderMgtServiceImpl.java
new file mode 100644
index 0000000..3b4e26d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderMgtServiceImpl.java
@@ -0,0 +1,145 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.segchk.domain.SegchkLableMgt;
+import com.ruoyi.segchk.mapper.SegchkProviderMgtMapper;
+import com.ruoyi.segchk.domain.SegchkProviderMgt;
+import com.ruoyi.segchk.service.ISegchkProviderMgtService;
+
+/**
+ * seg运营商管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkProviderMgtServiceImpl implements ISegchkProviderMgtService 
+{
+    @Autowired
+    private SegchkProviderMgtMapper segchkProviderMgtMapper;
+
+    /**
+     * 查询seg运营商管理
+     * 
+     * @param providerId seg运营商管理主键
+     * @return seg运营商管理
+     */
+    @Override
+    public SegchkProviderMgt selectSegchkProviderMgtByProviderId(Long providerId)
+    {
+        return segchkProviderMgtMapper.selectSegchkProviderMgtByProviderId(providerId);
+    }
+
+    /**
+     * 查询seg运营商管理列表
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return seg运营商管理
+     */
+    @Override
+    public List<SegchkProviderMgt> selectSegchkProviderMgtList(SegchkProviderMgt segchkProviderMgt)
+    {
+        return segchkProviderMgtMapper.selectSegchkProviderMgtList(segchkProviderMgt);
+    }
+
+    /**
+     * 新增seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt)
+    {
+        segchkProviderMgt.setCreateTime(DateUtils.getNowDate());
+        int rows = segchkProviderMgtMapper.insertSegchkProviderMgt(segchkProviderMgt);
+        insertSegchkLableMgt(segchkProviderMgt);
+        return rows;
+    }
+
+    /**
+     * 修改seg运营商管理
+     * 
+     * @param segchkProviderMgt seg运营商管理
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSegchkProviderMgt(SegchkProviderMgt segchkProviderMgt)
+    {
+        segchkProviderMgt.setUpdateTime(DateUtils.getNowDate());
+//        segchkProviderMgtMapper.deleteSegchkLableMgtByProviderId(segchkProviderMgt.getProviderId());
+//        insertSegchkLableMgt(segchkProviderMgt);
+        return segchkProviderMgtMapper.updateSegchkProviderMgt(segchkProviderMgt);
+    }
+
+    /**
+     * 批量删除seg运营商管理
+     * 
+     * @param providerIds 需要删除的seg运营商管理主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSegchkProviderMgtByProviderIds(Long[] providerIds)
+    {
+//        segchkProviderMgtMapper.deleteSegchkLableMgtByProviderIds(providerIds);
+        return segchkProviderMgtMapper.deleteSegchkProviderMgtByProviderIds(providerIds);
+    }
+
+    /**
+     * 删除seg运营商管理信息
+     * 
+     * @param providerId seg运营商管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkProviderMgtByProviderId(Long providerId)
+    {
+        segchkProviderMgtMapper.deleteSegchkLableMgtByProviderId(providerId);
+        return segchkProviderMgtMapper.deleteSegchkProviderMgtByProviderId(providerId);
+    }
+
+    @Override
+    public HashMap<String, Object> getCustomService(Long providerId) {
+        return segchkProviderMgtMapper.getCustomService(providerId);
+    }
+
+    @Override
+    public Long getProviderIdByPhoneNo(String phonenumber) {
+
+        return segchkProviderMgtMapper.getProviderIdByPhoneNo(phonenumber);
+    }
+
+    /**
+     * 新增seg首页标签管理信息
+     * 
+     * @param segchkProviderMgt seg运营商管理对象
+     */
+    public void insertSegchkLableMgt(SegchkProviderMgt segchkProviderMgt)
+    {
+        List<SegchkLableMgt> segchkLableMgtList = segchkProviderMgt.getSegchkLableMgtList();
+        Long providerId = segchkProviderMgt.getProviderId();
+        if (StringUtils.isNotNull(segchkLableMgtList))
+        {
+            List<SegchkLableMgt> list = new ArrayList<SegchkLableMgt>();
+            for (SegchkLableMgt segchkLableMgt : segchkLableMgtList)
+            {
+                segchkLableMgt.setProviderId(providerId);
+                list.add(segchkLableMgt);
+            }
+            if (list.size() > 0)
+            {
+                segchkProviderMgtMapper.batchSegchkLableMgt(list);
+            }
+        }
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderIndexServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderIndexServiceImpl.java
new file mode 100644
index 0000000..cfccc49
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderIndexServiceImpl.java
@@ -0,0 +1,99 @@
+package com.ruoyi.segchk.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebReq;
+import com.ruoyi.segchk.domain.SegchkRecommenderStoreWebResp;
+import com.ruoyi.segchk.mapper.SegchkRecommenderIndexMapper;
+import com.ruoyi.segchk.mapper.SegchkRecommenderStoreMapper;
+import com.ruoyi.segchk.service.ISegchkRecommenderIndexService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * seg首页推荐商户Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-07-01
+ */
+@Service
+public class SegchkRecommenderIndexServiceImpl implements ISegchkRecommenderIndexService
+{
+    @Autowired
+    private SegchkRecommenderIndexMapper segchkRecommenderIndexMapper;
+
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return seg首页推荐商户
+     */
+    @Override
+    public SegchkRecommenderStore selectSegchkRecommenderStoreById(Long recommenderId)
+    {
+        return segchkRecommenderIndexMapper.selectSegchkRecommenderStoreById(recommenderId);
+    }
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户
+     */
+    @Override
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderIndexMapper.selectSegchkRecommenderStoreList(segchkRecommenderStore);
+    }
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderIndexMapper.insertSegchkRecommenderStore(segchkRecommenderStore);
+    }
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderIndexMapper.updateSegchkRecommenderStore(segchkRecommenderStore);
+    }
+
+    /**
+     * 删除seg首页推荐商户对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkRecommenderStoreByIds(String ids)
+    {
+        return segchkRecommenderIndexMapper.deleteSegchkRecommenderStoreByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除seg首页推荐商户信息
+     * 
+     * @param recommenderId seg首页推荐商户ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkRecommenderStoreById(Long recommenderId)
+    {
+        return segchkRecommenderIndexMapper.deleteSegchkRecommenderStoreById(recommenderId);
+    }
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderStoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderStoreServiceImpl.java
new file mode 100644
index 0000000..dd4a726
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkRecommenderStoreServiceImpl.java
@@ -0,0 +1,98 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkRecommenderStoreMapper;
+import com.ruoyi.segchk.domain.SegchkRecommenderStore;
+import com.ruoyi.segchk.service.ISegchkRecommenderStoreService;
+
+/**
+ * seg首页推荐商户Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkRecommenderStoreServiceImpl implements ISegchkRecommenderStoreService 
+{
+    @Autowired
+    private SegchkRecommenderStoreMapper segchkRecommenderStoreMapper;
+
+    /**
+     * 查询seg首页推荐商户
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return seg首页推荐商户
+     */
+    @Override
+    public SegchkRecommenderStore selectSegchkRecommenderStoreByRecommenderId(Long recommenderId)
+    {
+        return segchkRecommenderStoreMapper.selectSegchkRecommenderStoreByRecommenderId(recommenderId);
+    }
+
+    /**
+     * 查询seg首页推荐商户列表
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return seg首页推荐商户
+     */
+    @Override
+    public List<SegchkRecommenderStore> selectSegchkRecommenderStoreList(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderStoreMapper.selectSegchkRecommenderStoreList(segchkRecommenderStore);
+    }
+
+    /**
+     * 新增seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderStoreMapper.insertSegchkRecommenderStore(segchkRecommenderStore);
+    }
+
+    /**
+     * 修改seg首页推荐商户
+     * 
+     * @param segchkRecommenderStore seg首页推荐商户
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkRecommenderStore(SegchkRecommenderStore segchkRecommenderStore)
+    {
+        return segchkRecommenderStoreMapper.updateSegchkRecommenderStore(segchkRecommenderStore);
+    }
+
+    /**
+     * 批量删除seg首页推荐商户
+     * 
+     * @param recommenderIds 需要删除的seg首页推荐商户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkRecommenderStoreByRecommenderIds(Long[] recommenderIds)
+    {
+        return segchkRecommenderStoreMapper.deleteSegchkRecommenderStoreByRecommenderIds(recommenderIds);
+    }
+
+    /**
+     * 删除seg首页推荐商户信息
+     * 
+     * @param recommenderId seg首页推荐商户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkRecommenderStoreByRecommenderId(Long recommenderId)
+    {
+        return segchkRecommenderStoreMapper.deleteSegchkRecommenderStoreByRecommenderId(recommenderId);
+    }
+
+    @Override
+    public int deleteSegchkRecommenderStoreByStoreIds(Long[] storeIds) {
+        return segchkRecommenderStoreMapper.deleteSegchkRecommenderStoreByStoreIds(storeIds);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSalerInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSalerInfoServiceImpl.java
new file mode 100644
index 0000000..34dd094
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSalerInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkSalerInfoMapper;
+import com.ruoyi.segchk.domain.SegchkSalerInfo;
+import com.ruoyi.segchk.service.ISegchkSalerInfoService;
+
+/**
+ * seg销售人员信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkSalerInfoServiceImpl implements ISegchkSalerInfoService 
+{
+    @Autowired
+    private SegchkSalerInfoMapper segchkSalerInfoMapper;
+
+    /**
+     * 查询seg销售人员信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return seg销售人员信息
+     */
+    @Override
+    public SegchkSalerInfo selectSegchkSalerInfoBySalerId(Integer salerId)
+    {
+        return segchkSalerInfoMapper.selectSegchkSalerInfoBySalerId(salerId);
+    }
+
+    /**
+     * 查询seg销售人员信息列表
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return seg销售人员信息
+     */
+    @Override
+    public List<SegchkSalerInfo> selectSegchkSalerInfoList(SegchkSalerInfo segchkSalerInfo)
+    {
+        return segchkSalerInfoMapper.selectSegchkSalerInfoList(segchkSalerInfo);
+    }
+
+    /**
+     * 新增seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo)
+    {
+        return segchkSalerInfoMapper.insertSegchkSalerInfo(segchkSalerInfo);
+    }
+
+    /**
+     * 修改seg销售人员信息
+     * 
+     * @param segchkSalerInfo seg销售人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkSalerInfo(SegchkSalerInfo segchkSalerInfo)
+    {
+        return segchkSalerInfoMapper.updateSegchkSalerInfo(segchkSalerInfo);
+    }
+
+    /**
+     * 批量删除seg销售人员信息
+     * 
+     * @param salerIds 需要删除的seg销售人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSalerInfoBySalerIds(Integer[] salerIds)
+    {
+        return segchkSalerInfoMapper.deleteSegchkSalerInfoBySalerIds(salerIds);
+    }
+
+    /**
+     * 删除seg销售人员信息信息
+     * 
+     * @param salerId seg销售人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSalerInfoBySalerId(Integer salerId)
+    {
+        return segchkSalerInfoMapper.deleteSegchkSalerInfoBySalerId(salerId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSelfServiceChkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSelfServiceChkServiceImpl.java
new file mode 100644
index 0000000..0d3b87f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSelfServiceChkServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkSelfServiceChkMapper;
+import com.ruoyi.segchk.domain.SegchkSelfServiceChk;
+import com.ruoyi.segchk.service.ISegchkSelfServiceChkService;
+
+/**
+ * seg自定义卡核消记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkSelfServiceChkServiceImpl implements ISegchkSelfServiceChkService 
+{
+    @Autowired
+    private SegchkSelfServiceChkMapper segchkSelfServiceChkMapper;
+
+    /**
+     * 查询seg自定义卡核消记录
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return seg自定义卡核消记录
+     */
+    @Override
+    public SegchkSelfServiceChk selectSegchkSelfServiceChkByChkServiceId(Long chkServiceId)
+    {
+        return segchkSelfServiceChkMapper.selectSegchkSelfServiceChkByChkServiceId(chkServiceId);
+    }
+
+    /**
+     * 查询seg自定义卡核消记录列表
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return seg自定义卡核消记录
+     */
+    @Override
+    public List<SegchkSelfServiceChk> selectSegchkSelfServiceChkList(SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+        return segchkSelfServiceChkMapper.selectSegchkSelfServiceChkList(segchkSelfServiceChk);
+    }
+
+    /**
+     * 新增seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+        return segchkSelfServiceChkMapper.insertSegchkSelfServiceChk(segchkSelfServiceChk);
+    }
+
+    /**
+     * 修改seg自定义卡核消记录
+     * 
+     * @param segchkSelfServiceChk seg自定义卡核消记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkSelfServiceChk(SegchkSelfServiceChk segchkSelfServiceChk)
+    {
+        return segchkSelfServiceChkMapper.updateSegchkSelfServiceChk(segchkSelfServiceChk);
+    }
+
+    /**
+     * 批量删除seg自定义卡核消记录
+     * 
+     * @param chkServiceIds 需要删除的seg自定义卡核消记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSelfServiceChkByChkServiceIds(Long[] chkServiceIds)
+    {
+        return segchkSelfServiceChkMapper.deleteSegchkSelfServiceChkByChkServiceIds(chkServiceIds);
+    }
+
+    /**
+     * 删除seg自定义卡核消记录信息
+     * 
+     * @param chkServiceId seg自定义卡核消记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSelfServiceChkByChkServiceId(Long chkServiceId)
+    {
+        return segchkSelfServiceChkMapper.deleteSegchkSelfServiceChkByChkServiceId(chkServiceId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceChkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceChkServiceImpl.java
new file mode 100644
index 0000000..019fb58
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceChkServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkServiceChkMapper;
+import com.ruoyi.segchk.domain.SegchkServiceChk;
+import com.ruoyi.segchk.service.ISegchkServiceChkService;
+
+/**
+ * seg核消记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkServiceChkServiceImpl implements ISegchkServiceChkService 
+{
+    @Autowired
+    private SegchkServiceChkMapper segchkServiceChkMapper;
+
+    /**
+     * 查询seg核消记录
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return seg核消记录
+     */
+    @Override
+    public SegchkServiceChk selectSegchkServiceChkByChkServiceId(Long chkServiceId)
+    {
+        return segchkServiceChkMapper.selectSegchkServiceChkByChkServiceId(chkServiceId);
+    }
+
+    /**
+     * 查询seg核消记录列表
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return seg核消记录
+     */
+    @Override
+    public List<SegchkServiceChk> selectSegchkServiceChkList(SegchkServiceChk segchkServiceChk)
+    {
+        return segchkServiceChkMapper.selectSegchkServiceChkList(segchkServiceChk);
+    }
+
+    /**
+     * 新增seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkServiceChk(SegchkServiceChk segchkServiceChk)
+    {
+        return segchkServiceChkMapper.insertSegchkServiceChk(segchkServiceChk);
+    }
+
+    /**
+     * 修改seg核消记录
+     * 
+     * @param segchkServiceChk seg核消记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkServiceChk(SegchkServiceChk segchkServiceChk)
+    {
+        return segchkServiceChkMapper.updateSegchkServiceChk(segchkServiceChk);
+    }
+
+    /**
+     * 批量删除seg核消记录
+     * 
+     * @param chkServiceIds 需要删除的seg核消记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkServiceChkByChkServiceIds(Long[] chkServiceIds)
+    {
+        return segchkServiceChkMapper.deleteSegchkServiceChkByChkServiceIds(chkServiceIds);
+    }
+
+    /**
+     * 删除seg核消记录信息
+     * 
+     * @param chkServiceId seg核消记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkServiceChkByChkServiceId(Long chkServiceId)
+    {
+        return segchkServiceChkMapper.deleteSegchkServiceChkByChkServiceId(chkServiceId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceCommentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceCommentServiceImpl.java
new file mode 100644
index 0000000..421f3f1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkServiceCommentServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkServiceCommentMapper;
+import com.ruoyi.segchk.domain.SegchkServiceComment;
+import com.ruoyi.segchk.service.ISegchkServiceCommentService;
+
+/**
+ * seg评价记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkServiceCommentServiceImpl implements ISegchkServiceCommentService 
+{
+    @Autowired
+    private SegchkServiceCommentMapper segchkServiceCommentMapper;
+
+    /**
+     * 查询seg评价记录
+     * 
+     * @param commentId seg评价记录主键
+     * @return seg评价记录
+     */
+    @Override
+    public SegchkServiceComment selectSegchkServiceCommentByCommentId(Long commentId)
+    {
+        return segchkServiceCommentMapper.selectSegchkServiceCommentByCommentId(commentId);
+    }
+
+    /**
+     * 查询seg评价记录列表
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return seg评价记录
+     */
+    @Override
+    public List<SegchkServiceComment> selectSegchkServiceCommentList(SegchkServiceComment segchkServiceComment)
+    {
+        return segchkServiceCommentMapper.selectSegchkServiceCommentList(segchkServiceComment);
+    }
+
+    /**
+     * 新增seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkServiceComment(SegchkServiceComment segchkServiceComment)
+    {
+        return segchkServiceCommentMapper.insertSegchkServiceComment(segchkServiceComment);
+    }
+
+    /**
+     * 修改seg评价记录
+     * 
+     * @param segchkServiceComment seg评价记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkServiceComment(SegchkServiceComment segchkServiceComment)
+    {
+        return segchkServiceCommentMapper.updateSegchkServiceComment(segchkServiceComment);
+    }
+
+    /**
+     * 批量删除seg评价记录
+     * 
+     * @param commentIds 需要删除的seg评价记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkServiceCommentByCommentIds(Long[] commentIds)
+    {
+        return segchkServiceCommentMapper.deleteSegchkServiceCommentByCommentIds(commentIds);
+    }
+
+    /**
+     * 删除seg评价记录信息
+     * 
+     * @param commentId seg评价记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkServiceCommentByCommentId(Long commentId)
+    {
+        return segchkServiceCommentMapper.deleteSegchkServiceCommentByCommentId(commentId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSmsDetailServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSmsDetailServiceImpl.java
new file mode 100644
index 0000000..a71d6a2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSmsDetailServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkSmsDetailMapper;
+import com.ruoyi.segchk.domain.SegchkSmsDetail;
+import com.ruoyi.segchk.service.ISegchkSmsDetailService;
+
+/**
+ * seg短信记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkSmsDetailServiceImpl implements ISegchkSmsDetailService 
+{
+    @Autowired
+    private SegchkSmsDetailMapper segchkSmsDetailMapper;
+
+    /**
+     * 查询seg短信记录
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return seg短信记录
+     */
+    @Override
+    public SegchkSmsDetail selectSegchkSmsDetailByShortMsgId(Long shortMsgId)
+    {
+        return segchkSmsDetailMapper.selectSegchkSmsDetailByShortMsgId(shortMsgId);
+    }
+
+    /**
+     * 查询seg短信记录列表
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return seg短信记录
+     */
+    @Override
+    public List<SegchkSmsDetail> selectSegchkSmsDetailList(SegchkSmsDetail segchkSmsDetail)
+    {
+        return segchkSmsDetailMapper.selectSegchkSmsDetailList(segchkSmsDetail);
+    }
+
+    /**
+     * 新增seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail)
+    {
+        segchkSmsDetail.setCreateTime(DateUtils.getNowDate());
+        return segchkSmsDetailMapper.insertSegchkSmsDetail(segchkSmsDetail);
+    }
+
+    /**
+     * 修改seg短信记录
+     * 
+     * @param segchkSmsDetail seg短信记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkSmsDetail(SegchkSmsDetail segchkSmsDetail)
+    {
+        return segchkSmsDetailMapper.updateSegchkSmsDetail(segchkSmsDetail);
+    }
+
+    /**
+     * 批量删除seg短信记录
+     * 
+     * @param shortMsgIds 需要删除的seg短信记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSmsDetailByShortMsgIds(Long[] shortMsgIds)
+    {
+        return segchkSmsDetailMapper.deleteSegchkSmsDetailByShortMsgIds(shortMsgIds);
+    }
+
+    /**
+     * 删除seg短信记录信息
+     * 
+     * @param shortMsgId seg短信记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSmsDetailByShortMsgId(Long shortMsgId)
+    {
+        return segchkSmsDetailMapper.deleteSegchkSmsDetailByShortMsgId(shortMsgId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreAccountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreAccountServiceImpl.java
new file mode 100644
index 0000000..10641f4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreAccountServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreAccountMapper;
+import com.ruoyi.segchk.domain.SegchkStoreAccount;
+import com.ruoyi.segchk.service.ISegchkStoreAccountService;
+
+/**
+ * seg商户余额信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreAccountServiceImpl implements ISegchkStoreAccountService 
+{
+    @Autowired
+    private SegchkStoreAccountMapper segchkStoreAccountMapper;
+
+    /**
+     * 查询seg商户余额信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return seg商户余额信息
+     */
+    @Override
+    public SegchkStoreAccount selectSegchkStoreAccountByAccountId(Long accountId)
+    {
+        return segchkStoreAccountMapper.selectSegchkStoreAccountByAccountId(accountId);
+    }
+
+    /**
+     * 查询seg商户余额信息列表
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return seg商户余额信息
+     */
+    @Override
+    public List<SegchkStoreAccount> selectSegchkStoreAccountList(SegchkStoreAccount segchkStoreAccount)
+    {
+        return segchkStoreAccountMapper.selectSegchkStoreAccountList(segchkStoreAccount);
+    }
+
+    /**
+     * 新增seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount)
+    {
+        return segchkStoreAccountMapper.insertSegchkStoreAccount(segchkStoreAccount);
+    }
+
+    /**
+     * 修改seg商户余额信息
+     * 
+     * @param segchkStoreAccount seg商户余额信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreAccount(SegchkStoreAccount segchkStoreAccount)
+    {
+        return segchkStoreAccountMapper.updateSegchkStoreAccount(segchkStoreAccount);
+    }
+
+    /**
+     * 批量删除seg商户余额信息
+     * 
+     * @param accountIds 需要删除的seg商户余额信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreAccountByAccountIds(Long[] accountIds)
+    {
+        return segchkStoreAccountMapper.deleteSegchkStoreAccountByAccountIds(accountIds);
+    }
+
+    /**
+     * 删除seg商户余额信息信息
+     * 
+     * @param accountId seg商户余额信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreAccountByAccountId(Long accountId)
+    {
+        return segchkStoreAccountMapper.deleteSegchkStoreAccountByAccountId(accountId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreBasicInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreBasicInfoServiceImpl.java
new file mode 100644
index 0000000..8183476
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreBasicInfoServiceImpl.java
@@ -0,0 +1,259 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.segchk.domain.*;
+import com.ruoyi.segchk.service.ISegchkCarouseMgtService;
+import com.ruoyi.segchk.service.ISegchkRecommenderStoreService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.segchk.mapper.SegchkStoreBasicInfoMapper;
+import com.ruoyi.segchk.service.ISegchkStoreBasicInfoService;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * seg商家基础信息Service业务层处理
+ *
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreBasicInfoServiceImpl implements ISegchkStoreBasicInfoService {
+    @Autowired
+    private SegchkStoreBasicInfoMapper segchkStoreBasicInfoMapper;
+
+    @Autowired
+    private ISegchkCarouseMgtService segchkCarouseMgtService;
+
+    @Autowired
+    private ISegchkRecommenderStoreService segchkRecommenderStoreService;
+
+    private static final Logger logger = LoggerFactory.getLogger(SegchkStoreBasicInfoServiceImpl.class);
+    /**
+     * 查询seg商家基础信息
+     *
+     * @param storeId seg商家基础信息主键
+     * @return seg商家基础信息
+     */
+    @Override
+    public SegchkStoreBasicInfo selectSegchkStoreBasicInfoByStoreId(Long storeId) {
+        return segchkStoreBasicInfoMapper.selectSegchkStoreBasicInfoByStoreId(storeId);
+    }
+
+    /**
+     * 查询seg商家基础信息列表
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return seg商家基础信息
+     */
+    @Override
+    public List<SegchkStoreBasicInfo> selectSegchkStoreBasicInfoList(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        return segchkStoreBasicInfoMapper.selectSegchkStoreBasicInfoList(segchkStoreBasicInfo);
+    }
+
+    /**
+     * 新增seg商家基础信息
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        Long store_id = segchkStoreBasicInfoMapper.selectStoreIdByPhone(segchkStoreBasicInfo.getStorePhone());
+        if(!ObjectUtils.isEmpty(store_id)){
+            logger.warn("insertSegchkStoreBasicInfo error insert for store({}) with phone({}) same to store({})", segchkStoreBasicInfo.getStoreName(), segchkStoreBasicInfo.getStorePhone(), store_id);
+            return -1;//说明该手机号已注册商户
+        }
+        int rows = segchkStoreBasicInfoMapper.insertSegchkStoreBasicInfo(segchkStoreBasicInfo);
+        insertSegchkStoreImage(segchkStoreBasicInfo);
+        insertSegchkStoreChkMgt(segchkStoreBasicInfo);
+        insertSegchkStoreLableMgt(segchkStoreBasicInfo);
+        insertSegchkStoreSecurity(segchkStoreBasicInfo);
+        return rows;
+    }
+
+    /**
+     * 修改seg商家基础信息
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSegchkStoreBasicInfo(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        Long store_id = segchkStoreBasicInfoMapper.selectStoreIdByPhone(segchkStoreBasicInfo.getStorePhone());
+        if(!ObjectUtils.isEmpty(store_id) && !segchkStoreBasicInfo.getStoreId().equals(store_id)){
+            logger.warn("updateSegchkStoreBasicInfo error update for store({}) with phone({}) same to store({})", segchkStoreBasicInfo.getStoreId(), segchkStoreBasicInfo.getStorePhone(), store_id);
+            return -1;//说明该手机号已注册其他商户
+        }
+        segchkStoreBasicInfoMapper.deleteSegchkStoreImageByStoreId(segchkStoreBasicInfo.getStoreId());
+        segchkStoreBasicInfoMapper.deleteSegchkStoreChkMgtByStoreId(segchkStoreBasicInfo.getStoreId());
+        segchkStoreBasicInfoMapper.deleteSegchkStoreLableMgtByStoreId(segchkStoreBasicInfo.getStoreId());
+        segchkStoreBasicInfoMapper.deleteSegchkStoreSecurityByStoreId(segchkStoreBasicInfo.getStoreId());
+        if(!segchkStoreBasicInfo.getServiceState().equals("0")){
+//            商户下线
+            Long[] storeIds = new Long[]{segchkStoreBasicInfo.getStoreId()};
+            segchkCarouseMgtService.deleteSegchkCarouseMgtByStoreIds(storeIds);
+        }
+        insertSegchkStoreImage(segchkStoreBasicInfo);
+        insertSegchkStoreChkMgt(segchkStoreBasicInfo);
+        insertSegchkStoreLableMgt(segchkStoreBasicInfo);
+        insertSegchkStoreSecurity(segchkStoreBasicInfo);
+        return segchkStoreBasicInfoMapper.updateSegchkStoreBasicInfo(segchkStoreBasicInfo);
+    }
+
+    /**
+     * 批量删除seg商家基础信息
+     *
+     * @param storeIds 需要删除的seg商家基础信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSegchkStoreBasicInfoByStoreIds(Long[] storeIds) {
+        segchkStoreBasicInfoMapper.deleteSegchkStoreImageByStoreIds(storeIds);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreChkMgtByStoreIds(storeIds);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreLableMgtByStoreIds(storeIds);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreSecurityByStoreIds(storeIds);
+        segchkCarouseMgtService.deleteSegchkCarouseMgtByStoreIds(storeIds);
+        segchkRecommenderStoreService.deleteSegchkRecommenderStoreByStoreIds(storeIds);
+        return segchkStoreBasicInfoMapper.deleteSegchkStoreBasicInfoByStoreIds(storeIds);
+    }
+
+    /**
+     * 删除seg商家基础信息信息
+     *
+     * @param storeId seg商家基础信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreBasicInfoByStoreId(Long storeId) {
+        segchkStoreBasicInfoMapper.deleteSegchkStoreImageByStoreId(storeId);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreChkMgtByStoreId(storeId);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreLableMgtByStoreId(storeId);
+        segchkStoreBasicInfoMapper.deleteSegchkStoreSecurityByStoreId(storeId);
+        Long[] storeIds = new Long[]{storeId};
+        segchkCarouseMgtService.deleteSegchkCarouseMgtByStoreIds(storeIds);
+        segchkRecommenderStoreService.deleteSegchkRecommenderStoreByStoreIds(storeIds);
+        return segchkStoreBasicInfoMapper.deleteSegchkStoreBasicInfoByStoreId(storeId);
+    }
+
+    /**
+     * 修改seg商家服务状态
+     *
+     * @param segchkStoreBasicInfo seg商家基础信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreServiceStatus(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        if(!segchkStoreBasicInfo.getServiceState().equals("0")){
+//            商户下线
+            Long[] storeIds = new Long[]{segchkStoreBasicInfo.getStoreId()};
+            segchkCarouseMgtService.deleteSegchkCarouseMgtByStoreIds(storeIds);
+            segchkRecommenderStoreService.deleteSegchkRecommenderStoreByStoreIds(storeIds);
+        }
+        return segchkStoreBasicInfoMapper.updateSegchkStoreServiceStatus(segchkStoreBasicInfo);
+    }
+
+    @Override
+    public int updateSegchkStoreDetail(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        return segchkStoreBasicInfoMapper.updateSegchkStoreDetail(segchkStoreBasicInfo);
+    }
+
+    /**
+     * 新增seg商家图片信息信息
+     *
+     * @param segchkStoreBasicInfo
+     */
+    public void insertSegchkStoreImage(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        List<SegchkStoreImage> segchkStoreImageList = segchkStoreBasicInfo.getSegchkStoreImageList();
+        Long storeId = segchkStoreBasicInfo.getStoreId();
+        Long providerId = segchkStoreBasicInfo.getProviderId();
+        if (StringUtils.isNotNull(segchkStoreImageList)) {
+            List<SegchkStoreImage> list = new ArrayList<SegchkStoreImage>();
+            for (SegchkStoreImage segchkStoreImage : segchkStoreImageList) {
+                segchkStoreImage.setStoreId(storeId);
+                segchkStoreImage.setProviderId(providerId);
+                list.add(segchkStoreImage);
+            }
+            if (list.size() > 0) {
+                segchkStoreBasicInfoMapper.batchSegchkStoreImage(list);
+            }
+        }
+    }
+
+    /**
+     * 新增seg商家核消管理信息
+     *
+     * @param segchkStoreBasicInfo
+     */
+    public void insertSegchkStoreChkMgt(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+
+        List<SegchkStoreChkMgt> segchkStoreChkMgtList = segchkStoreBasicInfo.getSegchkStoreChkMgtList();
+        Long storeId = segchkStoreBasicInfo.getStoreId();
+        Long providerId = segchkStoreBasicInfo.getProviderId();
+        if (StringUtils.isNotNull(segchkStoreChkMgtList)) {
+            List<SegchkStoreChkMgt> list = new ArrayList<SegchkStoreChkMgt>();
+            for (SegchkStoreChkMgt segchkStoreChkMgt : segchkStoreChkMgtList) {
+                segchkStoreChkMgt.setStoreId(storeId);
+                segchkStoreChkMgt.setProviderId(providerId);
+                list.add(segchkStoreChkMgt);
+            }
+            if (list.size() > 0) {
+                segchkStoreBasicInfoMapper.batchSegchkStoreChkMgt(list);
+            }
+        }
+    }
+
+    /**
+     * 新增seg商家标签管理信息
+     *
+     * @param segchkStoreBasicInfo
+     */
+    public void insertSegchkStoreLableMgt(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        List<SegchkStoreLableMgt> segchkStoreLableMgtList = segchkStoreBasicInfo.getSegchkStoreLableMgtList();
+        Long storeId = segchkStoreBasicInfo.getStoreId();
+        Long providerId = segchkStoreBasicInfo.getProviderId();
+        if (StringUtils.isNotNull(segchkStoreLableMgtList)) {
+            List<SegchkStoreLableMgt> list = new ArrayList<SegchkStoreLableMgt>();
+            for (SegchkStoreLableMgt segchkStoreLableMgt : segchkStoreLableMgtList) {
+                segchkStoreLableMgt.setStoreId(storeId);
+                segchkStoreLableMgt.setProviderId(providerId);
+                list.add(segchkStoreLableMgt);
+            }
+            if (list.size() > 0) {
+                segchkStoreBasicInfoMapper.batchSegchkStoreLableMgt(list);
+            }
+        }
+    }
+
+    /**
+     * 新增seg商家密码管理信息
+     *
+     * @param segchkStoreBasicInfo
+     */
+    public void insertSegchkStoreSecurity(SegchkStoreBasicInfo segchkStoreBasicInfo) {
+        List<SegchkStoreSecurity> segchkStoreSecurityList = segchkStoreBasicInfo.getSegchkStoreSecurityList();
+        Long storeId = segchkStoreBasicInfo.getStoreId();
+        Long providerId = segchkStoreBasicInfo.getProviderId();
+        if (StringUtils.isNotNull(segchkStoreSecurityList)) {
+            List<SegchkStoreSecurity> list = new ArrayList<SegchkStoreSecurity>();
+            for (SegchkStoreSecurity segchkStoreSecurity : segchkStoreSecurityList) {
+                segchkStoreSecurity.setStoreId(storeId);
+                segchkStoreSecurity.setProviderId(providerId);
+                list.add(segchkStoreSecurity);
+            }
+            if (list.size() > 0) {
+                segchkStoreBasicInfoMapper.batchSegchkStoreSecurity(list);
+            }
+        }
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreCashServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreCashServiceImpl.java
new file mode 100644
index 0000000..276f36f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreCashServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreCashMapper;
+import com.ruoyi.segchk.domain.SegchkStoreCash;
+import com.ruoyi.segchk.service.ISegchkStoreCashService;
+
+/**
+ * seg商户户提现记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreCashServiceImpl implements ISegchkStoreCashService 
+{
+    @Autowired
+    private SegchkStoreCashMapper segchkStoreCashMapper;
+
+    /**
+     * 查询seg商户户提现记录
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return seg商户户提现记录
+     */
+    @Override
+    public SegchkStoreCash selectSegchkStoreCashByCashId(Long cashId)
+    {
+        return segchkStoreCashMapper.selectSegchkStoreCashByCashId(cashId);
+    }
+
+    /**
+     * 查询seg商户户提现记录列表
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return seg商户户提现记录
+     */
+    @Override
+    public List<SegchkStoreCash> selectSegchkStoreCashList(SegchkStoreCash segchkStoreCash)
+    {
+        return segchkStoreCashMapper.selectSegchkStoreCashList(segchkStoreCash);
+    }
+
+    /**
+     * 新增seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreCash(SegchkStoreCash segchkStoreCash)
+    {
+        return segchkStoreCashMapper.insertSegchkStoreCash(segchkStoreCash);
+    }
+
+    /**
+     * 修改seg商户户提现记录
+     * 
+     * @param segchkStoreCash seg商户户提现记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreCash(SegchkStoreCash segchkStoreCash)
+    {
+        return segchkStoreCashMapper.updateSegchkStoreCash(segchkStoreCash);
+    }
+
+    /**
+     * 批量删除seg商户户提现记录
+     * 
+     * @param cashIds 需要删除的seg商户户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreCashByCashIds(Long[] cashIds)
+    {
+        return segchkStoreCashMapper.deleteSegchkStoreCashByCashIds(cashIds);
+    }
+
+    /**
+     * 删除seg商户户提现记录信息
+     * 
+     * @param cashId seg商户户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreCashByCashId(Long cashId)
+    {
+        return segchkStoreCashMapper.deleteSegchkStoreCashByCashId(cashId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChargeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChargeServiceImpl.java
new file mode 100644
index 0000000..2957e22
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChargeServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreChargeMapper;
+import com.ruoyi.segchk.domain.SegchkStoreCharge;
+import com.ruoyi.segchk.service.ISegchkStoreChargeService;
+
+/**
+ * seg商户充值记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreChargeServiceImpl implements ISegchkStoreChargeService 
+{
+    @Autowired
+    private SegchkStoreChargeMapper segchkStoreChargeMapper;
+
+    /**
+     * 查询seg商户充值记录
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return seg商户充值记录
+     */
+    @Override
+    public SegchkStoreCharge selectSegchkStoreChargeByChargeId(Long chargeId)
+    {
+        return segchkStoreChargeMapper.selectSegchkStoreChargeByChargeId(chargeId);
+    }
+
+    /**
+     * 查询seg商户充值记录列表
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return seg商户充值记录
+     */
+    @Override
+    public List<SegchkStoreCharge> selectSegchkStoreChargeList(SegchkStoreCharge segchkStoreCharge)
+    {
+        return segchkStoreChargeMapper.selectSegchkStoreChargeList(segchkStoreCharge);
+    }
+
+    /**
+     * 新增seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge)
+    {
+        return segchkStoreChargeMapper.insertSegchkStoreCharge(segchkStoreCharge);
+    }
+
+    /**
+     * 修改seg商户充值记录
+     * 
+     * @param segchkStoreCharge seg商户充值记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreCharge(SegchkStoreCharge segchkStoreCharge)
+    {
+        return segchkStoreChargeMapper.updateSegchkStoreCharge(segchkStoreCharge);
+    }
+
+    /**
+     * 批量删除seg商户充值记录
+     * 
+     * @param chargeIds 需要删除的seg商户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreChargeByChargeIds(Long[] chargeIds)
+    {
+        return segchkStoreChargeMapper.deleteSegchkStoreChargeByChargeIds(chargeIds);
+    }
+
+    /**
+     * 删除seg商户充值记录信息
+     * 
+     * @param chargeId seg商户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreChargeByChargeId(Long chargeId)
+    {
+        return segchkStoreChargeMapper.deleteSegchkStoreChargeByChargeId(chargeId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChkMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChkMgtServiceImpl.java
new file mode 100644
index 0000000..534c7b4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreChkMgtServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreChkMgtMapper;
+import com.ruoyi.segchk.domain.SegchkStoreChkMgt;
+import com.ruoyi.segchk.service.ISegchkStoreChkMgtService;
+
+/**
+ * seg商家核消卡管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreChkMgtServiceImpl implements ISegchkStoreChkMgtService 
+{
+    @Autowired
+    private SegchkStoreChkMgtMapper segchkStoreChkMgtMapper;
+
+    /**
+     * 查询seg商家核消卡管理
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return seg商家核消卡管理
+     */
+    @Override
+    public SegchkStoreChkMgt selectSegchkStoreChkMgtByMgtId(Integer mgtId)
+    {
+        return segchkStoreChkMgtMapper.selectSegchkStoreChkMgtByMgtId(mgtId);
+    }
+
+    /**
+     * 查询seg商家核消卡管理列表
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return seg商家核消卡管理
+     */
+    @Override
+    public List<SegchkStoreChkMgt> selectSegchkStoreChkMgtList(SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+        return segchkStoreChkMgtMapper.selectSegchkStoreChkMgtList(segchkStoreChkMgt);
+    }
+
+    /**
+     * 新增seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+        return segchkStoreChkMgtMapper.insertSegchkStoreChkMgt(segchkStoreChkMgt);
+    }
+
+    /**
+     * 修改seg商家核消卡管理
+     * 
+     * @param segchkStoreChkMgt seg商家核消卡管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreChkMgt(SegchkStoreChkMgt segchkStoreChkMgt)
+    {
+        return segchkStoreChkMgtMapper.updateSegchkStoreChkMgt(segchkStoreChkMgt);
+    }
+
+    /**
+     * 批量删除seg商家核消卡管理
+     * 
+     * @param mgtIds 需要删除的seg商家核消卡管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreChkMgtByMgtIds(Integer[] mgtIds)
+    {
+        return segchkStoreChkMgtMapper.deleteSegchkStoreChkMgtByMgtIds(mgtIds);
+    }
+
+    /**
+     * 删除seg商家核消卡管理信息
+     * 
+     * @param mgtId seg商家核消卡管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreChkMgtByMgtId(Integer mgtId)
+    {
+        return segchkStoreChkMgtMapper.deleteSegchkStoreChkMgtByMgtId(mgtId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreImageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreImageServiceImpl.java
new file mode 100644
index 0000000..690fa60
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreImageServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreImageMapper;
+import com.ruoyi.segchk.domain.SegchkStoreImage;
+import com.ruoyi.segchk.service.ISegchkStoreImageService;
+
+/**
+ * seg商家图片信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreImageServiceImpl implements ISegchkStoreImageService 
+{
+    @Autowired
+    private SegchkStoreImageMapper segchkStoreImageMapper;
+
+    /**
+     * 查询seg商家图片信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return seg商家图片信息
+     */
+    @Override
+    public SegchkStoreImage selectSegchkStoreImageByStoreId(Long storeId)
+    {
+        return segchkStoreImageMapper.selectSegchkStoreImageByStoreId(storeId);
+    }
+
+    /**
+     * 查询seg商家图片信息列表
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return seg商家图片信息
+     */
+    @Override
+    public List<SegchkStoreImage> selectSegchkStoreImageList(SegchkStoreImage segchkStoreImage)
+    {
+        return segchkStoreImageMapper.selectSegchkStoreImageList(segchkStoreImage);
+    }
+
+    /**
+     * 新增seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreImage(SegchkStoreImage segchkStoreImage)
+    {
+        return segchkStoreImageMapper.insertSegchkStoreImage(segchkStoreImage);
+    }
+
+    /**
+     * 修改seg商家图片信息
+     * 
+     * @param segchkStoreImage seg商家图片信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreImage(SegchkStoreImage segchkStoreImage)
+    {
+        return segchkStoreImageMapper.updateSegchkStoreImage(segchkStoreImage);
+    }
+
+    /**
+     * 批量删除seg商家图片信息
+     * 
+     * @param storeIds 需要删除的seg商家图片信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreImageByStoreIds(Long[] storeIds)
+    {
+        return segchkStoreImageMapper.deleteSegchkStoreImageByStoreIds(storeIds);
+    }
+
+    /**
+     * 删除seg商家图片信息信息
+     * 
+     * @param storeId seg商家图片信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreImageByStoreId(Long storeId)
+    {
+        return segchkStoreImageMapper.deleteSegchkStoreImageByStoreId(storeId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreLableMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreLableMgtServiceImpl.java
new file mode 100644
index 0000000..c3f0a0b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreLableMgtServiceImpl.java
@@ -0,0 +1,105 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreLableMgtMapper;
+import com.ruoyi.segchk.domain.SegchkStoreLableMgt;
+import com.ruoyi.segchk.service.ISegchkStoreLableMgtService;
+
+/**
+ * seg商家标签管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreLableMgtServiceImpl implements ISegchkStoreLableMgtService 
+{
+    @Autowired
+    private SegchkStoreLableMgtMapper segchkStoreLableMgtMapper;
+
+    private static final Logger logger = LoggerFactory.getLogger(SegchkStoreLableMgtServiceImpl.class);
+    /**
+     * 查询seg商家标签管理
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return seg商家标签管理
+     */
+    @Override
+    public SegchkStoreLableMgt selectSegchkStoreLableMgtByMgtId(Integer mgtId)
+    {
+        return segchkStoreLableMgtMapper.selectSegchkStoreLableMgtByMgtId(mgtId);
+    }
+
+    /**
+     * 查询seg商家标签管理列表
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return seg商家标签管理
+     */
+    @Override
+    public List<SegchkStoreLableMgt> selectSegchkStoreLableMgtList(SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+        return segchkStoreLableMgtMapper.selectSegchkStoreLableMgtList(segchkStoreLableMgt);
+    }
+
+    /**
+     * 新增seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+        return segchkStoreLableMgtMapper.insertSegchkStoreLableMgt(segchkStoreLableMgt);
+    }
+
+    /**
+     * 修改seg商家标签管理
+     * 
+     * @param segchkStoreLableMgt seg商家标签管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreLableMgt(SegchkStoreLableMgt segchkStoreLableMgt)
+    {
+        return segchkStoreLableMgtMapper.updateSegchkStoreLableMgt(segchkStoreLableMgt);
+    }
+
+    /**
+     * 批量删除seg商家标签管理
+     * 
+     * @param mgtIds 需要删除的seg商家标签管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreLableMgtByMgtIds(Integer[] mgtIds)
+    {
+        return segchkStoreLableMgtMapper.deleteSegchkStoreLableMgtByMgtIds(mgtIds);
+    }
+
+    /**
+     * 删除seg商家标签管理信息
+     * 
+     * @param mgtId seg商家标签管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreLableMgtByMgtId(Integer mgtId)
+    {
+        return segchkStoreLableMgtMapper.deleteSegchkStoreLableMgtByMgtId(mgtId);
+    }
+
+    @Override
+    public int deleteSegchkStoreLableMgtByCardTypeIds(Map<String, Object> paramsMap) {
+        int ret = segchkStoreLableMgtMapper.deleteSegchkStoreLableMgtByCardTypeIds(paramsMap);
+        logger.debug("deleteSegchkStoreLableMgtByCardTypeIds res: {} \t with: {}", ret, paramsMap.toString());
+        return ret;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreRewardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreRewardServiceImpl.java
new file mode 100644
index 0000000..5f5e3a0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreRewardServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreRewardMapper;
+import com.ruoyi.segchk.domain.SegchkStoreReward;
+import com.ruoyi.segchk.service.ISegchkStoreRewardService;
+
+/**
+ * seg商户奖励Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreRewardServiceImpl implements ISegchkStoreRewardService 
+{
+    @Autowired
+    private SegchkStoreRewardMapper segchkStoreRewardMapper;
+
+    /**
+     * 查询seg商户奖励
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return seg商户奖励
+     */
+    @Override
+    public SegchkStoreReward selectSegchkStoreRewardByRewardId(Long rewardId)
+    {
+        return segchkStoreRewardMapper.selectSegchkStoreRewardByRewardId(rewardId);
+    }
+
+    /**
+     * 查询seg商户奖励列表
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return seg商户奖励
+     */
+    @Override
+    public List<SegchkStoreReward> selectSegchkStoreRewardList(SegchkStoreReward segchkStoreReward)
+    {
+        return segchkStoreRewardMapper.selectSegchkStoreRewardList(segchkStoreReward);
+    }
+
+    /**
+     * 新增seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreReward(SegchkStoreReward segchkStoreReward)
+    {
+        return segchkStoreRewardMapper.insertSegchkStoreReward(segchkStoreReward);
+    }
+
+    /**
+     * 修改seg商户奖励
+     * 
+     * @param segchkStoreReward seg商户奖励
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreReward(SegchkStoreReward segchkStoreReward)
+    {
+        return segchkStoreRewardMapper.updateSegchkStoreReward(segchkStoreReward);
+    }
+
+    /**
+     * 批量删除seg商户奖励
+     * 
+     * @param rewardIds 需要删除的seg商户奖励主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreRewardByRewardIds(Long[] rewardIds)
+    {
+        return segchkStoreRewardMapper.deleteSegchkStoreRewardByRewardIds(rewardIds);
+    }
+
+    /**
+     * 删除seg商户奖励信息
+     * 
+     * @param rewardId seg商户奖励主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreRewardByRewardId(Long rewardId)
+    {
+        return segchkStoreRewardMapper.deleteSegchkStoreRewardByRewardId(rewardId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSecurityServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSecurityServiceImpl.java
new file mode 100644
index 0000000..84e482e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSecurityServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreSecurityMapper;
+import com.ruoyi.segchk.domain.SegchkStoreSecurity;
+import com.ruoyi.segchk.service.ISegchkStoreSecurityService;
+
+/**
+ * seg商户密码Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreSecurityServiceImpl implements ISegchkStoreSecurityService 
+{
+    @Autowired
+    private SegchkStoreSecurityMapper segchkStoreSecurityMapper;
+
+    /**
+     * 查询seg商户密码
+     * 
+     * @param pwdId seg商户密码主键
+     * @return seg商户密码
+     */
+    @Override
+    public SegchkStoreSecurity selectSegchkStoreSecurityByPwdId(Long pwdId)
+    {
+        return segchkStoreSecurityMapper.selectSegchkStoreSecurityByPwdId(pwdId);
+    }
+
+    /**
+     * 查询seg商户密码列表
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return seg商户密码
+     */
+    @Override
+    public List<SegchkStoreSecurity> selectSegchkStoreSecurityList(SegchkStoreSecurity segchkStoreSecurity)
+    {
+        return segchkStoreSecurityMapper.selectSegchkStoreSecurityList(segchkStoreSecurity);
+    }
+
+    /**
+     * 新增seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity)
+    {
+        return segchkStoreSecurityMapper.insertSegchkStoreSecurity(segchkStoreSecurity);
+    }
+
+    /**
+     * 修改seg商户密码
+     * 
+     * @param segchkStoreSecurity seg商户密码
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreSecurity(SegchkStoreSecurity segchkStoreSecurity)
+    {
+        return segchkStoreSecurityMapper.updateSegchkStoreSecurity(segchkStoreSecurity);
+    }
+
+    /**
+     * 批量删除seg商户密码
+     * 
+     * @param pwdIds 需要删除的seg商户密码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreSecurityByPwdIds(Long[] pwdIds)
+    {
+        return segchkStoreSecurityMapper.deleteSegchkStoreSecurityByPwdIds(pwdIds);
+    }
+
+    /**
+     * 删除seg商户密码信息
+     * 
+     * @param pwdId seg商户密码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreSecurityByPwdId(Long pwdId)
+    {
+        return segchkStoreSecurityMapper.deleteSegchkStoreSecurityByPwdId(pwdId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSelfMgtServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSelfMgtServiceImpl.java
new file mode 100644
index 0000000..72e47eb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkStoreSelfMgtServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkStoreSelfMgtMapper;
+import com.ruoyi.segchk.domain.SegchkStoreSelfMgt;
+import com.ruoyi.segchk.service.ISegchkStoreSelfMgtService;
+
+/**
+ * seg商家自定义卡管理Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkStoreSelfMgtServiceImpl implements ISegchkStoreSelfMgtService 
+{
+    @Autowired
+    private SegchkStoreSelfMgtMapper segchkStoreSelfMgtMapper;
+
+    /**
+     * 查询seg商家自定义卡管理
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return seg商家自定义卡管理
+     */
+    @Override
+    public SegchkStoreSelfMgt selectSegchkStoreSelfMgtByFreeCardId(Long freeCardId)
+    {
+        return segchkStoreSelfMgtMapper.selectSegchkStoreSelfMgtByFreeCardId(freeCardId);
+    }
+
+    /**
+     * 查询seg商家自定义卡管理列表
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return seg商家自定义卡管理
+     */
+    @Override
+    public List<SegchkStoreSelfMgt> selectSegchkStoreSelfMgtList(SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+        return segchkStoreSelfMgtMapper.selectSegchkStoreSelfMgtList(segchkStoreSelfMgt);
+    }
+
+    /**
+     * 新增seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+        return segchkStoreSelfMgtMapper.insertSegchkStoreSelfMgt(segchkStoreSelfMgt);
+    }
+
+    /**
+     * 修改seg商家自定义卡管理
+     * 
+     * @param segchkStoreSelfMgt seg商家自定义卡管理
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkStoreSelfMgt(SegchkStoreSelfMgt segchkStoreSelfMgt)
+    {
+        return segchkStoreSelfMgtMapper.updateSegchkStoreSelfMgt(segchkStoreSelfMgt);
+    }
+
+    /**
+     * 批量删除seg商家自定义卡管理
+     * 
+     * @param freeCardIds 需要删除的seg商家自定义卡管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreSelfMgtByFreeCardIds(Long[] freeCardIds)
+    {
+        return segchkStoreSelfMgtMapper.deleteSegchkStoreSelfMgtByFreeCardIds(freeCardIds);
+    }
+
+    /**
+     * 删除seg商家自定义卡管理信息
+     * 
+     * @param freeCardId seg商家自定义卡管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkStoreSelfMgtByFreeCardId(Long freeCardId)
+    {
+        return segchkStoreSelfMgtMapper.deleteSegchkStoreSelfMgtByFreeCardId(freeCardId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSystemSettingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSystemSettingServiceImpl.java
new file mode 100644
index 0000000..7aa64ad
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkSystemSettingServiceImpl.java
@@ -0,0 +1,189 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.RedisCahceKey;
+import com.ruoyi.segchk.domain.BaseInfoSet;
+import com.ruoyi.segchk.domain.SegchkBaseInfoSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkSystemSettingMapper;
+import com.ruoyi.segchk.domain.SegchkSystemSetting;
+import com.ruoyi.segchk.service.ISegchkSystemSettingService;
+
+/**
+ * 系统设置Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-10-27
+ */
+@Service
+public class SegchkSystemSettingServiceImpl implements ISegchkSystemSettingService 
+{
+    @Autowired
+    private SegchkSystemSettingMapper segchkSystemSettingMapper;
+
+    /**
+     * 调试日志
+     */
+    private Logger logger = LoggerFactory.getLogger(SegchkSystemSettingServiceImpl.class);
+    /**
+     * 查询系统设置
+     * 
+     * @param id 系统设置主键
+     * @return 系统设置
+     */
+    @Override
+    public SegchkSystemSetting selectSegchkSystemSettingById(Long id)
+    {
+        return segchkSystemSettingMapper.selectSegchkSystemSettingById(id);
+    }
+
+    /**
+     * 查询系统设置列表
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 系统设置
+     */
+    @Override
+    public List<SegchkSystemSetting> selectSegchkSystemSettingList(SegchkSystemSetting segchkSystemSetting)
+    {
+        return segchkSystemSettingMapper.selectSegchkSystemSettingList(segchkSystemSetting);
+    }
+
+    /**
+     * 新增系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting)
+    {
+        return segchkSystemSettingMapper.insertSegchkSystemSetting(segchkSystemSetting);
+    }
+
+    /**
+     * 修改系统设置
+     * 
+     * @param segchkSystemSetting 系统设置
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkSystemSetting(SegchkSystemSetting segchkSystemSetting)
+    {
+        return segchkSystemSettingMapper.updateSegchkSystemSetting(segchkSystemSetting);
+    }
+
+    /**
+     * 批量删除系统设置
+     * 
+     * @param ids 需要删除的系统设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSystemSettingByIds(Long[] ids)
+    {
+        return segchkSystemSettingMapper.deleteSegchkSystemSettingByIds(ids);
+    }
+
+    /**
+     * 删除系统设置信息
+     * 
+     * @param id 系统设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkSystemSettingById(Long id)
+    {
+        return segchkSystemSettingMapper.deleteSegchkSystemSettingById(id);
+    }
+
+
+    /**
+     * 查询基本信息和高级信息设置
+     *
+     * @return 基本信息和高级信息设置实体类
+     */
+    @Cacheable(value = RedisCahceKey.BASE_INFO_SET, key = "'BaseInfoSet'")
+    @Override
+    public BaseInfoSet queryBaseInfoSet() {
+        logger.debug("queryBaseInfoSet...");
+        return segchkSystemSettingMapper.queryBaseInfoSet();
+    }
+
+    /**
+     * 编辑基本信息和高级信息
+     *
+     * @param baseInfoSet 基本信息实体类
+     * @param type        1 基本信息 0高级信息
+     * @return -1编辑失败 1编辑成功 0编辑失败
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int editBaseInfoSet(BaseInfoSet baseInfoSet, int type) {
+        logger.debug("editBaseInfoSet and baseInfoSet:{}\r\n type:{}", baseInfoSet, type);
+        //非法参数
+        if (!checkParam(type)) {
+            logger.error("editBaseInfoSet error due to type is illegal...");
+            return -1;
+        }
+        baseInfoSet.dealPicUrl();
+        //设置基本信息
+        if (type == 1) {
+            logger.debug("editBaseInfoSet to editBaseInfoSetA and type:{}", type);
+            return segchkSystemSettingMapper.editBaseInfoSetA(baseInfoSet);
+        }
+        //设置高级信息
+        if (type == 0) {
+            logger.debug("editBaseInfoSet to editBaseInfoSetB and type:{}", type);
+            return segchkSystemSettingMapper.editBaseInfoSetB(baseInfoSet);
+        }
+        return 0;
+    }
+
+    /**
+     * 设置审核开关
+     *
+     * @param storeSpuAudit 店铺商品审核开关  0 需要审核 1 不需要 默认0
+     * @return 成功返回1，失败返回0
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int setAuditSwitch(String storeSpuAudit) {
+        logger.debug("setAuditSwitch and storeSpuAudit ：{}", storeSpuAudit);
+        return segchkSystemSettingMapper.setAuditSwitch(storeSpuAudit);
+    }
+
+    /**
+     * 设置会员价启用状态
+     *
+     * @param memberPriceStatus 会员等级启用状态   0 启用 1 不启用 默认0
+     * @return 成功返回1，失败返回0
+     */
+    @CacheEvict(value = RedisCahceKey.BASE_INFO_SET, allEntries = true)
+    @Override
+    public int setMemberPriceStatus(String memberPriceStatus) {
+        logger.debug("setMemberPriceStatus and memberPriceStatus ：{}", memberPriceStatus);
+        return segchkSystemSettingMapper.setMemberPriceStatus(memberPriceStatus);
+    }
+
+    @Override
+    public boolean isSkuNeedAudit() {
+        return queryBaseInfoSet().isSpuNeedAudit();
+    }
+
+    /**
+     * 校验参数是否为 0 或 1
+     *
+     * @param type 参数
+     * @return 正确true 错误 FALSE
+     */
+    private boolean checkParam(int type) {
+        return type == 1 || type == 0;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserAccountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserAccountServiceImpl.java
new file mode 100644
index 0000000..595dbef
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserAccountServiceImpl.java
@@ -0,0 +1,99 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserAccountMapper;
+import com.ruoyi.segchk.domain.SegchkUserAccount;
+import com.ruoyi.segchk.service.ISegchkUserAccountService;
+
+/**
+ * seg用户余额信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserAccountServiceImpl implements ISegchkUserAccountService 
+{
+    @Autowired
+    private SegchkUserAccountMapper segchkUserAccountMapper;
+
+    /**
+     * 查询seg用户余额信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return seg用户余额信息
+     */
+    @Override
+    public SegchkUserAccount selectSegchkUserAccountByAccountId(Long accountId)
+    {
+        return segchkUserAccountMapper.selectSegchkUserAccountByAccountId(accountId);
+    }
+
+    /**
+     * 查询seg用户余额信息列表
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return seg用户余额信息
+     */
+    @Override
+    public List<SegchkUserAccount> selectSegchkUserAccountList(SegchkUserAccount segchkUserAccount)
+    {
+        return segchkUserAccountMapper.selectSegchkUserAccountList(segchkUserAccount);
+    }
+
+    /**
+     * 新增seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserAccount(SegchkUserAccount segchkUserAccount)
+    {
+        return segchkUserAccountMapper.insertSegchkUserAccount(segchkUserAccount);
+    }
+
+    /**
+     * 修改seg用户余额信息
+     * 
+     * @param segchkUserAccount seg用户余额信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserAccount(SegchkUserAccount segchkUserAccount)
+    {
+        return segchkUserAccountMapper.updateSegchkUserAccount(segchkUserAccount);
+    }
+
+    /**
+     * 批量删除seg用户余额信息
+     * 
+     * @param accountIds 需要删除的seg用户余额信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserAccountByAccountIds(Long[] accountIds)
+    {
+        return segchkUserAccountMapper.deleteSegchkUserAccountByAccountIds(accountIds);
+    }
+
+    /**
+     * 删除seg用户余额信息信息
+     * 
+     * @param accountId seg用户余额信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserAccountByAccountId(Long accountId)
+    {
+        return segchkUserAccountMapper.deleteSegchkUserAccountByAccountId(accountId);
+    }
+
+    @Override
+    public int insertSegchkUserAccountBuyCharge(SegchkUserAccount segchkUserAccount) {
+        return segchkUserAccountMapper.insertSegchkUserAccountBuyCharge(segchkUserAccount);
+
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserBasicInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserBasicInfoServiceImpl.java
new file mode 100644
index 0000000..bf52092
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserBasicInfoServiceImpl.java
@@ -0,0 +1,130 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+import com.ruoyi.segchk.mapper.SegchkUserBasicInfoMapper;
+import com.ruoyi.segchk.domain.SegchkUserBasicInfo;
+import com.ruoyi.segchk.service.ISegchkUserBasicInfoService;
+
+/**
+ * seg用户基本信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserBasicInfoServiceImpl implements ISegchkUserBasicInfoService 
+{
+    @Autowired
+    private SegchkUserBasicInfoMapper segchkUserBasicInfoMapper;
+
+    /**
+     * 查询seg用户基本信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return seg用户基本信息
+     */
+    @Override
+    public SegchkUserBasicInfo selectSegchkUserBasicInfoByUserId(Long userId)
+    {
+        return segchkUserBasicInfoMapper.selectSegchkUserBasicInfoByUserId(userId);
+    }
+
+    /**
+     * 查询seg用户基本信息列表
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return seg用户基本信息
+     */
+    @Override
+    public List<SegchkUserBasicInfo> selectSegchkUserBasicInfoList(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+        return segchkUserBasicInfoMapper.selectSegchkUserBasicInfoList(segchkUserBasicInfo);
+    }
+
+    /**
+     * 新增seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+        int rows = segchkUserBasicInfoMapper.insertSegchkUserBasicInfo(segchkUserBasicInfo);
+        insertSegchkUserCertificationInfo(segchkUserBasicInfo);
+        return rows;
+    }
+
+    /**
+     * 修改seg用户基本信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSegchkUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+        segchkUserBasicInfoMapper.deleteSegchkUserCertificationInfoByUserId(segchkUserBasicInfo.getUserId());
+        insertSegchkUserCertificationInfo(segchkUserBasicInfo);
+        return segchkUserBasicInfoMapper.updateSegchkUserBasicInfo(segchkUserBasicInfo);
+    }
+
+    /**
+     * 批量删除seg用户基本信息
+     * 
+     * @param userIds 需要删除的seg用户基本信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSegchkUserBasicInfoByUserIds(Long[] userIds)
+    {
+        segchkUserBasicInfoMapper.deleteSegchkUserCertificationInfoByUserIds(userIds);
+        return segchkUserBasicInfoMapper.deleteSegchkUserBasicInfoByUserIds(userIds);
+    }
+
+    /**
+     * 删除seg用户基本信息信息
+     * 
+     * @param userId seg用户基本信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserBasicInfoByUserId(Long userId)
+    {
+        segchkUserBasicInfoMapper.deleteSegchkUserCertificationInfoByUserId(userId);
+        return segchkUserBasicInfoMapper.deleteSegchkUserBasicInfoByUserId(userId);
+    }
+
+    /**
+     * 新增seg用户实名认证信息信息
+     * 
+     * @param segchkUserBasicInfo seg用户基本信息对象
+     */
+    public void insertSegchkUserCertificationInfo(SegchkUserBasicInfo segchkUserBasicInfo)
+    {
+        List<SegchkUserCertificationInfo> segchkUserCertificationInfoList = segchkUserBasicInfo.getSegchkUserCertificationInfoList();
+        Long userId = segchkUserBasicInfo.getUserId();
+        if (StringUtils.isNotNull(segchkUserCertificationInfoList))
+        {
+            List<SegchkUserCertificationInfo> list = new ArrayList<SegchkUserCertificationInfo>();
+            for (SegchkUserCertificationInfo segchkUserCertificationInfo : segchkUserCertificationInfoList)
+            {
+                segchkUserCertificationInfo.setUserId(userId);
+                list.add(segchkUserCertificationInfo);
+            }
+            if (list.size() > 0)
+            {
+                segchkUserBasicInfoMapper.batchSegchkUserCertificationInfo(list);
+            }
+        }
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java
new file mode 100644
index 0000000..b8abe77
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCashServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserCashMapper;
+import com.ruoyi.segchk.domain.SegchkUserCash;
+import com.ruoyi.segchk.service.ISegchkUserCashService;
+
+/**
+ * seg用户提现记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserCashServiceImpl implements ISegchkUserCashService 
+{
+    @Autowired
+    private SegchkUserCashMapper segchkUserCashMapper;
+
+    /**
+     * 查询seg用户提现记录
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return seg用户提现记录
+     */
+    @Override
+    public SegchkUserCash selectSegchkUserCashByCashId(Long cashId)
+    {
+        return segchkUserCashMapper.selectSegchkUserCashByCashId(cashId);
+    }
+
+    /**
+     * 查询seg用户提现记录列表
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return seg用户提现记录
+     */
+    @Override
+    public List<SegchkUserCash> selectSegchkUserCashList(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.selectSegchkUserCashList(segchkUserCash);
+    }
+
+    /**
+     * 新增seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCash(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.insertSegchkUserCash(segchkUserCash);
+    }
+
+    /**
+     * 修改seg用户提现记录
+     * 
+     * @param segchkUserCash seg用户提现记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCash(SegchkUserCash segchkUserCash)
+    {
+        return segchkUserCashMapper.updateSegchkUserCash(segchkUserCash);
+    }
+
+    /**
+     * 批量删除seg用户提现记录
+     * 
+     * @param cashIds 需要删除的seg用户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCashByCashIds(Long[] cashIds)
+    {
+        return segchkUserCashMapper.deleteSegchkUserCashByCashIds(cashIds);
+    }
+
+    /**
+     * 删除seg用户提现记录信息
+     * 
+     * @param cashId seg用户提现记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCashByCashId(Long cashId)
+    {
+        return segchkUserCashMapper.deleteSegchkUserCashByCashId(cashId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCertificationInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCertificationInfoServiceImpl.java
new file mode 100644
index 0000000..8b17401
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCertificationInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserCertificationInfoMapper;
+import com.ruoyi.segchk.domain.SegchkUserCertificationInfo;
+import com.ruoyi.segchk.service.ISegchkUserCertificationInfoService;
+
+/**
+ * seg用户实名认证信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserCertificationInfoServiceImpl implements ISegchkUserCertificationInfoService 
+{
+    @Autowired
+    private SegchkUserCertificationInfoMapper segchkUserCertificationInfoMapper;
+
+    /**
+     * 查询seg用户实名认证信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return seg用户实名认证信息
+     */
+    @Override
+    public SegchkUserCertificationInfo selectSegchkUserCertificationInfoByUsercardId(Long usercardId)
+    {
+        return segchkUserCertificationInfoMapper.selectSegchkUserCertificationInfoByUsercardId(usercardId);
+    }
+
+    /**
+     * 查询seg用户实名认证信息列表
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return seg用户实名认证信息
+     */
+    @Override
+    public List<SegchkUserCertificationInfo> selectSegchkUserCertificationInfoList(SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+        return segchkUserCertificationInfoMapper.selectSegchkUserCertificationInfoList(segchkUserCertificationInfo);
+    }
+
+    /**
+     * 新增seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+        return segchkUserCertificationInfoMapper.insertSegchkUserCertificationInfo(segchkUserCertificationInfo);
+    }
+
+    /**
+     * 修改seg用户实名认证信息
+     * 
+     * @param segchkUserCertificationInfo seg用户实名认证信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCertificationInfo(SegchkUserCertificationInfo segchkUserCertificationInfo)
+    {
+        return segchkUserCertificationInfoMapper.updateSegchkUserCertificationInfo(segchkUserCertificationInfo);
+    }
+
+    /**
+     * 批量删除seg用户实名认证信息
+     * 
+     * @param usercardIds 需要删除的seg用户实名认证信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCertificationInfoByUsercardIds(Long[] usercardIds)
+    {
+        return segchkUserCertificationInfoMapper.deleteSegchkUserCertificationInfoByUsercardIds(usercardIds);
+    }
+
+    /**
+     * 删除seg用户实名认证信息信息
+     * 
+     * @param usercardId seg用户实名认证信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCertificationInfoByUsercardId(Long usercardId)
+    {
+        return segchkUserCertificationInfoMapper.deleteSegchkUserCertificationInfoByUsercardId(usercardId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserChargeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserChargeServiceImpl.java
new file mode 100644
index 0000000..7db2727
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserChargeServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.ruoyi.segchk.domain.SegchkUserAccount;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserChargeMapper;
+import com.ruoyi.segchk.domain.SegchkUserCharge;
+import com.ruoyi.segchk.service.ISegchkUserChargeService;
+
+/**
+ * seg用户充值记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserChargeServiceImpl implements ISegchkUserChargeService 
+{
+    @Autowired
+    private SegchkUserChargeMapper segchkUserChargeMapper;
+
+    /**
+     * 查询seg用户充值记录
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return seg用户充值记录
+     */
+    @Override
+    public SegchkUserCharge selectSegchkUserChargeByChargeId(Long chargeId)
+    {
+        return segchkUserChargeMapper.selectSegchkUserChargeByChargeId(chargeId);
+    }
+
+    /**
+     * 查询seg用户充值记录列表
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return seg用户充值记录
+     */
+    @Override
+    public List<SegchkUserCharge> selectSegchkUserChargeList(SegchkUserCharge segchkUserCharge)
+    {
+        return segchkUserChargeMapper.selectSegchkUserChargeList(segchkUserCharge);
+    }
+
+    /**
+     * 新增seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCharge(SegchkUserCharge segchkUserCharge)
+    {
+        return segchkUserChargeMapper.insertSegchkUserCharge(segchkUserCharge);
+    }
+
+    /**
+     * 修改seg用户充值记录
+     * 
+     * @param segchkUserCharge seg用户充值记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCharge(SegchkUserCharge segchkUserCharge)
+    {
+        return segchkUserChargeMapper.updateSegchkUserCharge(segchkUserCharge);
+    }
+
+    /**
+     * 批量删除seg用户充值记录
+     * 
+     * @param chargeIds 需要删除的seg用户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserChargeByChargeIds(Long[] chargeIds)
+    {
+        return segchkUserChargeMapper.deleteSegchkUserChargeByChargeIds(chargeIds);
+    }
+
+    /**
+     * 删除seg用户充值记录信息
+     * 
+     * @param chargeId seg用户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserChargeByChargeId(Long chargeId)
+    {
+        return segchkUserChargeMapper.deleteSegchkUserChargeByChargeId(chargeId);
+    }
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java
new file mode 100644
index 0000000..e1b387a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserCollectServiceImpl.java
@@ -0,0 +1,108 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ruoyi.common.core.text.Convert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserCollectMapper;
+import com.ruoyi.segchk.domain.SegchkUserCollect;
+import com.ruoyi.segchk.service.ISegchkUserCollectService;
+
+/**
+ * seg用户收藏记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserCollectServiceImpl implements ISegchkUserCollectService 
+{
+    @Autowired
+    private SegchkUserCollectMapper segchkUserCollectMapper;
+
+    /**
+     * 查询seg用户收藏记录
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return seg用户收藏记录
+     */
+    @Override
+    public SegchkUserCollect selectSegchkUserCollectByCollectId(Long collectId)
+    {
+        return segchkUserCollectMapper.selectSegchkUserCollectByCollectId(collectId);
+    }
+
+    /**
+     * 查询seg用户收藏记录列表
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return seg用户收藏记录
+     */
+    @Override
+    public List<SegchkUserCollect> selectSegchkUserCollectList(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.selectSegchkUserCollectList(segchkUserCollect);
+    }
+
+    /**
+     * 新增seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserCollect(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.insertSegchkUserCollect(segchkUserCollect);
+    }
+
+    /**
+     * 修改seg用户收藏记录
+     * 
+     * @param segchkUserCollect seg用户收藏记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserCollect(SegchkUserCollect segchkUserCollect)
+    {
+        return segchkUserCollectMapper.updateSegchkUserCollect(segchkUserCollect);
+    }
+
+    /**
+     * 批量删除seg用户收藏记录
+     * 
+     * @param collectIds 需要删除的seg用户收藏记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByCollectIds(Long[] collectIds)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectIds(collectIds);
+    }
+
+    /**
+     * 删除seg用户收藏记录信息
+     * 
+     * @param collectId seg用户收藏记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByCollectId(Long collectId)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectId(collectId);
+    }
+
+    /**
+     * 删除seg用户收藏记录对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserCollectByIds(String ids)
+    {
+        return segchkUserCollectMapper.deleteSegchkUserCollectByCollectIds(Convert.toLongArray(ids));
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserExtInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserExtInfoServiceImpl.java
new file mode 100644
index 0000000..1f9a3c8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserExtInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserExtInfoMapper;
+import com.ruoyi.segchk.domain.SegchkUserExtInfo;
+import com.ruoyi.segchk.service.ISegchkUserExtInfoService;
+
+/**
+ * seg用户扩展信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserExtInfoServiceImpl implements ISegchkUserExtInfoService 
+{
+    @Autowired
+    private SegchkUserExtInfoMapper segchkUserExtInfoMapper;
+
+    /**
+     * 查询seg用户扩展信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return seg用户扩展信息
+     */
+    @Override
+    public SegchkUserExtInfo selectSegchkUserExtInfoByUserId(Long userId)
+    {
+        return segchkUserExtInfoMapper.selectSegchkUserExtInfoByUserId(userId);
+    }
+
+    /**
+     * 查询seg用户扩展信息列表
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return seg用户扩展信息
+     */
+    @Override
+    public List<SegchkUserExtInfo> selectSegchkUserExtInfoList(SegchkUserExtInfo segchkUserExtInfo)
+    {
+        return segchkUserExtInfoMapper.selectSegchkUserExtInfoList(segchkUserExtInfo);
+    }
+
+    /**
+     * 新增seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo)
+    {
+        return segchkUserExtInfoMapper.insertSegchkUserExtInfo(segchkUserExtInfo);
+    }
+
+    /**
+     * 修改seg用户扩展信息
+     * 
+     * @param segchkUserExtInfo seg用户扩展信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserExtInfo(SegchkUserExtInfo segchkUserExtInfo)
+    {
+        return segchkUserExtInfoMapper.updateSegchkUserExtInfo(segchkUserExtInfo);
+    }
+
+    /**
+     * 批量删除seg用户扩展信息
+     * 
+     * @param userIds 需要删除的seg用户扩展信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserExtInfoByUserIds(Long[] userIds)
+    {
+        return segchkUserExtInfoMapper.deleteSegchkUserExtInfoByUserIds(userIds);
+    }
+
+    /**
+     * 删除seg用户扩展信息信息
+     * 
+     * @param userId seg用户扩展信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserExtInfoByUserId(Long userId)
+    {
+        return segchkUserExtInfoMapper.deleteSegchkUserExtInfoByUserId(userId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java
new file mode 100644
index 0000000..334a0b2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserLikegoServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserLikegoMapper;
+import com.ruoyi.segchk.domain.SegchkUserLikego;
+import com.ruoyi.segchk.service.ISegchkUserLikegoService;
+
+/**
+ * seg用户想去记录Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserLikegoServiceImpl implements ISegchkUserLikegoService 
+{
+    @Autowired
+    private SegchkUserLikegoMapper segchkUserLikegoMapper;
+
+    /**
+     * 查询seg用户想去记录
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return seg用户想去记录
+     */
+    @Override
+    public SegchkUserLikego selectSegchkUserLikegoByLikegoId(Long likegoId)
+    {
+        return segchkUserLikegoMapper.selectSegchkUserLikegoByLikegoId(likegoId);
+    }
+
+    /**
+     * 查询seg用户想去记录列表
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return seg用户想去记录
+     */
+    @Override
+    public List<SegchkUserLikego> selectSegchkUserLikegoList(SegchkUserLikego segchkUserLikego)
+    {
+        return segchkUserLikegoMapper.selectSegchkUserLikegoList(segchkUserLikego);
+    }
+
+    /**
+     * 新增seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserLikego(SegchkUserLikego segchkUserLikego)
+    {
+        //        此处根据用户id，卡id，卡类型，卡标签，商户id，及运营商id，生成预约二维码
+        segchkUserLikego.setQrCode(String.format("qrcode-%s-%s-%s-%s-%s", segchkUserLikego.getProviderId(), segchkUserLikego.getStoreId(), segchkUserLikego.getUserId(), segchkUserLikego.getCardId(), segchkUserLikego.getCardType()));
+        return segchkUserLikegoMapper.insertSegchkUserLikego(segchkUserLikego);
+    }
+
+    /**
+     * 修改seg用户想去记录
+     * 
+     * @param segchkUserLikego seg用户想去记录
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserLikego(SegchkUserLikego segchkUserLikego)
+    {
+        return segchkUserLikegoMapper.updateSegchkUserLikego(segchkUserLikego);
+    }
+
+    /**
+     * 批量删除seg用户想去记录
+     * 
+     * @param likegoIds 需要删除的seg用户想去记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserLikegoByLikegoIds(Long[] likegoIds)
+    {
+        return segchkUserLikegoMapper.deleteSegchkUserLikegoByLikegoIds(likegoIds);
+    }
+
+    /**
+     * 删除seg用户想去记录信息
+     * 
+     * @param likegoId seg用户想去记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserLikegoByLikegoId(Long likegoId)
+    {
+        return segchkUserLikegoMapper.deleteSegchkUserLikegoByLikegoId(likegoId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardCtlServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardCtlServiceImpl.java
new file mode 100644
index 0000000..e3dd126
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardCtlServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserRewardCtlMapper;
+import com.ruoyi.segchk.domain.SegchkUserRewardCtl;
+import com.ruoyi.segchk.service.ISegchkUserRewardCtlService;
+
+/**
+ * seg会员推荐控制Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserRewardCtlServiceImpl implements ISegchkUserRewardCtlService 
+{
+    @Autowired
+    private SegchkUserRewardCtlMapper segchkUserRewardCtlMapper;
+
+    /**
+     * 查询seg会员推荐控制
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return seg会员推荐控制
+     */
+    @Override
+    public SegchkUserRewardCtl selectSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId)
+    {
+        return segchkUserRewardCtlMapper.selectSegchkUserRewardCtlByRewardCtlId(rewardCtlId);
+    }
+
+    /**
+     * 查询seg会员推荐控制列表
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return seg会员推荐控制
+     */
+    @Override
+    public List<SegchkUserRewardCtl> selectSegchkUserRewardCtlList(SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+        return segchkUserRewardCtlMapper.selectSegchkUserRewardCtlList(segchkUserRewardCtl);
+    }
+
+    /**
+     * 新增seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+        return segchkUserRewardCtlMapper.insertSegchkUserRewardCtl(segchkUserRewardCtl);
+    }
+
+    /**
+     * 修改seg会员推荐控制
+     * 
+     * @param segchkUserRewardCtl seg会员推荐控制
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserRewardCtl(SegchkUserRewardCtl segchkUserRewardCtl)
+    {
+        return segchkUserRewardCtlMapper.updateSegchkUserRewardCtl(segchkUserRewardCtl);
+    }
+
+    /**
+     * 批量删除seg会员推荐控制
+     * 
+     * @param rewardCtlIds 需要删除的seg会员推荐控制主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserRewardCtlByRewardCtlIds(Integer[] rewardCtlIds)
+    {
+        return segchkUserRewardCtlMapper.deleteSegchkUserRewardCtlByRewardCtlIds(rewardCtlIds);
+    }
+
+    /**
+     * 删除seg会员推荐控制信息
+     * 
+     * @param rewardCtlId seg会员推荐控制主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserRewardCtlByRewardCtlId(Integer rewardCtlId)
+    {
+        return segchkUserRewardCtlMapper.deleteSegchkUserRewardCtlByRewardCtlId(rewardCtlId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardServiceImpl.java
new file mode 100644
index 0000000..5b956cc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserRewardServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserRewardMapper;
+import com.ruoyi.segchk.domain.SegchkUserReward;
+import com.ruoyi.segchk.service.ISegchkUserRewardService;
+
+/**
+ * seg用户奖励Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserRewardServiceImpl implements ISegchkUserRewardService 
+{
+    @Autowired
+    private SegchkUserRewardMapper segchkUserRewardMapper;
+
+    /**
+     * 查询seg用户奖励
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return seg用户奖励
+     */
+    @Override
+    public SegchkUserReward selectSegchkUserRewardByRewardId(Long rewardId)
+    {
+        return segchkUserRewardMapper.selectSegchkUserRewardByRewardId(rewardId);
+    }
+
+    /**
+     * 查询seg用户奖励列表
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return seg用户奖励
+     */
+    @Override
+    public List<SegchkUserReward> selectSegchkUserRewardList(SegchkUserReward segchkUserReward)
+    {
+        return segchkUserRewardMapper.selectSegchkUserRewardList(segchkUserReward);
+    }
+
+    /**
+     * 新增seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserReward(SegchkUserReward segchkUserReward)
+    {
+        return segchkUserRewardMapper.insertSegchkUserReward(segchkUserReward);
+    }
+
+    /**
+     * 修改seg用户奖励
+     * 
+     * @param segchkUserReward seg用户奖励
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserReward(SegchkUserReward segchkUserReward)
+    {
+        return segchkUserRewardMapper.updateSegchkUserReward(segchkUserReward);
+    }
+
+    /**
+     * 批量删除seg用户奖励
+     * 
+     * @param rewardIds 需要删除的seg用户奖励主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserRewardByRewardIds(Long[] rewardIds)
+    {
+        return segchkUserRewardMapper.deleteSegchkUserRewardByRewardIds(rewardIds);
+    }
+
+    /**
+     * 删除seg用户奖励信息
+     * 
+     * @param rewardId seg用户奖励主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserRewardByRewardId(Long rewardId)
+    {
+        return segchkUserRewardMapper.deleteSegchkUserRewardByRewardId(rewardId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserSecurityServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserSecurityServiceImpl.java
new file mode 100644
index 0000000..9465ad4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserSecurityServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserSecurityMapper;
+import com.ruoyi.segchk.domain.SegchkUserSecurity;
+import com.ruoyi.segchk.service.ISegchkUserSecurityService;
+
+/**
+ * seg用户密码Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserSecurityServiceImpl implements ISegchkUserSecurityService 
+{
+    @Autowired
+    private SegchkUserSecurityMapper segchkUserSecurityMapper;
+
+    /**
+     * 查询seg用户密码
+     * 
+     * @param pwdId seg用户密码主键
+     * @return seg用户密码
+     */
+    @Override
+    public SegchkUserSecurity selectSegchkUserSecurityByPwdId(Long pwdId)
+    {
+        return segchkUserSecurityMapper.selectSegchkUserSecurityByPwdId(pwdId);
+    }
+
+    /**
+     * 查询seg用户密码列表
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return seg用户密码
+     */
+    @Override
+    public List<SegchkUserSecurity> selectSegchkUserSecurityList(SegchkUserSecurity segchkUserSecurity)
+    {
+        return segchkUserSecurityMapper.selectSegchkUserSecurityList(segchkUserSecurity);
+    }
+
+    /**
+     * 新增seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity)
+    {
+        return segchkUserSecurityMapper.insertSegchkUserSecurity(segchkUserSecurity);
+    }
+
+    /**
+     * 修改seg用户密码
+     * 
+     * @param segchkUserSecurity seg用户密码
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserSecurity(SegchkUserSecurity segchkUserSecurity)
+    {
+        return segchkUserSecurityMapper.updateSegchkUserSecurity(segchkUserSecurity);
+    }
+
+    /**
+     * 批量删除seg用户密码
+     * 
+     * @param pwdIds 需要删除的seg用户密码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserSecurityByPwdIds(Long[] pwdIds)
+    {
+        return segchkUserSecurityMapper.deleteSegchkUserSecurityByPwdIds(pwdIds);
+    }
+
+    /**
+     * 删除seg用户密码信息
+     * 
+     * @param pwdId seg用户密码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserSecurityByPwdId(Long pwdId)
+    {
+        return segchkUserSecurityMapper.deleteSegchkUserSecurityByPwdId(pwdId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserVipServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserVipServiceImpl.java
new file mode 100644
index 0000000..f10aed1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserVipServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserVipMapper;
+import com.ruoyi.segchk.domain.SegchkUserVip;
+import com.ruoyi.segchk.service.ISegchkUserVipService;
+
+/**
+ * seg会员卡Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserVipServiceImpl implements ISegchkUserVipService 
+{
+    @Autowired
+    private SegchkUserVipMapper segchkUserVipMapper;
+
+    /**
+     * 查询seg会员卡
+     * 
+     * @param cardId seg会员卡主键
+     * @return seg会员卡
+     */
+    @Override
+    public SegchkUserVip selectSegchkUserVipByCardId(Long cardId)
+    {
+        return segchkUserVipMapper.selectSegchkUserVipByCardId(cardId);
+    }
+
+    /**
+     * 查询seg会员卡列表
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return seg会员卡
+     */
+    @Override
+    public List<SegchkUserVip> selectSegchkUserVipList(SegchkUserVip segchkUserVip)
+    {
+        return segchkUserVipMapper.selectSegchkUserVipList(segchkUserVip);
+    }
+
+    /**
+     * 新增seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserVip(SegchkUserVip segchkUserVip)
+    {
+        return segchkUserVipMapper.insertSegchkUserVip(segchkUserVip);
+    }
+
+    /**
+     * 修改seg会员卡
+     * 
+     * @param segchkUserVip seg会员卡
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserVip(SegchkUserVip segchkUserVip)
+    {
+        return segchkUserVipMapper.updateSegchkUserVip(segchkUserVip);
+    }
+
+    /**
+     * 批量删除seg会员卡
+     * 
+     * @param cardIds 需要删除的seg会员卡主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserVipByCardIds(Long[] cardIds)
+    {
+        return segchkUserVipMapper.deleteSegchkUserVipByCardIds(cardIds);
+    }
+
+    /**
+     * 删除seg会员卡信息
+     * 
+     * @param cardId seg会员卡主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserVipByCardId(Long cardId)
+    {
+        return segchkUserVipMapper.deleteSegchkUserVipByCardId(cardId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java
new file mode 100644
index 0000000..1761246
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserWechatServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkUserWechatMapper;
+import com.ruoyi.segchk.domain.SegchkUserWechat;
+import com.ruoyi.segchk.service.ISegchkUserWechatService;
+
+/**
+ * seg用户微信信息Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkUserWechatServiceImpl implements ISegchkUserWechatService 
+{
+    @Autowired
+    private SegchkUserWechatMapper segchkUserWechatMapper;
+
+    /**
+     * 查询seg用户微信信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return seg用户微信信息
+     */
+    @Override
+    public SegchkUserWechat selectSegchkUserWechatByUserId(Long userId)
+    {
+        return segchkUserWechatMapper.selectSegchkUserWechatByUserId(userId);
+    }
+
+    /**
+     * 查询seg用户微信信息列表
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return seg用户微信信息
+     */
+    @Override
+    public List<SegchkUserWechat> selectSegchkUserWechatList(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.selectSegchkUserWechatList(segchkUserWechat);
+    }
+
+    /**
+     * 新增seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkUserWechat(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.insertSegchkUserWechat(segchkUserWechat);
+    }
+
+    /**
+     * 修改seg用户微信信息
+     * 
+     * @param segchkUserWechat seg用户微信信息
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat)
+    {
+        return segchkUserWechatMapper.updateSegchkUserWechat(segchkUserWechat);
+    }
+
+    /**
+     * 批量删除seg用户微信信息
+     * 
+     * @param userIds 需要删除的seg用户微信信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserWechatByUserIds(Long[] userIds)
+    {
+        return segchkUserWechatMapper.deleteSegchkUserWechatByUserIds(userIds);
+    }
+
+    /**
+     * 删除seg用户微信信息信息
+     * 
+     * @param userId seg用户微信信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkUserWechatByUserId(Long userId)
+    {
+        return segchkUserWechatMapper.deleteSegchkUserWechatByUserId(userId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkVipSetInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkVipSetInfoServiceImpl.java
new file mode 100644
index 0000000..20c87c5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/segchk/service/impl/SegchkVipSetInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.segchk.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.segchk.mapper.SegchkVipSetInfoMapper;
+import com.ruoyi.segchk.domain.SegchkVipSetInfo;
+import com.ruoyi.segchk.service.ISegchkVipSetInfoService;
+
+/**
+ * seg会员卡设置Service业务层处理
+ * 
+ * @author yinzhiying
+ * @date 2021-08-23
+ */
+@Service
+public class SegchkVipSetInfoServiceImpl implements ISegchkVipSetInfoService 
+{
+    @Autowired
+    private SegchkVipSetInfoMapper segchkVipSetInfoMapper;
+
+    /**
+     * 查询seg会员卡设置
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return seg会员卡设置
+     */
+    @Override
+    public SegchkVipSetInfo selectSegchkVipSetInfoByModeId(Integer modeId)
+    {
+        return segchkVipSetInfoMapper.selectSegchkVipSetInfoByModeId(modeId);
+    }
+
+    /**
+     * 查询seg会员卡设置列表
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return seg会员卡设置
+     */
+    @Override
+    public List<SegchkVipSetInfo> selectSegchkVipSetInfoList(SegchkVipSetInfo segchkVipSetInfo)
+    {
+        return segchkVipSetInfoMapper.selectSegchkVipSetInfoList(segchkVipSetInfo);
+    }
+
+    /**
+     * 新增seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    @Override
+    public int insertSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo)
+    {
+        return segchkVipSetInfoMapper.insertSegchkVipSetInfo(segchkVipSetInfo);
+    }
+
+    /**
+     * 修改seg会员卡设置
+     * 
+     * @param segchkVipSetInfo seg会员卡设置
+     * @return 结果
+     */
+    @Override
+    public int updateSegchkVipSetInfo(SegchkVipSetInfo segchkVipSetInfo)
+    {
+        return segchkVipSetInfoMapper.updateSegchkVipSetInfo(segchkVipSetInfo);
+    }
+
+    /**
+     * 批量删除seg会员卡设置
+     * 
+     * @param modeIds 需要删除的seg会员卡设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkVipSetInfoByModeIds(Integer[] modeIds)
+    {
+        return segchkVipSetInfoMapper.deleteSegchkVipSetInfoByModeIds(modeIds);
+    }
+
+    /**
+     * 删除seg会员卡设置信息
+     * 
+     * @param modeId seg会员卡设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSegchkVipSetInfoByModeId(Integer modeId)
+    {
+        return segchkVipSetInfoMapper.deleteSegchkVipSetInfoByModeId(modeId);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
new file mode 100644
index 0000000..c54678c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -0,0 +1,111 @@
+package com.ruoyi.system.domain;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 参数配置表 sys_config
+ * 
+ * @author ruoyi
+ */
+public class SysConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数主键 */
+    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    private Long configId;
+
+    /** 参数名称 */
+    @Excel(name = "参数名称")
+    private String configName;
+
+    /** 参数键名 */
+    @Excel(name = "参数键名")
+    private String configKey;
+
+    /** 参数键值 */
+    @Excel(name = "参数键值")
+    private String configValue;
+
+    /** 系统内置（Y是 N否） */
+    @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+    private String configType;
+
+    public Long getConfigId()
+    {
+        return configId;
+    }
+
+    public void setConfigId(Long configId)
+    {
+        this.configId = configId;
+    }
+
+    @NotBlank(message = "参数名称不能为空")
+    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
+    public String getConfigName()
+    {
+        return configName;
+    }
+
+    public void setConfigName(String configName)
+    {
+        this.configName = configName;
+    }
+
+    @NotBlank(message = "参数键名长度不能为空")
+    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
+    public String getConfigKey()
+    {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    @NotBlank(message = "参数键值不能为空")
+    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
+    public String getConfigValue()
+    {
+        return configValue;
+    }
+
+    public void setConfigValue(String configValue)
+    {
+        this.configValue = configValue;
+    }
+
+    public String getConfigType()
+    {
+        return configType;
+    }
+
+    public void setConfigType(String configType)
+    {
+        this.configType = configType;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("configId", getConfigId())
+            .append("configName", getConfigName())
+            .append("configKey", getConfigKey())
+            .append("configValue", getConfigValue())
+            .append("configType", getConfigType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
new file mode 100644
index 0000000..7fdea30
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -0,0 +1,144 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ * 
+ * @author ruoyi
+ */
+public class SysLogininfor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
+    private Long infoId;
+
+    /** 用户账号 */
+    @Excel(name = "用户账号")
+    private String userName;
+
+    /** 登录状态 0成功 1失败 */
+    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
+    private String status;
+
+    /** 登录IP地址 */
+    @Excel(name = "登录地址")
+    private String ipaddr;
+
+    /** 登录地点 */
+    @Excel(name = "登录地点")
+    private String loginLocation;
+
+    /** 浏览器类型 */
+    @Excel(name = "浏览器")
+    private String browser;
+
+    /** 操作系统 */
+    @Excel(name = "操作系统")
+    private String os;
+
+    /** 提示消息 */
+    @Excel(name = "提示消息")
+    private String msg;
+
+    /** 访问时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date loginTime;
+
+    public Long getInfoId()
+    {
+        return infoId;
+    }
+
+    public void setInfoId(Long infoId)
+    {
+        this.infoId = infoId;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getIpaddr()
+    {
+        return ipaddr;
+    }
+
+    public void setIpaddr(String ipaddr)
+    {
+        this.ipaddr = ipaddr;
+    }
+
+    public String getLoginLocation()
+    {
+        return loginLocation;
+    }
+
+    public void setLoginLocation(String loginLocation)
+    {
+        this.loginLocation = loginLocation;
+    }
+
+    public String getBrowser()
+    {
+        return browser;
+    }
+
+    public void setBrowser(String browser)
+    {
+        this.browser = browser;
+    }
+
+    public String getOs()
+    {
+        return os;
+    }
+
+    public void setOs(String os)
+    {
+        this.os = os;
+    }
+
+    public String getMsg()
+    {
+        return msg;
+    }
+
+    public void setMsg(String msg)
+    {
+        this.msg = msg;
+    }
+
+    public Date getLoginTime()
+    {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime)
+    {
+        this.loginTime = loginTime;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
new file mode 100644
index 0000000..b43abea
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -0,0 +1,100 @@
+package com.ruoyi.system.domain;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 通知公告表 sys_notice
+ * 
+ * @author ruoyi
+ */
+public class SysNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 公告ID */
+    private Long noticeId;
+
+    /** 公告标题 */
+    private String noticeTitle;
+
+    /** 公告类型（1通知 2公告） */
+    private String noticeType;
+
+    /** 公告内容 */
+    private String noticeContent;
+
+    /** 公告状态（0正常 1关闭） */
+    private String status;
+
+    public Long getNoticeId()
+    {
+        return noticeId;
+    }
+
+    public void setNoticeId(Long noticeId)
+    {
+        this.noticeId = noticeId;
+    }
+
+    public void setNoticeTitle(String noticeTitle)
+    {
+        this.noticeTitle = noticeTitle;
+    }
+
+    @NotBlank(message = "公告标题不能为空")
+    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
+    public String getNoticeTitle()
+    {
+        return noticeTitle;
+    }
+
+    public void setNoticeType(String noticeType)
+    {
+        this.noticeType = noticeType;
+    }
+
+    public String getNoticeType()
+    {
+        return noticeType;
+    }
+
+    public void setNoticeContent(String noticeContent)
+    {
+        this.noticeContent = noticeContent;
+    }
+
+    public String getNoticeContent()
+    {
+        return noticeContent;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("noticeId", getNoticeId())
+            .append("noticeTitle", getNoticeTitle())
+            .append("noticeType", getNoticeType())
+            .append("noticeContent", getNoticeContent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
new file mode 100644
index 0000000..175ee03
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -0,0 +1,255 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 操作日志记录表 oper_log
+ * 
+ * @author ruoyi
+ */
+public class SysOperLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 日志主键 */
+    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+    private Long operId;
+
+    /** 操作模块 */
+    @Excel(name = "操作模块")
+    private String title;
+
+    /** 业务类型（0其它 1新增 2修改 3删除） */
+    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+    private Integer businessType;
+
+    /** 业务类型数组 */
+    private Integer[] businessTypes;
+
+    /** 请求方法 */
+    @Excel(name = "请求方法")
+    private String method;
+
+    /** 请求方式 */
+    @Excel(name = "请求方式")
+    private String requestMethod;
+
+    /** 操作类别（0其它 1后台用户 2手机端用户） */
+    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+    private Integer operatorType;
+
+    /** 操作人员 */
+    @Excel(name = "操作人员")
+    private String operName;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    /** 请求url */
+    @Excel(name = "请求地址")
+    private String operUrl;
+
+    /** 操作地址 */
+    @Excel(name = "操作地址")
+    private String operIp;
+
+    /** 操作地点 */
+    @Excel(name = "操作地点")
+    private String operLocation;
+
+    /** 请求参数 */
+    @Excel(name = "请求参数")
+    private String operParam;
+
+    /** 返回参数 */
+    @Excel(name = "返回参数")
+    private String jsonResult;
+
+    /** 操作状态（0正常 1异常） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+    private Integer status;
+
+    /** 错误消息 */
+    @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 operTime;
+
+    public Long getOperId()
+    {
+        return operId;
+    }
+
+    public void setOperId(Long operId)
+    {
+        this.operId = operId;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public Integer getBusinessType()
+    {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType)
+    {
+        this.businessType = businessType;
+    }
+
+    public Integer[] getBusinessTypes()
+    {
+        return businessTypes;
+    }
+
+    public void setBusinessTypes(Integer[] businessTypes)
+    {
+        this.businessTypes = businessTypes;
+    }
+
+    public String getMethod()
+    {
+        return method;
+    }
+
+    public void setMethod(String method)
+    {
+        this.method = method;
+    }
+
+    public String getRequestMethod()
+    {
+        return requestMethod;
+    }
+
+    public void setRequestMethod(String requestMethod)
+    {
+        this.requestMethod = requestMethod;
+    }
+
+    public Integer getOperatorType()
+    {
+        return operatorType;
+    }
+
+    public void setOperatorType(Integer operatorType)
+    {
+        this.operatorType = operatorType;
+    }
+
+    public String getOperName()
+    {
+        return operName;
+    }
+
+    public void setOperName(String operName)
+    {
+        this.operName = operName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getOperUrl()
+    {
+        return operUrl;
+    }
+
+    public void setOperUrl(String operUrl)
+    {
+        this.operUrl = operUrl;
+    }
+
+    public String getOperIp()
+    {
+        return operIp;
+    }
+
+    public void setOperIp(String operIp)
+    {
+        this.operIp = operIp;
+    }
+
+    public String getOperLocation()
+    {
+        return operLocation;
+    }
+
+    public void setOperLocation(String operLocation)
+    {
+        this.operLocation = operLocation;
+    }
+
+    public String getOperParam()
+    {
+        return operParam;
+    }
+
+    public void setOperParam(String operParam)
+    {
+        this.operParam = operParam;
+    }
+
+    public String getJsonResult()
+    {
+        return jsonResult;
+    }
+
+    public void setJsonResult(String jsonResult)
+    {
+        this.jsonResult = jsonResult;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public String getErrorMsg()
+    {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg)
+    {
+        this.errorMsg = errorMsg;
+    }
+
+    public Date getOperTime()
+    {
+        return operTime;
+    }
+
+    public void setOperTime(Date operTime)
+    {
+        this.operTime = operTime;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
new file mode 100644
index 0000000..1f1fcf4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -0,0 +1,123 @@
+package com.ruoyi.system.domain;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 岗位表 sys_post
+ * 
+ * @author ruoyi
+ */
+public class SysPost extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 岗位序号 */
+    @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
+    private Long postId;
+
+    /** 岗位编码 */
+    @Excel(name = "岗位编码")
+    private String postCode;
+
+    /** 岗位名称 */
+    @Excel(name = "岗位名称")
+    private String postName;
+
+    /** 岗位排序 */
+    @Excel(name = "岗位排序")
+    private String postSort;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 用户是否存在此岗位标识 默认不存在 */
+    private boolean flag = false;
+
+    public Long getPostId()
+    {
+        return postId;
+    }
+
+    public void setPostId(Long postId)
+    {
+        this.postId = postId;
+    }
+
+    @NotBlank(message = "岗位编码不能为空")
+    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
+    public String getPostCode()
+    {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode)
+    {
+        this.postCode = postCode;
+    }
+
+    @NotBlank(message = "岗位名称不能为空")
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
+    public String getPostName()
+    {
+        return postName;
+    }
+
+    public void setPostName(String postName)
+    {
+        this.postName = postName;
+    }
+
+    @NotBlank(message = "显示顺序不能为空")
+    public String getPostSort()
+    {
+        return postSort;
+    }
+
+    public void setPostSort(String postSort)
+    {
+        this.postSort = postSort;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public boolean isFlag()
+    {
+        return flag;
+    }
+
+    public void setFlag(boolean flag)
+    {
+        this.flag = flag;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("postId", getPostId())
+            .append("postCode", getPostCode())
+            .append("postName", getPostName())
+            .append("postSort", getPostSort())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
new file mode 100644
index 0000000..47b21bf
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ * 
+ * @author ruoyi
+ */
+public class SysRoleDept
+{
+    /** 角色ID */
+    private Long roleId;
+    
+    /** 部门ID */
+    private Long deptId;
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
new file mode 100644
index 0000000..de10a74
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和菜单关联 sys_role_menu
+ * 
+ * @author ruoyi
+ */
+public class SysRoleMenu
+{
+    /** 角色ID */
+    private Long roleId;
+    
+    /** 菜单ID */
+    private Long menuId;
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("roleId", getRoleId())
+            .append("menuId", getMenuId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
new file mode 100644
index 0000000..2bbd318
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -0,0 +1,113 @@
+package com.ruoyi.system.domain;
+
+/**
+ * 当前在线会话
+ * 
+ * @author ruoyi
+ */
+public class SysUserOnline
+{
+    /** 会话编号 */
+    private String tokenId;
+
+    /** 部门名称 */
+    private String deptName;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 登录IP地址 */
+    private String ipaddr;
+
+    /** 登录地址 */
+    private String loginLocation;
+
+    /** 浏览器类型 */
+    private String browser;
+
+    /** 操作系统 */
+    private String os;
+
+    /** 登录时间 */
+    private Long loginTime;
+
+    public String getTokenId()
+    {
+        return tokenId;
+    }
+
+    public void setTokenId(String tokenId)
+    {
+        this.tokenId = tokenId;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getIpaddr()
+    {
+        return ipaddr;
+    }
+
+    public void setIpaddr(String ipaddr)
+    {
+        this.ipaddr = ipaddr;
+    }
+
+    public String getLoginLocation()
+    {
+        return loginLocation;
+    }
+
+    public void setLoginLocation(String loginLocation)
+    {
+        this.loginLocation = loginLocation;
+    }
+
+    public String getBrowser()
+    {
+        return browser;
+    }
+
+    public void setBrowser(String browser)
+    {
+        this.browser = browser;
+    }
+
+    public String getOs()
+    {
+        return os;
+    }
+
+    public void setOs(String os)
+    {
+        this.os = os;
+    }
+
+    public Long getLoginTime()
+    {
+        return loginTime;
+    }
+
+    public void setLoginTime(Long loginTime)
+    {
+        this.loginTime = loginTime;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
new file mode 100644
index 0000000..6e8c416
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ * 
+ * @author ruoyi
+ */
+public class SysUserPost
+{
+    /** 用户ID */
+    private Long userId;
+    
+    /** 岗位ID */
+    private Long postId;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getPostId()
+    {
+        return postId;
+    }
+
+    public void setPostId(Long postId)
+    {
+        this.postId = postId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("postId", getPostId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
new file mode 100644
index 0000000..4d15810
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和角色关联 sys_user_role
+ * 
+ * @author ruoyi
+ */
+public class SysUserRole
+{
+    /** 用户ID */
+    private Long userId;
+    
+    /** 角色ID */
+    private Long roleId;
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getRoleId()
+    {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("roleId", getRoleId())
+            .toString();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
new file mode 100644
index 0000000..a5d5fdc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -0,0 +1,106 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 路由显示信息
+ * 
+ * @author ruoyi
+ */
+public class MetaVo
+{
+    /**
+     * 设置该路由在侧边栏和面包屑中展示的名字
+     */
+    private String title;
+
+    /**
+     * 设置该路由的图标，对应路径src/assets/icons/svg
+     */
+    private String icon;
+
+    /**
+     * 设置为true，则不会被 <keep-alive>缓存
+     */
+    private boolean noCache;
+
+    /**
+     * 内链地址（http(s)://开头）
+     */
+    private String link;
+
+    public MetaVo()
+    {
+    }
+
+    public MetaVo(String title, String icon)
+    {
+        this.title = title;
+        this.icon = icon;
+    }
+
+    public MetaVo(String title, String icon, boolean noCache)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+    }
+
+    public MetaVo(String title, String icon, String link)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.link = link;
+    }
+
+    public MetaVo(String title, String icon, boolean noCache, String link)
+    {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+        if (StringUtils.ishttp(link))
+        {
+            this.link = link;
+        }
+    }
+
+    public boolean isNoCache()
+    {
+        return noCache;
+    }
+
+    public void setNoCache(boolean noCache)
+    {
+        this.noCache = noCache;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getIcon()
+    {
+        return icon;
+    }
+
+    public void setIcon(String icon)
+    {
+        this.icon = icon;
+    }
+
+    public String getLink()
+    {
+        return link;
+    }
+
+    public void setLink(String link)
+    {
+        this.link = link;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
new file mode 100644
index 0000000..b5501b7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -0,0 +1,133 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.List;
+
+/**
+ * 路由配置信息
+ * 
+ * @author ruoyi
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class RouterVo
+{
+    /**
+     * 路由名字
+     */
+    private String name;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
+     */
+    private boolean hidden;
+
+    /**
+     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+     */
+    private String redirect;
+
+    /**
+     * 组件地址
+     */
+    private String component;
+
+    /**
+     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+     */
+    private Boolean alwaysShow;
+
+    /**
+     * 其他元素
+     */
+    private MetaVo meta;
+
+    /**
+     * 子路由
+     */
+    private List<RouterVo> children;
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    public boolean getHidden()
+    {
+        return hidden;
+    }
+
+    public void setHidden(boolean hidden)
+    {
+        this.hidden = hidden;
+    }
+
+    public String getRedirect()
+    {
+        return redirect;
+    }
+
+    public void setRedirect(String redirect)
+    {
+        this.redirect = redirect;
+    }
+
+    public String getComponent()
+    {
+        return component;
+    }
+
+    public void setComponent(String component)
+    {
+        this.component = component;
+    }
+
+    public Boolean getAlwaysShow()
+    {
+        return alwaysShow;
+    }
+
+    public void setAlwaysShow(Boolean alwaysShow)
+    {
+        this.alwaysShow = alwaysShow;
+    }
+
+    public MetaVo getMeta()
+    {
+        return meta;
+    }
+
+    public void setMeta(MetaVo meta)
+    {
+        this.meta = meta;
+    }
+
+    public List<RouterVo> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<RouterVo> children)
+    {
+        this.children = children;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
new file mode 100644
index 0000000..0ed0c0a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -0,0 +1,68 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysConfig;
+
+/**
+ * 参数配置 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysConfigMapper
+{
+    /**
+     * 查询参数配置信息
+     * 
+     * @param config 参数配置信息
+     * @return 参数配置信息
+     */
+    public SysConfig selectConfig(SysConfig config);
+
+    /**
+     * 查询参数配置列表
+     * 
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    public List<SysConfig> selectConfigList(SysConfig config);
+
+    /**
+     * 根据键名查询参数配置信息
+     * 
+     * @param configKey 参数键名
+     * @return 参数配置信息
+     */
+    public SysConfig checkConfigKeyUnique(String configKey);
+
+    /**
+     * 新增参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertConfig(SysConfig config);
+
+    /**
+     * 修改参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateConfig(SysConfig config);
+
+    /**
+     * 删除参数配置
+     * 
+     * @param configId 参数ID
+     * @return 结果
+     */
+    public int deleteConfigById(Long configId);
+
+    /**
+     * 批量删除参数信息
+     * 
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    public int deleteConfigByIds(Long[] configIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
new file mode 100644
index 0000000..415599c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -0,0 +1,118 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.common.core.domain.entity.SysDept;
+
+/**
+ * 部门管理 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysDeptMapper
+{
+    /**
+     * 查询部门管理数据
+     * 
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptList(SysDept dept);
+
+    /**
+     * 根据角色ID查询部门树信息
+     * 
+     * @param roleId 角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+
+    /**
+     * 根据部门ID查询信息
+     * 
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    public SysDept selectDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门
+     * 
+     * @param deptId 部门ID
+     * @return 部门列表
+     */
+    public List<SysDept> selectChildrenDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门（正常状态）
+     * 
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    public int selectNormalChildrenDeptById(Long deptId);
+
+    /**
+     * 是否存在子节点
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int hasChildByDeptId(Long deptId);
+
+    /**
+     * 查询部门是否存在用户
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int checkDeptExistUser(Long deptId);
+
+    /**
+     * 校验部门名称是否唯一
+     * 
+     * @param deptName 部门名称
+     * @param parentId 父部门ID
+     * @return 结果
+     */
+    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+
+    /**
+     * 新增部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int insertDept(SysDept dept);
+
+    /**
+     * 修改部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int updateDept(SysDept dept);
+
+    /**
+     * 修改所在部门正常状态
+     * 
+     * @param deptIds 部门ID组
+     */
+    public void updateDeptStatusNormal(Long[] deptIds);
+
+    /**
+     * 修改子元素关系
+     * 
+     * @param depts 子元素
+     * @return 结果
+     */
+    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
+
+    /**
+     * 删除部门管理信息
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int deleteDeptById(Long deptId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
new file mode 100644
index 0000000..a341f1e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
@@ -0,0 +1,95 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+
+/**
+ * 字典表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysDictDataMapper
+{
+    /**
+     * 根据条件分页查询字典数据
+     * 
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataList(SysDictData dictData);
+
+    /**
+     * 根据字典类型查询字典数据
+     * 
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataByType(String dictType);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     * 
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
+
+    /**
+     * 根据字典数据ID查询信息
+     * 
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    public SysDictData selectDictDataById(Long dictCode);
+
+    /**
+     * 查询字典数据
+     * 
+     * @param dictType 字典类型
+     * @return 字典数据
+     */
+    public int countDictDataByType(String dictType);
+
+    /**
+     * 通过字典ID删除字典数据信息
+     * 
+     * @param dictCode 字典数据ID
+     * @return 结果
+     */
+    public int deleteDictDataById(Long dictCode);
+
+    /**
+     * 批量删除字典数据信息
+     * 
+     * @param dictCodes 需要删除的字典数据ID
+     * @return 结果
+     */
+    public int deleteDictDataByIds(Long[] dictCodes);
+
+    /**
+     * 新增字典数据信息
+     * 
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int insertDictData(SysDictData dictData);
+
+    /**
+     * 修改字典数据信息
+     * 
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int updateDictData(SysDictData dictData);
+
+    /**
+     * 同步修改字典类型
+     * 
+     * @param oldDictType 旧字典类型
+     * @param newDictType 新旧字典类型
+     * @return 结果
+     */
+    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
new file mode 100644
index 0000000..17545cd
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
@@ -0,0 +1,85 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+
+/**
+ * 字典表 数据层
+ * 
+ * @author ruoyi
+ */
+@Mapper
+public interface SysDictTypeMapper
+{
+    /**
+     * 根据条件分页查询字典类型
+     * 
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+
+    /**
+     * 根据所有字典类型
+     * 
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeAll();
+
+    /**
+     * 根据字典类型ID查询信息
+     * 
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeById(Long dictId);
+
+    /**
+     * 根据字典类型查询信息
+     * 
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeByType(String dictType);
+
+    /**
+     * 通过字典ID删除字典信息
+     * 
+     * @param dictId 字典ID
+     * @return 结果
+     */
+    public int deleteDictTypeById(Long dictId);
+
+    /**
+     * 批量删除字典类型信息
+     * 
+     * @param dictIds 需要删除的字典ID
+     * @return 结果
+     */
+    public int deleteDictTypeByIds(Long[] dictIds);
+
+    /**
+     * 新增字典类型信息
+     * 
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int insertDictType(SysDictType dictType);
+
+    /**
+     * 修改字典类型信息
+     * 
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int updateDictType(SysDictType dictType);
+
+    /**
+     * 校验字典类型称是否唯一
+     * 
+     * @param dictType 字典类型
+     * @return 结果
+     */
+    public SysDictType checkDictTypeUnique(String dictType);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
new file mode 100644
index 0000000..629866f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
@@ -0,0 +1,42 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysLogininfor;
+
+/**
+ * 系统访问日志情况信息 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysLogininforMapper
+{
+    /**
+     * 新增系统登录日志
+     * 
+     * @param logininfor 访问日志对象
+     */
+    public void insertLogininfor(SysLogininfor logininfor);
+
+    /**
+     * 查询系统登录日志集合
+     * 
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
+
+    /**
+     * 批量删除系统登录日志
+     * 
+     * @param infoIds 需要删除的登录日志ID
+     * @return 结果
+     */
+    public int deleteLogininforByIds(Long[] infoIds);
+
+    /**
+     * 清空系统登录日志
+     * 
+     * @return 结果
+     */
+    public int cleanLogininfor();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
new file mode 100644
index 0000000..1c2e853
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -0,0 +1,117 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+
+/**
+ * 菜单表 数据层
+ *
+ * @author ruoyi
+ */
+public interface SysMenuMapper
+{
+    /**
+     * 查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuList(SysMenu menu);
+
+    /**
+     * 根据用户所有权限
+     *
+     * @return 权限列表
+     */
+    public List<String> selectMenuPerms();
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    public List<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuTreeAll();
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     * 
+     * @param roleId 角色ID
+     * @param menuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+    public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    public SysMenu selectMenuById(Long menuId);
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int hasChildByMenuId(Long menuId);
+
+    /**
+     * 新增菜单信息
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int insertMenu(SysMenu menu);
+
+    /**
+     * 修改菜单信息
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int updateMenu(SysMenu menu);
+
+    /**
+     * 删除菜单管理信息
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int deleteMenuById(Long menuId);
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menuName 菜单名称
+     * @param parentId 父菜单ID
+     * @return 结果
+     */
+    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
new file mode 100644
index 0000000..c34f0a2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
@@ -0,0 +1,60 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysNotice;
+
+/**
+ * 通知公告表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysNoticeMapper
+{
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    public SysNotice selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public List<SysNotice> selectNoticeList(SysNotice notice);
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int insertNotice(SysNotice notice);
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int updateNotice(SysNotice notice);
+
+    /**
+     * 批量删除公告
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    public int deleteNoticeById(Long noticeId);
+
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    public int deleteNoticeByIds(Long[] noticeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
new file mode 100644
index 0000000..2ae6457
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
@@ -0,0 +1,48 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysOperLog;
+
+/**
+ * 操作日志 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysOperLogMapper
+{
+    /**
+     * 新增操作日志
+     * 
+     * @param operLog 操作日志对象
+     */
+    public void insertOperlog(SysOperLog operLog);
+
+    /**
+     * 查询系统操作日志集合
+     * 
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+
+    /**
+     * 批量删除系统操作日志
+     * 
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    public int deleteOperLogByIds(Long[] operIds);
+
+    /**
+     * 查询操作日志详细
+     * 
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    public SysOperLog selectOperLogById(Long operId);
+
+    /**
+     * 清空操作日志
+     */
+    public void cleanOperLog();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
new file mode 100644
index 0000000..b428747
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysPost;
+
+/**
+ * 岗位信息 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysPostMapper
+{
+    /**
+     * 查询岗位数据集合
+     * 
+     * @param post 岗位信息
+     * @return 岗位数据集合
+     */
+    public List<SysPost> selectPostList(SysPost post);
+
+    /**
+     * 查询所有岗位
+     * 
+     * @return 岗位列表
+     */
+    public List<SysPost> selectPostAll();
+
+    /**
+     * 通过岗位ID查询岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    public SysPost selectPostById(Long postId);
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    public List<Integer> selectPostListByUserId(Long userId);
+
+    /**
+     * 查询用户所属岗位组
+     * 
+     * @param userName 用户名
+     * @return 结果
+     */
+    public List<SysPost> selectPostsByUserName(String userName);
+
+    /**
+     * 删除岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    public int deletePostById(Long postId);
+
+    /**
+     * 批量删除岗位信息
+     * 
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     */
+    public int deletePostByIds(Long[] postIds);
+
+    /**
+     * 修改岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int updatePost(SysPost post);
+
+    /**
+     * 新增岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int insertPost(SysPost post);
+
+    /**
+     * 校验岗位名称
+     * 
+     * @param postName 岗位名称
+     * @return 结果
+     */
+    public SysPost checkPostNameUnique(String postName);
+
+    /**
+     * 校验岗位编码
+     * 
+     * @param postCode 岗位编码
+     * @return 结果
+     */
+    public SysPost checkPostCodeUnique(String postCode);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
new file mode 100644
index 0000000..f9d3a2f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
@@ -0,0 +1,44 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysRoleDept;
+
+/**
+ * 角色与部门关联表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysRoleDeptMapper
+{
+    /**
+     * 通过角色ID删除角色和部门关联
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int deleteRoleDeptByRoleId(Long roleId);
+
+    /**
+     * 批量删除角色部门关联信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteRoleDept(Long[] ids);
+
+    /**
+     * 查询部门使用数量
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int selectCountRoleDeptByDeptId(Long deptId);
+
+    /**
+     * 批量新增角色部门信息
+     * 
+     * @param roleDeptList 角色部门列表
+     * @return 结果
+     */
+    public int batchRoleDept(List<SysRoleDept> roleDeptList);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
new file mode 100644
index 0000000..16d5594
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -0,0 +1,107 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysRole;
+
+/**
+ * 角色表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysRoleMapper
+{
+    /**
+     * 根据条件分页查询角色数据
+     * 
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    public List<SysRole> selectRoleList(SysRole role);
+
+    /**
+     * 根据用户ID查询角色
+     * 
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    public List<SysRole> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 查询所有角色
+     * 
+     * @return 角色列表
+     */
+    public List<SysRole> selectRoleAll();
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    public List<Integer> selectRoleListByUserId(Long userId);
+
+    /**
+     * 通过角色ID查询角色
+     * 
+     * @param roleId 角色ID
+     * @return 角色对象信息
+     */
+    public SysRole selectRoleById(Long roleId);
+
+    /**
+     * 根据用户ID查询角色
+     * 
+     * @param userName 用户名
+     * @return 角色列表
+     */
+    public List<SysRole> selectRolesByUserName(String userName);
+
+    /**
+     * 校验角色名称是否唯一
+     * 
+     * @param roleName 角色名称
+     * @return 角色信息
+     */
+    public SysRole checkRoleNameUnique(String roleName);
+
+    /**
+     * 校验角色权限是否唯一
+     * 
+     * @param roleKey 角色权限
+     * @return 角色信息
+     */
+    public SysRole checkRoleKeyUnique(String roleKey);
+
+    /**
+     * 修改角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int updateRole(SysRole role);
+
+    /**
+     * 新增角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int insertRole(SysRole role);
+
+    /**
+     * 通过角色ID删除角色
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int deleteRoleById(Long roleId);
+
+    /**
+     * 批量删除角色信息
+     * 
+     * @param roleIds 需要删除的角色ID
+     * @return 结果
+     */
+    public int deleteRoleByIds(Long[] roleIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
new file mode 100644
index 0000000..6602bee
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
@@ -0,0 +1,44 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysRoleMenu;
+
+/**
+ * 角色与菜单关联表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysRoleMenuMapper
+{
+    /**
+     * 查询菜单使用数量
+     * 
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int checkMenuExistRole(Long menuId);
+
+    /**
+     * 通过角色ID删除角色和菜单关联
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int deleteRoleMenuByRoleId(Long roleId);
+
+    /**
+     * 批量删除角色菜单关联信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteRoleMenu(Long[] ids);
+
+    /**
+     * 批量新增角色菜单信息
+     * 
+     * @param roleMenuList 角色菜单列表
+     * @return 结果
+     */
+    public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
new file mode 100644
index 0000000..98363f9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -0,0 +1,127 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.common.core.domain.entity.SysUser;
+
+/**
+ * 用户表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysUserMapper
+{
+    /**
+     * 根据条件分页查询用户列表
+     * 
+     * @param sysUser 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUserList(SysUser sysUser);
+
+    /**
+     * 根据条件分页查询未已配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectAllocatedList(SysUser user);
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUnallocatedList(SysUser user);
+
+    /**
+     * 通过用户名查询用户
+     * 
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByUserName(String userName);
+
+    /**
+     * 通过用户ID查询用户
+     * 
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public SysUser selectUserById(Long userId);
+
+    /**
+     * 新增用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int insertUser(SysUser user);
+
+    /**
+     * 修改用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUser(SysUser user);
+
+    /**
+     * 修改用户头像
+     * 
+     * @param userName 用户名
+     * @param avatar 头像地址
+     * @return 结果
+     */
+    public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
+
+    /**
+     * 重置用户密码
+     * 
+     * @param userName 用户名
+     * @param password 密码
+     * @return 结果
+     */
+    public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+
+    /**
+     * 通过用户ID删除用户
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deleteUserById(Long userId);
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param userIds 需要删除的用户ID
+     * @return 结果
+     */
+    public int deleteUserByIds(Long[] userIds);
+
+    /**
+     * 校验用户名称是否唯一
+     * 
+     * @param userName 用户名称
+     * @return 结果
+     */
+    public int checkUserNameUnique(String userName);
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param phonenumber 手机号码
+     * @return 结果
+     */
+    public SysUser checkPhoneUnique(String phonenumber);
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param email 用户邮箱
+     * @return 结果
+     */
+    public SysUser checkEmailUnique(String email);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
new file mode 100644
index 0000000..e08991d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -0,0 +1,44 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysUserPost;
+
+/**
+ * 用户与岗位关联表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysUserPostMapper
+{
+    /**
+     * 通过用户ID删除用户和岗位关联
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deleteUserPostByUserId(Long userId);
+
+    /**
+     * 通过岗位ID查询岗位使用数量
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    public int countUserPostById(Long postId);
+
+    /**
+     * 批量删除用户和岗位关联
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteUserPost(Long[] ids);
+
+    /**
+     * 批量新增用户岗位信息
+     * 
+     * @param userPostList 用户角色列表
+     * @return 结果
+     */
+    public int batchUserPost(List<SysUserPost> userPostList);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
new file mode 100644
index 0000000..3143ec8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.system.domain.SysUserRole;
+
+/**
+ * 用户与角色关联表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysUserRoleMapper
+{
+    /**
+     * 通过用户ID删除用户和角色关联
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deleteUserRoleByUserId(Long userId);
+
+    /**
+     * 批量删除用户和角色关联
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteUserRole(Long[] ids);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int countUserRoleByRoleId(Long roleId);
+
+    /**
+     * 批量新增用户角色信息
+     * 
+     * @param userRoleList 用户角色列表
+     * @return 结果
+     */
+    public int batchUserRole(List<SysUserRole> userRoleList);
+
+    /**
+     * 删除用户和角色关联信息
+     * 
+     * @param userRole 用户和角色关联信息
+     * @return 结果
+     */
+    public int deleteUserRoleInfo(SysUserRole userRole);
+
+    /**
+     * 批量取消授权用户角色
+     * 
+     * @param roleId 角色ID
+     * @param userIds 需要删除的用户数据ID
+     * @return 结果
+     */
+    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
new file mode 100644
index 0000000..f867e63
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -0,0 +1,90 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysConfig;
+
+/**
+ * 参数配置 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysConfigService
+{
+    /**
+     * 查询参数配置信息
+     * 
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    public SysConfig selectConfigById(Long configId);
+
+    /**
+     * 根据键名查询参数配置信息
+     * 
+     * @param configKey 参数键名
+     * @return 参数键值
+     */
+    public String selectConfigByKey(String configKey);
+
+    /**
+     * 获取验证码开关
+     * 
+     * @return true开启，false关闭
+     */
+    public boolean selectCaptchaOnOff();
+
+    /**
+     * 查询参数配置列表
+     * 
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    public List<SysConfig> selectConfigList(SysConfig config);
+
+    /**
+     * 新增参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertConfig(SysConfig config);
+
+    /**
+     * 修改参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateConfig(SysConfig config);
+
+    /**
+     * 批量删除参数信息
+     * 
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    public void deleteConfigByIds(Long[] configIds);
+
+    /**
+     * 加载参数缓存数据
+     */
+    public void loadingConfigCache();
+
+    /**
+     * 清空参数缓存数据
+     */
+    public void clearConfigCache();
+
+    /**
+     * 重置参数缓存数据
+     */
+    public void resetConfigCache();
+
+    /**
+     * 校验参数键名是否唯一
+     * 
+     * @param config 参数信息
+     * @return 结果
+     */
+    public String checkConfigKeyUnique(SysConfig config);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
new file mode 100644
index 0000000..bf8ab3e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
@@ -0,0 +1,109 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysDept;
+
+/**
+ * 部门管理 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysDeptService
+{
+    /**
+     * 查询部门管理数据
+     * 
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptList(SysDept dept);
+
+    /**
+     * 构建前端所需要树结构
+     * 
+     * @param depts 部门列表
+     * @return 树结构列表
+     */
+    public List<SysDept> buildDeptTree(List<SysDept> depts);
+
+    /**
+     * 构建前端所需要下拉树结构
+     * 
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
+    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
+
+    /**
+     * 根据角色ID查询部门树信息
+     * 
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    public List<Integer> selectDeptListByRoleId(Long roleId);
+
+    /**
+     * 根据部门ID查询信息
+     * 
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    public SysDept selectDeptById(Long deptId);
+
+    /**
+     * 根据ID查询所有子部门（正常状态）
+     * 
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    public int selectNormalChildrenDeptById(Long deptId);
+
+    /**
+     * 是否存在部门子节点
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public boolean hasChildByDeptId(Long deptId);
+
+    /**
+     * 查询部门是否存在用户
+     * 
+     * @param deptId 部门ID
+     * @return 结果 true 存在 false 不存在
+     */
+    public boolean checkDeptExistUser(Long deptId);
+
+    /**
+     * 校验部门名称是否唯一
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public String checkDeptNameUnique(SysDept dept);
+
+    /**
+     * 新增保存部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int insertDept(SysDept dept);
+
+    /**
+     * 修改保存部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    public int updateDept(SysDept dept);
+
+    /**
+     * 删除部门管理信息
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    public int deleteDeptById(Long deptId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
new file mode 100644
index 0000000..b4993e1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+
+/**
+ * 字典 业务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysDictDataService
+{
+    /**
+     * 根据条件分页查询字典数据
+     * 
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataList(SysDictData dictData);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     * 
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    public String selectDictLabel(String dictType, String dictValue);
+
+    /**
+     * 根据字典数据ID查询信息
+     * 
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    public SysDictData selectDictDataById(Long dictCode);
+
+    /**
+     * 批量删除字典数据信息
+     * 
+     * @param dictCodes 需要删除的字典数据ID
+     * @return 结果
+     */
+    public void deleteDictDataByIds(Long[] dictCodes);
+
+    /**
+     * 新增保存字典数据信息
+     * 
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int insertDictData(SysDictData dictData);
+
+    /**
+     * 修改保存字典数据信息
+     * 
+     * @param dictData 字典数据信息
+     * @return 结果
+     */
+    public int updateDictData(SysDictData dictData);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
new file mode 100644
index 0000000..72d9af5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@@ -0,0 +1,99 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+
+/**
+ * 字典 业务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysDictTypeService
+{
+    /**
+     * 根据条件分页查询字典类型
+     * 
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+
+    /**
+     * 根据所有字典类型
+     * 
+     * @return 字典类型集合信息
+     */
+    public List<SysDictType> selectDictTypeAll();
+
+    /**
+     * 根据字典类型查询字典数据
+     * 
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataByType(String dictType);
+
+    /**
+     * 根据字典类型ID查询信息
+     * 
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeById(Long dictId);
+
+    /**
+     * 根据字典类型查询信息
+     * 
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    public SysDictType selectDictTypeByType(String dictType);
+
+    /**
+     * 批量删除字典信息
+     * 
+     * @param dictIds 需要删除的字典ID
+     * @return 结果
+     */
+    public void deleteDictTypeByIds(Long[] dictIds);
+
+    /**
+     * 加载字典缓存数据
+     */
+    public void loadingDictCache();
+
+    /**
+     * 清空字典缓存数据
+     */
+    public void clearDictCache();
+
+    /**
+     * 重置字典缓存数据
+     */
+    public void resetDictCache();
+
+    /**
+     * 新增保存字典类型信息
+     * 
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int insertDictType(SysDictType dictType);
+
+    /**
+     * 修改保存字典类型信息
+     * 
+     * @param dictType 字典类型信息
+     * @return 结果
+     */
+    public int updateDictType(SysDictType dictType);
+
+    /**
+     * 校验字典类型称是否唯一
+     * 
+     * @param dictType 字典类型
+     * @return 结果
+     */
+    public String checkDictTypeUnique(SysDictType dictType);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
new file mode 100644
index 0000000..96c4d54
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
@@ -0,0 +1,40 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysLogininfor;
+
+/**
+ * 系统访问日志情况信息 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysLogininforService
+{
+    /**
+     * 新增系统登录日志
+     * 
+     * @param logininfor 访问日志对象
+     */
+    public void insertLogininfor(SysLogininfor logininfor);
+
+    /**
+     * 查询系统登录日志集合
+     * 
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
+
+    /**
+     * 批量删除系统登录日志
+     * 
+     * @param infoIds 需要删除的登录日志ID
+     * @return
+     */
+    public int deleteLogininforByIds(Long[] infoIds);
+
+    /**
+     * 清空系统登录日志
+     */
+    public void cleanLogininfor();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
new file mode 100644
index 0000000..f64bee1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -0,0 +1,136 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import java.util.Set;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.domain.vo.RouterVo;
+
+/**
+ * 菜单 业务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysMenuService
+{
+    /**
+     * 根据用户查询系统菜单列表
+     * 
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuList(Long userId);
+
+    /**
+     * 根据用户查询系统菜单列表
+     * 
+     * @param menu 菜单信息
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+
+    /**
+     * 根据用户ID查询权限
+     * 
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    public Set<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询菜单树信息
+     * 
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     * 
+     * @param roleId 角色ID
+     * @return 选中菜单列表
+     */
+    public List<Integer> selectMenuListByRoleId(Long roleId);
+
+    /**
+     * 构建前端路由所需要的菜单
+     * 
+     * @param menus 菜单列表
+     * @return 路由列表
+     */
+    public List<RouterVo> buildMenus(List<SysMenu> menus);
+
+    /**
+     * 构建前端所需要树结构
+     * 
+     * @param menus 菜单列表
+     * @return 树结构列表
+     */
+    public List<SysMenu> buildMenuTree(List<SysMenu> menus);
+
+    /**
+     * 构建前端所需要下拉树结构
+     * 
+     * @param menus 菜单列表
+     * @return 下拉树结构列表
+     */
+    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
+
+    /**
+     * 根据菜单ID查询信息
+     * 
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    public SysMenu selectMenuById(Long menuId);
+
+    /**
+     * 是否存在菜单子节点
+     * 
+     * @param menuId 菜单ID
+     * @return 结果 true 存在 false 不存在
+     */
+    public boolean hasChildByMenuId(Long menuId);
+
+    /**
+     * 查询菜单是否存在角色
+     * 
+     * @param menuId 菜单ID
+     * @return 结果 true 存在 false 不存在
+     */
+    public boolean checkMenuExistRole(Long menuId);
+
+    /**
+     * 新增保存菜单信息
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int insertMenu(SysMenu menu);
+
+    /**
+     * 修改保存菜单信息
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public int updateMenu(SysMenu menu);
+
+    /**
+     * 删除菜单管理信息
+     * 
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int deleteMenuById(Long menuId);
+
+    /**
+     * 校验菜单名称是否唯一
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public String checkMenuNameUnique(SysMenu menu);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
new file mode 100644
index 0000000..47ce1b7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
@@ -0,0 +1,60 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysNotice;
+
+/**
+ * 公告 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysNoticeService
+{
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    public SysNotice selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public List<SysNotice> selectNoticeList(SysNotice notice);
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int insertNotice(SysNotice notice);
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int updateNotice(SysNotice notice);
+
+    /**
+     * 删除公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    public int deleteNoticeById(Long noticeId);
+    
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    public int deleteNoticeByIds(Long[] noticeIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
new file mode 100644
index 0000000..4fd8e5a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
@@ -0,0 +1,48 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysOperLog;
+
+/**
+ * 操作日志 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysOperLogService
+{
+    /**
+     * 新增操作日志
+     * 
+     * @param operLog 操作日志对象
+     */
+    public void insertOperlog(SysOperLog operLog);
+
+    /**
+     * 查询系统操作日志集合
+     * 
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+
+    /**
+     * 批量删除系统操作日志
+     * 
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    public int deleteOperLogByIds(Long[] operIds);
+
+    /**
+     * 查询操作日志详细
+     * 
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    public SysOperLog selectOperLogById(Long operId);
+
+    /**
+     * 清空操作日志
+     */
+    public void cleanOperLog();
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
new file mode 100644
index 0000000..aab216d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
@@ -0,0 +1,100 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysPost;
+
+/**
+ * 岗位信息 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysPostService
+{
+    /**
+     * 查询岗位信息集合
+     * 
+     * @param post 岗位信息
+     * @return 岗位列表
+     */
+    public List<SysPost> selectPostList(SysPost post);
+
+    /**
+     * 查询所有岗位
+     * 
+     * @return 岗位列表
+     */
+    public List<SysPost> selectPostAll();
+
+    /**
+     * 通过岗位ID查询岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    public SysPost selectPostById(Long postId);
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    public List<Integer> selectPostListByUserId(Long userId);
+
+    /**
+     * 校验岗位名称
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public String checkPostNameUnique(SysPost post);
+
+    /**
+     * 校验岗位编码
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public String checkPostCodeUnique(SysPost post);
+
+    /**
+     * 通过岗位ID查询岗位使用数量
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    public int countUserPostById(Long postId);
+
+    /**
+     * 删除岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    public int deletePostById(Long postId);
+
+    /**
+     * 批量删除岗位信息
+     * 
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     * @throws Exception 异常
+     */
+    public int deletePostByIds(Long[] postIds);
+
+    /**
+     * 新增保存岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int insertPost(SysPost post);
+
+    /**
+     * 修改保存岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    public int updatePost(SysPost post);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
new file mode 100644
index 0000000..b2cc528
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -0,0 +1,166 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import java.util.Set;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.system.domain.SysUserRole;
+
+/**
+ * 角色业务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysRoleService
+{
+    /**
+     * 根据条件分页查询角色数据
+     * 
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    public List<SysRole> selectRoleList(SysRole role);
+
+    /**
+     * 根据用户ID查询角色列表
+     * 
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    public List<SysRole> selectRolesByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询角色权限
+     * 
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    public Set<String> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 查询所有角色
+     * 
+     * @return 角色列表
+     */
+    public List<SysRole> selectRoleAll();
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    public List<Integer> selectRoleListByUserId(Long userId);
+
+    /**
+     * 通过角色ID查询角色
+     * 
+     * @param roleId 角色ID
+     * @return 角色对象信息
+     */
+    public SysRole selectRoleById(Long roleId);
+
+    /**
+     * 校验角色名称是否唯一
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public String checkRoleNameUnique(SysRole role);
+
+    /**
+     * 校验角色权限是否唯一
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public String checkRoleKeyUnique(SysRole role);
+
+    /**
+     * 校验角色是否允许操作
+     * 
+     * @param role 角色信息
+     */
+    public void checkRoleAllowed(SysRole role);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int countUserRoleByRoleId(Long roleId);
+
+    /**
+     * 新增保存角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int insertRole(SysRole role);
+
+    /**
+     * 修改保存角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int updateRole(SysRole role);
+
+    /**
+     * 修改角色状态
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int updateRoleStatus(SysRole role);
+
+    /**
+     * 修改数据权限信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    public int authDataScope(SysRole role);
+
+    /**
+     * 通过角色ID删除角色
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    public int deleteRoleById(Long roleId);
+
+    /**
+     * 批量删除角色信息
+     * 
+     * @param roleIds 需要删除的角色ID
+     * @return 结果
+     */
+    public int deleteRoleByIds(Long[] roleIds);
+
+    /**
+     * 取消授权用户角色
+     * 
+     * @param userRole 用户和角色关联信息
+     * @return 结果
+     */
+    public int deleteAuthUser(SysUserRole userRole);
+
+    /**
+     * 批量取消授权用户角色
+     * 
+     * @param roleId 角色ID
+     * @param userIds 需要取消授权的用户数据ID
+     * @return 结果
+     */
+    public int deleteAuthUsers(Long roleId, Long[] userIds);
+
+    /**
+     * 批量选择授权用户角色
+     * 
+     * @param roleId 角色ID
+     * @param userIds 需要删除的用户数据ID
+     * @return 结果
+     */
+    public int insertAuthUsers(Long roleId, Long[] userIds);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
new file mode 100644
index 0000000..8eb5448
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
@@ -0,0 +1,48 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.system.domain.SysUserOnline;
+
+/**
+ * 在线用户 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysUserOnlineService
+{
+    /**
+     * 通过登录地址查询信息
+     * 
+     * @param ipaddr 登录地址
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
+
+    /**
+     * 通过用户名称查询信息
+     * 
+     * @param userName 用户名称
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
+
+    /**
+     * 通过登录地址/用户名称查询信息
+     * 
+     * @param ipaddr 登录地址
+     * @param userName 用户名称
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
+
+    /**
+     * 设置在线用户信息
+     * 
+     * @param user 用户信息
+     * @return 在线用户
+     */
+    public SysUserOnline loginUserToUserOnline(LoginUser user);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
new file mode 100644
index 0000000..bed8667
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -0,0 +1,199 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysUser;
+
+/**
+ * 用户 业务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysUserService
+{
+    /**
+     * 根据条件分页查询用户列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUserList(SysUser user);
+
+    /**
+     * 根据条件分页查询已分配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectAllocatedList(SysUser user);
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUnallocatedList(SysUser user);
+
+    /**
+     * 通过用户名查询用户
+     * 
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByUserName(String userName);
+
+    /**
+     * 通过用户ID查询用户
+     * 
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public SysUser selectUserById(Long userId);
+
+    /**
+     * 根据用户ID查询用户所属角色组
+     * 
+     * @param userName 用户名
+     * @return 结果
+     */
+    public String selectUserRoleGroup(String userName);
+
+    /**
+     * 根据用户ID查询用户所属岗位组
+     * 
+     * @param userName 用户名
+     * @return 结果
+     */
+    public String selectUserPostGroup(String userName);
+
+    /**
+     * 校验用户名称是否唯一
+     * 
+     * @param userName 用户名称
+     * @return 结果
+     */
+    public String checkUserNameUnique(String userName);
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public String checkPhoneUnique(SysUser user);
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public String checkEmailUnique(SysUser user);
+
+    /**
+     * 校验用户是否允许操作
+     * 
+     * @param user 用户信息
+     */
+    public void checkUserAllowed(SysUser user);
+
+    /**
+     * 新增用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int insertUser(SysUser user);
+
+    /**
+     * 注册用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public boolean registerUser(SysUser user);
+
+    /**
+     * 修改用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUser(SysUser user);
+
+    /**
+     * 用户授权角色
+     * 
+     * @param userId 用户ID
+     * @param roleIds 角色组
+     */
+    public void insertUserAuth(Long userId, Long[] roleIds);
+
+    /**
+     * 修改用户状态
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserStatus(SysUser user);
+
+    /**
+     * 修改用户基本信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserProfile(SysUser user);
+
+    /**
+     * 修改用户头像
+     * 
+     * @param userName 用户名
+     * @param avatar 头像地址
+     * @return 结果
+     */
+    public boolean updateUserAvatar(String userName, String avatar);
+
+    /**
+     * 重置用户密码
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int resetPwd(SysUser user);
+
+    /**
+     * 重置用户密码
+     * 
+     * @param userName 用户名
+     * @param password 密码
+     * @return 结果
+     */
+    public int resetUserPwd(String userName, String password);
+
+    /**
+     * 通过用户ID删除用户
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deleteUserById(Long userId);
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param userIds 需要删除的用户ID
+     * @return 结果
+     */
+    public int deleteUserByIds(Long[] userIds);
+
+    /**
+     * 导入用户数据
+     * 
+     * @param userList 用户数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param operName 操作用户
+     * @return 结果
+     */
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
new file mode 100644
index 0000000..6f5e5e4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -0,0 +1,227 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 参数配置 服务层实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysConfigServiceImpl implements ISysConfigService
+{
+    @Autowired
+    private SysConfigMapper configMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 项目启动时，初始化参数到缓存
+     */
+    @PostConstruct
+    public void init()
+    {
+        loadingConfigCache();
+    }
+
+    /**
+     * 查询参数配置信息
+     * 
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    @Override
+    @DataSource(DataSourceType.MASTER)
+    public SysConfig selectConfigById(Long configId)
+    {
+        SysConfig config = new SysConfig();
+        config.setConfigId(configId);
+        return configMapper.selectConfig(config);
+    }
+
+    /**
+     * 根据键名查询参数配置信息
+     * 
+     * @param configKey 参数key
+     * @return 参数键值
+     */
+    @Override
+    public String selectConfigByKey(String configKey)
+    {
+        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
+        if (StringUtils.isNotEmpty(configValue))
+        {
+            return configValue;
+        }
+        SysConfig config = new SysConfig();
+        config.setConfigKey(configKey);
+        SysConfig retConfig = configMapper.selectConfig(config);
+        if (StringUtils.isNotNull(retConfig))
+        {
+            redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
+            return retConfig.getConfigValue();
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取验证码开关
+     * 
+     * @return true开启，false关闭
+     */
+    @Override
+    public boolean selectCaptchaOnOff()
+    {
+        String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+        if (StringUtils.isEmpty(captchaOnOff))
+        {
+            return true;
+        }
+        return Convert.toBool(captchaOnOff);
+    }
+
+    /**
+     * 查询参数配置列表
+     * 
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    @Override
+    public List<SysConfig> selectConfigList(SysConfig config)
+    {
+        return configMapper.selectConfigList(config);
+    }
+
+    /**
+     * 新增参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public int insertConfig(SysConfig config)
+    {
+        int row = configMapper.insertConfig(config);
+        if (row > 0)
+        {
+            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+        }
+        return row;
+    }
+
+    /**
+     * 修改参数配置
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public int updateConfig(SysConfig config)
+    {
+        int row = configMapper.updateConfig(config);
+        if (row > 0)
+        {
+            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+        }
+        return row;
+    }
+
+    /**
+     * 批量删除参数信息
+     * 
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    @Override
+    public void deleteConfigByIds(Long[] configIds)
+    {
+        for (Long configId : configIds)
+        {
+            SysConfig config = selectConfigById(configId);
+            if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
+            {
+                throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
+            }
+            configMapper.deleteConfigById(configId);
+            redisCache.deleteObject(getCacheKey(config.getConfigKey()));
+        }
+    }
+
+    /**
+     * 加载参数缓存数据
+     */
+    @Override
+    public void loadingConfigCache()
+    {
+        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+        for (SysConfig config : configsList)
+        {
+            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+        }
+    }
+
+    /**
+     * 清空参数缓存数据
+     */
+    @Override
+    public void clearConfigCache()
+    {
+        Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
+        redisCache.deleteObject(keys);
+    }
+
+    /**
+     * 重置参数缓存数据
+     */
+    @Override
+    public void resetConfigCache()
+    {
+        clearConfigCache();
+        loadingConfigCache();
+    }
+
+    /**
+     * 校验参数键名是否唯一
+     * 
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public String checkConfigKeyUnique(SysConfig config)
+    {
+        Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+        SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
+        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 设置cache key
+     * 
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    private String getCacheKey(String configKey)
+    {
+        return Constants.SYS_CONFIG_KEY + configKey;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
new file mode 100644
index 0000000..acf44b5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -0,0 +1,307 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.service.ISysDeptService;
+
+/**
+ * 部门管理 服务实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysDeptServiceImpl implements ISysDeptService
+{
+    @Autowired
+    private SysDeptMapper deptMapper;
+
+    @Autowired
+    private SysRoleMapper roleMapper;
+
+    /**
+     * 查询部门管理数据
+     * 
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptList(SysDept dept)
+    {
+        return deptMapper.selectDeptList(dept);
+    }
+
+    /**
+     * 构建前端所需要树结构
+     * 
+     * @param depts 部门列表
+     * @return 树结构列表
+     */
+    @Override
+    public List<SysDept> buildDeptTree(List<SysDept> depts)
+    {
+        List<SysDept> returnList = new ArrayList<SysDept>();
+        List<Long> tempList = new ArrayList<Long>();
+        for (SysDept dept : depts)
+        {
+            tempList.add(dept.getDeptId());
+        }
+        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
+        {
+            SysDept dept = (SysDept) iterator.next();
+            // 如果是顶级节点, 遍历该父节点的所有子节点
+            if (!tempList.contains(dept.getParentId()))
+            {
+                recursionFn(depts, dept);
+                returnList.add(dept);
+            }
+        }
+        if (returnList.isEmpty())
+        {
+            returnList = depts;
+        }
+        return returnList;
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     * 
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
+    {
+        List<SysDept> deptTrees = buildDeptTree(depts);
+        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    /**
+     * 根据角色ID查询部门树信息
+     * 
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    @Override
+    public List<Integer> selectDeptListByRoleId(Long roleId)
+    {
+        SysRole role = roleMapper.selectRoleById(roleId);
+        return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
+    }
+
+    /**
+     * 根据部门ID查询信息
+     * 
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    @Override
+    public SysDept selectDeptById(Long deptId)
+    {
+        return deptMapper.selectDeptById(deptId);
+    }
+
+    /**
+     * 根据ID查询所有子部门（正常状态）
+     * 
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    @Override
+    public int selectNormalChildrenDeptById(Long deptId)
+    {
+        return deptMapper.selectNormalChildrenDeptById(deptId);
+    }
+
+    /**
+     * 是否存在子节点
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByDeptId(Long deptId)
+    {
+        int result = deptMapper.hasChildByDeptId(deptId);
+        return result > 0 ? true : false;
+    }
+
+    /**
+     * 查询部门是否存在用户
+     * 
+     * @param deptId 部门ID
+     * @return 结果 true 存在 false 不存在
+     */
+    @Override
+    public boolean checkDeptExistUser(Long deptId)
+    {
+        int result = deptMapper.checkDeptExistUser(deptId);
+        return result > 0 ? true : false;
+    }
+
+    /**
+     * 校验部门名称是否唯一
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    @Override
+    public String checkDeptNameUnique(SysDept dept)
+    {
+        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
+        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 新增保存部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    @Override
+    public int insertDept(SysDept dept)
+    {
+        SysDept info = deptMapper.selectDeptById(dept.getParentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+        {
+            throw new ServiceException("部门停用，不允许新增");
+        }
+        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+        return deptMapper.insertDept(dept);
+    }
+
+    /**
+     * 修改保存部门信息
+     * 
+     * @param dept 部门信息
+     * @return 结果
+     */
+    @Override
+    public int updateDept(SysDept dept)
+    {
+        SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
+        SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
+        {
+            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+            String oldAncestors = oldDept.getAncestors();
+            dept.setAncestors(newAncestors);
+            updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+        }
+        int result = deptMapper.updateDept(dept);
+        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
+                && !StringUtils.equals("0", dept.getAncestors()))
+        {
+            // 如果该部门是启用状态，则启用该部门的所有上级部门
+            updateParentDeptStatusNormal(dept);
+        }
+        return result;
+    }
+
+    /**
+     * 修改该部门的父级部门状态
+     * 
+     * @param dept 当前部门
+     */
+    private void updateParentDeptStatusNormal(SysDept dept)
+    {
+        String ancestors = dept.getAncestors();
+        Long[] deptIds = Convert.toLongArray(ancestors);
+        deptMapper.updateDeptStatusNormal(deptIds);
+    }
+
+    /**
+     * 修改子元素关系
+     * 
+     * @param deptId 被修改的部门ID
+     * @param newAncestors 新的父ID集合
+     * @param oldAncestors 旧的父ID集合
+     */
+    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    {
+        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+        for (SysDept child : children)
+        {
+            child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
+        }
+        if (children.size() > 0)
+        {
+            deptMapper.updateDeptChildren(children);
+        }
+    }
+
+    /**
+     * 删除部门管理信息
+     * 
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDeptById(Long deptId)
+    {
+        return deptMapper.deleteDeptById(deptId);
+    }
+
+    /**
+     * 递归列表
+     */
+    private void recursionFn(List<SysDept> list, SysDept t)
+    {
+        // 得到子节点列表
+        List<SysDept> childList = getChildList(list, t);
+        t.setChildren(childList);
+        for (SysDept tChild : childList)
+        {
+            if (hasChild(list, tChild))
+            {
+                recursionFn(list, tChild);
+            }
+        }
+    }
+
+    /**
+     * 得到子节点列表
+     */
+    private List<SysDept> getChildList(List<SysDept> list, SysDept t)
+    {
+        List<SysDept> tlist = new ArrayList<SysDept>();
+        Iterator<SysDept> it = list.iterator();
+        while (it.hasNext())
+        {
+            SysDept n = (SysDept) it.next();
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
+
+    /**
+     * 判断是否有子节点
+     */
+    private boolean hasChild(List<SysDept> list, SysDept t)
+    {
+        return getChildList(list, t).size() > 0 ? true : false;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
new file mode 100644
index 0000000..f6a1938
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -0,0 +1,112 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.system.service.ISysDictDataService;
+
+/**
+ * 字典 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysDictDataServiceImpl implements ISysDictDataService
+{
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
+    /**
+     * 根据条件分页查询字典数据
+     * 
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    @Override
+    public List<SysDictData> selectDictDataList(SysDictData dictData)
+    {
+        return dictDataMapper.selectDictDataList(dictData);
+    }
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     * 
+     * @param dictType 字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    @Override
+    public String selectDictLabel(String dictType, String dictValue)
+    {
+        return dictDataMapper.selectDictLabel(dictType, dictValue);
+    }
+
+    /**
+     * 根据字典数据ID查询信息
+     * 
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    @Override
+    public SysDictData selectDictDataById(Long dictCode)
+    {
+        return dictDataMapper.selectDictDataById(dictCode);
+    }
+
+    /**
+     * 批量删除字典数据信息
+     * 
+     * @param dictCodes 需要删除的字典数据ID
+     * @return 结果
+     */
+    @Override
+    public void deleteDictDataByIds(Long[] dictCodes)
+    {
+        for (Long dictCode : dictCodes)
+        {
+            SysDictData data = selectDictDataById(dictCode);
+            dictDataMapper.deleteDictDataById(dictCode);
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            DictUtils.setDictCache(data.getDictType(), dictDatas);
+        }
+    }
+
+    /**
+     * 新增保存字典数据信息
+     * 
+     * @param data 字典数据信息
+     * @return 结果
+     */
+    @Override
+    public int insertDictData(SysDictData data)
+    {
+        int row = dictDataMapper.insertDictData(data);
+        if (row > 0)
+        {
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            DictUtils.setDictCache(data.getDictType(), dictDatas);
+        }
+        return row;
+    }
+
+    /**
+     * 修改保存字典数据信息
+     * 
+     * @param data 字典数据信息
+     * @return 结果
+     */
+    @Override
+    public int updateDictData(SysDictData data)
+    {
+        int row = dictDataMapper.updateDictData(data);
+        if (row > 0)
+        {
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            DictUtils.setDictCache(data.getDictType(), dictDatas);
+        }
+        return row;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
new file mode 100644
index 0000000..8e75c4f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -0,0 +1,220 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.system.mapper.SysDictTypeMapper;
+import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+/**
+ * 字典 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysDictTypeServiceImpl implements ISysDictTypeService
+{
+    @Autowired
+    private SysDictTypeMapper dictTypeMapper;
+
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
+    /**
+     * 项目启动时，初始化字典到缓存
+     */
+    @PostConstruct
+    public void init()
+    {
+        loadingDictCache();
+    }
+
+    /**
+     * 根据条件分页查询字典类型
+     * 
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    @Override
+    public List<SysDictType> selectDictTypeList(SysDictType dictType)
+    {
+        return dictTypeMapper.selectDictTypeList(dictType);
+    }
+
+    /**
+     * 根据所有字典类型
+     * 
+     * @return 字典类型集合信息
+     */
+    @Override
+    public List<SysDictType> selectDictTypeAll()
+    {
+        return dictTypeMapper.selectDictTypeAll();
+    }
+
+    /**
+     * 根据字典类型查询字典数据
+     * 
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    @Override
+    public List<SysDictData> selectDictDataByType(String dictType)
+    {
+        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
+        if (StringUtils.isNotEmpty(dictDatas))
+        {
+            return dictDatas;
+        }
+        dictDatas = dictDataMapper.selectDictDataByType(dictType);
+        if (StringUtils.isNotEmpty(dictDatas))
+        {
+            DictUtils.setDictCache(dictType, dictDatas);
+            return dictDatas;
+        }
+        return null;
+    }
+
+    /**
+     * 根据字典类型ID查询信息
+     * 
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    @Override
+    public SysDictType selectDictTypeById(Long dictId)
+    {
+        return dictTypeMapper.selectDictTypeById(dictId);
+    }
+
+    /**
+     * 根据字典类型查询信息
+     * 
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    @Override
+    public SysDictType selectDictTypeByType(String dictType)
+    {
+        return dictTypeMapper.selectDictTypeByType(dictType);
+    }
+
+    /**
+     * 批量删除字典类型信息
+     * 
+     * @param dictIds 需要删除的字典ID
+     * @return 结果
+     */
+    @Override
+    public void deleteDictTypeByIds(Long[] dictIds)
+    {
+        for (Long dictId : dictIds)
+        {
+            SysDictType dictType = selectDictTypeById(dictId);
+            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
+            {
+                throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
+            }
+            dictTypeMapper.deleteDictTypeById(dictId);
+            DictUtils.removeDictCache(dictType.getDictType());
+        }
+    }
+
+    /**
+     * 加载字典缓存数据
+     */
+    @Override
+    public void loadingDictCache()
+    {
+        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+        for (SysDictType dictType : dictTypeList)
+        {
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+            DictUtils.setDictCache(dictType.getDictType(), dictDatas);
+        }
+    }
+
+    /**
+     * 清空字典缓存数据
+     */
+    @Override
+    public void clearDictCache()
+    {
+        DictUtils.clearDictCache();
+    }
+
+    /**
+     * 重置字典缓存数据
+     */
+    @Override
+    public void resetDictCache()
+    {
+        clearDictCache();
+        loadingDictCache();
+    }
+
+    /**
+     * 新增保存字典类型信息
+     * 
+     * @param dict 字典类型信息
+     * @return 结果
+     */
+    @Override
+    public int insertDictType(SysDictType dict)
+    {
+        int row = dictTypeMapper.insertDictType(dict);
+        if (row > 0)
+        {
+            DictUtils.setDictCache(dict.getDictType(), null);
+        }
+        return row;
+    }
+
+    /**
+     * 修改保存字典类型信息
+     * 
+     * @param dict 字典类型信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateDictType(SysDictType dict)
+    {
+        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
+        dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
+        int row = dictTypeMapper.updateDictType(dict);
+        if (row > 0)
+        {
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
+            DictUtils.setDictCache(dict.getDictType(), dictDatas);
+        }
+        return row;
+    }
+
+    /**
+     * 校验字典类型称是否唯一
+     * 
+     * @param dict 字典类型
+     * @return 结果
+     */
+    @Override
+    public String checkDictTypeUnique(SysDictType dict)
+    {
+        Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
+        SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
+        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
new file mode 100644
index 0000000..a3b5257
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -0,0 +1,65 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.mapper.SysLogininforMapper;
+import com.ruoyi.system.service.ISysLogininforService;
+
+/**
+ * 系统访问日志情况信息 服务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysLogininforServiceImpl implements ISysLogininforService
+{
+
+    @Autowired
+    private SysLogininforMapper logininforMapper;
+
+    /**
+     * 新增系统登录日志
+     * 
+     * @param logininfor 访问日志对象
+     */
+    @Override
+    public void insertLogininfor(SysLogininfor logininfor)
+    {
+        logininforMapper.insertLogininfor(logininfor);
+    }
+
+    /**
+     * 查询系统登录日志集合
+     * 
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    @Override
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
+    {
+        return logininforMapper.selectLogininforList(logininfor);
+    }
+
+    /**
+     * 批量删除系统登录日志
+     * 
+     * @param infoIds 需要删除的登录日志ID
+     * @return
+     */
+    @Override
+    public int deleteLogininforByIds(Long[] infoIds)
+    {
+        return logininforMapper.deleteLogininforByIds(infoIds);
+    }
+
+    /**
+     * 清空系统登录日志
+     */
+    @Override
+    public void cleanLogininfor()
+    {
+        logininforMapper.cleanLogininfor();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
new file mode 100644
index 0000000..e8da922
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -0,0 +1,501 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.vo.MetaVo;
+import com.ruoyi.system.domain.vo.RouterVo;
+import com.ruoyi.system.mapper.SysMenuMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 菜单 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysMenuServiceImpl implements ISysMenuService
+{
+    public static final String PREMISSION_STRING = "perms[\"{0}\"]";
+
+    @Autowired
+    private SysMenuMapper menuMapper;
+
+    @Autowired
+    private SysRoleMapper roleMapper;
+
+    @Autowired
+    private SysRoleMenuMapper roleMenuMapper;
+
+    /**
+     * 根据用户查询系统菜单列表
+     * 
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectMenuList(Long userId)
+    {
+        return selectMenuList(new SysMenu(), userId);
+    }
+
+    /**
+     * 查询系统菜单列表
+     * 
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
+    {
+        List<SysMenu> menuList = null;
+        // 管理员显示所有菜单信息
+        if (SysUser.isAdmin(userId))
+        {
+            menuList = menuMapper.selectMenuList(menu);
+        }
+        else
+        {
+            menu.getParams().put("userId", userId);
+            menuList = menuMapper.selectMenuListByUserId(menu);
+        }
+        return menuList;
+    }
+
+    /**
+     * 根据用户ID查询权限
+     * 
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectMenuPermsByUserId(Long userId)
+    {
+        List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms)
+        {
+            if (StringUtils.isNotEmpty(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
+    /**
+     * 根据用户ID查询菜单
+     * 
+     * @param userId 用户名称
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    {
+        List<SysMenu> menus = null;
+        if (SecurityUtils.isAdmin(userId))
+        {
+            menus = menuMapper.selectMenuTreeAll();
+        }
+        else
+        {
+            menus = menuMapper.selectMenuTreeByUserId(userId);
+        }
+        return getChildPerms(menus, 0);
+    }
+
+    /**
+     * 根据角色ID查询菜单树信息
+     * 
+     * @param roleId 角色ID
+     * @return 选中菜单列表
+     */
+    @Override
+    public List<Integer> selectMenuListByRoleId(Long roleId)
+    {
+        SysRole role = roleMapper.selectRoleById(roleId);
+        return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
+    }
+
+    /**
+     * 构建前端路由所需要的菜单
+     * 
+     * @param menus 菜单列表
+     * @return 路由列表
+     */
+    @Override
+    public List<RouterVo> buildMenus(List<SysMenu> menus)
+    {
+        List<RouterVo> routers = new LinkedList<RouterVo>();
+        for (SysMenu menu : menus)
+        {
+            RouterVo router = new RouterVo();
+            router.setHidden("1".equals(menu.getVisible()));
+            router.setName(getRouteName(menu));
+            router.setPath(getRouterPath(menu));
+            router.setComponent(getComponent(menu));
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            List<SysMenu> cMenus = menu.getChildren();
+            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
+            {
+                router.setAlwaysShow(true);
+                router.setRedirect("noRedirect");
+                router.setChildren(buildMenus(cMenus));
+            }
+            else if (isMenuFrame(menu))
+            {
+                router.setMeta(null);
+                List<RouterVo> childrenList = new ArrayList<RouterVo>();
+                RouterVo children = new RouterVo();
+                children.setPath(menu.getPath());
+                children.setComponent(menu.getComponent());
+                children.setName(StringUtils.capitalize(menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                childrenList.add(children);
+                router.setChildren(childrenList);
+            }
+            else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
+            {
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
+                router.setPath("/inner");
+                List<RouterVo> childrenList = new ArrayList<RouterVo>();
+                RouterVo children = new RouterVo();
+                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
+                children.setPath(routerPath);
+                children.setComponent(UserConstants.INNER_LINK);
+                children.setName(StringUtils.capitalize(routerPath));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
+                childrenList.add(children);
+                router.setChildren(childrenList);
+            }
+            routers.add(router);
+        }
+        return routers;
+    }
+
+    /**
+     * 构建前端所需要树结构
+     * 
+     * @param menus 菜单列表
+     * @return 树结构列表
+     */
+    @Override
+    public List<SysMenu> buildMenuTree(List<SysMenu> menus)
+    {
+        List<SysMenu> returnList = new ArrayList<SysMenu>();
+        List<Long> tempList = new ArrayList<Long>();
+        for (SysMenu dept : menus)
+        {
+            tempList.add(dept.getMenuId());
+        }
+        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
+        {
+            SysMenu menu = (SysMenu) iterator.next();
+            // 如果是顶级节点, 遍历该父节点的所有子节点
+            if (!tempList.contains(menu.getParentId()))
+            {
+                recursionFn(menus, menu);
+                returnList.add(menu);
+            }
+        }
+        if (returnList.isEmpty())
+        {
+            returnList = menus;
+        }
+        return returnList;
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     * 
+     * @param menus 菜单列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus)
+    {
+        List<SysMenu> menuTrees = buildMenuTree(menus);
+        return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    }
+
+    /**
+     * 根据菜单ID查询信息
+     * 
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    @Override
+    public SysMenu selectMenuById(Long menuId)
+    {
+        return menuMapper.selectMenuById(menuId);
+    }
+
+    /**
+     * 是否存在菜单子节点
+     * 
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByMenuId(Long menuId)
+    {
+        int result = menuMapper.hasChildByMenuId(menuId);
+        return result > 0 ? true : false;
+    }
+
+    /**
+     * 查询菜单使用数量
+     * 
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public boolean checkMenuExistRole(Long menuId)
+    {
+        int result = roleMenuMapper.checkMenuExistRole(menuId);
+        return result > 0 ? true : false;
+    }
+
+    /**
+     * 新增保存菜单信息
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    @Override
+    public int insertMenu(SysMenu menu)
+    {
+        return menuMapper.insertMenu(menu);
+    }
+
+    /**
+     * 修改保存菜单信息
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    @Override
+    public int updateMenu(SysMenu menu)
+    {
+        return menuMapper.updateMenu(menu);
+    }
+
+    /**
+     * 删除菜单管理信息
+     * 
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuById(Long menuId)
+    {
+        return menuMapper.deleteMenuById(menuId);
+    }
+
+    /**
+     * 校验菜单名称是否唯一
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    @Override
+    public String checkMenuNameUnique(SysMenu menu)
+    {
+        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
+        SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
+        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 获取路由名称
+     * 
+     * @param menu 菜单信息
+     * @return 路由名称
+     */
+    public String getRouteName(SysMenu menu)
+    {
+        String routerName = StringUtils.capitalize(menu.getPath());
+        // 非外链并且是一级目录（类型为目录）
+        if (isMenuFrame(menu))
+        {
+            routerName = StringUtils.EMPTY;
+        }
+        return routerName;
+    }
+
+    /**
+     * 获取路由地址
+     * 
+     * @param menu 菜单信息
+     * @return 路由地址
+     */
+    public String getRouterPath(SysMenu menu)
+    {
+        String routerPath = menu.getPath();
+        // 内链打开外网方式
+        if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
+        {
+            routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
+        }
+        // 非外链并且是一级目录（类型为目录）
+        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
+                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
+        {
+            routerPath = "/" + menu.getPath();
+        }
+        // 非外链并且是一级目录（类型为菜单）
+        else if (isMenuFrame(menu))
+        {
+            routerPath = "/";
+        }
+        return routerPath;
+    }
+
+    /**
+     * 获取组件信息
+     * 
+     * @param menu 菜单信息
+     * @return 组件信息
+     */
+    public String getComponent(SysMenu menu)
+    {
+        String component = UserConstants.LAYOUT;
+        if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
+        {
+            component = menu.getComponent();
+        }
+        else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu))
+        {
+            component = UserConstants.INNER_LINK;
+        }
+        else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
+        {
+            component = UserConstants.PARENT_VIEW;
+        }
+        return component;
+    }
+
+    /**
+     * 是否为菜单内部跳转
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isMenuFrame(SysMenu menu)
+    {
+        return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
+                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
+    }
+
+    /**
+     * 是否为内链组件
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isInnerLink(SysMenu menu)
+    {
+        return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
+    }
+
+    /**
+     * 是否为parent_view组件
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isParentView(SysMenu menu)
+    {
+        return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+    }
+
+    /**
+     * 根据父节点的ID获取所有子节点
+     * 
+     * @param list 分类表
+     * @param parentId 传入的父节点ID
+     * @return String
+     */
+    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId)
+    {
+        List<SysMenu> returnList = new ArrayList<SysMenu>();
+        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
+        {
+            SysMenu t = (SysMenu) iterator.next();
+            // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
+            if (t.getParentId() == parentId)
+            {
+                recursionFn(list, t);
+                returnList.add(t);
+            }
+        }
+        return returnList;
+    }
+
+    /**
+     * 递归列表
+     * 
+     * @param list
+     * @param t
+     */
+    private void recursionFn(List<SysMenu> list, SysMenu t)
+    {
+        // 得到子节点列表
+        List<SysMenu> childList = getChildList(list, t);
+        t.setChildren(childList);
+        for (SysMenu tChild : childList)
+        {
+            if (hasChild(list, tChild))
+            {
+                recursionFn(list, tChild);
+            }
+        }
+    }
+
+    /**
+     * 得到子节点列表
+     */
+    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t)
+    {
+        List<SysMenu> tlist = new ArrayList<SysMenu>();
+        Iterator<SysMenu> it = list.iterator();
+        while (it.hasNext())
+        {
+            SysMenu n = (SysMenu) it.next();
+            if (n.getParentId().longValue() == t.getMenuId().longValue())
+            {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
+
+    /**
+     * 判断是否有子节点
+     */
+    private boolean hasChild(List<SysMenu> list, SysMenu t)
+    {
+        return getChildList(list, t).size() > 0 ? true : false;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
new file mode 100644
index 0000000..765438b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.mapper.SysNoticeMapper;
+import com.ruoyi.system.service.ISysNoticeService;
+
+/**
+ * 公告 服务层实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysNoticeServiceImpl implements ISysNoticeService
+{
+    @Autowired
+    private SysNoticeMapper noticeMapper;
+
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    @Override
+    public SysNotice selectNoticeById(Long noticeId)
+    {
+        return noticeMapper.selectNoticeById(noticeId);
+    }
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    @Override
+    public List<SysNotice> selectNoticeList(SysNotice notice)
+    {
+        return noticeMapper.selectNoticeList(notice);
+    }
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    @Override
+    public int insertNotice(SysNotice notice)
+    {
+        return noticeMapper.insertNotice(notice);
+    }
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    @Override
+    public int updateNotice(SysNotice notice)
+    {
+        return noticeMapper.updateNotice(notice);
+    }
+
+    /**
+     * 删除公告对象
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeById(Long noticeId)
+    {
+        return noticeMapper.deleteNoticeById(noticeId);
+    }
+
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeByIds(Long[] noticeIds)
+    {
+        return noticeMapper.deleteNoticeByIds(noticeIds);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
new file mode 100644
index 0000000..5489815
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -0,0 +1,76 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.mapper.SysOperLogMapper;
+import com.ruoyi.system.service.ISysOperLogService;
+
+/**
+ * 操作日志 服务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysOperLogServiceImpl implements ISysOperLogService
+{
+    @Autowired
+    private SysOperLogMapper operLogMapper;
+
+    /**
+     * 新增操作日志
+     * 
+     * @param operLog 操作日志对象
+     */
+    @Override
+    public void insertOperlog(SysOperLog operLog)
+    {
+        operLogMapper.insertOperlog(operLog);
+    }
+
+    /**
+     * 查询系统操作日志集合
+     * 
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    @Override
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
+    {
+        return operLogMapper.selectOperLogList(operLog);
+    }
+
+    /**
+     * 批量删除系统操作日志
+     * 
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOperLogByIds(Long[] operIds)
+    {
+        return operLogMapper.deleteOperLogByIds(operIds);
+    }
+
+    /**
+     * 查询操作日志详细
+     * 
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    @Override
+    public SysOperLog selectOperLogById(Long operId)
+    {
+        return operLogMapper.selectOperLogById(operId);
+    }
+
+    /**
+     * 清空操作日志
+     */
+    @Override
+    public void cleanOperLog()
+    {
+        operLogMapper.cleanOperLog();
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
new file mode 100644
index 0000000..46805ef
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@@ -0,0 +1,179 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.service.ISysPostService;
+
+/**
+ * 岗位信息 服务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysPostServiceImpl implements ISysPostService
+{
+    @Autowired
+    private SysPostMapper postMapper;
+
+    @Autowired
+    private SysUserPostMapper userPostMapper;
+
+    /**
+     * 查询岗位信息集合
+     * 
+     * @param post 岗位信息
+     * @return 岗位信息集合
+     */
+    @Override
+    public List<SysPost> selectPostList(SysPost post)
+    {
+        return postMapper.selectPostList(post);
+    }
+
+    /**
+     * 查询所有岗位
+     * 
+     * @return 岗位列表
+     */
+    @Override
+    public List<SysPost> selectPostAll()
+    {
+        return postMapper.selectPostAll();
+    }
+
+    /**
+     * 通过岗位ID查询岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    @Override
+    public SysPost selectPostById(Long postId)
+    {
+        return postMapper.selectPostById(postId);
+    }
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    @Override
+    public List<Integer> selectPostListByUserId(Long userId)
+    {
+        return postMapper.selectPostListByUserId(userId);
+    }
+
+    /**
+     * 校验岗位名称是否唯一
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public String checkPostNameUnique(SysPost post)
+    {
+        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        SysPost info = postMapper.checkPostNameUnique(post.getPostName());
+        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验岗位编码是否唯一
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public String checkPostCodeUnique(SysPost post)
+    {
+        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
+        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 通过岗位ID查询岗位使用数量
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    @Override
+    public int countUserPostById(Long postId)
+    {
+        return userPostMapper.countUserPostById(postId);
+    }
+
+    /**
+     * 删除岗位信息
+     * 
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    @Override
+    public int deletePostById(Long postId)
+    {
+        return postMapper.deletePostById(postId);
+    }
+
+    /**
+     * 批量删除岗位信息
+     * 
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     * @throws Exception 异常
+     */
+    @Override
+    public int deletePostByIds(Long[] postIds)
+    {
+        for (Long postId : postIds)
+        {
+            SysPost post = selectPostById(postId);
+            if (countUserPostById(postId) > 0)
+            {
+                throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));
+            }
+        }
+        return postMapper.deletePostByIds(postIds);
+    }
+
+    /**
+     * 新增保存岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public int insertPost(SysPost post)
+    {
+        return postMapper.insertPost(post);
+    }
+
+    /**
+     * 修改保存岗位信息
+     * 
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public int updatePost(SysPost post)
+    {
+        return postMapper.updatePost(post);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
new file mode 100644
index 0000000..87f1606
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -0,0 +1,401 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.domain.SysRoleDept;
+import com.ruoyi.system.domain.SysRoleMenu;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysRoleDeptMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysRoleService;
+
+/**
+ * 角色 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysRoleServiceImpl implements ISysRoleService
+{
+    @Autowired
+    private SysRoleMapper roleMapper;
+
+    @Autowired
+    private SysRoleMenuMapper roleMenuMapper;
+
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+
+    @Autowired
+    private SysRoleDeptMapper roleDeptMapper;
+
+    /**
+     * 根据条件分页查询角色数据
+     * 
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysRole> selectRoleList(SysRole role)
+    {
+        return roleMapper.selectRoleList(role);
+    }
+
+    /**
+     * 根据用户ID查询角色
+     * 
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    @Override
+    public List<SysRole> selectRolesByUserId(Long userId)
+    {
+        List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
+        List<SysRole> roles = selectRoleAll();
+        for (SysRole role : roles)
+        {
+            for (SysRole userRole : userRoles)
+            {
+                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
+                {
+                    role.setFlag(true);
+                    break;
+                }
+            }
+        }
+        return roles;
+    }
+
+    /**
+     * 根据用户ID查询权限
+     * 
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectRolePermissionByUserId(Long userId)
+    {
+        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (SysRole perm : perms)
+        {
+            if (StringUtils.isNotNull(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
+    /**
+     * 查询所有角色
+     * 
+     * @return 角色列表
+     */
+    @Override
+    public List<SysRole> selectRoleAll()
+    {
+        return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
+    }
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     * 
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    @Override
+    public List<Integer> selectRoleListByUserId(Long userId)
+    {
+        return roleMapper.selectRoleListByUserId(userId);
+    }
+
+    /**
+     * 通过角色ID查询角色
+     * 
+     * @param roleId 角色ID
+     * @return 角色对象信息
+     */
+    @Override
+    public SysRole selectRoleById(Long roleId)
+    {
+        return roleMapper.selectRoleById(roleId);
+    }
+
+    /**
+     * 校验角色名称是否唯一
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    public String checkRoleNameUnique(SysRole role)
+    {
+        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验角色权限是否唯一
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    public String checkRoleKeyUnique(SysRole role)
+    {
+        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验角色是否允许操作
+     * 
+     * @param role 角色信息
+     */
+    @Override
+    public void checkRoleAllowed(SysRole role)
+    {
+        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
+        {
+            throw new ServiceException("不允许操作超级管理员角色");
+        }
+    }
+
+    /**
+     * 通过角色ID查询角色使用数量
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    @Override
+    public int countUserRoleByRoleId(Long roleId)
+    {
+        return userRoleMapper.countUserRoleByRoleId(roleId);
+    }
+
+    /**
+     * 新增保存角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertRole(SysRole role)
+    {
+        // 新增角色信息
+        roleMapper.insertRole(role);
+        return insertRoleMenu(role);
+    }
+
+    /**
+     * 修改保存角色信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateRole(SysRole role)
+    {
+        // 修改角色信息
+        roleMapper.updateRole(role);
+        // 删除角色与菜单关联
+        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+        return insertRoleMenu(role);
+    }
+
+    /**
+     * 修改角色状态
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    public int updateRoleStatus(SysRole role)
+    {
+        return roleMapper.updateRole(role);
+    }
+
+    /**
+     * 修改数据权限信息
+     * 
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int authDataScope(SysRole role)
+    {
+        // 修改角色信息
+        roleMapper.updateRole(role);
+        // 删除角色与部门关联
+        roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+        // 新增角色和部门信息（数据权限）
+        return insertRoleDept(role);
+    }
+
+    /**
+     * 新增角色菜单信息
+     * 
+     * @param role 角色对象
+     */
+    public int insertRoleMenu(SysRole role)
+    {
+        int rows = 1;
+        // 新增用户与角色管理
+        List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
+        for (Long menuId : role.getMenuIds())
+        {
+            SysRoleMenu rm = new SysRoleMenu();
+            rm.setRoleId(role.getRoleId());
+            rm.setMenuId(menuId);
+            list.add(rm);
+        }
+        if (list.size() > 0)
+        {
+            rows = roleMenuMapper.batchRoleMenu(list);
+        }
+        return rows;
+    }
+
+    /**
+     * 新增角色部门信息(数据权限)
+     *
+     * @param role 角色对象
+     */
+    public int insertRoleDept(SysRole role)
+    {
+        int rows = 1;
+        // 新增角色与部门（数据权限）管理
+        List<SysRoleDept> list = new ArrayList<SysRoleDept>();
+        for (Long deptId : role.getDeptIds())
+        {
+            SysRoleDept rd = new SysRoleDept();
+            rd.setRoleId(role.getRoleId());
+            rd.setDeptId(deptId);
+            list.add(rd);
+        }
+        if (list.size() > 0)
+        {
+            rows = roleDeptMapper.batchRoleDept(list);
+        }
+        return rows;
+    }
+
+    /**
+     * 通过角色ID删除角色
+     * 
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteRoleById(Long roleId)
+    {
+        // 删除角色与菜单关联
+        roleMenuMapper.deleteRoleMenuByRoleId(roleId);
+        // 删除角色与部门关联
+        roleDeptMapper.deleteRoleDeptByRoleId(roleId);
+        return roleMapper.deleteRoleById(roleId);
+    }
+
+    /**
+     * 批量删除角色信息
+     * 
+     * @param roleIds 需要删除的角色ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteRoleByIds(Long[] roleIds)
+    {
+        for (Long roleId : roleIds)
+        {
+            checkRoleAllowed(new SysRole(roleId));
+            SysRole role = selectRoleById(roleId);
+            if (countUserRoleByRoleId(roleId) > 0)
+            {
+                throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
+            }
+        }
+        // 删除角色与菜单关联
+        roleMenuMapper.deleteRoleMenu(roleIds);
+        // 删除角色与部门关联
+        roleDeptMapper.deleteRoleDept(roleIds);
+        return roleMapper.deleteRoleByIds(roleIds);
+    }
+
+    /**
+     * 取消授权用户角色
+     * 
+     * @param userRole 用户和角色关联信息
+     * @return 结果
+     */
+    @Override
+    public int deleteAuthUser(SysUserRole userRole)
+    {
+        return userRoleMapper.deleteUserRoleInfo(userRole);
+    }
+
+    /**
+     * 批量取消授权用户角色
+     * 
+     * @param roleId 角色ID
+     * @param userIds 需要取消授权的用户数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteAuthUsers(Long roleId, Long[] userIds)
+    {
+        return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
+    }
+
+    /**
+     * 批量选择授权用户角色
+     * 
+     * @param roleId 角色ID
+     * @param userIds 需要删除的用户数据ID
+     * @return 结果
+     */
+    @Override
+    public int insertAuthUsers(Long roleId, Long[] userIds)
+    {
+        // 新增用户与角色管理
+        List<SysUserRole> list = new ArrayList<SysUserRole>();
+        for (Long userId : userIds)
+        {
+            SysUserRole ur = new SysUserRole();
+            ur.setUserId(userId);
+            ur.setRoleId(roleId);
+            list.add(ur);
+        }
+        return userRoleMapper.batchUserRole(list);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
new file mode 100644
index 0000000..f80a877
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户 服务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysUserOnlineServiceImpl implements ISysUserOnlineService
+{
+    /**
+     * 通过登录地址查询信息
+     * 
+     * @param ipaddr 登录地址
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    @Override
+    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
+    {
+        if (StringUtils.equals(ipaddr, user.getIpaddr()))
+        {
+            return loginUserToUserOnline(user);
+        }
+        return null;
+    }
+
+    /**
+     * 通过用户名称查询信息
+     * 
+     * @param userName 用户名称
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    @Override
+    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
+    {
+        if (StringUtils.equals(userName, user.getUsername()))
+        {
+            return loginUserToUserOnline(user);
+        }
+        return null;
+    }
+
+    /**
+     * 通过登录地址/用户名称查询信息
+     * 
+     * @param ipaddr 登录地址
+     * @param userName 用户名称
+     * @param user 用户信息
+     * @return 在线用户信息
+     */
+    @Override
+    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
+    {
+        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+        {
+            return loginUserToUserOnline(user);
+        }
+        return null;
+    }
+
+    /**
+     * 设置在线用户信息
+     * 
+     * @param user 用户信息
+     * @return 在线用户
+     */
+    @Override
+    public SysUserOnline loginUserToUserOnline(LoginUser user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
+        {
+            return null;
+        }
+        SysUserOnline sysUserOnline = new SysUserOnline();
+        sysUserOnline.setTokenId(user.getToken());
+        sysUserOnline.setUserName(user.getUsername());
+        sysUserOnline.setIpaddr(user.getIpaddr());
+        sysUserOnline.setLoginLocation(user.getLoginLocation());
+        sysUserOnline.setBrowser(user.getBrowser());
+        sysUserOnline.setOs(user.getOs());
+        sysUserOnline.setLoginTime(user.getLoginTime());
+        if (StringUtils.isNotNull(user.getUser().getDept()))
+        {
+            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
+        }
+        return sysUserOnline;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
new file mode 100644
index 0000000..5fa90e4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,597 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+import com.ruoyi.segchk.domain.SegchkProviderMgt;
+import com.ruoyi.segchk.mapper.SegchkProviderMgtMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.SysUserPost;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 用户 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysUserServiceImpl implements ISysUserService
+{
+    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysRoleMapper roleMapper;
+
+    @Autowired
+    private SysPostMapper postMapper;
+
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+
+    @Autowired
+    private SysUserPostMapper userPostMapper;
+
+    @Autowired
+    private SegchkProviderMgtMapper segchkProviderMgtMapper;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 根据条件分页查询用户列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectUserList(SysUser user)
+    {
+        List<SysUser> sysUsers = userMapper.selectUserList(user);
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+        List<SegchkProviderMgt> segchkProviderMgtList = segchkProviderMgtMapper.selectSegchkProviderMgtList(segchkProviderMgt);
+        Map<String, List<SegchkProviderMgt>> collect = segchkProviderMgtList.parallelStream().collect(Collectors.groupingBy(SegchkProviderMgt::getPhoneNo));
+        List<SysUser> collect1 = sysUsers.parallelStream().map(v -> {
+            List<SegchkProviderMgt> segchkProviderMgtList1 = collect.get(v.getPhonenumber());
+            if (ObjectUtils.isNotEmpty(segchkProviderMgtList1)) {
+                v.setProviderId(segchkProviderMgtList1.get(0).getProviderId());
+                v.setDistictId(segchkProviderMgtList1.get(0).getDistrictId().longValue());
+            }
+            return v;
+        }).collect(Collectors.toList());
+        return collect1;
+    }
+
+    /**
+     * 根据条件分页查询已分配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectAllocatedList(SysUser user)
+    {
+        return userMapper.selectAllocatedList(user);
+    }
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     * 
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectUnallocatedList(SysUser user)
+    {
+        return userMapper.selectUnallocatedList(user);
+    }
+
+    /**
+     * 通过用户名查询用户
+     * 
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUser selectUserByUserName(String userName)
+    {
+
+        SysUser sysUser = userMapper.selectUserByUserName(userName);
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+        segchkProviderMgt.setPhoneNo(sysUser.getPhonenumber());
+        List<SegchkProviderMgt> segchkProviderMgtList = segchkProviderMgtMapper.selectSegchkProviderMgtList(segchkProviderMgt);
+        if(ObjectUtils.isNotEmpty(segchkProviderMgtList) && !segchkProviderMgtList.isEmpty() && segchkProviderMgtList.size() > 0){
+            sysUser.setProviderId(segchkProviderMgtList.get(0).getProviderId());
+            sysUser.setDistictId(segchkProviderMgtList.get(0).getDistrictId().longValue());
+        }
+        return sysUser;
+    }
+
+    /**
+     * 通过用户ID查询用户
+     * 
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUser selectUserById(Long userId)
+    {
+
+        SysUser sysUser = userMapper.selectUserById(userId);
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+        segchkProviderMgt.setPhoneNo(sysUser.getPhonenumber());
+        List<SegchkProviderMgt> segchkProviderMgtList = segchkProviderMgtMapper.selectSegchkProviderMgtList(segchkProviderMgt);
+        if(ObjectUtils.isNotEmpty(segchkProviderMgtList) && !segchkProviderMgtList.isEmpty() && segchkProviderMgtList.size() > 0){
+            sysUser.setProviderId(segchkProviderMgtList.get(0).getProviderId());
+            sysUser.setDistictId(segchkProviderMgtList.get(0).getDistrictId().longValue());
+        }
+        return sysUser;
+    }
+
+    /**
+     * 查询用户所属角色组
+     * 
+     * @param userName 用户名
+     * @return 结果
+     */
+    @Override
+    public String selectUserRoleGroup(String userName)
+    {
+        List<SysRole> list = roleMapper.selectRolesByUserName(userName);
+        StringBuffer idsStr = new StringBuffer();
+        for (SysRole role : list)
+        {
+            idsStr.append(role.getRoleName()).append(",");
+        }
+        if (StringUtils.isNotEmpty(idsStr.toString()))
+        {
+            return idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
+
+    /**
+     * 查询用户所属岗位组
+     * 
+     * @param userName 用户名
+     * @return 结果
+     */
+    @Override
+    public String selectUserPostGroup(String userName)
+    {
+        List<SysPost> list = postMapper.selectPostsByUserName(userName);
+        StringBuffer idsStr = new StringBuffer();
+        for (SysPost post : list)
+        {
+            idsStr.append(post.getPostName()).append(",");
+        }
+        if (StringUtils.isNotEmpty(idsStr.toString()))
+        {
+            return idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
+
+    /**
+     * 校验用户名称是否唯一
+     * 
+     * @param userName 用户名称
+     * @return 结果
+     */
+    @Override
+    public String checkUserNameUnique(String userName)
+    {
+        int count = userMapper.checkUserNameUnique(userName);
+        if (count > 0)
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验用户名称是否唯一
+     *
+     * @param user 用户信息
+     * @return
+     */
+    @Override
+    public String checkPhoneUnique(SysUser user)
+    {
+        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+        segchkProviderMgt.setPhoneNo(user.getPhonenumber());
+        List<SegchkProviderMgt> segchkProviderMgtList = segchkProviderMgtMapper.selectSegchkProviderMgtList(segchkProviderMgt);
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue() && ObjectUtils.isNotEmpty(segchkProviderMgtList))
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param user 用户信息
+     * @return
+     */
+    @Override
+    public String checkEmailUnique(SysUser user)
+    {
+        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        SysUser info = userMapper.checkEmailUnique(user.getEmail());
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 校验用户是否允许操作
+     * 
+     * @param user 用户信息
+     */
+    @Override
+    public void checkUserAllowed(SysUser user)
+    {
+        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+        {
+            throw new ServiceException("不允许操作超级管理员用户");
+        }
+    }
+
+    /**
+     * 新增保存用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertUser(SysUser user)
+    {
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+
+//        增加用户信息写入运营商管理表
+        SegchkProviderMgt segchkProviderMgt = new SegchkProviderMgt();
+//        Long[] roleIds = user.getRoleIds();
+        if(ObjectUtils.isNotEmpty(user.getDistictId())) {
+//            10以上都是运营商
+            segchkProviderMgt.setNickName(user.getNickName());
+            segchkProviderMgt.setPhoneNo(user.getPhonenumber());
+            segchkProviderMgt.setDistrictId(user.getDistictId().intValue());
+            segchkProviderMgt.setFlagId(0);
+            int ret = segchkProviderMgtMapper.insertSegchkProviderMgt(segchkProviderMgt);
+        }
+        // 新增用户岗位关联
+        insertUserPost(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return rows;
+    }
+
+    /**
+     * 注册用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public boolean registerUser(SysUser user)
+    {
+        return userMapper.insertUser(user) > 0;
+    }
+
+    /**
+     * 修改保存用户信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateUser(SysUser user)
+    {
+        Long userId = user.getUserId();
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRoleByUserId(userId);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        // 删除用户与岗位关联
+        userPostMapper.deleteUserPostByUserId(userId);
+        // 新增用户与岗位管理
+        insertUserPost(user);
+        return userMapper.updateUser(user);
+    }
+
+    /**
+     * 用户授权角色
+     * 
+     * @param userId 用户ID
+     * @param roleIds 角色组
+     */
+    @Override
+    @Transactional
+    public void insertUserAuth(Long userId, Long[] roleIds)
+    {
+        userRoleMapper.deleteUserRoleByUserId(userId);
+        insertUserRole(userId, roleIds);
+    }
+
+    /**
+     * 修改用户状态
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserStatus(SysUser user)
+    {
+        return userMapper.updateUser(user);
+    }
+
+    /**
+     * 修改用户基本信息
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserProfile(SysUser user)
+    {
+        return userMapper.updateUser(user);
+    }
+
+    /**
+     * 修改用户头像
+     * 
+     * @param userName 用户名
+     * @param avatar 头像地址
+     * @return 结果
+     */
+    @Override
+    public boolean updateUserAvatar(String userName, String avatar)
+    {
+        return userMapper.updateUserAvatar(userName, avatar) > 0;
+    }
+
+    /**
+     * 重置用户密码
+     * 
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int resetPwd(SysUser user)
+    {
+        return userMapper.updateUser(user);
+    }
+
+    /**
+     * 重置用户密码
+     * 
+     * @param userName 用户名
+     * @param password 密码
+     * @return 结果
+     */
+    @Override
+    public int resetUserPwd(String userName, String password)
+    {
+        return userMapper.resetUserPwd(userName, password);
+    }
+
+    /**
+     * 新增用户角色信息
+     * 
+     * @param user 用户对象
+     */
+    public void insertUserRole(SysUser user)
+    {
+        Long[] roles = user.getRoleIds();
+        if (StringUtils.isNotNull(roles))
+        {
+            // 新增用户与角色管理
+            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            for (Long roleId : roles)
+            {
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(user.getUserId());
+                ur.setRoleId(roleId);
+                list.add(ur);
+            }
+            if (list.size() > 0)
+            {
+                userRoleMapper.batchUserRole(list);
+            }
+        }
+    }
+
+    /**
+     * 新增用户岗位信息
+     * 
+     * @param user 用户对象
+     */
+    public void insertUserPost(SysUser user)
+    {
+        Long[] posts = user.getPostIds();
+        if (StringUtils.isNotNull(posts))
+        {
+            // 新增用户与岗位管理
+            List<SysUserPost> list = new ArrayList<SysUserPost>();
+            for (Long postId : posts)
+            {
+                SysUserPost up = new SysUserPost();
+                up.setUserId(user.getUserId());
+                up.setPostId(postId);
+                list.add(up);
+            }
+            if (list.size() > 0)
+            {
+                userPostMapper.batchUserPost(list);
+            }
+        }
+    }
+
+    /**
+     * 新增用户角色信息
+     * 
+     * @param userId 用户ID
+     * @param roleIds 角色组
+     */
+    public void insertUserRole(Long userId, Long[] roleIds)
+    {
+        if (StringUtils.isNotNull(roleIds))
+        {
+            // 新增用户与角色管理
+            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            for (Long roleId : roleIds)
+            {
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(userId);
+                ur.setRoleId(roleId);
+                list.add(ur);
+            }
+            if (list.size() > 0)
+            {
+                userRoleMapper.batchUserRole(list);
+            }
+        }
+    }
+
+    /**
+     * 通过用户ID删除用户
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteUserById(Long userId)
+    {
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRoleByUserId(userId);
+        // 删除用户与岗位表
+        userPostMapper.deleteUserPostByUserId(userId);
+        return userMapper.deleteUserById(userId);
+    }
+
+    /**
+     * 批量删除用户信息
+     * 
+     * @param userIds 需要删除的用户ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteUserByIds(Long[] userIds)
+    {
+        for (Long userId : userIds)
+        {
+            checkUserAllowed(new SysUser(userId));
+        }
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRole(userIds);
+        // 删除用户与岗位关联
+        userPostMapper.deleteUserPost(userIds);
+        return userMapper.deleteUserByIds(userIds);
+    }
+
+    /**
+     * 导入用户数据
+     * 
+     * @param userList 用户数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param operName 操作用户
+     * @return 结果
+     */
+    @Override
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
+    {
+        if (StringUtils.isNull(userList) || userList.size() == 0)
+        {
+            throw new ServiceException("导入用户数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        String password = configService.selectConfigByKey("sys.user.initPassword");
+        for (SysUser user : userList)
+        {
+            try
+            {
+                // 验证是否存在这个用户
+                SysUser u = userMapper.selectUserByUserName(user.getUserName());
+                if (StringUtils.isNull(u))
+                {
+                    user.setPassword(SecurityUtils.encryptPassword(password));
+                    user.setCreateBy(operName);
+                    this.insertUser(user);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
+                }
+                else if (isUpdateSupport)
+                {
+                    user.setUpdateBy(operName);
+                    this.updateUser(user);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
+                }
+                else
+                {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkCarouseMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkCarouseMgtMapper.xml
new file mode 100644
index 0000000..84ffe63
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkCarouseMgtMapper.xml
@@ -0,0 +1,99 @@
+<?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.segchk.mapper.SegchkCarouseMgtMapper">
+    
+    <resultMap type="SegchkCarouseMgt" id="SegchkCarouseMgtResult">
+        <result property="carouseId"    column="carouse_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="storeCarousel"    column="store_carousel"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkCarouseMgtVo">
+        select carouse_id, provider_id, store_id, store_carousel, mgt_state, sort_id, mod_time from segchk_carouse_mgt
+    </sql>
+
+    <select id="selectSegchkCarouseMgtList" parameterType="SegchkCarouseMgt" resultMap="SegchkCarouseMgtResult">
+        <include refid="selectSegchkCarouseMgtVo"/>
+        <where>  
+            <if test="carouseId != null "> and carouse_id = #{carouseId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="storeCarousel != null  and storeCarousel != ''"> and store_carousel = #{storeCarousel}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkCarouseMgtByCarouseId" parameterType="Long" resultMap="SegchkCarouseMgtResult">
+        <include refid="selectSegchkCarouseMgtVo"/>
+        where carouse_id = #{carouseId}
+    </select>
+        
+    <insert id="insertSegchkCarouseMgt" parameterType="SegchkCarouseMgt" useGeneratedKeys="true" keyProperty="carouseId">
+        insert into segchk_carouse_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="storeCarousel != null">store_carousel,</if>
+            <if test="mgtState != null">mgt_state,</if>
+            <if test="sortId != null">sort_id,</if>
+            <if test="modTime != null">mod_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="storeCarousel != null">#{storeCarousel},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+            <if test="sortId != null">#{sortId},</if>
+            <if test="modTime != null">#{modTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkCarouseMgt" parameterType="SegchkCarouseMgt">
+        update segchk_carouse_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="storeCarousel != null">store_carousel = #{storeCarousel},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+            <if test="sortId != null">sort_id = #{sortId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where carouse_id = #{carouseId}
+    </update>
+
+    <update id="updateSegchkCarouseMgtSortBatch"  parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update segchk_carouse_mgt
+            <set>
+                sort_id=#{item.sortId}
+            </set>
+            where carouse_id = #{item.carouseId}
+        </foreach>
+    </update>
+
+    <delete id="deleteSegchkCarouseMgtByCarouseId" parameterType="Long">
+        delete from segchk_carouse_mgt where carouse_id = #{carouseId}
+    </delete>
+
+    <delete id="deleteSegchkCarouseMgtByCarouseIds" parameterType="String">
+        delete from segchk_carouse_mgt where carouse_id in 
+        <foreach item="carouseId" collection="array" open="(" separator="," close=")">
+            #{carouseId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkCarouseMgtByStoreIds" parameterType="String">
+        delete from segchk_carouse_mgt where store_id in
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkChargeCardMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkChargeCardMapper.xml
new file mode 100644
index 0000000..5b73a19
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkChargeCardMapper.xml
@@ -0,0 +1,84 @@
+<?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.segchk.mapper.SegchkChargeCardMapper">
+    
+    <resultMap type="SegchkChargeCard" id="SegchkChargeCardResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="cardTypeName"    column="card_type_name"    />
+        <result property="cardTypeValue"    column="card_type_value"    />
+        <result property="effectiveTime"    column="effective_time"    />
+        <result property="buyCount"    column="buy_count"    />
+        <result property="cardTypeChkcount"    column="card_type_chkcount"    />
+    </resultMap>
+
+    <sql id="selectSegchkChargeCardVo">
+        select provider_id, card_type_id, card_type_name, card_type_value, effective_time, buy_count, card_type_chkcount from segchk_charge_card
+    </sql>
+
+    <select id="selectSegchkChargeCardList" parameterType="SegchkChargeCard" resultMap="SegchkChargeCardResult">
+        <include refid="selectSegchkChargeCardVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="cardTypeName != null  and cardTypeName != ''"> and card_type_name like concat('%', #{cardTypeName}, '%')</if>
+            <if test="params.beginCardTypeValue != null and params.beginCardTypeValue != '' and params.endCardTypeValue != null and params.endCardTypeValue != ''"> and card_type_value between #{params.beginCardTypeValue} and #{params.endCardTypeValue}</if>
+            <if test="effectiveTime != null "> and effective_time = #{effectiveTime}</if>
+            <if test="buyCount != null "> and buy_count = #{buyCount}</if>
+            <if test="cardTypeChkcount != null "> and card_type_chkcount = #{cardTypeChkcount}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkChargeCardBycardTypeId" parameterType="Long" resultMap="SegchkChargeCardResult">
+        <include refid="selectSegchkChargeCardVo"/>
+        where
+        card_type_id = #{cardTypeId}
+    </select>
+        
+    <insert id="insertSegchkChargeCard" parameterType="SegchkChargeCard" useGeneratedKeys="true" keyProperty="cardTypeId">
+        insert into segchk_charge_card
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="cardTypeName != null and cardTypeName != ''">card_type_name,</if>
+            <if test="cardTypeValue != null">card_type_value,</if>
+            <if test="effectiveTime != null">effective_time,</if>
+            <if test="buyCount != null">buy_count,</if>
+            <if test="cardTypeChkcount != null">card_type_chkcount,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="cardTypeName != null and cardTypeName != ''">#{cardTypeName},</if>
+            <if test="cardTypeValue != null">#{cardTypeValue},</if>
+            <if test="effectiveTime != null">#{effectiveTime},</if>
+            <if test="buyCount != null">#{buyCount},</if>
+            <if test="cardTypeChkcount != null">#{cardTypeChkcount},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSegchkChargeCard" parameterType="SegchkChargeCard">
+        update segchk_charge_card
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="cardTypeName != null and cardTypeName != ''">card_type_name = #{cardTypeName},</if>
+            <if test="cardTypeValue != null">card_type_value = #{cardTypeValue},</if>
+            <if test="effectiveTime != null">effective_time = #{effectiveTime},</if>
+            <if test="buyCount != null">buy_count = #{buyCount},</if>
+            <if test="cardTypeChkcount != null">card_type_chkcount = #{cardTypeChkcount},</if>
+        </trim>
+        where
+        card_type_id = #{cardTypeId}
+    </update>
+
+    <delete id="deleteSegchkChargeCardByCardTypeId" parameterType="Long">
+        delete from segchk_charge_card where card_type_id = #{cardTypeId}
+    </delete>
+
+    <delete id="deleteSegchkChargeCardByCardTypeIds" parameterType="String">
+        delete from segchk_charge_card where card_type_id in
+        <foreach item="cardTypeId" collection="array" open="(" separator="," close=")">
+            #{cardTypeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkCommentAccMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkCommentAccMapper.xml
new file mode 100644
index 0000000..54a2c6a
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkCommentAccMapper.xml
@@ -0,0 +1,83 @@
+<?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.segchk.mapper.SegchkCommentAccMapper">
+    
+    <resultMap type="SegchkCommentAcc" id="SegchkCommentAccResult">
+        <result property="updateId"    column="update_id"    />
+        <result property="starCount"    column="star_count"    />
+        <result property="starLevel"    column="star_level"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkCommentAccVo">
+        select update_id, star_count, star_level, store_id, provider_id, mod_time from segchk_comment_acc
+    </sql>
+
+    <select id="selectSegchkCommentAccList" parameterType="SegchkCommentAcc" resultMap="SegchkCommentAccResult">
+        <include refid="selectSegchkCommentAccVo"/>
+        <where>  
+            <if test="updateId != null "> and update_id = #{updateId}</if>
+            <if test="starCount != null "> and star_count = #{starCount}</if>
+            <if test="starLevel != null "> and star_level = #{starLevel}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkCommentAccByUpdateId" parameterType="Long" resultMap="SegchkCommentAccResult">
+        <include refid="selectSegchkCommentAccVo"/>
+        where update_id = #{updateId}
+    </select>
+        
+    <insert id="insertSegchkCommentAcc" parameterType="SegchkCommentAcc" useGeneratedKeys="true" keyProperty="updateId">
+        insert into segchk_comment_acc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="starCount != null">star_count,</if>
+            <if test="starLevel != null">star_level,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="providerId != null">provider_id,</if>
+            mod_time,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="starCount != null">#{starCount},</if>
+            <if test="starLevel != null">#{starLevel},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkCommentAcc" parameterType="SegchkCommentAcc">
+        update segchk_comment_acc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="starCount != null">star_count = #{starCount},</if>
+            <if test="starLevel != null">star_level = #{starLevel},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <choose>
+                <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+        </trim>
+        where update_id = #{updateId}
+    </update>
+
+    <delete id="deleteSegchkCommentAccByUpdateId" parameterType="Long">
+        delete from segchk_comment_acc where update_id = #{updateId}
+    </delete>
+
+    <delete id="deleteSegchkCommentAccByUpdateIds" parameterType="String">
+        delete from segchk_comment_acc where update_id in 
+        <foreach item="updateId" collection="array" open="(" separator="," close=")">
+            #{updateId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkDistrictInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkDistrictInfoMapper.xml
new file mode 100644
index 0000000..433f3a7
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkDistrictInfoMapper.xml
@@ -0,0 +1,69 @@
+<?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.segchk.mapper.SegchkDistrictInfoMapper">
+    
+    <resultMap type="SegchkDistrictInfo" id="SegchkDistrictInfoResult">
+        <result property="districtId"    column="district_id"    />
+        <result property="districtName"    column="district_name"    />
+        <result property="districtParent"    column="district_parent"    />
+        <result property="districtLevel"    column="district_level"    />
+    </resultMap>
+
+    <sql id="selectSegchkDistrictInfoVo">
+        select district_id, district_name, district_parent, district_level from segchk_district_info
+    </sql>
+
+    <select id="selectSegchkDistrictInfoList" parameterType="SegchkDistrictInfo" resultMap="SegchkDistrictInfoResult">
+        <include refid="selectSegchkDistrictInfoVo"/>
+        <where>  
+            <if test="districtId != null "> and district_id = #{districtId}</if>
+            <if test="districtName != null  and districtName != ''"> and district_name like concat('%', #{districtName}, '%')</if>
+            <if test="districtParent != null "> and district_parent = #{districtParent}</if>
+            <if test="districtLevel != null "> and district_level = #{districtLevel}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkDistrictInfoByDistrictId" parameterType="Integer" resultMap="SegchkDistrictInfoResult">
+        <include refid="selectSegchkDistrictInfoVo"/>
+        where district_id = #{districtId}
+    </select>
+        
+    <insert id="insertSegchkDistrictInfo" parameterType="SegchkDistrictInfo">
+        insert into segchk_district_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="districtId != null">district_id,</if>
+            <if test="districtName != null and districtName != ''">district_name,</if>
+            <if test="districtParent != null">district_parent,</if>
+            <if test="districtLevel != null">district_level,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="districtId != null">#{districtId},</if>
+            <if test="districtName != null and districtName != ''">#{districtName},</if>
+            <if test="districtParent != null">#{districtParent},</if>
+            <if test="districtLevel != null">#{districtLevel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkDistrictInfo" parameterType="SegchkDistrictInfo">
+        update segchk_district_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="districtName != null and districtName != ''">district_name = #{districtName},</if>
+            <if test="districtParent != null">district_parent = #{districtParent},</if>
+            <if test="districtLevel != null">district_level = #{districtLevel},</if>
+        </trim>
+        where district_id = #{districtId}
+    </update>
+
+    <delete id="deleteSegchkDistrictInfoByDistrictId" parameterType="Integer">
+        delete from segchk_district_info where district_id = #{districtId}
+    </delete>
+
+    <delete id="deleteSegchkDistrictInfoByDistrictIds" parameterType="String">
+        delete from segchk_district_info where district_id in 
+        <foreach item="districtId" collection="array" open="(" separator="," close=")">
+            #{districtId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexStoreAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexStoreAccountMapper.xml
new file mode 100644
index 0000000..0139375
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexStoreAccountMapper.xml
@@ -0,0 +1,114 @@
+<?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.segchk.mapper.SegchkIndexStoreAccountMapper">
+    
+    <resultMap type="SegchkStoreAccount" id="SegchkStoreAccountResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="accountType"    column="account_type"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="account"    column="account"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="cashId"    column="cash_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreAccountVo">
+        select store_id, account_type, account_id, account, reward_id, charge_id, cash_id, mod_time, provider_id from segchk_store_account
+    </sql>
+
+    <select id="selectSegchkStoreAccountList" parameterType="SegchkStoreAccount" resultMap="SegchkStoreAccountResult">
+        <include refid="selectSegchkStoreAccountVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="accountType != null  and accountType != ''"> and account_type = #{accountType}</if>
+            <if test="account != null "> and account = #{account}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+            <if test="modTime != null "> and mod_time = #{modTime}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreAccountById" parameterType="Long" resultMap="SegchkStoreAccountResult">
+        <include refid="selectSegchkStoreAccountVo"/>
+        where account_id = #{accountId}
+    </select>
+        
+    <insert id="insertSegchkStoreAccount" parameterType="SegchkStoreAccount" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_store_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="accountType != null and accountType != ''">account_type,</if>
+            <if test="account != null">account,</if>
+            <if test="rewardId != null">reward_id,</if>
+            <if test="chargeId != null">charge_id,</if>
+            <if test="cashId != null">cash_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="accountType != null and accountType != ''">#{accountType},</if>
+            <if test="account != null">#{account},</if>
+            <if test="rewardId != null">#{rewardId},</if>
+            <if test="chargeId != null">#{chargeId},</if>
+            <if test="cashId != null">#{cashId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreAccount" parameterType="SegchkStoreAccount">
+        update segchk_store_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="accountType != null and accountType != ''">account_type = #{accountType},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="rewardId != null">reward_id = #{rewardId},</if>
+            <if test="chargeId != null">charge_id = #{chargeId},</if>
+            <if test="cashId != null">cash_id = #{cashId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where account_id = #{accountId}
+    </update>
+
+    <delete id="deleteSegchkStoreAccountById" parameterType="Long">
+        delete from segchk_store_account where account_id = #{accountId}
+    </delete>
+
+    <delete id="deleteSegchkStoreAccountByIds" parameterType="String">
+        delete from segchk_store_account where account_id in 
+        <foreach item="accountId" collection="array" open="(" separator="," close=")">
+            #{accountId}
+        </foreach>
+    </delete>
+
+
+    <insert id="insertSegchkStoreAccountByCash" parameterType="SegchkStoreCash" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_store_account (
+        store_id
+        , account
+        , account_type
+        , cash_id
+        , mod_time
+        , provider_id
+        ) select a.store_id
+        , (a.account - #{cash}) as account
+        , 0 as account_type
+        , #{cashId} as cash_id
+        , now() as mod_time
+        , a.provider_id
+        from
+        (select * from segchk_store_account where provider_id = #{providerId} and store_id = #{storeId} order by account_id desc limit 1) a
+    </insert>
+
+    <delete id="deleteSegchkStoreAccountByCash" parameterType="SegchkStoreCash">
+        delete from segchk_store_account where cash_id = #{cashId}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserAccountMapper.xml
new file mode 100644
index 0000000..f2f2c51
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserAccountMapper.xml
@@ -0,0 +1,139 @@
+<?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.segchk.mapper.SegchkIndexUserAccountMapper">
+    
+    <resultMap type="SegchkUserAccount" id="SegchkUserAccountResult">
+        <result property="userId"    column="user_id"    />
+        <result property="account"    column="account"    />
+        <result property="accountType"    column="account_type"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="cashId"    column="cash_id"    />
+    </resultMap>
+
+    <resultMap type="SegchkUserCashOpsResp" id="SegchkUserCashOpsRespResult">
+        <result property="account"    column="account"    />
+        <result property="cashId"    column="cash_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserAccountVo">
+        select user_id, account, account_type, provider_id, account_id, reward_id, charge_id, cash_id from segchk_user_account
+    </sql>
+
+    <select id="selectSegchkUserAccountList" parameterType="SegchkUserAccount" resultMap="SegchkUserAccountResult">
+        <include refid="selectSegchkUserAccountVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="account != null "> and account = #{account}</if>
+            <if test="accountType != null  and accountType != ''"> and account_type = #{accountType}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserAccountById" parameterType="Long" resultMap="SegchkUserAccountResult">
+        <include refid="selectSegchkUserAccountVo"/>
+        where account_id = #{accountId}
+    </select>
+        
+    <insert id="insertSegchkUserAccount" parameterType="SegchkUserAccount" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_user_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="account != null">account,</if>
+            <if test="accountType != null and accountType != ''">account_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="rewardId != null">reward_id,</if>
+            <if test="chargeId != null">charge_id,</if>
+            <if test="cashId != null">cash_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="account != null">#{account},</if>
+            <if test="accountType != null and accountType != ''">#{accountType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="rewardId != null">#{rewardId},</if>
+            <if test="chargeId != null">#{chargeId},</if>
+            <if test="cashId != null">#{cashId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserAccount" parameterType="SegchkUserAccount">
+        update segchk_user_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="accountType != null and accountType != ''">account_type = #{accountType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="rewardId != null">reward_id = #{rewardId},</if>
+            <if test="chargeId != null">charge_id = #{chargeId},</if>
+            <if test="cashId != null">cash_id = #{cashId},</if>
+        </trim>
+        where account_id = #{accountId}
+    </update>
+
+    <delete id="deleteSegchkUserAccountById" parameterType="Long">
+        delete from segchk_user_account where account_id = #{accountId}
+    </delete>
+
+    <delete id="deleteSegchkUserAccountByIds" parameterType="String">
+        delete from segchk_user_account where account_id in 
+        <foreach item="accountId" collection="array" open="(" separator="," close=")">
+            #{accountId}
+        </foreach>
+    </delete>
+
+
+    <select id="checkSegchkUserAccount" parameterType="SegchkUserAccountCheck" resultType="java.math.BigDecimal">
+        select ifnull(account, 0.0) as account from segchk_user_account where provider_id = #{providerId} and user_id = #{userId} order by account_id desc limit 1;
+    </select>
+
+    <insert id="updateSegchkUserAccountBycharge" parameterType="SegchkUserAccountCheck" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_user_account
+        (user_id
+        ,account
+        ,account_type
+        ,provider_id
+        )
+        select user_id, account - #{account} as account, 0, provider_id from segchk_user_account where provider_id = #{providerId} and user_id = #{userId} order by account_id desc limit 1
+    </insert>
+
+    <delete id="deleteSegchkUserAccountByCharge" parameterType="SegchkUserCharge">
+        delete from segchk_user_account where charge_id = #{chargeId};
+    </delete>
+
+    <select id="selectSegchkUserAccountForCash" parameterType="SegchkUserCashOpsReq" resultMap="SegchkUserCashOpsRespResult">
+        select cash_id
+        , ifnull(account, -1.0) as account from
+        ((select sua.provider_id, sua.user_id, account, user_level, suc.cash_id from (select *, 2 as user_level from segchk_user_account where provider_id = #{providerId} and user_id = #{userId} order by account_id desc limit 1) sua left join (select * from segchk_user_cash where provider_id = #{providerId} and user_id = #{userId} and ret_flag = 1 limit 1) suc on sua.provider_id = suc.provider_id and sua.user_id = suc.user_id)
+        union all
+        (select ssa.provider_id, ssa.store_id as user_id, account, user_level, ssc.cash_id from (select *, 1 as user_level from segchk_store_account where provider_id = #{providerId} and store_id = #{userId} order by account_id desc limit 1) ssa left join (select * from segchk_store_cash where provider_id = #{providerId} and store_id = #{userId} and ret_flag = 1 limit 1) ssc on ssc.provider_id = ssa.provider_id and ssc.store_id = ssa.store_id)) ret
+        where user_level = #{userLevel}
+    </select>
+
+    <insert id="insertSegchkStoreAccountByCash" parameterType="SegchkUserCash" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_user_account (
+        user_id
+        , account
+        , account_type
+        , cash_id
+        , provider_id
+        ) select a.user_id
+        , (a.account - #{cash}) as account
+        , 0 as account_type
+        , #{cashId} as cash_id
+        , a.provider_id
+        from
+        (select * from segchk_user_account where provider_id = #{providerId} and user_id = #{userId} order by account_id desc limit 1) a
+    </insert>
+
+    <delete id="deleteSegchkUserAccountByCash" parameterType="SegchkUserCash">
+        delete from segchk_user_account where cash_id = #{cashId};
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserVipMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserVipMapper.xml
new file mode 100644
index 0000000..19e599b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkIndexUserVipMapper.xml
@@ -0,0 +1,43 @@
+<?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.segchk.mapper.SegchkIndexUserVipMapper">
+    
+    <resultMap type="SegchkUserVip" id="SegchkUserVipResult">
+        <result property="cardId"    column="card_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="effectiveTime"    column="effective_time"    />
+        <result property="useCount"    column="use_count"    />
+        <result property="leftCount"    column="left_count"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserVipVo">
+        select card_id, card_type_id, user_id, provider_id, mod_time, effective_time, use_count, left_count, status from segchk_user_vip
+    </sql>
+
+
+    <update id="updateSegchkUserVipCheck" parameterType="Long">
+        update segchk_user_vip set mod_time = now(), use_count = use_count + 1, status = if(left_count = 1, 1, 0), left_count = if(left_count = 1, 0, left_count - 1) where card_id = #{cardId}
+    </update>
+
+    <insert id="insertSegchkUserVipByCharge" parameterType="SegchkChargeRet" useGeneratedKeys="true" keyProperty="cardId">
+        insert into segchk_user_vip (
+        card_type_id
+        , user_id
+        , provider_id
+        , mod_time
+        , effective_time
+        , use_count
+        , left_count
+        , status)
+        select * from ( select suc.card_type_id, suc.user_id, suc.provider_id, now() as mod_time, now() + interval scc.effective_time day as effective_time, 0 as use_count, scc.card_type_chkcount as left_count, 0 as status from
+        (select user_id, card_type_id, provider_id from segchk_user_charge where charge_id = #{chargeId} and ret_flag = 0) suc
+        left join segchk_charge_card scc on suc.provider_id = scc.provider_id and suc.card_type_id = scc.card_type_id) ret
+    </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkKeywordLableMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkKeywordLableMapper.xml
new file mode 100644
index 0000000..ac772e0
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkKeywordLableMapper.xml
@@ -0,0 +1,73 @@
+<?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.segchk.mapper.SegchkKeywordLableMapper">
+    
+    <resultMap type="SegchkKeywordLable" id="SegchkKeywordLableResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="keywordId"    column="keyword_id"    />
+        <result property="keywordName"    column="keyword_name"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="keywordUrl"    column="keyword_url"    />
+    </resultMap>
+
+    <sql id="selectSegchkKeywordLableVo">
+        select provider_id, keyword_id, keyword_name, mod_time, keyword_url from segchk_keyword_lable
+    </sql>
+
+    <select id="selectSegchkKeywordLableList" parameterType="SegchkKeywordLable" resultMap="SegchkKeywordLableResult">
+        <include refid="selectSegchkKeywordLableVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="keywordId != null "> and keyword_id = #{keywordId}</if>
+            <if test="keywordName != null  and keywordName != ''"> and keyword_name like concat('%', #{keywordName}, '%')</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="keywordUrl != null  and keywordUrl != ''"> and keyword_url = #{keywordUrl}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkKeywordLableByKeywordId" parameterType="Long" resultMap="SegchkKeywordLableResult">
+        <include refid="selectSegchkKeywordLableVo"/>
+        where keyword_id = #{keywordId}
+    </select>
+        
+    <insert id="insertSegchkKeywordLable" parameterType="SegchkKeywordLable" useGeneratedKeys="true" keyProperty="keywordId">
+        insert into segchk_keyword_lable
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="keywordName != null and keywordName != ''">keyword_name,</if>
+            mod_time,
+            <if test="keywordUrl != null and keywordUrl != ''">keyword_url,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="keywordName != null and keywordName != ''">#{keywordName},</if>
+            now(),
+            <if test="keywordUrl != null and keywordUrl != ''">#{keywordUrl},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkKeywordLable" parameterType="SegchkKeywordLable">
+        update segchk_keyword_lable
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="keywordName != null and keywordName != ''">keyword_name = #{keywordName},</if>
+            mod_time = now(),
+            <if test="keywordUrl != null and keywordUrl != ''">keyword_url = #{keywordUrl},</if>
+        </trim>
+        where
+        keyword_id = #{keywordId}
+    </update>
+
+    <delete id="deleteSegchkKeywordLableByProviderId" parameterType="Long">
+        delete from segchk_keyword_lable where provider_id = #{providerId}
+    </delete>
+
+    <delete id="deleteSegchkKeywordLableByKeywordIds" parameterType="Long">
+        delete from segchk_keyword_lable where keyword_id in
+        <foreach item="keywordId" collection="array" open="(" separator="," close=")">
+            #{keywordId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkLableMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkLableMgtMapper.xml
new file mode 100644
index 0000000..fa0d3ce
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkLableMgtMapper.xml
@@ -0,0 +1,98 @@
+<?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.segchk.mapper.SegchkLableMgtMapper">
+    
+    <resultMap type="SegchkLableMgt" id="SegchkLableMgtResult">
+        <result property="mgtId"    column="mgt_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="cardTypeName"    column="card_type_name"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="lableFlag"    column="lable_flag"    />
+        <result property="iconUrl"    column="icon_url"    />
+    </resultMap>
+
+    <sql id="selectSegchkLableMgtVo">
+        select mgt_id, provider_id, card_type_id, card_type_name, mgt_state, mod_time, sort_id, lable_flag, icon_url from segchk_lable_mgt
+    </sql>
+
+    <select id="selectSegchkLableMgtList" parameterType="SegchkLableMgt" resultMap="SegchkLableMgtResult">
+        <include refid="selectSegchkLableMgtVo"/>
+        <where>
+            <if test="cardTypeName != null  and cardTypeName != ''"> and card_type_name like concat('%', #{cardTypeName}, '%')</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="providerId != null"> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkLableMgtByMgtId" parameterType="Long" resultMap="SegchkLableMgtResult">
+        <include refid="selectSegchkLableMgtVo"/>
+        where mgt_id = #{mgtId}
+    </select>
+        
+    <insert id="insertSegchkLableMgt" parameterType="SegchkLableMgt" useGeneratedKeys="true" keyProperty="mgtId">
+        insert into segchk_lable_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="cardTypeId != null">card_type_id,</if>
+            <if test="cardTypeName != null and cardTypeName != ''">card_type_name,</if>
+            <if test="mgtState != null">mgt_state,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="sortId != null">sort_id,</if>
+            <if test="lableFlag != null">lable_flag,</if>
+            <if test="iconUrl != null">icon_url,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="cardTypeId != null">#{cardTypeId},</if>
+            <if test="cardTypeName != null and cardTypeName != ''">#{cardTypeName},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="sortId != null">#{sortId},</if>
+            <if test="lableFlag != null">#{lableFlag},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkLableMgt" parameterType="SegchkLableMgt">
+        update segchk_lable_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="cardTypeName != null and cardTypeName != ''">card_type_name = #{cardTypeName},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="sortId != null">sort_id = #{sortId},</if>
+            <if test="lableFlag != null">lable_flag = #{lableFlag},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+        </trim>
+        where mgt_id = #{mgtId}
+    </update>
+
+    <delete id="deleteSegchkLableMgtByMgtId" parameterType="Long">
+        delete from segchk_lable_mgt where mgt_id = #{mgtId}
+    </delete>
+
+    <delete id="deleteSegchkLableMgtByMgtIds" parameterType="String">
+        delete from segchk_lable_mgt where mgt_id in
+        <foreach item="mgtId" collection="array" open="(" separator="," close=")">
+            #{mgtId}
+        </foreach>
+    </delete>
+
+
+    <delete id="deleteSegchkLableMgtByCardTypeIds" parameterType="java.util.Map">
+        delete from segchk_lable_mgt where card_type_id in
+        <foreach item="cardTypeId" collection="cardTypeIds" open="(" separator="," close=")">
+            #{cardTypeId}
+        </foreach>
+        <if test="typeId != null and typeId != ''"> and lable_flag = #{typeId}</if>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkLogionDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkLogionDetailMapper.xml
new file mode 100644
index 0000000..2404934
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkLogionDetailMapper.xml
@@ -0,0 +1,72 @@
+<?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.segchk.mapper.SegchkLogionDetailMapper">
+    
+    <resultMap type="SegchkLogionDetail" id="SegchkLogionDetailResult">
+        <result property="userId"    column="user_id"    />
+        <result property="logionTime"    column="logion_time"    />
+        <result property="userLevel"    column="user_level"    />
+        <result property="loginId"    column="login_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkLogionDetailVo">
+        select user_id, logion_time, user_level, login_id, provider_id from segchk_logion_detail
+    </sql>
+
+    <select id="selectSegchkLogionDetailList" parameterType="SegchkLogionDetail" resultMap="SegchkLogionDetailResult">
+        <include refid="selectSegchkLogionDetailVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginLogionTime != null and params.beginLogionTime != '' and params.endLogionTime != null and params.endLogionTime != ''"> and logion_time between #{params.beginLogionTime} and #{params.endLogionTime}</if>
+            <if test="userLevel != null  and userLevel != ''"> and user_level = #{userLevel}</if>
+            <if test="loginId != null "> and login_id = #{loginId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkLogionDetailByLoginId" parameterType="Long" resultMap="SegchkLogionDetailResult">
+        <include refid="selectSegchkLogionDetailVo"/>
+        where login_id = #{loginId}
+    </select>
+        
+    <insert id="insertSegchkLogionDetail" parameterType="SegchkLogionDetail" useGeneratedKeys="true" keyProperty="loginId">
+        insert into segchk_logion_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="logionTime != null">logion_time,</if>
+            <if test="userLevel != null and userLevel != ''">user_level,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="logionTime != null">#{logionTime},</if>
+            <if test="userLevel != null and userLevel != ''">#{userLevel},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkLogionDetail" parameterType="SegchkLogionDetail">
+        update segchk_logion_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="logionTime != null">logion_time = #{logionTime},</if>
+            <if test="userLevel != null and userLevel != ''">user_level = #{userLevel},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where login_id = #{loginId}
+    </update>
+
+    <delete id="deleteSegchkLogionDetailByLoginId" parameterType="Long">
+        delete from segchk_logion_detail where login_id = #{loginId}
+    </delete>
+
+    <delete id="deleteSegchkLogionDetailByLoginIds" parameterType="String">
+        delete from segchk_logion_detail where login_id in 
+        <foreach item="loginId" collection="array" open="(" separator="," close=")">
+            #{loginId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkMsgDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkMsgDetailMapper.xml
new file mode 100644
index 0000000..abc370a
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkMsgDetailMapper.xml
@@ -0,0 +1,101 @@
+<?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.segchk.mapper.SegchkMsgDetailMapper">
+    
+    <resultMap type="SegchkMsgDetail" id="SegchkMsgDetailResult">
+        <result property="fromId"    column="from_id"    />
+        <result property="toId"    column="to_id"    />
+        <result property="msgType"    column="msg_type"    />
+        <result property="msgContent"    column="msg_content"    />
+        <result property="msgTitle"    column="msg_title"    />
+        <result property="fromTime"    column="from_time"    />
+        <result property="getTime"    column="get_time"    />
+        <result property="msgId"    column="msg_id"    />
+        <result property="msgFlag"    column="msg_flag"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="recvLevel"    column="recv_level"    />
+    </resultMap>
+
+    <sql id="selectSegchkMsgDetailVo">
+        select from_id, to_id, msg_type, msg_content, msg_title, from_time, get_time, msg_id, msg_flag, provider_id, recv_level from segchk_msg_detail
+    </sql>
+
+    <select id="selectSegchkMsgDetailList" parameterType="SegchkMsgDetail" resultMap="SegchkMsgDetailResult">
+        <include refid="selectSegchkMsgDetailVo"/>
+        <where>  
+            <if test="fromId != null "> and from_id = #{fromId}</if>
+            <if test="toId != null "> and to_id = #{toId}</if>
+            <if test="msgType != null  and msgType != ''"> and msg_type = #{msgType}</if>
+            <if test="msgContent != null  and msgContent != ''"> and msg_content like concat('%', #{msgContent}, '%')</if>
+            <if test="msgTitle != null  and msgTitle != ''"> and msg_title like concat('%', #{msgTitle}, '%')</if>
+            <if test="params.beginFromTime != null and params.beginFromTime != '' and params.endFromTime != null and params.endFromTime != ''"> and from_time between #{params.beginFromTime} and #{params.endFromTime}</if>
+            <if test="params.beginGetTime != null and params.beginGetTime != '' and params.endGetTime != null and params.endGetTime != ''"> and get_time between #{params.beginGetTime} and #{params.endGetTime}</if>
+            <if test="msgFlag != null  and msgFlag != ''"> and msg_flag = #{msgFlag}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="recvLevel != null  and recvLevel != ''"> and recv_level = #{recvLevel}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkMsgDetailByMsgId" parameterType="Long" resultMap="SegchkMsgDetailResult">
+        <include refid="selectSegchkMsgDetailVo"/>
+        where msg_id = #{msgId}
+    </select>
+        
+    <insert id="insertSegchkMsgDetail" parameterType="SegchkMsgDetail" useGeneratedKeys="true" keyProperty="msgId">
+        insert into segchk_msg_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fromId != null">from_id,</if>
+            <if test="toId != null">to_id,</if>
+            <if test="msgType != null and msgType != ''">msg_type,</if>
+            <if test="msgContent != null and msgContent != ''">msg_content,</if>
+            <if test="msgTitle != null and msgTitle != ''">msg_title,</if>
+            <if test="fromTime != null">from_time,</if>
+            <if test="getTime != null">get_time,</if>
+            <if test="msgFlag != null and msgFlag != ''">msg_flag,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="recvLevel != null and recvLevel != ''">recv_level,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fromId != null">#{fromId},</if>
+            <if test="toId != null">#{toId},</if>
+            <if test="msgType != null and msgType != ''">#{msgType},</if>
+            <if test="msgContent != null and msgContent != ''">#{msgContent},</if>
+            <if test="msgTitle != null and msgTitle != ''">#{msgTitle},</if>
+            <if test="fromTime != null">#{fromTime},</if>
+            <if test="getTime != null">#{getTime},</if>
+            <if test="msgFlag != null and msgFlag != ''">#{msgFlag},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="recvLevel != null and recvLevel != ''">#{recvLevel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkMsgDetail" parameterType="SegchkMsgDetail">
+        update segchk_msg_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fromId != null">from_id = #{fromId},</if>
+            <if test="toId != null">to_id = #{toId},</if>
+            <if test="msgType != null and msgType != ''">msg_type = #{msgType},</if>
+            <if test="msgContent != null and msgContent != ''">msg_content = #{msgContent},</if>
+            <if test="msgTitle != null and msgTitle != ''">msg_title = #{msgTitle},</if>
+            <if test="fromTime != null">from_time = #{fromTime},</if>
+            <if test="getTime != null">get_time = #{getTime},</if>
+            <if test="msgFlag != null and msgFlag != ''">msg_flag = #{msgFlag},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="recvLevel != null and recvLevel != ''">recv_level = #{recvLevel},</if>
+        </trim>
+        where msg_id = #{msgId}
+    </update>
+
+    <delete id="deleteSegchkMsgDetailByMsgId" parameterType="Long">
+        delete from segchk_msg_detail where msg_id = #{msgId}
+    </delete>
+
+    <delete id="deleteSegchkMsgDetailByMsgIds" parameterType="String">
+        delete from segchk_msg_detail where msg_id in 
+        <foreach item="msgId" collection="array" open="(" separator="," close=")">
+            #{msgId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkPreferenceLableMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkPreferenceLableMapper.xml
new file mode 100644
index 0000000..4673503
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkPreferenceLableMapper.xml
@@ -0,0 +1,73 @@
+<?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.segchk.mapper.SegchkPreferenceLableMapper">
+    
+    <resultMap type="SegchkPreferenceLable" id="SegchkPreferenceLableResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="preferenceId"    column="preference_id"    />
+        <result property="preferenceName"    column="preference_name"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="preferenceUrl"    column="preference_url"    />
+    </resultMap>
+
+    <sql id="selectSegchkPreferenceLableVo">
+        select provider_id, preference_id, preference_name, mod_time, preference_url from segchk_preference_lable
+    </sql>
+
+    <select id="selectSegchkPreferenceLableList" parameterType="SegchkPreferenceLable" resultMap="SegchkPreferenceLableResult">
+        <include refid="selectSegchkPreferenceLableVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="preferenceId != null "> and preference_id = #{preferenceId}</if>
+            <if test="preferenceName != null  and preferenceName != ''"> and preference_name like concat('%', #{preferenceName}, '%')</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="preferenceUrl != null  and preferenceUrl != ''"> and preference_url = #{preferenceUrl}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkPreferenceLableByPreferenceId" parameterType="Long" resultMap="SegchkPreferenceLableResult">
+        <include refid="selectSegchkPreferenceLableVo"/>
+        where preference_id = #{preferenceId}
+    </select>
+        
+    <insert id="insertSegchkPreferenceLable" parameterType="SegchkPreferenceLable" useGeneratedKeys="true" keyProperty="preferenceId">
+        insert into segchk_preference_lable
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="preferenceName != null and preferenceName != ''">preference_name,</if>
+            mod_time,
+            <if test="preferenceUrl != null and preferenceUrl != ''">preference_url,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="preferenceName != null and preferenceName != ''">#{preferenceName},</if>
+            now(),
+            <if test="preferenceUrl != null and preferenceUrl != ''">#{preferenceUrl},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkPreferenceLable" parameterType="SegchkPreferenceLable">
+        update segchk_preference_lable
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="preferenceName != null and preferenceName != ''">preference_name = #{preferenceName},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="preferenceUrl != null and preferenceUrl != ''">preference_url = #{preferenceUrl},</if>
+        </trim>
+        where
+        preference_id = #{preferenceId}
+    </update>
+
+    <delete id="deleteSegchkPreferenceLableByProviderId" parameterType="Long">
+        delete from segchk_preference_lable where preference_id = #{preferenceId}
+    </delete>
+
+    <delete id="deleteSegchkPreferenceLableByPreferenceIds" parameterType="String">
+        delete from segchk_preference_lable where preference_id in
+        <foreach item="preferenceId" collection="array" open="(" separator="," close=")">
+            #{preferenceId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkProviderMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkProviderMgtMapper.xml
new file mode 100644
index 0000000..2121e3b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkProviderMgtMapper.xml
@@ -0,0 +1,149 @@
+<?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.segchk.mapper.SegchkProviderMgtMapper">
+    
+    <resultMap type="SegchkProviderMgt" id="SegchkProviderMgtResult">
+        <result property="openid"    column="openid"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="wechatId"    column="wechat_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="phoneNo"    column="phone_no"    />
+        <result property="flagId"    column="flag_id"    />
+        <result property="districtId"    column="District_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="delTime"    column="del_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap id="SegchkProviderMgtSegchkLableMgtResult" type="SegchkProviderMgt" extends="SegchkProviderMgtResult">
+        <collection property="segchkLableMgtList" notNullColumn="sub_provider_id" javaType="java.util.List" resultMap="SegchkLableMgtResult" />
+    </resultMap>
+
+    <resultMap type="SegchkLableMgt" id="SegchkLableMgtResult">
+        <result property="providerId"    column="sub_provider_id"    />
+        <result property="cardTypeId"    column="sub_card_type_id"    />
+        <result property="cardTypeName"    column="sub_card_type_name"    />
+        <result property="mgtState"    column="sub_mgt_state"    />
+        <result property="modTime"    column="sub_mod_time"    />
+        <result property="sortId"    column="sub_sort_id"    />
+        <result property="lableFlag"    column="sub_lable_flag"    />
+        <result property="iconUrl"    column="sub_icon_url"    />
+    </resultMap>
+
+    <sql id="selectSegchkProviderMgtVo">
+        select openid, union_id, wechat_id, provider_id, nick_name, icon_url, phone_no, flag_id, District_id, create_time, del_time, update_time from segchk_provider_mgt
+    </sql>
+
+    <select id="selectSegchkProviderMgtList" parameterType="SegchkProviderMgt" resultMap="SegchkProviderMgtResult">
+        <include refid="selectSegchkProviderMgtVo"/>
+        <where>  
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="wechatId != null  and wechatId != ''"> and wechat_id = #{wechatId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="phoneNo != null  and phoneNo != ''"> and phone_no = #{phoneNo}</if>
+            <if test="flagId != null "> and flag_id = #{flagId}</if>
+            <if test="districtId != null "> and District_id = #{districtId}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="params.beginDelTime != null and params.beginDelTime != '' and params.endDelTime != null and params.endDelTime != ''"> and del_time between #{params.beginDelTime} and #{params.endDelTime}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkProviderMgtByProviderId" parameterType="Long" resultMap="SegchkProviderMgtSegchkLableMgtResult">
+        select a.openid, a.union_id, a.provider_id, a.nick_name, a.icon_url, a.phone_no, a.flag_id, a.District_id, a.create_time, a.del_time, a.update_time,
+            b.provider_id as sub_provider_id, b.card_type_id as sub_card_type_id, b.card_type_name as sub_card_type_name, b.mgt_state as sub_mgt_state, b.mod_time as sub_mod_time, b.sort_id as sub_sort_id, b.lable_flag as sub_lable_flag, b.icon_url as sub_icon_url
+        from segchk_provider_mgt a
+        left join segchk_lable_mgt b on b.provider_id = a.provider_id
+        where a.provider_id = #{providerId}
+    </select>
+    <select id="getCustomService" resultType="java.util.HashMap">
+        select wechat_id as wechatId, phone_no as phoneNo from segchk_provider_mgt where provider_id = #{providerId}
+    </select>
+    <select id="getProviderIdByPhoneNo" parameterType="string" resultType="java.lang.Long">
+        select provider_id from segchk_provider_mgt where phone_no = #{phoneNo}
+    </select>
+
+    <insert id="insertSegchkProviderMgt" parameterType="SegchkProviderMgt" useGeneratedKeys="true" keyProperty="providerId">
+        insert into segchk_provider_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openid != null and openid != ''">openid,</if>
+            <if test="unionId != null and unionId != ''">union_id,</if>
+            <if test="wechatId != null and wechatId != ''">wechat_id,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="phoneNo != null and phoneNo != ''">phone_no,</if>
+            <if test="flagId != null">flag_id,</if>
+            <if test="districtId != null">District_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="delTime != null">del_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openid != null and openid != ''">#{openid},</if>
+            <if test="unionId != null and unionId != ''">#{unionId},</if>
+            <if test="wechatId != null and wechatId != ''">#{wechatId},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="phoneNo != null and phoneNo != ''">#{phoneNo},</if>
+            <if test="flagId != null">#{flagId},</if>
+            <if test="districtId != null">#{districtId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkProviderMgt" parameterType="SegchkProviderMgt">
+        update segchk_provider_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openid != null and openid != ''">openid = #{openid},</if>
+            <if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
+            <if test="wechatId != null and wechatId != ''">wechat_id = #{wechatId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="phoneNo != null and phoneNo != ''">phone_no = #{phoneNo},</if>
+            <if test="flagId != null">flag_id = #{flagId},</if>
+            <if test="districtId != null">District_id = #{districtId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where provider_id = #{providerId}
+    </update>
+
+    <delete id="deleteSegchkProviderMgtByProviderId" parameterType="Long">
+        delete from segchk_provider_mgt where provider_id = #{providerId}
+    </delete>
+
+    <delete id="deleteSegchkProviderMgtByProviderIds" parameterType="String">
+        delete from segchk_provider_mgt where provider_id in 
+        <foreach item="providerId" collection="array" open="(" separator="," close=")">
+            #{providerId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteSegchkLableMgtByProviderIds" parameterType="String">
+        delete from segchk_lable_mgt where provider_id in 
+        <foreach item="providerId" collection="array" open="(" separator="," close=")">
+            #{providerId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkLableMgtByProviderId" parameterType="Long">
+        delete from segchk_lable_mgt where provider_id = #{providerId}
+    </delete>
+
+    <insert id="batchSegchkLableMgt">
+        insert into segchk_lable_mgt( provider_id, card_type_id, card_type_name, mgt_state, mod_time, sort_id, lable_flag, icon_url) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.providerId}, #{item.cardTypeId}, #{item.cardTypeName}, #{item.mgtState}, #{item.modTime}, #{item.sortId}, #{item.lableFlag}, #{item.iconUrl})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderIndexMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderIndexMapper.xml
new file mode 100644
index 0000000..83375de
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderIndexMapper.xml
@@ -0,0 +1,78 @@
+<?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.segchk.mapper.SegchkRecommenderIndexMapper">
+    
+    <resultMap type="SegchkRecommenderStore" id="SegchkRecommenderStoreResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="recommenderId"    column="recommender_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkRecommenderStoreVo">
+        select provider_id, store_id, mgt_state, mod_time, sort_id, recommender_id from segchk_recommender_store
+    </sql>
+
+    <select id="selectSegchkRecommenderStoreList" parameterType="SegchkRecommenderStore" resultMap="SegchkRecommenderStoreResult">
+        <include refid="selectSegchkRecommenderStoreVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="modTime != null "> and mod_time = #{modTime}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="recommenderId != null "> and recommender_id = #{recommenderId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkRecommenderStoreById" parameterType="Long" resultMap="SegchkRecommenderStoreResult">
+        <include refid="selectSegchkRecommenderStoreVo"/>
+        where recommender_id = #{recommenderId}
+    </select>
+        
+    <insert id="insertSegchkRecommenderStore" parameterType="SegchkRecommenderStore" useGeneratedKeys="true" keyProperty="recommenderId">
+        insert into segchk_recommender_store
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="mgtState != null">mgt_state,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="sortId != null">sort_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="sortId != null">#{sortId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkRecommenderStore" parameterType="SegchkRecommenderStore">
+        update segchk_recommender_store
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="sortId != null">sort_id = #{sortId},</if>
+        </trim>
+        where recommender_id = #{recommenderId}
+    </update>
+
+    <delete id="deleteSegchkRecommenderStoreById" parameterType="Long">
+        delete from segchk_recommender_store where recommender_id = #{recommenderId}
+    </delete>
+
+    <delete id="deleteSegchkRecommenderStoreByIds" parameterType="String">
+        delete from segchk_recommender_store where recommender_id in 
+        <foreach item="recommenderId" collection="array" open="(" separator="," close=")">
+            #{recommenderId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderStoreMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderStoreMapper.xml
new file mode 100644
index 0000000..b382074
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkRecommenderStoreMapper.xml
@@ -0,0 +1,83 @@
+<?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.segchk.mapper.SegchkRecommenderStoreMapper">
+    
+    <resultMap type="SegchkRecommenderStore" id="SegchkRecommenderStoreResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="recommenderId"    column="recommender_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkRecommenderStoreVo">
+        select provider_id, store_id, mgt_state, mod_time, sort_id, recommender_id from segchk_recommender_store
+    </sql>
+
+    <select id="selectSegchkRecommenderStoreList" parameterType="SegchkRecommenderStore" resultMap="SegchkRecommenderStoreResult">
+        <include refid="selectSegchkRecommenderStoreVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="recommenderId != null "> and recommender_id = #{recommenderId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkRecommenderStoreByRecommenderId" parameterType="Long" resultMap="SegchkRecommenderStoreResult">
+        <include refid="selectSegchkRecommenderStoreVo"/>
+        where recommender_id = #{recommenderId}
+    </select>
+        
+    <insert id="insertSegchkRecommenderStore" parameterType="SegchkRecommenderStore" useGeneratedKeys="true" keyProperty="recommenderId">
+        insert into segchk_recommender_store
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="mgtState != null">mgt_state,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="sortId != null">sort_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="sortId != null">#{sortId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkRecommenderStore" parameterType="SegchkRecommenderStore">
+        update segchk_recommender_store
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="sortId != null">sort_id = #{sortId},</if>
+        </trim>
+        where recommender_id = #{recommenderId}
+    </update>
+
+    <delete id="deleteSegchkRecommenderStoreByRecommenderId" parameterType="Long">
+        delete from segchk_recommender_store where recommender_id = #{recommenderId}
+    </delete>
+
+    <delete id="deleteSegchkRecommenderStoreByRecommenderIds" parameterType="String">
+        delete from segchk_recommender_store where recommender_id in 
+        <foreach item="recommenderId" collection="array" open="(" separator="," close=")">
+            #{recommenderId}
+        </foreach>
+    </delete>
+    <delete id="deleteSegchkRecommenderStoreByStoreIds" parameterType="String">
+        delete from segchk_recommender_store where store_id in
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkSalerInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSalerInfoMapper.xml
new file mode 100644
index 0000000..af936fd
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSalerInfoMapper.xml
@@ -0,0 +1,82 @@
+<?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.segchk.mapper.SegchkSalerInfoMapper">
+    
+    <resultMap type="SegchkSalerInfo" id="SegchkSalerInfoResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="salerId"    column="saler_id"    />
+        <result property="salerName"    column="saler_name"    />
+        <result property="salerPhone"    column="saler_phone"    />
+        <result property="salerCard"    column="saler_card"    />
+        <result property="salerState"    column="saler_state"    />
+    </resultMap>
+
+    <sql id="selectSegchkSalerInfoVo">
+        select provider_id, mod_time, saler_id, saler_name, saler_phone, saler_card, saler_state from segchk_saler_info
+    </sql>
+
+    <select id="selectSegchkSalerInfoList" parameterType="SegchkSalerInfo" resultMap="SegchkSalerInfoResult">
+        <include refid="selectSegchkSalerInfoVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="salerId != null "> and saler_id = #{salerId}</if>
+            <if test="salerName != null  and salerName != ''"> and saler_name like concat('%', #{salerName}, '%')</if>
+            <if test="salerPhone != null  and salerPhone != ''"> and saler_phone = #{salerPhone}</if>
+            <if test="salerCard != null  and salerCard != ''"> and saler_card = #{salerCard}</if>
+            <if test="salerState != null "> and saler_state = #{salerState}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkSalerInfoBySalerId" parameterType="Integer" resultMap="SegchkSalerInfoResult">
+        <include refid="selectSegchkSalerInfoVo"/>
+        where saler_id = #{salerId}
+    </select>
+        
+    <insert id="insertSegchkSalerInfo" parameterType="SegchkSalerInfo" useGeneratedKeys="true" keyProperty="salerId">
+        insert into segchk_saler_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="salerName != null and salerName != ''">saler_name,</if>
+            <if test="salerPhone != null and salerPhone != ''">saler_phone,</if>
+            <if test="salerCard != null and salerCard != ''">saler_card,</if>
+            <if test="salerState != null">saler_state,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="salerName != null and salerName != ''">#{salerName},</if>
+            <if test="salerPhone != null and salerPhone != ''">#{salerPhone},</if>
+            <if test="salerCard != null and salerCard != ''">#{salerCard},</if>
+            <if test="salerState != null">#{salerState},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkSalerInfo" parameterType="SegchkSalerInfo">
+        update segchk_saler_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="salerName != null and salerName != ''">saler_name = #{salerName},</if>
+            <if test="salerPhone != null and salerPhone != ''">saler_phone = #{salerPhone},</if>
+            <if test="salerCard != null and salerCard != ''">saler_card = #{salerCard},</if>
+            <if test="salerState != null">saler_state = #{salerState},</if>
+        </trim>
+        where saler_id = #{salerId}
+    </update>
+
+    <delete id="deleteSegchkSalerInfoBySalerId" parameterType="Integer">
+        delete from segchk_saler_info where saler_id = #{salerId}
+    </delete>
+
+    <delete id="deleteSegchkSalerInfoBySalerIds" parameterType="String">
+        delete from segchk_saler_info where saler_id in 
+        <foreach item="salerId" collection="array" open="(" separator="," close=")">
+            #{salerId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkSelfServiceChkMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSelfServiceChkMapper.xml
new file mode 100644
index 0000000..b2a37f0
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSelfServiceChkMapper.xml
@@ -0,0 +1,77 @@
+<?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.segchk.mapper.SegchkSelfServiceChkMapper">
+    
+    <resultMap type="SegchkSelfServiceChk" id="SegchkSelfServiceChkResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="chkServiceId"    column="chk_service_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkSelfServiceChkVo">
+        select provider_id, card_id, store_id, user_id, mod_time, chk_service_id from segchk_self_service_chk
+    </sql>
+
+    <select id="selectSegchkSelfServiceChkList" parameterType="SegchkSelfServiceChk" resultMap="SegchkSelfServiceChkResult">
+        <include refid="selectSegchkSelfServiceChkVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="chkServiceId != null "> and chk_service_id = #{chkServiceId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkSelfServiceChkByChkServiceId" parameterType="Long" resultMap="SegchkSelfServiceChkResult">
+        <include refid="selectSegchkSelfServiceChkVo"/>
+        where chk_service_id = #{chkServiceId}
+    </select>
+        
+    <insert id="insertSegchkSelfServiceChk" parameterType="SegchkSelfServiceChk" useGeneratedKeys="true" keyProperty="chkServiceId">
+        insert into segchk_self_service_chk
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="modTime != null">mod_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="modTime != null">#{modTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkSelfServiceChk" parameterType="SegchkSelfServiceChk">
+        update segchk_self_service_chk
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where chk_service_id = #{chkServiceId}
+    </update>
+
+    <delete id="deleteSegchkSelfServiceChkByChkServiceId" parameterType="Long">
+        delete from segchk_self_service_chk where chk_service_id = #{chkServiceId}
+    </delete>
+
+    <delete id="deleteSegchkSelfServiceChkByChkServiceIds" parameterType="String">
+        delete from segchk_self_service_chk where chk_service_id in 
+        <foreach item="chkServiceId" collection="array" open="(" separator="," close=")">
+            #{chkServiceId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceChkMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceChkMapper.xml
new file mode 100644
index 0000000..2232753
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceChkMapper.xml
@@ -0,0 +1,93 @@
+<?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.segchk.mapper.SegchkServiceChkMapper">
+    
+    <resultMap type="SegchkServiceChk" id="SegchkServiceChkResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="chkServiceId"    column="chk_service_id"    />
+        <result property="commentId"    column="comment_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkServiceChkVo">
+        select provider_id, card_id, store_id, card_type_id, user_id, mod_time, chk_service_id, comment_id from segchk_service_chk
+    </sql>
+
+    <select id="selectSegchkServiceChkList" parameterType="SegchkServiceChk" resultMap="SegchkServiceChkResult">
+        <include refid="selectSegchkServiceChkVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="chkServiceId != null "> and chk_service_id = #{chkServiceId}</if>
+            <if test="commentId != null "> and comment_id = #{commentId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkServiceChkByChkServiceId" parameterType="Long" resultMap="SegchkServiceChkResult">
+        <include refid="selectSegchkServiceChkVo"/>
+        where chk_service_id = #{chkServiceId}
+    </select>
+        
+    <insert id="insertSegchkServiceChk" parameterType="SegchkServiceChk" useGeneratedKeys="true" keyProperty="chkServiceId">
+        insert into segchk_service_chk
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="userId != null">user_id,</if>
+            mod_time,
+            <if test="commentId != null">comment_id,</if>
+            card_type_id,
+         </trim>
+        select base.*, card.card_type_id from
+        (
+            select
+            <trim suffixOverrides=",">
+                <if test="providerId != null">#{providerId} as provider_id,</if>
+                <if test="cardId != null">#{cardId} as card_id,</if>
+                <if test="storeId != null">#{storeId} as store_id,</if>
+                <if test="userId != null">#{userId} as user_id,</if>
+                now() as mod_time,
+                <if test="commentId != null">#{commentId} as comment_id,</if>
+            </trim>
+        ) base
+        left join
+        (select card_type_id, provider_id, user_id, card_id from segchk_user_vip where card_id = #{cardId} and user_id = #{userId}) card on base.card_id = card.card_id
+
+    </insert>
+
+    <update id="updateSegchkServiceChk" parameterType="SegchkServiceChk">
+        update segchk_service_chk
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="commentId != null">comment_id = #{commentId},</if>
+        </trim>
+        where chk_service_id = #{chkServiceId}
+    </update>
+
+    <delete id="deleteSegchkServiceChkByChkServiceId" parameterType="Long">
+        delete from segchk_service_chk where chk_service_id = #{chkServiceId}
+    </delete>
+
+    <delete id="deleteSegchkServiceChkByChkServiceIds" parameterType="String">
+        delete from segchk_service_chk where chk_service_id in 
+        <foreach item="chkServiceId" collection="array" open="(" separator="," close=")">
+            #{chkServiceId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceCommentMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceCommentMapper.xml
new file mode 100644
index 0000000..99205a3
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkServiceCommentMapper.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.segchk.mapper.SegchkServiceCommentMapper">
+    
+    <resultMap type="SegchkServiceComment" id="SegchkServiceCommentResult">
+        <result property="commentId"    column="comment_id"    />
+        <result property="starLevel"    column="star_level"    />
+        <result property="contentText"    column="content_text"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkServiceCommentVo">
+        select comment_id, star_level, content_text, mod_time, provider_id, store_id from segchk_service_comment
+    </sql>
+
+    <select id="selectSegchkServiceCommentList" parameterType="SegchkServiceComment" resultMap="SegchkServiceCommentResult">
+        <include refid="selectSegchkServiceCommentVo"/>
+        <where>  
+            <if test="commentId != null "> and comment_id = #{commentId}</if>
+            <if test="starLevel != null "> and star_level = #{starLevel}</if>
+            <if test="contentText != null  and contentText != ''"> and content_text = #{contentText}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkServiceCommentByCommentId" parameterType="Long" resultMap="SegchkServiceCommentResult">
+        <include refid="selectSegchkServiceCommentVo"/>
+        where comment_id = #{commentId}
+    </select>
+        
+    <insert id="insertSegchkServiceComment" parameterType="SegchkServiceComment" useGeneratedKeys="true" keyProperty="commentId">
+        insert into segchk_service_comment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="starLevel != null">star_level,</if>
+            <if test="contentText != null and contentText != ''">content_text,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="starLevel != null">#{starLevel},</if>
+            <if test="contentText != null and contentText != ''">#{contentText},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkServiceComment" parameterType="SegchkServiceComment">
+        update segchk_service_comment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="starLevel != null">star_level = #{starLevel},</if>
+            <if test="contentText != null and contentText != ''">content_text = #{contentText},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+        </trim>
+        where comment_id = #{commentId}
+    </update>
+
+    <delete id="deleteSegchkServiceCommentByCommentId" parameterType="Long">
+        delete from segchk_service_comment where comment_id = #{commentId}
+    </delete>
+
+    <delete id="deleteSegchkServiceCommentByCommentIds" parameterType="String">
+        delete from segchk_service_comment where comment_id in 
+        <foreach item="commentId" collection="array" open="(" separator="," close=")">
+            #{commentId}
+        </foreach>
+    </delete>
+
+    <insert id="insertSegchkServiceCommentByChk" parameterType="SegchkServiceCommentUserReq" useGeneratedKeys="true" keyProperty="commentId">
+        insert into segchk_service_comment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            star_level,
+            content_text,
+            mod_time,
+            provider_id,
+            store_id,
+        </trim>
+        select #{starLevel} as star_level
+        , #{contentText} as content_text
+        <choose>
+            <when test="modTime != null">, #{modTime} as mod_time</when>
+            <otherwise>, now() as mod_time</otherwise>
+        </choose>
+        , provider_id
+        , store_id
+        from segchk_service_chk where chk_service_id = #{chkServiceId}
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkSmsDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSmsDetailMapper.xml
new file mode 100644
index 0000000..e7bdd0a
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSmsDetailMapper.xml
@@ -0,0 +1,77 @@
+<?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.segchk.mapper.SegchkSmsDetailMapper">
+    
+    <resultMap type="SegchkSmsDetail" id="SegchkSmsDetailResult">
+        <result property="phoneNo"    column="phone_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="validateCode"    column="validate_code"    />
+        <result property="flag"    column="flag"    />
+        <result property="shortMsgId"    column="short_msg_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkSmsDetailVo">
+        select phone_no, create_time, validate_code, flag, short_msg_id, provider_id from segchk_sms_detail
+    </sql>
+
+    <select id="selectSegchkSmsDetailList" parameterType="SegchkSmsDetail" resultMap="SegchkSmsDetailResult">
+        <include refid="selectSegchkSmsDetailVo"/>
+        <where>  
+            <if test="phoneNo != null  and phoneNo != ''"> and phone_no = #{phoneNo}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="validateCode != null  and validateCode != ''"> and validate_code = #{validateCode}</if>
+            <if test="flag != null  and flag != ''"> and flag = #{flag}</if>
+            <if test="shortMsgId != null "> and short_msg_id = #{shortMsgId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkSmsDetailByShortMsgId" parameterType="Long" resultMap="SegchkSmsDetailResult">
+        <include refid="selectSegchkSmsDetailVo"/>
+        where short_msg_id = #{shortMsgId}
+    </select>
+        
+    <insert id="insertSegchkSmsDetail" parameterType="SegchkSmsDetail" useGeneratedKeys="true" keyProperty="shortMsgId">
+        insert into segchk_sms_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">phone_no,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="validateCode != null and validateCode != ''">validate_code,</if>
+            <if test="flag != null and flag != ''">flag,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">#{phoneNo},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="validateCode != null and validateCode != ''">#{validateCode},</if>
+            <if test="flag != null and flag != ''">#{flag},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkSmsDetail" parameterType="SegchkSmsDetail">
+        update segchk_sms_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">phone_no = #{phoneNo},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="validateCode != null and validateCode != ''">validate_code = #{validateCode},</if>
+            <if test="flag != null and flag != ''">flag = #{flag},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where short_msg_id = #{shortMsgId}
+    </update>
+
+    <delete id="deleteSegchkSmsDetailByShortMsgId" parameterType="Long">
+        delete from segchk_sms_detail where short_msg_id = #{shortMsgId}
+    </delete>
+
+    <delete id="deleteSegchkSmsDetailByShortMsgIds" parameterType="String">
+        delete from segchk_sms_detail where short_msg_id in 
+        <foreach item="shortMsgId" collection="array" open="(" separator="," close=")">
+            #{shortMsgId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreAccountMapper.xml
new file mode 100644
index 0000000..8726ec8
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreAccountMapper.xml
@@ -0,0 +1,98 @@
+<?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.segchk.mapper.SegchkStoreAccountMapper">
+    
+    <resultMap type="SegchkStoreAccount" id="SegchkStoreAccountResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="account"    column="account"    />
+        <result property="accountType"    column="account_type"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="cashId"    column="cash_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreAccountVo">
+        select store_id, account, account_type, account_id, reward_id, charge_id, cash_id, mod_time, provider_id from segchk_store_account
+    </sql>
+
+    <select id="selectSegchkStoreAccountList" parameterType="SegchkStoreAccount" resultMap="SegchkStoreAccountResult">
+        <include refid="selectSegchkStoreAccountVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginAccount != null and params.beginAccount != '' and params.endAccount != null and params.endAccount != ''"> and account between #{params.beginAccount} and #{params.endAccount}</if>
+            <if test="accountType != null  and accountType != ''"> and account_type = #{accountType}</if>
+            <if test="accountId != null "> and account_id = #{accountId}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreAccountByAccountId" parameterType="Long" resultMap="SegchkStoreAccountResult">
+        <include refid="selectSegchkStoreAccountVo"/>
+        where account_id = #{accountId}
+    </select>
+        
+    <insert id="insertSegchkStoreAccount" parameterType="SegchkStoreAccount" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_store_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="account != null">account,</if>
+            <if test="accountType != null">account_type,</if>
+            <if test="rewardId != null">reward_id,</if>
+            <if test="chargeId != null">charge_id,</if>
+            <if test="cashId != null">cash_id,</if>
+            mod_time,
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="account != null">#{account},</if>
+            <if test="accountType != null">#{accountType},</if>
+            <if test="rewardId != null">#{rewardId},</if>
+            <if test="chargeId != null">#{chargeId},</if>
+            <if test="cashId != null">#{cashId},</if>
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreAccount" parameterType="SegchkStoreAccount">
+        update segchk_store_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="accountType != null">account_type = #{accountType},</if>
+            <if test="rewardId != null">reward_id = #{rewardId},</if>
+            <if test="chargeId != null">charge_id = #{chargeId},</if>
+            <if test="cashId != null">cash_id = #{cashId},</if>
+            <choose>
+                <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where account_id = #{accountId}
+    </update>
+
+    <delete id="deleteSegchkStoreAccountByAccountId" parameterType="Long">
+        delete from segchk_store_account where account_id = #{accountId}
+    </delete>
+
+    <delete id="deleteSegchkStoreAccountByAccountIds" parameterType="String">
+        delete from segchk_store_account where account_id in 
+        <foreach item="accountId" collection="array" open="(" separator="," close=")">
+            #{accountId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreBasicInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreBasicInfoMapper.xml
new file mode 100644
index 0000000..2f6e27f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreBasicInfoMapper.xml
@@ -0,0 +1,379 @@
+<?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.segchk.mapper.SegchkStoreBasicInfoMapper">
+    
+    <resultMap type="SegchkStoreBasicInfo" id="SegchkStoreBasicInfoResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="storeName"    column="store_name"    />
+        <result property="storePhone"    column="store_phone"    />
+        <result property="openid"    column="openid"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="serviceState"    column="service_state"    />
+        <result property="salerId"    column="saler_id"    />
+        <result property="effectiveDate"    column="effective_date"    />
+        <result property="storeCorporation"    column="store_corporation"    />
+        <result property="storeAddr"    column="store_addr"    />
+        <result property="storeCard"    column="store_card"    />
+        <result property="withMsg"    column="with_msg"    />
+        <result property="cashThreshold"    column="cash_threshold"    />
+        <result property="cashDay"    column="cash_day"    />
+        <result property="serviceDownThreshold"    column="service_down_threshold"    />
+        <result property="stateFlag"    column="state_flag"    />
+        <result property="storeLon"    column="store_lon"    />
+        <result property="storeLat"    column="store_lat"    />
+        <result property="onService"    column="on_service"    />
+        <result property="detail"    column="detail"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <resultMap id="SegchkStoreBasicInfoSegchkStoreImageResult" type="SegchkStoreBasicInfo" extends="SegchkStoreBasicInfoResult">
+        <collection property="segchkStoreImageList" notNullColumn="sub_store_id" javaType="java.util.List" resultMap="SegchkStoreImageResult" />
+        <collection property="segchkStoreChkMgtList" notNullColumn="sub_store_id1" javaType="java.util.List" resultMap="SegchkStoreChkMgtResult" />
+        <collection property="segchkStoreLableMgtList" notNullColumn="sub_store_id2" javaType="java.util.List" resultMap="SegchkStoreLableMgtResult" />
+        <collection property="segchkStoreSecurityList" notNullColumn="sub_store_id3" javaType="java.util.List" resultMap="SegchkStoreSecurityResult" />
+    </resultMap>
+
+    <resultMap type="SegchkStoreImage" id="SegchkStoreImageResult">
+        <result property="providerId"    column="sub_provider_id"    />
+        <result property="storeId"    column="sub_store_id"    />
+        <result property="storeCertificate1"    column="sub_store_certificate1"    />
+        <result property="storeCertificate2"    column="sub_store_certificate2"    />
+        <result property="storeIcon"    column="sub_store_icon"    />
+        <result property="storeGificon"    column="sub_store_gificon"    />
+        <result property="storeCarousel1"    column="sub_store_carousel1"    />
+        <result property="storeCarousel2"    column="sub_store_carousel2"    />
+        <result property="storeCarousel3"    column="sub_store_carousel3"    />
+        <result property="storeCarousel4"    column="sub_store_carousel4"    />
+        <result property="storeCarousel5"    column="sub_store_carousel5"    />
+        <result property="storeCarousel6"    column="sub_store_carousel6"    />
+        <result property="storeEnv1"    column="sub_store_env1"    />
+        <result property="storeEnv2"    column="sub_store_env2"    />
+        <result property="storeEnv3"    column="sub_store_env3"    />
+        <result property="storeEnv4"    column="sub_store_env4"    />
+        <result property="modTime"    column="sub_mod_time"    />
+    </resultMap>
+
+    <resultMap type="SegchkStoreChkMgt" id="SegchkStoreChkMgtResult">
+        <result property="providerId"    column="sub_provider_id1"    />
+        <result property="storeId"    column="sub_store_id1"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="chkCount"    column="chk_count"    />
+        <result property="saleCount"    column="sale_count"    />
+        <result property="cardCommission"    column="card_commission"    />
+        <result property="salerCommission"    column="saler_commission"    />
+        <result property="mgtId"    column="mgt_id"    />
+    </resultMap>
+
+    <resultMap type="SegchkStoreLableMgt" id="SegchkStoreLableMgtResult">
+        <result property="storeId"    column="sub_store_id2"    />
+        <result property="providerId"    column="sub_provider_id2"    />
+        <result property="lableId"    column="lable_id"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="typeId"    column="type_id"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="modTime"    column="mod_time1"    />
+        <result property="mgtId"    column="mgt_id1"    />
+    </resultMap>
+
+    <resultMap type="SegchkStoreSecurity" id="SegchkStoreSecurityResult">
+        <result property="storeId"    column="sub_store_id3"    />
+        <result property="passwd"    column="passwd"    />
+        <result property="modTime"    column="mod_time2"    />
+        <result property="pwdId"    column="pwd_id"    />
+        <result property="providerId"    column="sub_provider_id3"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreBasicInfoVo">
+        select provider_id, store_id, store_name, store_phone, openid, union_id, nick_name, icon_url, service_state, saler_id, effective_date, store_corporation, store_addr, store_card, with_msg, cash_threshold, cash_day, service_down_threshold, state_flag, store_lon, store_lat, on_service, detail, mod_time from segchk_store_basic_info
+    </sql>
+
+    <select id="selectSegchkStoreBasicInfoList" parameterType="SegchkStoreBasicInfo" resultMap="SegchkStoreBasicInfoResult">
+        <include refid="selectSegchkStoreBasicInfoVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeName != null  and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
+            <if test="storePhone != null  and storePhone != ''"> and store_phone = #{storePhone}</if>
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="serviceState != null  and serviceState != ''"> and service_state = #{serviceState}</if>
+            <if test="salerId != null "> and saler_id = #{salerId}</if>
+            <if test="params.beginEffectiveDate != null and params.beginEffectiveDate != '' and params.endEffectiveDate != null and params.endEffectiveDate != ''"> and effective_date between #{params.beginEffectiveDate} and #{params.endEffectiveDate}</if>
+            <if test="storeCorporation != null  and storeCorporation != ''"> and store_corporation = #{storeCorporation}</if>
+            <if test="storeAddr != null  and storeAddr != ''"> and store_addr = #{storeAddr}</if>
+            <if test="storeCard != null  and storeCard != ''"> and store_card = #{storeCard}</if>
+            <if test="withMsg != null  and withMsg != ''"> and with_msg = #{withMsg}</if>
+            <if test="params.beginCashThreshold != null and params.beginCashThreshold != '' and params.endCashThreshold != null and params.endCashThreshold != ''"> and cash_threshold between #{params.beginCashThreshold} and #{params.endCashThreshold}</if>
+            <if test="cashDay != null "> and cash_day = #{cashDay}</if>
+            <if test="serviceDownThreshold != null "> and service_down_threshold = #{serviceDownThreshold}</if>
+            <if test="stateFlag != null  and stateFlag != ''"> and state_flag = #{stateFlag}</if>
+            <if test="storeLon != null "> and store_lon = #{storeLon}</if>
+            <if test="storeLat != null "> and store_lat = #{storeLat}</if>
+            <if test="onService != null  and onService != ''"> and on_service = #{onService}</if>
+            <if test="detail != null  and detail != ''"> and detail like concat('%', #{detail}, '%')</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreBasicInfoByStoreId" parameterType="Long" resultMap="SegchkStoreBasicInfoSegchkStoreImageResult">
+        select a.provider_id, a.store_id, a.store_name, a.store_phone, a.openid, a.union_id, a.nick_name, a.icon_url, a.service_state, a.saler_id, a.effective_date, a.store_corporation, a.store_addr, a.store_card, a.with_msg, a.cash_threshold, a.cash_day, a.service_down_threshold, a.state_flag, a.store_lon, a.store_lat, a.on_service, a.detail, a.mod_time,
+            b.provider_id as sub_provider_id, b.store_id as sub_store_id, b.store_certificate1 as sub_store_certificate1, b.store_certificate2 as sub_store_certificate2, b.store_icon as sub_store_icon, b.store_gificon as sub_store_gificon, b.store_carousel1 as sub_store_carousel1, b.store_carousel2 as sub_store_carousel2, b.store_carousel3 as sub_store_carousel3, b.store_carousel4 as sub_store_carousel4, b.store_carousel5 as sub_store_carousel5, b.store_carousel6 as sub_store_carousel6, b.store_env1 as sub_store_env1, b.store_env2 as sub_store_env2, b.store_env3 as sub_store_env3, b.store_env4 as sub_store_env4, b.mod_time as sub_mod_time
+        , c.provider_id as sub_provider_id1
+        , c.store_id as sub_store_id1
+        , c.card_type_id as card_type_id
+        , c.chk_count as chk_count
+        , c.sale_count as sale_count
+        , c.card_commission as card_commission
+        , c.saler_commission as saler_commission
+        , c.mgt_id as mgt_id
+        , d.store_id as sub_store_id2
+        , d.provider_id as sub_provider_id2
+        , d.lable_id as lable_id
+        , d.sort_id as sort_id
+        , d.type_id as type_id
+        , d.mgt_state as mgt_state
+        , d.mod_time as mod_time1
+        , d.mgt_id as mgt_id1
+        , e.store_id as sub_store_id3
+        , e.passwd as passwd
+        , e.mod_time as mod_time2
+        , e.pwd_id as pwd_id
+        , e.provider_id as sub_provider_id3
+        from segchk_store_basic_info a
+        left join (select * from segchk_store_image where store_id = #{storeId}) b on b.store_id = a.store_id
+        left join (select * from segchk_store_chk_mgt where store_id = #{storeId}) c on c.store_id = a.store_id
+        left join (select * from segchk_store_lable_mgt where store_id = #{storeId}) d on d.store_id = a.store_id
+        left join (select * from segchk_store_security where store_id = #{storeId}) e on e.store_id = a.store_id
+
+        where a.store_id = #{storeId}
+    </select>
+    <select id="selectStoreIdByPhone" resultType="java.lang.Long">
+        select store_id from segchk_store_basic_info where store_phone = #{storePhone}
+    </select>
+
+    <insert id="insertSegchkStoreBasicInfo" parameterType="SegchkStoreBasicInfo" useGeneratedKeys="true" keyProperty="storeId">
+        insert into segchk_store_basic_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeName != null and storeName != ''">store_name,</if>
+            <if test="storePhone != null and storePhone != ''">store_phone,</if>
+            <if test="openid != null">openid,</if>
+            <if test="unionId != null">union_id,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="serviceState != null and serviceState != ''">service_state,</if>
+            <if test="salerId != null">saler_id,</if>
+            <if test="effectiveDate != null">effective_date,</if>
+            <if test="storeCorporation != null">store_corporation,</if>
+            <if test="storeAddr != null">store_addr,</if>
+            <if test="storeCard != null">store_card,</if>
+            <if test="withMsg != null and withMsg != ''">with_msg,</if>
+            <if test="cashThreshold != null">cash_threshold,</if>
+            <if test="cashDay != null">cash_day,</if>
+            <if test="serviceDownThreshold != null">service_down_threshold,</if>
+            <if test="stateFlag != null and stateFlag != ''">state_flag,</if>
+            <if test="storeLon != null">store_lon,</if>
+            <if test="storeLat != null">store_lat,</if>
+            <if test="onService != null and onService != ''">on_service,</if>
+            <if test="detail != null and detail != ''">detail,</if>
+            <if test="modTime != null">mod_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeName != null and storeName != ''">#{storeName},</if>
+            <if test="storePhone != null and storePhone != ''">#{storePhone},</if>
+            <if test="openid != null">#{openid},</if>
+            <if test="unionId != null">#{union_id},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="serviceState != null and serviceState != ''">#{serviceState},</if>
+            <if test="salerId != null">#{salerId},</if>
+            <if test="effectiveDate != null">#{effectiveDate},</if>
+            <if test="storeCorporation != null">#{storeCorporation},</if>
+            <if test="storeAddr != null">#{storeAddr},</if>
+            <if test="storeCard != null">#{storeCard},</if>
+            <if test="withMsg != null and withMsg != ''">#{withMsg},</if>
+            <if test="cashThreshold != null">#{cashThreshold},</if>
+            <if test="cashDay != null">#{cashDay},</if>
+            <if test="serviceDownThreshold != null">#{serviceDownThreshold},</if>
+            <if test="stateFlag != null and stateFlag != ''">#{stateFlag},</if>
+            <if test="storeLon != null">#{storeLon},</if>
+            <if test="storeLat != null">#{storeLat},</if>
+            <if test="onService != null and onService != ''">#{onService},</if>
+            <if test="detail != null and detail != ''">#{detail},</if>
+            <if test="modTime != null">#{modTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreBasicInfo" parameterType="SegchkStoreBasicInfo">
+        update segchk_store_basic_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeName != null and storeName != ''">store_name = #{storeName},</if>
+            <if test="storePhone != null and storePhone != ''">store_phone = #{storePhone},</if>
+            <if test="openid != null">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="serviceState != null and serviceState != ''">service_state = #{serviceState},</if>
+            <if test="salerId != null">saler_id = #{salerId},</if>
+            <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
+            <if test="storeCorporation != null">store_corporation = #{storeCorporation},</if>
+            <if test="storeAddr != null">store_addr = #{storeAddr},</if>
+            <if test="storeCard != null">store_card = #{storeCard},</if>
+            <if test="withMsg != null and withMsg != ''">with_msg = #{withMsg},</if>
+            <if test="cashThreshold != null">cash_threshold = #{cashThreshold},</if>
+            <if test="cashDay != null">cash_day = #{cashDay},</if>
+            <if test="serviceDownThreshold != null">service_down_threshold = #{serviceDownThreshold},</if>
+            <if test="stateFlag != null and stateFlag != ''">state_flag = #{stateFlag},</if>
+            <if test="storeLon != null">store_lon = #{storeLon},</if>
+            <if test="storeLat != null">store_lat = #{storeLat},</if>
+            <if test="onService != null and onService != ''">on_service = #{onService},</if>
+            <if test="detail != null and detail != ''">detail = #{detail},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where store_id = #{storeId}
+    </update>
+
+    <delete id="deleteSegchkStoreBasicInfoByStoreId" parameterType="Long">
+        delete from segchk_store_basic_info where store_id = #{storeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreBasicInfoByStoreIds" parameterType="String">
+        delete from segchk_store_basic_info where store_id in 
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteSegchkStoreImageByStoreIds" parameterType="String">
+        delete from segchk_store_image where store_id in 
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkStoreChkMgtByStoreIds" parameterType="String">
+        delete from segchk_store_chk_mgt where store_id in
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkStoreLableMgtByStoreIds" parameterType="String">
+        delete from segchk_store_lable_mgt where store_id in
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkStoreSecurityByStoreIds" parameterType="String">
+        delete from segchk_store_security where store_id in
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkStoreImageByStoreId" parameterType="Long">
+        delete from segchk_store_image where store_id = #{storeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreChkMgtByStoreId" parameterType="Long">
+        delete from segchk_store_chk_mgt where store_id = #{storeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreLableMgtByStoreId" parameterType="Long">
+        delete from segchk_store_lable_mgt where store_id = #{storeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreSecurityByStoreId" parameterType="Long">
+        delete from segchk_store_security where store_id = #{storeId}
+    </delete>
+
+    <insert id="batchSegchkStoreImage">
+        insert into segchk_store_image( provider_id, store_id, store_certificate1, store_certificate2, store_icon, store_gificon, store_carousel1, store_carousel2, store_carousel3, store_carousel4, store_carousel5, store_carousel6, store_env1, store_env2, store_env3, store_env4, mod_time) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.providerId}, #{item.storeId}, #{item.storeCertificate1}, #{item.storeCertificate2}, #{item.storeIcon}, #{item.storeGificon}, #{item.storeCarousel1}, #{item.storeCarousel2}, #{item.storeCarousel3}, #{item.storeCarousel4}, #{item.storeCarousel5}, #{item.storeCarousel6}, #{item.storeEnv1}, #{item.storeEnv2}, #{item.storeEnv3}, #{item.storeEnv4}, now())
+        </foreach>
+    </insert>
+
+    <insert id="batchSegchkStoreChkMgt">
+        insert into segchk_store_chk_mgt(
+        provider_id
+        , store_id
+        , card_type_id
+        , chk_count
+        , sale_count
+        , card_commission
+        , saler_commission ) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.providerId}
+            , #{item.storeId}
+            , #{item.cardTypeId}
+            , #{item.chkCount}
+            , #{item.saleCount}
+            , #{item.cardCommission}
+            , #{item.salerCommission}
+            )
+        </foreach>
+    </insert>
+
+    <insert id="batchSegchkStoreLableMgt">
+        insert into segchk_store_lable_mgt(
+        store_id
+        , provider_id
+        , lable_id
+        , sort_id
+        , type_id
+        , mgt_state
+        , mod_time ) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.storeId}
+            , #{item.providerId}
+            , #{item.lableId}
+            , #{item.sortId}
+            , #{item.typeId}
+            , #{item.mgtState}
+            , now()
+            )
+        </foreach>
+    </insert>
+
+    <insert id="batchSegchkStoreSecurity">
+        insert into segchk_store_security(
+        store_id
+        , passwd
+        , mod_time
+        , provider_id ) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.storeId}
+            , #{item.passwd}
+            , now()
+            , #{item.providerId}
+            )
+        </foreach>
+    </insert>
+
+
+    <update id="updateSegchkStoreServiceStatus" parameterType="SegchkStoreBasicInfo">
+        update segchk_store_basic_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="serviceState != null and serviceState != ''">service_state = #{serviceState},</if>
+            <if test="withMsg != null and withMsg != ''">with_msg = #{withMsg},</if>
+            mod_time = now(),
+        </trim>
+        where store_id = #{storeId}
+        <if test="providerId != null and providerId != ''">and provider_id = #{providerId}</if>
+    </update>
+    <update id="updateSegchkStoreDetail" parameterType="SegchkStoreBasicInfo">
+        update segchk_store_basic_info set detail = #{detail}
+        where store_id = #{storeId}
+        <if test="providerId != null and providerId != ''">and provider_id = #{providerId}</if>
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreCashMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreCashMapper.xml
new file mode 100644
index 0000000..f293592
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreCashMapper.xml
@@ -0,0 +1,82 @@
+<?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.segchk.mapper.SegchkStoreCashMapper">
+    
+    <resultMap type="SegchkStoreCash" id="SegchkStoreCashResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="cash"    column="cash"    />
+        <result property="cashType"    column="cash_type"    />
+        <result property="cashId"    column="cash_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="retFlag"    column="ret_flag"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreCashVo">
+        select store_id, cash, cash_type, cash_id, provider_id, mod_time, ret_flag from segchk_store_cash
+    </sql>
+
+    <select id="selectSegchkStoreCashList" parameterType="SegchkStoreCash" resultMap="SegchkStoreCashResult">
+        <include refid="selectSegchkStoreCashVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginCash != null and params.beginCash != '' and params.endCash != null and params.endCash != ''"> and cash between #{params.beginCash} and #{params.endCash}</if>
+            <if test="cashType != null  and cashType != ''"> and cash_type = #{cashType}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="retFlag != null  and retFlag != ''"> and ret_flag = #{retFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreCashByCashId" parameterType="Long" resultMap="SegchkStoreCashResult">
+        <include refid="selectSegchkStoreCashVo"/>
+        where cash_id = #{cashId}
+    </select>
+        
+    <insert id="insertSegchkStoreCash" parameterType="SegchkStoreCash" useGeneratedKeys="true" keyProperty="cashId">
+        insert into segchk_store_cash
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="cash != null">cash,</if>
+            <if test="cashType != null">cash_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="retFlag != null and retFlag != ''">ret_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="cash != null">#{cash},</if>
+            <if test="cashType != null">#{cashType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="retFlag != null and retFlag != ''">#{retFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreCash" parameterType="SegchkStoreCash">
+        update segchk_store_cash
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="cash != null">cash = #{cash},</if>
+            <if test="cashType != null">cash_type = #{cashType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="retFlag != null and retFlag != ''">ret_flag = #{retFlag},</if>
+        </trim>
+        where cash_id = #{cashId}
+    </update>
+
+    <delete id="deleteSegchkStoreCashByCashId" parameterType="Long">
+        delete from segchk_store_cash where cash_id = #{cashId}
+    </delete>
+
+    <delete id="deleteSegchkStoreCashByCashIds" parameterType="String">
+        delete from segchk_store_cash where cash_id in 
+        <foreach item="cashId" collection="array" open="(" separator="," close=")">
+            #{cashId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChargeMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChargeMapper.xml
new file mode 100644
index 0000000..5e25b77
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChargeMapper.xml
@@ -0,0 +1,82 @@
+<?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.segchk.mapper.SegchkStoreChargeMapper">
+    
+    <resultMap type="SegchkStoreCharge" id="SegchkStoreChargeResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="charge"    column="charge"    />
+        <result property="chargeType"    column="charge_type"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="retFlag"    column="ret_flag"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreChargeVo">
+        select store_id, charge, charge_type, charge_id, provider_id, mod_time, ret_flag from segchk_store_charge
+    </sql>
+
+    <select id="selectSegchkStoreChargeList" parameterType="SegchkStoreCharge" resultMap="SegchkStoreChargeResult">
+        <include refid="selectSegchkStoreChargeVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginCharge != null and params.beginCharge != '' and params.endCharge != null and params.endCharge != ''"> and charge between #{params.beginCharge} and #{params.endCharge}</if>
+            <if test="chargeType != null  and chargeType != ''"> and charge_type = #{chargeType}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="retFlag != null  and retFlag != ''"> and ret_flag = #{retFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreChargeByChargeId" parameterType="Long" resultMap="SegchkStoreChargeResult">
+        <include refid="selectSegchkStoreChargeVo"/>
+        where charge_id = #{chargeId}
+    </select>
+        
+    <insert id="insertSegchkStoreCharge" parameterType="SegchkStoreCharge" useGeneratedKeys="true" keyProperty="chargeId">
+        insert into segchk_store_charge
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="charge != null">charge,</if>
+            <if test="chargeType != null and chargeType != ''">charge_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="retFlag != null and retFlag != ''">ret_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="charge != null">#{charge},</if>
+            <if test="chargeType != null and chargeType != ''">#{chargeType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="retFlag != null and retFlag != ''">#{retFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreCharge" parameterType="SegchkStoreCharge">
+        update segchk_store_charge
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="charge != null">charge = #{charge},</if>
+            <if test="chargeType != null and chargeType != ''">charge_type = #{chargeType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="retFlag != null and retFlag != ''">ret_flag = #{retFlag},</if>
+        </trim>
+        where charge_id = #{chargeId}
+    </update>
+
+    <delete id="deleteSegchkStoreChargeByChargeId" parameterType="Long">
+        delete from segchk_store_charge where charge_id = #{chargeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreChargeByChargeIds" parameterType="String">
+        delete from segchk_store_charge where charge_id in 
+        <foreach item="chargeId" collection="array" open="(" separator="," close=")">
+            #{chargeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChkMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChkMgtMapper.xml
new file mode 100644
index 0000000..e541444
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreChkMgtMapper.xml
@@ -0,0 +1,87 @@
+<?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.segchk.mapper.SegchkStoreChkMgtMapper">
+    
+    <resultMap type="SegchkStoreChkMgt" id="SegchkStoreChkMgtResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="chkCount"    column="chk_count"    />
+        <result property="saleCount"    column="sale_count"    />
+        <result property="cardCommission"    column="card_commission"    />
+        <result property="salerCommission"    column="saler_commission"    />
+        <result property="mgtId"    column="mgt_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreChkMgtVo">
+        select provider_id, store_id, card_type_id, chk_count, sale_count, card_commission, saler_commission, mgt_id from segchk_store_chk_mgt
+    </sql>
+
+    <select id="selectSegchkStoreChkMgtList" parameterType="SegchkStoreChkMgt" resultMap="SegchkStoreChkMgtResult">
+        <include refid="selectSegchkStoreChkMgtVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="chkCount != null "> and chk_count = #{chkCount}</if>
+            <if test="saleCount != null "> and sale_count = #{saleCount}</if>
+            <if test="params.beginCardCommission != null and params.beginCardCommission != '' and params.endCardCommission != null and params.endCardCommission != ''"> and card_commission between #{params.beginCardCommission} and #{params.endCardCommission}</if>
+            <if test="salerCommission != null "> and saler_commission = #{salerCommission}</if>
+            <if test="mgtId != null "> and mgt_id = #{mgtId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreChkMgtByMgtId" parameterType="Integer" resultMap="SegchkStoreChkMgtResult">
+        <include refid="selectSegchkStoreChkMgtVo"/>
+        where mgt_id = #{mgtId}
+    </select>
+        
+    <insert id="insertSegchkStoreChkMgt" parameterType="SegchkStoreChkMgt" useGeneratedKeys="true" keyProperty="mgtId">
+        insert into segchk_store_chk_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="cardTypeId != null">card_type_id,</if>
+            <if test="chkCount != null">chk_count,</if>
+            <if test="saleCount != null">sale_count,</if>
+            <if test="cardCommission != null">card_commission,</if>
+            <if test="salerCommission != null">saler_commission,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="cardTypeId != null">#{cardTypeId},</if>
+            <if test="chkCount != null">#{chkCount},</if>
+            <if test="saleCount != null">#{saleCount},</if>
+            <if test="cardCommission != null">#{cardCommission},</if>
+            <if test="salerCommission != null">#{salerCommission},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreChkMgt" parameterType="SegchkStoreChkMgt">
+        update segchk_store_chk_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="chkCount != null">chk_count = #{chkCount},</if>
+            <if test="saleCount != null">sale_count = #{saleCount},</if>
+            <if test="cardCommission != null">card_commission = #{cardCommission},</if>
+            <if test="salerCommission != null">saler_commission = #{salerCommission},</if>
+        </trim>
+        where mgt_id = #{mgtId}
+    </update>
+
+    <delete id="deleteSegchkStoreChkMgtByMgtId" parameterType="Integer">
+        delete from segchk_store_chk_mgt where mgt_id = #{mgtId}
+    </delete>
+
+    <delete id="deleteSegchkStoreChkMgtByMgtIds" parameterType="String">
+        delete from segchk_store_chk_mgt where mgt_id in 
+        <foreach item="mgtId" collection="array" open="(" separator="," close=")">
+            #{mgtId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreImageMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreImageMapper.xml
new file mode 100644
index 0000000..7aa86d4
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreImageMapper.xml
@@ -0,0 +1,141 @@
+<?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.segchk.mapper.SegchkStoreImageMapper">
+    
+    <resultMap type="SegchkStoreImage" id="SegchkStoreImageResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="storeCertificate1"    column="store_certificate1"    />
+        <result property="storeCertificate2"    column="store_certificate2"    />
+        <result property="storeIcon"    column="store_icon"    />
+        <result property="storeGificon"    column="store_gificon"    />
+        <result property="storeCarousel1"    column="store_carousel1"    />
+        <result property="storeCarousel2"    column="store_carousel2"    />
+        <result property="storeCarousel3"    column="store_carousel3"    />
+        <result property="storeCarousel4"    column="store_carousel4"    />
+        <result property="storeCarousel5"    column="store_carousel5"    />
+        <result property="storeCarousel6"    column="store_carousel6"    />
+        <result property="storeEnv1"    column="store_env1"    />
+        <result property="storeEnv2"    column="store_env2"    />
+        <result property="storeEnv3"    column="store_env3"    />
+        <result property="storeEnv4"    column="store_env4"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreImageVo">
+        select provider_id, store_id, store_certificate1, store_certificate2, store_icon, store_gificon, store_carousel1, store_carousel2, store_carousel3, store_carousel4, store_carousel5, store_carousel6, store_env1, store_env2, store_env3, store_env4, mod_time from segchk_store_image
+    </sql>
+
+    <select id="selectSegchkStoreImageList" parameterType="SegchkStoreImage" resultMap="SegchkStoreImageResult">
+        <include refid="selectSegchkStoreImageVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="storeCertificate1 != null  and storeCertificate1 != ''"> and store_certificate1 = #{storeCertificate1}</if>
+            <if test="storeCertificate2 != null  and storeCertificate2 != ''"> and store_certificate2 = #{storeCertificate2}</if>
+            <if test="storeIcon != null  and storeIcon != ''"> and store_icon = #{storeIcon}</if>
+            <if test="storeGificon != null  and storeGificon != ''"> and store_gificon = #{storeGificon}</if>
+            <if test="storeCarousel1 != null  and storeCarousel1 != ''"> and store_carousel1 = #{storeCarousel1}</if>
+            <if test="storeCarousel2 != null  and storeCarousel2 != ''"> and store_carousel2 = #{storeCarousel2}</if>
+            <if test="storeCarousel3 != null  and storeCarousel3 != ''"> and store_carousel3 = #{storeCarousel3}</if>
+            <if test="storeCarousel4 != null  and storeCarousel4 != ''"> and store_carousel4 = #{storeCarousel4}</if>
+            <if test="storeCarousel5 != null  and storeCarousel5 != ''"> and store_carousel5 = #{storeCarousel5}</if>
+            <if test="storeCarousel6 != null  and storeCarousel6 != ''"> and store_carousel6 = #{storeCarousel6}</if>
+            <if test="storeEnv1 != null  and storeEnv1 != ''"> and store_env1 = #{storeEnv1}</if>
+            <if test="storeEnv2 != null  and storeEnv2 != ''"> and store_env2 = #{storeEnv2}</if>
+            <if test="storeEnv3 != null  and storeEnv3 != ''"> and store_env3 = #{storeEnv3}</if>
+            <if test="storeEnv4 != null  and storeEnv4 != ''"> and store_env4 = #{storeEnv4}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreImageByStoreId" parameterType="Long" resultMap="SegchkStoreImageResult">
+        <include refid="selectSegchkStoreImageVo"/>
+        where store_id = #{storeId}
+    </select>
+        
+    <insert id="insertSegchkStoreImage" parameterType="SegchkStoreImage">
+        insert into segchk_store_image
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="storeCertificate1 != null">store_certificate1,</if>
+            <if test="storeCertificate2 != null">store_certificate2,</if>
+            <if test="storeIcon != null">store_icon,</if>
+            <if test="storeGificon != null">store_gificon,</if>
+            <if test="storeCarousel1 != null">store_carousel1,</if>
+            <if test="storeCarousel2 != null">store_carousel2,</if>
+            <if test="storeCarousel3 != null">store_carousel3,</if>
+            <if test="storeCarousel4 != null">store_carousel4,</if>
+            <if test="storeCarousel5 != null">store_carousel5,</if>
+            <if test="storeCarousel6 != null">store_carousel6,</if>
+            <if test="storeEnv1 != null">store_env1,</if>
+            <if test="storeEnv2 != null">store_env2,</if>
+            <if test="storeEnv3 != null">store_env3,</if>
+            <if test="storeEnv4 != null">store_env4,</if>
+            mod_time,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="storeCertificate1 != null">#{storeCertificate1},</if>
+            <if test="storeCertificate2 != null">#{storeCertificate2},</if>
+            <if test="storeIcon != null">#{storeIcon},</if>
+            <if test="storeGificon != null">#{storeGificon},</if>
+            <if test="storeCarousel1 != null">#{storeCarousel1},</if>
+            <if test="storeCarousel2 != null">#{storeCarousel2},</if>
+            <if test="storeCarousel3 != null">#{storeCarousel3},</if>
+            <if test="storeCarousel4 != null">#{storeCarousel4},</if>
+            <if test="storeCarousel5 != null">#{storeCarousel5},</if>
+            <if test="storeCarousel6 != null">#{storeCarousel6},</if>
+            <if test="storeEnv1 != null">#{storeEnv1},</if>
+            <if test="storeEnv2 != null">#{storeEnv2},</if>
+            <if test="storeEnv3 != null">#{storeEnv3},</if>
+            <if test="storeEnv4 != null">#{storeEnv4},</if>
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreImage" parameterType="SegchkStoreImage">
+        update segchk_store_image
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="storeCertificate1 != null">store_certificate1 = #{storeCertificate1},</if>
+            <if test="storeCertificate2 != null">store_certificate2 = #{storeCertificate2},</if>
+            <if test="storeIcon != null">store_icon = #{storeIcon},</if>
+            <if test="storeGificon != null">store_gificon = #{storeGificon},</if>
+            <if test="storeCarousel1 != null">store_carousel1 = #{storeCarousel1},</if>
+            <if test="storeCarousel2 != null">store_carousel2 = #{storeCarousel2},</if>
+            <if test="storeCarousel3 != null">store_carousel3 = #{storeCarousel3},</if>
+            <if test="storeCarousel4 != null">store_carousel4 = #{storeCarousel4},</if>
+            <if test="storeCarousel5 != null">store_carousel5 = #{storeCarousel5},</if>
+            <if test="storeCarousel6 != null">store_carousel6 = #{storeCarousel6},</if>
+            <if test="storeEnv1 != null">store_env1 = #{storeEnv1},</if>
+            <if test="storeEnv2 != null">store_env2 = #{storeEnv2},</if>
+            <if test="storeEnv3 != null">store_env3 = #{storeEnv3},</if>
+            <if test="storeEnv4 != null">store_env4 = #{storeEnv4},</if>
+            <choose>
+                <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+<!--            <if test="modTime != null">mod_time = #{modTime},</if>-->
+        </trim>
+        where store_id = #{storeId}
+    </update>
+
+    <delete id="deleteSegchkStoreImageByStoreId" parameterType="Long">
+        delete from segchk_store_image where store_id = #{storeId}
+    </delete>
+
+    <delete id="deleteSegchkStoreImageByStoreIds" parameterType="String">
+        delete from segchk_store_image where store_id in 
+        <foreach item="storeId" collection="array" open="(" separator="," close=")">
+            #{storeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreLableMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreLableMgtMapper.xml
new file mode 100644
index 0000000..d8d719a
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreLableMgtMapper.xml
@@ -0,0 +1,100 @@
+<?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.segchk.mapper.SegchkStoreLableMgtMapper">
+    
+    <resultMap type="SegchkStoreLableMgt" id="SegchkStoreLableMgtResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="lableId"    column="lable_id"    />
+        <result property="sortId"    column="sort_id"    />
+        <result property="typeId"    column="type_id"    />
+        <result property="mgtState"    column="mgt_state"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="mgtId"    column="mgt_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreLableMgtVo">
+        select store_id, provider_id, lable_id, sort_id, type_id, mgt_state, mod_time, mgt_id from segchk_store_lable_mgt
+    </sql>
+
+    <select id="selectSegchkStoreLableMgtList" parameterType="SegchkStoreLableMgt" resultMap="SegchkStoreLableMgtResult">
+        <include refid="selectSegchkStoreLableMgtVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="lableId != null "> and lable_id = #{lableId}</if>
+            <if test="sortId != null "> and sort_id = #{sortId}</if>
+            <if test="typeId != null "> and type_id = #{typeId}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="mgtId != null "> and mgt_id = #{mgtId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreLableMgtByMgtId" parameterType="Integer" resultMap="SegchkStoreLableMgtResult">
+        <include refid="selectSegchkStoreLableMgtVo"/>
+        where mgt_id = #{mgtId}
+    </select>
+        
+    <insert id="insertSegchkStoreLableMgt" parameterType="SegchkStoreLableMgt" useGeneratedKeys="true" keyProperty="mgtId">
+        insert into segchk_store_lable_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="lableId != null">lable_id,</if>
+            <if test="sortId != null">sort_id,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="mgtState != null">mgt_state,</if>
+            mod_time,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="lableId != null">#{lableId},</if>
+            <if test="sortId != null">#{sortId},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreLableMgt" parameterType="SegchkStoreLableMgt">
+        update segchk_store_lable_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="lableId != null">lable_id = #{lableId},</if>
+            <if test="sortId != null">sort_id = #{sortId},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+            <choose>
+                <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+        </trim>
+        where mgt_id = #{mgtId}
+    </update>
+
+    <delete id="deleteSegchkStoreLableMgtByMgtId" parameterType="Integer">
+        delete from segchk_store_lable_mgt where mgt_id = #{mgtId}
+    </delete>
+
+    <delete id="deleteSegchkStoreLableMgtByMgtIds" parameterType="String">
+        delete from segchk_store_lable_mgt where mgt_id in 
+        <foreach item="mgtId" collection="array" open="(" separator="," close=")">
+            #{mgtId}
+        </foreach>
+    </delete>
+    <delete id="deleteSegchkStoreLableMgtByCardTypeIds" parameterType="java.util.Map">
+        delete from segchk_store_lable_mgt where lable_id in
+        <foreach item="cardTypeId" collection="cardTypeIds" open="(" separator="," close=")">
+            #{cardTypeId}
+        </foreach>
+        and type_id = #{typeId}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreRewardMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreRewardMapper.xml
new file mode 100644
index 0000000..e6ccf8f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreRewardMapper.xml
@@ -0,0 +1,93 @@
+<?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.segchk.mapper.SegchkStoreRewardMapper">
+    
+    <resultMap type="SegchkStoreReward" id="SegchkStoreRewardResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="reward"    column="reward"    />
+        <result property="rewardType"    column="reward_type"    />
+        <result property="rewardCardId"    column="reward_card_id"    />
+        <result property="rewardCardTypeId"    column="reward_card_type_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreRewardVo">
+        select store_id, reward, reward_type, reward_card_id, reward_card_type_id, mod_time, reward_id, provider_id from segchk_store_reward
+    </sql>
+
+    <select id="selectSegchkStoreRewardList" parameterType="SegchkStoreReward" resultMap="SegchkStoreRewardResult">
+        <include refid="selectSegchkStoreRewardVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginReward != null and params.beginReward != '' and params.endReward != null and params.endReward != ''"> and reward between #{params.beginReward} and #{params.endReward}</if>
+            <if test="rewardType != null  and rewardType != ''"> and reward_type = #{rewardType}</if>
+            <if test="rewardCardId != null "> and reward_card_id = #{rewardCardId}</if>
+            <if test="rewardCardTypeId != null "> and reward_card_type_id = #{rewardCardTypeId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreRewardByRewardId" parameterType="Long" resultMap="SegchkStoreRewardResult">
+        <include refid="selectSegchkStoreRewardVo"/>
+        where reward_id = #{rewardId}
+    </select>
+        
+    <insert id="insertSegchkStoreReward" parameterType="SegchkStoreReward" useGeneratedKeys="true" keyProperty="rewardId">
+        insert into segchk_store_reward
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="reward != null">reward,</if>
+            <if test="rewardType != null and rewardType != ''">reward_type,</if>
+            <if test="rewardCardId != null">reward_card_id,</if>
+            <if test="rewardCardTypeId != null">reward_card_type_id,</if>
+            mod_time,
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="reward != null">#{reward},</if>
+            <if test="rewardType != null and rewardType != ''">#{rewardType},</if>
+            <if test="rewardCardId != null">#{rewardCardId},</if>
+            <if test="rewardCardTypeId != null">#{rewardCardTypeId},</if>
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreReward" parameterType="SegchkStoreReward">
+        update segchk_store_reward
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="reward != null">reward = #{reward},</if>
+            <if test="rewardType != null and rewardType != ''">reward_type = #{rewardType},</if>
+            <if test="rewardCardId != null">reward_card_id = #{rewardCardId},</if>
+            <if test="rewardCardTypeId != null">reward_card_type_id = #{rewardCardTypeId},</if>
+            <choose>
+            <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where reward_id = #{rewardId}
+    </update>
+
+    <delete id="deleteSegchkStoreRewardByRewardId" parameterType="Long">
+        delete from segchk_store_reward where reward_id = #{rewardId}
+    </delete>
+
+    <delete id="deleteSegchkStoreRewardByRewardIds" parameterType="String">
+        delete from segchk_store_reward where reward_id in 
+        <foreach item="rewardId" collection="array" open="(" separator="," close=")">
+            #{rewardId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSecurityMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSecurityMapper.xml
new file mode 100644
index 0000000..8ce094f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSecurityMapper.xml
@@ -0,0 +1,72 @@
+<?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.segchk.mapper.SegchkStoreSecurityMapper">
+    
+    <resultMap type="SegchkStoreSecurity" id="SegchkStoreSecurityResult">
+        <result property="storeId"    column="store_id"    />
+        <result property="passwd"    column="passwd"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="pwdId"    column="pwd_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreSecurityVo">
+        select store_id, passwd, mod_time, pwd_id, provider_id from segchk_store_security
+    </sql>
+
+    <select id="selectSegchkStoreSecurityList" parameterType="SegchkStoreSecurity" resultMap="SegchkStoreSecurityResult">
+        <include refid="selectSegchkStoreSecurityVo"/>
+        <where>  
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="passwd != null  and passwd != ''"> and passwd like concat('%', #{passwd}, '%')</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="pwdId != null "> and pwd_id = #{pwdId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreSecurityByPwdId" parameterType="Long" resultMap="SegchkStoreSecurityResult">
+        <include refid="selectSegchkStoreSecurityVo"/>
+        where pwd_id = #{pwdId}
+    </select>
+        
+    <insert id="insertSegchkStoreSecurity" parameterType="SegchkStoreSecurity" useGeneratedKeys="true" keyProperty="pwdId">
+        insert into segchk_store_security
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
+            <if test="passwd != null and passwd != ''">passwd,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">#{storeId},</if>
+            <if test="passwd != null and passwd != ''">#{passwd},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreSecurity" parameterType="SegchkStoreSecurity">
+        update segchk_store_security
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="passwd != null and passwd != ''">passwd = #{passwd},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where pwd_id = #{pwdId}
+    </update>
+
+    <delete id="deleteSegchkStoreSecurityByPwdId" parameterType="Long">
+        delete from segchk_store_security where pwd_id = #{pwdId}
+    </delete>
+
+    <delete id="deleteSegchkStoreSecurityByPwdIds" parameterType="String">
+        delete from segchk_store_security where pwd_id in 
+        <foreach item="pwdId" collection="array" open="(" separator="," close=")">
+            #{pwdId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSelfMgtMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSelfMgtMapper.xml
new file mode 100644
index 0000000..6bb6e38
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkStoreSelfMgtMapper.xml
@@ -0,0 +1,120 @@
+<?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.segchk.mapper.SegchkStoreSelfMgtMapper">
+    
+    <resultMap type="SegchkStoreSelfMgt" id="SegchkStoreSelfMgtResult">
+        <result property="freeCardId"    column="free_card_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="lableId"    column="lable_id"    />
+        <result property="typeId"    column="type_id"    />
+        <result property="freeCount"    column="free_count"    />
+        <result property="freeName"    column="free_name"    />
+        <result property="freeContent"    column="free_content"    />
+        <result property="leftCount"    column="left_count"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectSegchkStoreSelfMgtVo">
+        select free_card_id, mod_time, store_id, provider_id, user_id, card_id, lable_id, type_id, free_count, free_name, free_content, left_count, status from segchk_store_self_mgt
+    </sql>
+
+    <select id="selectSegchkStoreSelfMgtList" parameterType="SegchkStoreSelfMgt" resultMap="SegchkStoreSelfMgtResult">
+        <include refid="selectSegchkStoreSelfMgtVo"/>
+        <where>  
+            <if test="freeCardId != null "> and free_card_id = #{freeCardId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="lableId != null "> and lable_id = #{lableId}</if>
+            <if test="typeId != null "> and type_id = #{typeId}</if>
+            <if test="freeCount != null "> and free_count = #{freeCount}</if>
+            <if test="freeName != null  and freeName != ''"> and free_name like concat('%', #{freeName}, '%')</if>
+            <if test="freeContent != null  and freeContent != ''"> and free_content like concat('%', #{freeContent}, '%')</if>
+            <if test="leftCount != null "> and left_count = #{leftCount}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkStoreSelfMgtByFreeCardId" parameterType="Long" resultMap="SegchkStoreSelfMgtResult">
+        <include refid="selectSegchkStoreSelfMgtVo"/>
+        where free_card_id = #{freeCardId}
+    </select>
+        
+    <insert id="insertSegchkStoreSelfMgt" parameterType="SegchkStoreSelfMgt" useGeneratedKeys="true" keyProperty="freeCardId">
+        insert into segchk_store_self_mgt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            mod_time,
+            <if test="storeId != null">store_id,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="lableId != null">lable_id,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="freeCount != null">free_count,</if>
+            <if test="freeName != null and freeName != ''">free_name,</if>
+            <if test="freeContent != null and freeContent != ''">free_content,</if>
+            <if test="leftCount != null">left_count,</if>
+            <if test="status != null and status != ''">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <choose>
+                <when test="modTime != null">#{modTime},</when>
+                <otherwise>if(true, (select effective_time from segchk_user_vip where card_id = #{cardId}), now()),</otherwise>
+            </choose>
+<!--            <if test="modTime != null">#{modTime},</if>-->
+            <if test="storeId != null">#{storeId},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="lableId != null">#{lableId},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="freeCount != null">#{freeCount},</if>
+            <if test="freeName != null and freeName != ''">#{freeName},</if>
+            <if test="freeContent != null and freeContent != ''">#{freeContent},</if>
+            <if test="leftCount != null">#{leftCount},</if>
+            <if test="status != null and status != ''">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkStoreSelfMgt" parameterType="SegchkStoreSelfMgt">
+        update segchk_store_self_mgt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="lableId != null">lable_id = #{lableId},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="freeCount != null">free_count = #{freeCount},</if>
+            <if test="freeName != null and freeName != ''">free_name = #{freeName},</if>
+            <if test="freeContent != null and freeContent != ''">free_content = #{freeContent},</if>
+            <if test="leftCount != null">left_count = #{leftCount},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+        </trim>
+        where free_card_id = #{freeCardId}
+    </update>
+
+    <delete id="deleteSegchkStoreSelfMgtByFreeCardId" parameterType="Long">
+        delete from segchk_store_self_mgt where free_card_id = #{freeCardId}
+    </delete>
+
+    <delete id="deleteSegchkStoreSelfMgtByFreeCardIds" parameterType="String">
+        delete from segchk_store_self_mgt where free_card_id in 
+        <foreach item="freeCardId" collection="array" open="(" separator="," close=")">
+            #{freeCardId}
+        </foreach>
+    </delete>
+
+    <update id="updateSegchkUserVipCheck" parameterType="Long">
+        update segchk_store_self_mgt set status = if(left_count = 1, 1, 0), left_count = if(left_count = 1, 0, left_count - 1) where free_card_id = #{cardId}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkSystemSettingMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSystemSettingMapper.xml
new file mode 100644
index 0000000..acdf2b0
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkSystemSettingMapper.xml
@@ -0,0 +1,228 @@
+<?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.segchk.mapper.SegchkSystemSettingMapper">
+    
+    <resultMap type="SegchkSystemSetting" id="SegchkSystemSettingResult">
+        <result property="id"    column="id"    />
+        <result property="siteUrl"    column="site_url"    />
+        <result property="siteName"    column="site_name"    />
+        <result property="logo"    column="logo"    />
+        <result property="labelLog"    column="label_log"    />
+        <result property="siteLogin"    column="site_login"    />
+        <result property="siteRegister"    column="site_register"    />
+        <result property="storeLogin"    column="store_login"    />
+        <result property="storeRegister"    column="store_register"    />
+        <result property="copyrightInfo"    column="copyright_info"    />
+        <result property="registerProtocol"    column="register_protocol"    />
+        <result property="userPrivacyAgreement"    column="user_privacy_agreement"    />
+        <result property="vipServiceAgreement"    column="vip_service_agreement"    />
+        <result property="storeRegisterProtocol"    column="store_register_protocol"    />
+        <result property="storeOpenProtocol"    column="store_open_protocol"    />
+        <result property="phone"    column="phone"    />
+        <result property="adminLogo"    column="admin_logo"    />
+        <result property="adminIndexLogo"    column="admin_index_logo"    />
+        <result property="captchaOpen"    column="captcha_open"    />
+        <result property="storeSpuAudit"    column="store_spu_audit"    />
+        <result property="memberPriceStatus"    column="member_price_status"    />
+        <result property="crowdfundingProtocol"    column="crowdfunding_protocol"    />
+        <result property="h5CallBackDomain"    column="h5_call_back_domain"    />
+        <result property="pcCallBackDomain"    column="pc_call_back_domain"    />
+    </resultMap>
+
+    <sql id="selectSegchkSystemSettingVo">
+        select id, site_url, site_name, logo, label_log, site_login, site_register, store_login, store_register, copyright_info, register_protocol, user_privacy_agreement, vip_service_agreement, store_register_protocol, store_open_protocol, phone, admin_logo, admin_index_logo, captcha_open, store_spu_audit, member_price_status, crowdfunding_protocol, h5_call_back_domain, pc_call_back_domain from segchk_system_setting
+    </sql>
+
+    <select id="selectSegchkSystemSettingList" parameterType="SegchkSystemSetting" resultMap="SegchkSystemSettingResult">
+        <include refid="selectSegchkSystemSettingVo"/>
+        <where>  
+            <if test="siteUrl != null  and siteUrl != ''"> and site_url = #{siteUrl}</if>
+            <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
+            <if test="logo != null  and logo != ''"> and logo = #{logo}</if>
+            <if test="labelLog != null  and labelLog != ''"> and label_log = #{labelLog}</if>
+            <if test="siteLogin != null  and siteLogin != ''"> and site_login = #{siteLogin}</if>
+            <if test="siteRegister != null  and siteRegister != ''"> and site_register = #{siteRegister}</if>
+            <if test="storeLogin != null  and storeLogin != ''"> and store_login = #{storeLogin}</if>
+            <if test="storeRegister != null  and storeRegister != ''"> and store_register = #{storeRegister}</if>
+            <if test="copyrightInfo != null  and copyrightInfo != ''"> and copyright_info = #{copyrightInfo}</if>
+            <if test="registerProtocol != null  and registerProtocol != ''"> and register_protocol = #{registerProtocol}</if>
+            <if test="userPrivacyAgreement != null  and userPrivacyAgreement != ''"> and user_privacy_agreement = #{userPrivacyAgreement}</if>
+            <if test="vipServiceAgreement != null  and vipServiceAgreement != ''"> and vip_service_agreement = #{vipServiceAgreement}</if>
+            <if test="storeRegisterProtocol != null  and storeRegisterProtocol != ''"> and store_register_protocol = #{storeRegisterProtocol}</if>
+            <if test="storeOpenProtocol != null  and storeOpenProtocol != ''"> and store_open_protocol = #{storeOpenProtocol}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="adminLogo != null  and adminLogo != ''"> and admin_logo = #{adminLogo}</if>
+            <if test="adminIndexLogo != null  and adminIndexLogo != ''"> and admin_index_logo = #{adminIndexLogo}</if>
+            <if test="captchaOpen != null  and captchaOpen != ''"> and captcha_open = #{captchaOpen}</if>
+            <if test="storeSpuAudit != null  and storeSpuAudit != ''"> and store_spu_audit = #{storeSpuAudit}</if>
+            <if test="memberPriceStatus != null  and memberPriceStatus != ''"> and member_price_status = #{memberPriceStatus}</if>
+            <if test="crowdfundingProtocol != null  and crowdfundingProtocol != ''"> and crowdfunding_protocol = #{crowdfundingProtocol}</if>
+            <if test="h5CallBackDomain != null  and h5CallBackDomain != ''"> and h5_call_back_domain = #{h5CallBackDomain}</if>
+            <if test="pcCallBackDomain != null  and pcCallBackDomain != ''"> and pc_call_back_domain = #{pcCallBackDomain}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkSystemSettingById" parameterType="Long" resultMap="SegchkSystemSettingResult">
+        <include refid="selectSegchkSystemSettingVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSegchkSystemSetting" parameterType="SegchkSystemSetting" useGeneratedKeys="true" keyProperty="id">
+        insert into segchk_system_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="siteUrl != null and siteUrl != ''">site_url,</if>
+            <if test="siteName != null and siteName != ''">site_name,</if>
+            <if test="logo != null">logo,</if>
+            <if test="labelLog != null">label_log,</if>
+            <if test="siteLogin != null">site_login,</if>
+            <if test="siteRegister != null">site_register,</if>
+            <if test="storeLogin != null">store_login,</if>
+            <if test="storeRegister != null">store_register,</if>
+            <if test="copyrightInfo != null">copyright_info,</if>
+            <if test="registerProtocol != null">register_protocol,</if>
+            <if test="userPrivacyAgreement != null">user_privacy_agreement,</if>
+            <if test="vipServiceAgreement != null">vip_service_agreement,</if>
+            <if test="storeRegisterProtocol != null">store_register_protocol,</if>
+            <if test="storeOpenProtocol != null">store_open_protocol,</if>
+            <if test="phone != null">phone,</if>
+            <if test="adminLogo != null">admin_logo,</if>
+            <if test="adminIndexLogo != null">admin_index_logo,</if>
+            <if test="captchaOpen != null">captcha_open,</if>
+            <if test="storeSpuAudit != null">store_spu_audit,</if>
+            <if test="memberPriceStatus != null">member_price_status,</if>
+            <if test="crowdfundingProtocol != null">crowdfunding_protocol,</if>
+            <if test="h5CallBackDomain != null">h5_call_back_domain,</if>
+            <if test="pcCallBackDomain != null">pc_call_back_domain,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="siteUrl != null and siteUrl != ''">#{siteUrl},</if>
+            <if test="siteName != null and siteName != ''">#{siteName},</if>
+            <if test="logo != null">#{logo},</if>
+            <if test="labelLog != null">#{labelLog},</if>
+            <if test="siteLogin != null">#{siteLogin},</if>
+            <if test="siteRegister != null">#{siteRegister},</if>
+            <if test="storeLogin != null">#{storeLogin},</if>
+            <if test="storeRegister != null">#{storeRegister},</if>
+            <if test="copyrightInfo != null">#{copyrightInfo},</if>
+            <if test="registerProtocol != null">#{registerProtocol},</if>
+            <if test="userPrivacyAgreement != null">#{userPrivacyAgreement},</if>
+            <if test="vipServiceAgreement != null">#{vipServiceAgreement},</if>
+            <if test="storeRegisterProtocol != null">#{storeRegisterProtocol},</if>
+            <if test="storeOpenProtocol != null">#{storeOpenProtocol},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="adminLogo != null">#{adminLogo},</if>
+            <if test="adminIndexLogo != null">#{adminIndexLogo},</if>
+            <if test="captchaOpen != null">#{captchaOpen},</if>
+            <if test="storeSpuAudit != null">#{storeSpuAudit},</if>
+            <if test="memberPriceStatus != null">#{memberPriceStatus},</if>
+            <if test="crowdfundingProtocol != null">#{crowdfundingProtocol},</if>
+            <if test="h5CallBackDomain != null">#{h5CallBackDomain},</if>
+            <if test="pcCallBackDomain != null">#{pcCallBackDomain},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkSystemSetting" parameterType="SegchkSystemSetting">
+        update segchk_system_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="siteUrl != null and siteUrl != ''">site_url = #{siteUrl},</if>
+            <if test="siteName != null and siteName != ''">site_name = #{siteName},</if>
+            <if test="logo != null">logo = #{logo},</if>
+            <if test="labelLog != null">label_log = #{labelLog},</if>
+            <if test="siteLogin != null">site_login = #{siteLogin},</if>
+            <if test="siteRegister != null">site_register = #{siteRegister},</if>
+            <if test="storeLogin != null">store_login = #{storeLogin},</if>
+            <if test="storeRegister != null">store_register = #{storeRegister},</if>
+            <if test="copyrightInfo != null">copyright_info = #{copyrightInfo},</if>
+            <if test="registerProtocol != null">register_protocol = #{registerProtocol},</if>
+            <if test="userPrivacyAgreement != null">user_privacy_agreement = #{userPrivacyAgreement},</if>
+            <if test="vipServiceAgreement != null">vip_service_agreement = #{vipServiceAgreement},</if>
+            <if test="storeRegisterProtocol != null">store_register_protocol = #{storeRegisterProtocol},</if>
+            <if test="storeOpenProtocol != null">store_open_protocol = #{storeOpenProtocol},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="adminLogo != null">admin_logo = #{adminLogo},</if>
+            <if test="adminIndexLogo != null">admin_index_logo = #{adminIndexLogo},</if>
+            <if test="captchaOpen != null">captcha_open = #{captchaOpen},</if>
+            <if test="storeSpuAudit != null">store_spu_audit = #{storeSpuAudit},</if>
+            <if test="memberPriceStatus != null">member_price_status = #{memberPriceStatus},</if>
+            <if test="crowdfundingProtocol != null">crowdfunding_protocol = #{crowdfundingProtocol},</if>
+            <if test="h5CallBackDomain != null">h5_call_back_domain = #{h5CallBackDomain},</if>
+            <if test="pcCallBackDomain != null">pc_call_back_domain = #{pcCallBackDomain},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSegchkSystemSettingById" parameterType="Long">
+        delete from segchk_system_setting where id = #{id}
+    </delete>
+
+    <delete id="deleteSegchkSystemSettingByIds" parameterType="String">
+        delete from segchk_system_setting where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+
+    <resultMap id="BaseResult" type="com.ruoyi.segchk.domain.BaseInfoSet">
+        <result column="id" property="id"/>
+        <result column="phone" property="phone"/>
+        <result column="logo" property="logo"/>
+        <result column="site_url" property="siteUrl"/>
+        <result column="site_name" property="siteName"/>
+        <result column="label_log" property="labelLog"/>
+        <result column="admin_logo" property="adminLogo"/>
+        <result column="captcha_open" property="captchaOpen"/>
+        <result column="site_login" property="siteLoginPic"/>
+        <result column="store_login" property="storeLoginPic"/>
+        <result column="site_register" property="siteRegisterPic"/>
+        <result column="store_register" property="storeRegisterPic"/>
+        <result column="copyright_info" property="copyrightInfo"/>
+        <result column="admin_index_logo" property="adminIndexLogo"/>
+        <result column="store_open_protocol" property="storeOpenProtocol"/>
+        <result column="register_protocol" property="siteRegisterProtocol"/>
+        <result column="user_privacy_agreement" property="userPrivacyAgreement"/>
+        <result column="vip_service_agreement" property="vipServiceAgreement"/>
+        <result column="store_register_protocol" property="storeRegisterProtocol"/>
+        <result column="store_spu_audit" property="storeSpuAudit"/>
+        <result column="member_price_status" property="memberPriceStatus"/>
+        <result column="crowdfunding_protocol" property="crowdFundingProtocol"/>
+        <result column="h5_call_back_domain" property="h5CallBackDomain"/>
+        <result column="pc_call_back_domain" property="pcCallBackDomain"/>
+
+    </resultMap>
+    <sql id="columnList">
+        id,phone,logo,site_url,site_name,label_log,admin_logo,captcha_open,site_login,store_login,site_register,store_register,copyright_info,admin_index_logo,
+        store_open_protocol,register_protocol
+        ,user_privacy_agreement,vip_service_agreement,store_register_protocol,store_spu_audit,member_price_status,crowdfunding_protocol,h5_call_back_domain,pc_call_back_domain
+    </sql>
+    <select id="queryBaseInfoSet" resultMap="BaseResult">
+        SELECT
+        <include refid="columnList"/>
+        FROM segchk_system_setting limit 1
+    </select>
+
+    <update id="editBaseInfoSetA" parameterType="com.ruoyi.segchk.domain.BaseInfoSet">
+        UPDATE segchk_system_setting SET
+        phone=#{phone},logo=#{logo},site_url=#{siteUrl},site_name=#{siteName},label_log=#{labelLog},admin_logo=#{adminLogo},
+        site_login=#{siteLoginPic},store_login=#{storeLoginPic},site_register=#{siteRegisterPic},store_register=#{storeRegisterPic},
+        copyright_info=#{copyrightInfo},admin_index_logo=#{adminIndexLogo},store_open_protocol=#{storeOpenProtocol}
+        ,register_protocol=#{siteRegisterProtocol}
+        ,user_privacy_agreement=#{userPrivacyAgreement}
+        ,vip_service_agreement=#{vipServiceAgreement}
+        ,store_register_protocol=#{storeRegisterProtocol}
+        ,crowdfunding_protocol=#{crowdFundingProtocol}
+        ,h5_call_back_domain=#{h5CallBackDomain},pc_call_back_domain=#{pcCallBackDomain}
+    </update>
+    <update id="editBaseInfoSetB" parameterType="com.ruoyi.segchk.domain.BaseInfoSet">
+        UPDATE segchk_system_setting SET captcha_open = #{captchaOpen}
+    </update>
+    <update id="setAuditSwitch" parameterType="java.lang.String">
+        UPDATE segchk_system_setting SET store_spu_audit = #{storeSpuAudit}
+    </update>
+    <update id="setMemberPriceStatus" parameterType="java.lang.String">
+        UPDATE segchk_system_setting SET member_price_status = #{memberPriceStatus}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserAccountMapper.xml
new file mode 100644
index 0000000..10c661b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserAccountMapper.xml
@@ -0,0 +1,116 @@
+<?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.segchk.mapper.SegchkUserAccountMapper">
+    
+    <resultMap type="SegchkUserAccount" id="SegchkUserAccountResult">
+        <result property="userId"    column="user_id"    />
+        <result property="account"    column="account"    />
+        <result property="accountType"    column="account_type"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="accountId"    column="account_id"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="cashId"    column="cash_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserAccountVo">
+        select user_id, account, account_type, provider_id, account_id, reward_id, charge_id, cash_id from segchk_user_account
+    </sql>
+
+    <select id="selectSegchkUserAccountList" parameterType="SegchkUserAccount" resultMap="SegchkUserAccountResult">
+        <include refid="selectSegchkUserAccountVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginAccount != null and params.beginAccount != '' and params.endAccount != null and params.endAccount != ''"> and account between #{params.beginAccount} and #{params.endAccount}</if>
+            <if test="accountType != null  and accountType != ''"> and account_type = #{accountType}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="accountId != null "> and account_id = #{accountId}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserAccountByAccountId" parameterType="Long" resultMap="SegchkUserAccountResult">
+        <include refid="selectSegchkUserAccountVo"/>
+        where account_id = #{accountId}
+    </select>
+        
+    <insert id="insertSegchkUserAccount" parameterType="SegchkUserAccount" useGeneratedKeys="true" keyProperty="accountId">
+        insert into segchk_user_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="account != null">account,</if>
+            <if test="accountType != null and accountType != ''">account_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="rewardId != null">reward_id,</if>
+            <if test="chargeId != null">charge_id,</if>
+            <if test="cashId != null">cash_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="account != null">#{account},</if>
+            <if test="accountType != null and accountType != ''">#{accountType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="rewardId != null">#{rewardId},</if>
+            <if test="chargeId != null">#{chargeId},</if>
+            <if test="cashId != null">#{cashId},</if>
+         </trim>
+    </insert>
+    <insert id="insertSegchkUserAccountBuyCharge">
+        insert into segchk_user_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="account != null">account,</if>
+            <if test="accountType != null and accountType != ''">account_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="rewardId != null">reward_id,</if>
+            <if test="chargeId != null">charge_id,</if>
+            <if test="cashId != null">cash_id,</if>
+        </trim>
+        select
+        <trim suffixOverrides=",">
+            uc.user_id,
+            if(isnull(account), 0.0, (account - uc.account_use)) as account,
+            , ifnull(sua.account_type, 0) as account_type
+            , ifnull(sua.provider_id,uc.provider_id) as provider_id
+            , ifnull(sua.reward_id, 0)
+            , uc.charge_id
+            , ifnull(sua.cash_id, 0)
+        </trim>
+        from
+        (select #{account} as account_use, #{userId} as user_id, #{chargeId} as charge_id, #{providerId} as provider_id) uc
+        left join
+        (
+        select user_id, account, account_type, provider_id, account_id, reward_id, charge_id, cash_id from segchk_user_account where user_id = #{userId} order by account_id desc limit 1
+        ) sua
+        on uc.user_id = sua.user_id;
+    </insert>
+
+    <update id="updateSegchkUserAccount" parameterType="SegchkUserAccount">
+        update segchk_user_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="accountType != null and accountType != ''">account_type = #{accountType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="rewardId != null">reward_id = #{rewardId},</if>
+            <if test="chargeId != null">charge_id = #{chargeId},</if>
+            <if test="cashId != null">cash_id = #{cashId},</if>
+        </trim>
+        where account_id = #{accountId}
+    </update>
+
+    <delete id="deleteSegchkUserAccountByAccountId" parameterType="Long">
+        delete from segchk_user_account where account_id = #{accountId}
+    </delete>
+
+    <delete id="deleteSegchkUserAccountByAccountIds" parameterType="String">
+        delete from segchk_user_account where account_id in 
+        <foreach item="accountId" collection="array" open="(" separator="," close=")">
+            #{accountId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserBasicInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserBasicInfoMapper.xml
new file mode 100644
index 0000000..a207701
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserBasicInfoMapper.xml
@@ -0,0 +1,113 @@
+<?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.segchk.mapper.SegchkUserBasicInfoMapper">
+    
+    <resultMap type="SegchkUserBasicInfo" id="SegchkUserBasicInfoResult">
+        <result property="userId"    column="user_id"    />
+        <result property="phoneNo"    column="phone_no"    />
+        <result property="userIcon"    column="user_icon"    />
+        <result property="hasWechat"    column="has_wechat"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <resultMap id="SegchkUserBasicInfoSegchkUserCertificationInfoResult" type="SegchkUserBasicInfo" extends="SegchkUserBasicInfoResult">
+        <collection property="segchkUserCertificationInfoList" notNullColumn="sub_usercard_id" javaType="java.util.List" resultMap="SegchkUserCertificationInfoResult" />
+    </resultMap>
+
+    <resultMap type="SegchkUserCertificationInfo" id="SegchkUserCertificationInfoResult">
+        <result property="usercardId"    column="sub_usercard_id"    />
+        <result property="userName"    column="sub_user_name"    />
+        <result property="userId"    column="sub_user_id"    />
+        <result property="providerId"    column="sub_provider_id"    />
+        <result property="idcard"    column="sub_IDcard"    />
+        <result property="card1"    column="sub_card1"    />
+        <result property="card2"    column="sub_card2"    />
+        <result property="modTime"    column="sub_mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserBasicInfoVo">
+        select user_id, phone_no, user_icon, has_wechat, card_type_id, provider_id from segchk_user_basic_info
+    </sql>
+
+    <select id="selectSegchkUserBasicInfoList" parameterType="SegchkUserBasicInfo" resultMap="SegchkUserBasicInfoResult">
+        <include refid="selectSegchkUserBasicInfoVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="phoneNo != null  and phoneNo != ''"> and phone_no = #{phoneNo}</if>
+            <if test="userIcon != null  and userIcon != ''"> and user_icon = #{userIcon}</if>
+            <if test="hasWechat != null  and hasWechat != ''"> and has_wechat = #{hasWechat}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserBasicInfoByUserId" parameterType="Long" resultMap="SegchkUserBasicInfoSegchkUserCertificationInfoResult">
+        select a.user_id, a.phone_no, a.user_icon, a.has_wechat, a.card_type_id, a.provider_id,
+            b.usercard_id as sub_usercard_id, b.user_name as sub_user_name, b.user_id as sub_user_id, b.provider_id as sub_provider_id, b.IDcard as sub_IDcard, b.card1 as sub_card1, b.card2 as sub_card2, b.mod_time as sub_mod_time
+        from segchk_user_basic_info a
+        left join segchk_user_certification_info b on b.user_id = a.user_id
+        where a.user_id = #{userId}
+    </select>
+        
+    <insert id="insertSegchkUserBasicInfo" parameterType="SegchkUserBasicInfo" useGeneratedKeys="true" keyProperty="userId">
+        insert into segchk_user_basic_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">phone_no,</if>
+            <if test="userIcon != null">user_icon,</if>
+            <if test="hasWechat != null and hasWechat != ''">has_wechat,</if>
+            <if test="cardTypeId != null">card_type_id,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">#{phoneNo},</if>
+            <if test="userIcon != null">#{userIcon},</if>
+            <if test="hasWechat != null and hasWechat != ''">#{hasWechat},</if>
+            <if test="cardTypeId != null">#{cardTypeId},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserBasicInfo" parameterType="SegchkUserBasicInfo">
+        update segchk_user_basic_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="phoneNo != null and phoneNo != ''">phone_no = #{phoneNo},</if>
+            <if test="userIcon != null">user_icon = #{userIcon},</if>
+            <if test="hasWechat != null and hasWechat != ''">has_wechat = #{hasWechat},</if>
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteSegchkUserBasicInfoByUserId" parameterType="Long">
+        delete from segchk_user_basic_info where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteSegchkUserBasicInfoByUserIds" parameterType="String">
+        delete from segchk_user_basic_info where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteSegchkUserCertificationInfoByUserIds" parameterType="String">
+        delete from segchk_user_certification_info where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSegchkUserCertificationInfoByUserId" parameterType="Long">
+        delete from segchk_user_certification_info where user_id = #{userId}
+    </delete>
+
+    <insert id="batchSegchkUserCertificationInfo">
+        insert into segchk_user_certification_info( usercard_id, user_name, user_id, provider_id, IDcard, card1, card2, mod_time) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.usercardId}, #{item.userName}, #{item.userId}, #{item.providerId}, #{item.idcard}, #{item.card1}, #{item.card2}, #{item.modTime})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCashMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCashMapper.xml
new file mode 100644
index 0000000..4f7b3db
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCashMapper.xml
@@ -0,0 +1,82 @@
+<?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.segchk.mapper.SegchkUserCashMapper">
+    
+    <resultMap type="SegchkUserCash" id="SegchkUserCashResult">
+        <result property="userId"    column="user_id"    />
+        <result property="cash"    column="cash"    />
+        <result property="cashType"    column="cash_type"    />
+        <result property="cashId"    column="cash_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="retFlag"    column="ret_flag"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserCashVo">
+        select user_id, cash, cash_type, cash_id, provider_id, mod_time, ret_flag from segchk_user_cash
+    </sql>
+
+    <select id="selectSegchkUserCashList" parameterType="SegchkUserCash" resultMap="SegchkUserCashResult">
+        <include refid="selectSegchkUserCashVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginCash != null and params.beginCash != '' and params.endCash != null and params.endCash != ''"> and cash between #{params.beginCash} and #{params.endCash}</if>
+            <if test="cashType != null  and cashType != ''"> and cash_type = #{cashType}</if>
+            <if test="cashId != null "> and cash_id = #{cashId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="retFlag != null "> and ret_flag = #{retFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserCashByCashId" parameterType="Long" resultMap="SegchkUserCashResult">
+        <include refid="selectSegchkUserCashVo"/>
+        where cash_id = #{cashId}
+    </select>
+        
+    <insert id="insertSegchkUserCash" parameterType="SegchkUserCash" useGeneratedKeys="true" keyProperty="cashId">
+        insert into segchk_user_cash
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="cash != null">cash,</if>
+            <if test="cashType != null">cash_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="retFlag != null">ret_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="cash != null">#{cash},</if>
+            <if test="cashType != null">#{cashType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="retFlag != null">#{retFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserCash" parameterType="SegchkUserCash">
+        update segchk_user_cash
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="cash != null">cash = #{cash},</if>
+            <if test="cashType != null">cash_type = #{cashType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="retFlag != null">ret_flag = #{retFlag},</if>
+        </trim>
+        where cash_id = #{cashId}
+    </update>
+
+    <delete id="deleteSegchkUserCashByCashId" parameterType="Long">
+        delete from segchk_user_cash where cash_id = #{cashId}
+    </delete>
+
+    <delete id="deleteSegchkUserCashByCashIds" parameterType="String">
+        delete from segchk_user_cash where cash_id in 
+        <foreach item="cashId" collection="array" open="(" separator="," close=")">
+            #{cashId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCertificationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCertificationInfoMapper.xml
new file mode 100644
index 0000000..743329f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCertificationInfoMapper.xml
@@ -0,0 +1,87 @@
+<?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.segchk.mapper.SegchkUserCertificationInfoMapper">
+    
+    <resultMap type="SegchkUserCertificationInfo" id="SegchkUserCertificationInfoResult">
+        <result property="usercardId"    column="usercard_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="idcard"    column="IDcard"    />
+        <result property="card1"    column="card1"    />
+        <result property="card2"    column="card2"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserCertificationInfoVo">
+        select usercard_id, user_name, user_id, provider_id, IDcard, card1, card2, mod_time from segchk_user_certification_info
+    </sql>
+
+    <select id="selectSegchkUserCertificationInfoList" parameterType="SegchkUserCertificationInfo" resultMap="SegchkUserCertificationInfoResult">
+        <include refid="selectSegchkUserCertificationInfoVo"/>
+        <where>  
+            <if test="usercardId != null "> and usercard_id = #{usercardId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="idcard != null  and idcard != ''"> and IDcard = #{idcard}</if>
+            <if test="card1 != null  and card1 != ''"> and card1 = #{card1}</if>
+            <if test="card2 != null  and card2 != ''"> and card2 = #{card2}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserCertificationInfoByUsercardId" parameterType="Long" resultMap="SegchkUserCertificationInfoResult">
+        <include refid="selectSegchkUserCertificationInfoVo"/>
+        where usercard_id = #{usercardId}
+    </select>
+        
+    <insert id="insertSegchkUserCertificationInfo" parameterType="SegchkUserCertificationInfo" useGeneratedKeys="true" keyProperty="usercardId">
+        insert into segchk_user_certification_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="idcard != null and idcard != ''">IDcard,</if>
+            <if test="card1 != null and card1 != ''">card1,</if>
+            <if test="card2 != null and card2 != ''">card2,</if>
+            <if test="modTime != null">mod_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="idcard != null and idcard != ''">#{idcard},</if>
+            <if test="card1 != null and card1 != ''">#{card1},</if>
+            <if test="card2 != null and card2 != ''">#{card2},</if>
+            <if test="modTime != null">#{modTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserCertificationInfo" parameterType="SegchkUserCertificationInfo">
+        update segchk_user_certification_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="idcard != null and idcard != ''">IDcard = #{idcard},</if>
+            <if test="card1 != null and card1 != ''">card1 = #{card1},</if>
+            <if test="card2 != null and card2 != ''">card2 = #{card2},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where usercard_id = #{usercardId}
+    </update>
+
+    <delete id="deleteSegchkUserCertificationInfoByUsercardId" parameterType="Long">
+        delete from segchk_user_certification_info where usercard_id = #{usercardId}
+    </delete>
+
+    <delete id="deleteSegchkUserCertificationInfoByUsercardIds" parameterType="String">
+        delete from segchk_user_certification_info where usercard_id in 
+        <foreach item="usercardId" collection="array" open="(" separator="," close=")">
+            #{usercardId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserChargeMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserChargeMapper.xml
new file mode 100644
index 0000000..ae50a2d
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserChargeMapper.xml
@@ -0,0 +1,157 @@
+<?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.segchk.mapper.SegchkUserChargeMapper">
+    
+    <resultMap type="SegchkUserCharge" id="SegchkUserChargeResult">
+        <result property="userId"    column="user_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="charge"    column="charge"    />
+        <result property="accountUsed"    column="account_used"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="chargeType"    column="charge_type"    />
+        <result property="chargeId"    column="charge_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="retFlag"    column="ret_flag"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserChargeVo">
+        select user_id, store_id, charge, account_used, card_id, card_type_id, charge_type, charge_id, provider_id, mod_time, ret_flag from segchk_user_charge
+    </sql>
+
+    <select id="selectSegchkUserChargeList" parameterType="SegchkUserCharge" resultMap="SegchkUserChargeResult">
+        <include refid="selectSegchkUserChargeVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginCharge != null and params.beginCharge != '' and params.endCharge != null and params.endCharge != ''"> and charge between #{params.beginCharge} and #{params.endCharge}</if>
+            <if test="params.beginAccountUsed != null and params.beginAccountUsed != '' and params.endAccountUsed != null and params.endAccountUsed != ''"> and account_used between #{params.beginAccountUsed} and #{params.endAccountUsed}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="chargeType != null  and chargeType != ''"> and charge_type = #{chargeType}</if>
+            <if test="chargeId != null "> and charge_id = #{chargeId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="retFlag != null "> and ret_flag = #{retFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserChargeByChargeId" parameterType="Long" resultMap="SegchkUserChargeResult">
+        <include refid="selectSegchkUserChargeVo"/>
+        where charge_id = #{chargeId}
+    </select>
+
+    <insert id="insertSegchkUserCharge" parameterType="SegchkUserCharge" useGeneratedKeys="true" keyProperty="chargeId">
+        insert into segchk_user_charge
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            store_id,
+            <if test="charge != null">charge,</if>
+            <if test="accountUsed != null">account_used,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="cardTypeId != null">card_type_id,</if>
+            <if test="chargeType != null and chargeType != ''">charge_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            mod_time,
+            ret_flag,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="charge != null">#{charge},</if>
+            <if test="accountUsed != null">#{accountUsed},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="cardTypeId != null">#{cardTypeId},</if>
+            <if test="chargeType != null and chargeType != ''">#{chargeType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <choose>
+                <when test="modTime != null and modTime != ''">#{modTime},</when>
+                <otherwise>now(),</otherwise>
+            </choose>
+            <choose>
+                <when test="retFlag != null and modTime != ''">#{retFlag},</when>
+                <otherwise>0,</otherwise>
+            </choose>
+        </trim>
+
+    </insert>
+    <insert id="addSegchkUserChargeWithRecommend" parameterType="SegchkUserCharge" useGeneratedKeys="true" keyProperty="chargeId">
+        insert into segchk_user_charge (
+        user_id
+        , store_id
+        , charge
+        , account_used
+        , card_type_id
+        , provider_id
+        , mod_time
+        , ret_flag
+        )
+
+        select
+        uc.user_id
+        , if(isnull(suei.recommenders_level), null, if(suei.recommenders_level = 1, suei.user_recommenders, null)) as store_id
+        , uc.charge
+        , uc.account_used
+        , uc.card_type_id
+        , uc.provider_id
+        , now() as mod_time
+        , 0 as ret_flag from
+        (
+        (select
+        #{userId} as user_id
+        , #{charge} as charge
+        , #{cardTypeId} as card_type_id
+        , #{accountUsed} as account_used
+        , #{providerId} as provider_id
+        ) uc
+        left join
+        (select user_id, user_recommenders, recommenders_level, provider_id from segchk_user_ext_info where user_id = #{userId}) suei
+        on suei.provider_id = uc.provider_id and suei.user_id = uc.user_id
+        )
+    </insert>
+
+    <update id="updateSegchkUserCharge" parameterType="SegchkUserCharge">
+        update segchk_user_charge
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="charge != null">charge = #{charge},</if>
+            <if test="accountUsed != null">account_used = #{accountUsed},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="chargeType != null and chargeType != ''">charge_type = #{chargeType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="retFlag != null">ret_flag = #{retFlag},</if>
+        </trim>
+        where charge_id = #{chargeId}
+    </update>
+
+    <delete id="deleteSegchkUserChargeByChargeId" parameterType="Long">
+        delete from segchk_user_charge where charge_id = #{chargeId}
+    </delete>
+
+    <delete id="deleteSegchkUserChargeByChargeIds" parameterType="String">
+        delete from segchk_user_charge where charge_id in 
+        <foreach item="chargeId" collection="array" open="(" separator="," close=")">
+            #{chargeId}
+        </foreach>
+    </delete>
+
+    <update id="updateSegchkUserChargeByRet" parameterType="SegchkUserCharge">
+        update segchk_user_charge suc
+        left join (select provider_id, user_id, effective_time, card_id from segchk_user_vip where card_id = #{cardId}) suv on suv.provider_id = suc.provider_id and suv.user_id = suc.user_id
+        left join segchk_store_self_mgt sssm on suc.provider_id = sssm.provider_id and suc.user_id = sssm.user_id
+        set
+            suc.card_id = #{cardId}
+        , suc.mod_time = now()
+        , suc.ret_flag = #{retFlag}
+        , sssm.status = if(sssm.left_count <![CDATA[ > ]]> 0, 0, sssm.status)
+        , sssm.card_id = if(sssm.left_count <![CDATA[ > ]]> 0, suv.card_id, sssm.card_id)
+        , sssm.mod_time = if(sssm.left_count <![CDATA[ > ]]> 0 and sssm.mod_time <![CDATA[ < ]]> suv.effective_time, suv.effective_time, sssm.mod_time)
+        where suc.charge_id = #{chargeId}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCollectMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCollectMapper.xml
new file mode 100644
index 0000000..3c8520f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserCollectMapper.xml
@@ -0,0 +1,85 @@
+<?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.segchk.mapper.SegchkUserCollectMapper">
+    
+    <resultMap type="SegchkUserCollect" id="SegchkUserCollectResult">
+        <result property="collectId"    column="collect_id"    />
+        <result property="collectType"    column="collect_type"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="mgtState"    column="mgt_state"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserCollectVo">
+        select collect_id, collect_type, provider_id, user_id, store_id, mod_time, mgt_state from segchk_user_collect
+    </sql>
+
+    <select id="selectSegchkUserCollectList" parameterType="SegchkUserCollect" resultMap="SegchkUserCollectResult">
+        <include refid="selectSegchkUserCollectVo"/>
+        <where>  
+            <if test="collectId != null "> and collect_id = #{collectId}</if>
+            <if test="collectType != null  and collectType != ''"> and collect_type = #{collectType}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserCollectByCollectId" parameterType="Long" resultMap="SegchkUserCollectResult">
+        <include refid="selectSegchkUserCollectVo"/>
+        where collect_id = #{collectId}
+    </select>
+        
+    <insert id="insertSegchkUserCollect" parameterType="SegchkUserCollect" useGeneratedKeys="true" keyProperty="collectId">
+        insert into segchk_user_collect
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="collectType != null and collectType != ''">collect_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="mgtState != null">mgt_state,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="collectType != null and collectType != ''">#{collectType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+         </trim>
+        ON DUPLICATE KEY UPDATE
+        mod_time = now()
+        , mgt_state = 0
+    </insert>
+
+    <update id="updateSegchkUserCollect" parameterType="SegchkUserCollect">
+        update segchk_user_collect
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="collectType != null and collectType != ''">collect_type = #{collectType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+        </trim>
+        where collect_id = #{collectId}
+    </update>
+
+    <delete id="deleteSegchkUserCollectByCollectId" parameterType="Long">
+        delete from segchk_user_collect where collect_id = #{collectId}
+    </delete>
+
+    <delete id="deleteSegchkUserCollectByCollectIds" parameterType="String">
+        delete from segchk_user_collect where collect_id in 
+        <foreach item="collectId" collection="array" open="(" separator="," close=")">
+            #{collectId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserExtInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserExtInfoMapper.xml
new file mode 100644
index 0000000..f443890
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserExtInfoMapper.xml
@@ -0,0 +1,79 @@
+<?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.segchk.mapper.SegchkUserExtInfoMapper">
+    
+    <resultMap type="SegchkUserExtInfo" id="SegchkUserExtInfoResult">
+        <result property="userId"    column="user_id"    />
+        <result property="userRecommenders"    column="user_recommenders"    />
+        <result property="recommendersLevel"    column="recommenders_level"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserExtInfoVo">
+        select user_id, user_recommenders, recommenders_level, provider_id, mod_time from segchk_user_ext_info
+    </sql>
+
+    <select id="selectSegchkUserExtInfoList" parameterType="SegchkUserExtInfo" resultMap="SegchkUserExtInfoResult">
+        <include refid="selectSegchkUserExtInfoVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userRecommenders != null "> and user_recommenders = #{userRecommenders}</if>
+            <if test="recommendersLevel != null  and recommendersLevel != ''"> and recommenders_level = #{recommendersLevel}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserExtInfoByUserId" parameterType="Long" resultMap="SegchkUserExtInfoResult">
+        <include refid="selectSegchkUserExtInfoVo"/>
+        where user_id = #{userId}
+    </select>
+        
+    <insert id="insertSegchkUserExtInfo" parameterType="SegchkUserExtInfo">
+        insert into segchk_user_ext_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="userRecommenders != null">user_recommenders,</if>
+            <if test="recommendersLevel != null and recommendersLevel != ''">recommenders_level,</if>
+            <if test="providerId != null">provider_id,</if>
+            mod_time,
+<!--            <if test="modTime != null">mod_time,</if>-->
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="userRecommenders != null">#{userRecommenders},</if>
+            <if test="recommendersLevel != null and recommendersLevel != ''">#{recommendersLevel},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <choose>
+                <when test="modTime != null and modTime != ''">#{modTime},</when>
+                <otherwise>now()</otherwise>
+            </choose>
+<!--            <if test="modTime != null">#{modTime},</if>-->
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserExtInfo" parameterType="SegchkUserExtInfo">
+        update segchk_user_ext_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userRecommenders != null">user_recommenders = #{userRecommenders},</if>
+            <if test="recommendersLevel != null and recommendersLevel != ''">recommenders_level = #{recommendersLevel},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteSegchkUserExtInfoByUserId" parameterType="Long">
+        delete from segchk_user_ext_info where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteSegchkUserExtInfoByUserIds" parameterType="String">
+        delete from segchk_user_ext_info where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserLikegoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserLikegoMapper.xml
new file mode 100644
index 0000000..e9aa402
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserLikegoMapper.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.segchk.mapper.SegchkUserLikegoMapper">
+    
+    <resultMap type="SegchkUserLikego" id="SegchkUserLikegoResult">
+        <result property="likegoId"    column="likego_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="cardType"    column="card_type"    />
+        <result property="qrCode"    column="QR_code"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="mgtState"    column="mgt_state"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserLikegoVo">
+        select likego_id, provider_id, user_id, store_id, card_id, card_type, QR_code, mod_time, mgt_state from segchk_user_likego
+    </sql>
+
+    <select id="selectSegchkUserLikegoList" parameterType="SegchkUserLikego" resultMap="SegchkUserLikegoResult">
+        <include refid="selectSegchkUserLikegoVo"/>
+        <where>  
+            <if test="likegoId != null "> and likego_id = #{likegoId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="cardType != null "> and card_type = #{cardType}</if>
+            <if test="qrCode != null  and qrCode != ''"> and QR_code = #{qrCode}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="mgtState != null "> and mgt_state = #{mgtState}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserLikegoByLikegoId" parameterType="Long" resultMap="SegchkUserLikegoResult">
+        <include refid="selectSegchkUserLikegoVo"/>
+        where likego_id = #{likegoId}
+    </select>
+        
+    <insert id="insertSegchkUserLikego" parameterType="SegchkUserLikego" useGeneratedKeys="true" keyProperty="likegoId">
+        insert into segchk_user_likego
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="cardType != null">card_type,</if>
+            <if test="qrCode != null">QR_code,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="mgtState != null">mgt_state,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="cardType != null">#{cardType},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="mgtState != null">#{mgtState},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserLikego" parameterType="SegchkUserLikego">
+        update segchk_user_likego
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="cardType != null">card_type = #{cardType},</if>
+            <if test="qrCode != null">QR_code = #{qrCode},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="mgtState != null">mgt_state = #{mgtState},</if>
+        </trim>
+        where likego_id = #{likegoId}
+    </update>
+
+    <delete id="deleteSegchkUserLikegoByLikegoId" parameterType="Long">
+        delete from segchk_user_likego where likego_id = #{likegoId}
+    </delete>
+
+    <delete id="deleteSegchkUserLikegoByLikegoIds" parameterType="String">
+        delete from segchk_user_likego where likego_id in 
+        <foreach item="likegoId" collection="array" open="(" separator="," close=")">
+            #{likegoId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardCtlMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardCtlMapper.xml
new file mode 100644
index 0000000..a908e99
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardCtlMapper.xml
@@ -0,0 +1,84 @@
+<?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.segchk.mapper.SegchkUserRewardCtlMapper">
+    
+    <resultMap type="SegchkUserRewardCtl" id="SegchkUserRewardCtlResult">
+        <result property="rewardCtlId"    column="reward_ctl_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="fromId"    column="from_id"    />
+        <result property="reward"    column="reward"    />
+        <result property="toId"    column="to_id"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserRewardCtlVo">
+        select reward_ctl_id, provider_id, from_id, reward, to_id, mod_time from segchk_user_reward_ctl
+    </sql>
+
+    <select id="selectSegchkUserRewardCtlList" parameterType="SegchkUserRewardCtl" resultMap="SegchkUserRewardCtlResult">
+        <include refid="selectSegchkUserRewardCtlVo"/>
+        <where>  
+            <if test="rewardCtlId != null "> and reward_ctl_id = #{rewardCtlId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="fromId != null "> and from_id = #{fromId}</if>
+            <if test="params.beginReward != null and params.beginReward != '' and params.endReward != null and params.endReward != ''"> and reward between #{params.beginReward} and #{params.endReward}</if>
+            <if test="toId != null "> and to_id = #{toId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserRewardCtlByRewardCtlId" parameterType="Integer" resultMap="SegchkUserRewardCtlResult">
+        <include refid="selectSegchkUserRewardCtlVo"/>
+        where reward_ctl_id = #{rewardCtlId}
+    </select>
+        
+    <insert id="insertSegchkUserRewardCtl" parameterType="SegchkUserRewardCtl" useGeneratedKeys="true" keyProperty="rewardCtlId">
+        insert into segchk_user_reward_ctl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="fromId != null">from_id,</if>
+            <if test="reward != null">reward,</if>
+            <if test="toId != null">to_id,</if>
+            mod_time,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="fromId != null">#{fromId},</if>
+            <if test="reward != null">#{reward},</if>
+            <if test="toId != null">#{toId},</if>
+            <choose>
+                <when test="modTime != null and modTime != ''">#{modTime},</when>
+                <otherwise>now()</otherwise>
+            </choose>
+<!--            <if test="modTime != null">#{modTime},</if>-->
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserRewardCtl" parameterType="SegchkUserRewardCtl">
+        update segchk_user_reward_ctl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="fromId != null">from_id = #{fromId},</if>
+            <if test="reward != null">reward = #{reward},</if>
+            <if test="toId != null">to_id = #{toId},</if>
+            <choose>
+                <when test="modTime != null">mod_time = #{modTime},</when>
+                <otherwise>mod_time = now(),</otherwise>
+            </choose>
+        </trim>
+        where reward_ctl_id = #{rewardCtlId}
+    </update>
+
+    <delete id="deleteSegchkUserRewardCtlByRewardCtlId" parameterType="Integer">
+        delete from segchk_user_reward_ctl where reward_ctl_id = #{rewardCtlId}
+    </delete>
+
+    <delete id="deleteSegchkUserRewardCtlByRewardCtlIds" parameterType="String">
+        delete from segchk_user_reward_ctl where reward_ctl_id in 
+        <foreach item="rewardCtlId" collection="array" open="(" separator="," close=")">
+            #{rewardCtlId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardMapper.xml
new file mode 100644
index 0000000..8fba955
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserRewardMapper.xml
@@ -0,0 +1,87 @@
+<?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.segchk.mapper.SegchkUserRewardMapper">
+    
+    <resultMap type="SegchkUserReward" id="SegchkUserRewardResult">
+        <result property="userId"    column="user_id"    />
+        <result property="reward"    column="reward"    />
+        <result property="rewardType"    column="reward_type"    />
+        <result property="rewardCardId"    column="reward_card_id"    />
+        <result property="rewardCardTypeId"    column="reward_card_type_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="rewardId"    column="reward_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserRewardVo">
+        select user_id, reward, reward_type, reward_card_id, reward_card_type_id, mod_time, reward_id, provider_id from segchk_user_reward
+    </sql>
+
+    <select id="selectSegchkUserRewardList" parameterType="SegchkUserReward" resultMap="SegchkUserRewardResult">
+        <include refid="selectSegchkUserRewardVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="params.beginReward != null and params.beginReward != '' and params.endReward != null and params.endReward != ''"> and reward between #{params.beginReward} and #{params.endReward}</if>
+            <if test="rewardType != null  and rewardType != ''"> and reward_type = #{rewardType}</if>
+            <if test="rewardCardId != null "> and reward_card_id = #{rewardCardId}</if>
+            <if test="rewardCardTypeId != null "> and reward_card_type_id = #{rewardCardTypeId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="rewardId != null "> and reward_id = #{rewardId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserRewardByRewardId" parameterType="Long" resultMap="SegchkUserRewardResult">
+        <include refid="selectSegchkUserRewardVo"/>
+        where reward_id = #{rewardId}
+    </select>
+        
+    <insert id="insertSegchkUserReward" parameterType="SegchkUserReward" useGeneratedKeys="true" keyProperty="rewardId">
+        insert into segchk_user_reward
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="reward != null">reward,</if>
+            <if test="rewardType != null and rewardType != ''">reward_type,</if>
+            <if test="rewardCardId != null">reward_card_id,</if>
+            <if test="rewardCardTypeId != null">reward_card_type_id,</if>
+            mod_time,
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="reward != null">#{reward},</if>
+            <if test="rewardType != null and rewardType != ''">#{rewardType},</if>
+            <if test="rewardCardId != null">#{rewardCardId},</if>
+            <if test="rewardCardTypeId != null">#{rewardCardTypeId},</if>
+            now(),
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserReward" parameterType="SegchkUserReward">
+        update segchk_user_reward
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="reward != null">reward = #{reward},</if>
+            <if test="rewardType != null and rewardType != ''">reward_type = #{rewardType},</if>
+            <if test="rewardCardId != null">reward_card_id = #{rewardCardId},</if>
+            <if test="rewardCardTypeId != null">reward_card_type_id = #{rewardCardTypeId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where reward_id = #{rewardId}
+    </update>
+
+    <delete id="deleteSegchkUserRewardByRewardId" parameterType="Long">
+        delete from segchk_user_reward where reward_id = #{rewardId}
+    </delete>
+
+    <delete id="deleteSegchkUserRewardByRewardIds" parameterType="String">
+        delete from segchk_user_reward where reward_id in 
+        <foreach item="rewardId" collection="array" open="(" separator="," close=")">
+            #{rewardId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserSecurityMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserSecurityMapper.xml
new file mode 100644
index 0000000..8f45a53
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserSecurityMapper.xml
@@ -0,0 +1,72 @@
+<?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.segchk.mapper.SegchkUserSecurityMapper">
+    
+    <resultMap type="SegchkUserSecurity" id="SegchkUserSecurityResult">
+        <result property="userId"    column="user_id"    />
+        <result property="passwd"    column="passwd"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="pwdId"    column="pwd_id"    />
+        <result property="providerId"    column="provider_id"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserSecurityVo">
+        select user_id, passwd, mod_time, pwd_id, provider_id from segchk_user_security
+    </sql>
+
+    <select id="selectSegchkUserSecurityList" parameterType="SegchkUserSecurity" resultMap="SegchkUserSecurityResult">
+        <include refid="selectSegchkUserSecurityVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="passwd != null  and passwd != ''"> and passwd like concat('%', #{passwd}, '%')</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="pwdId != null "> and pwd_id = #{pwdId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserSecurityByPwdId" parameterType="Long" resultMap="SegchkUserSecurityResult">
+        <include refid="selectSegchkUserSecurityVo"/>
+        where pwd_id = #{pwdId}
+    </select>
+        
+    <insert id="insertSegchkUserSecurity" parameterType="SegchkUserSecurity" useGeneratedKeys="true" keyProperty="pwdId">
+        insert into segchk_user_security
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="passwd != null">passwd,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="providerId != null">provider_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="passwd != null">#{passwd},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="providerId != null">#{providerId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserSecurity" parameterType="SegchkUserSecurity">
+        update segchk_user_security
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="passwd != null">passwd = #{passwd},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+        </trim>
+        where pwd_id = #{pwdId}
+    </update>
+
+    <delete id="deleteSegchkUserSecurityByPwdId" parameterType="Long">
+        delete from segchk_user_security where pwd_id = #{pwdId}
+    </delete>
+
+    <delete id="deleteSegchkUserSecurityByPwdIds" parameterType="String">
+        delete from segchk_user_security where pwd_id in 
+        <foreach item="pwdId" collection="array" open="(" separator="," close=")">
+            #{pwdId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserVipMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserVipMapper.xml
new file mode 100644
index 0000000..00284bb
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserVipMapper.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.segchk.mapper.SegchkUserVipMapper">
+    
+    <resultMap type="SegchkUserVip" id="SegchkUserVipResult">
+        <result property="cardId"    column="card_id"    />
+        <result property="cardTypeId"    column="card_type_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="effectiveTime"    column="effective_time"    />
+        <result property="useCount"    column="use_count"    />
+        <result property="leftCount"    column="left_count"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserVipVo">
+        select card_id, card_type_id, user_id, provider_id, mod_time, effective_time, use_count, left_count, status from segchk_user_vip
+    </sql>
+
+    <select id="selectSegchkUserVipList" parameterType="SegchkUserVip" resultMap="SegchkUserVipResult">
+        <include refid="selectSegchkUserVipVo"/>
+        <where>  
+            <if test="cardId != null "> and card_id = #{cardId}</if>
+            <if test="cardTypeId != null "> and card_type_id = #{cardTypeId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="params.beginEffectiveTime != null and params.beginEffectiveTime != '' and params.endEffectiveTime != null and params.endEffectiveTime != ''"> and effective_time between #{params.beginEffectiveTime} and #{params.endEffectiveTime}</if>
+            <if test="useCount != null "> and use_count = #{useCount}</if>
+            <if test="leftCount != null "> and left_count = #{leftCount}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserVipByCardId" parameterType="Long" resultMap="SegchkUserVipResult">
+        <include refid="selectSegchkUserVipVo"/>
+        where card_id = #{cardId}
+    </select>
+        
+    <insert id="insertSegchkUserVip" parameterType="SegchkUserVip" useGeneratedKeys="true" keyProperty="cardId">
+        insert into segchk_user_vip
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cardTypeId != null">card_type_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="effectiveTime != null">effective_time,</if>
+            <if test="useCount != null">use_count,</if>
+            <if test="leftCount != null">left_count,</if>
+            <if test="status != null and status != ''">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cardTypeId != null">#{cardTypeId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="effectiveTime != null">#{effectiveTime},</if>
+            <if test="useCount != null">#{useCount},</if>
+            <if test="leftCount != null">#{leftCount},</if>
+            <if test="status != null and status != ''">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserVip" parameterType="SegchkUserVip">
+        update segchk_user_vip
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cardTypeId != null">card_type_id = #{cardTypeId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="effectiveTime != null">effective_time = #{effectiveTime},</if>
+            <if test="useCount != null">use_count = #{useCount},</if>
+            <if test="leftCount != null">left_count = #{leftCount},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+        </trim>
+        where card_id = #{cardId}
+    </update>
+
+    <delete id="deleteSegchkUserVipByCardId" parameterType="Long">
+        delete from segchk_user_vip where card_id = #{cardId}
+    </delete>
+
+    <delete id="deleteSegchkUserVipByCardIds" parameterType="String">
+        delete from segchk_user_vip where card_id in 
+        <foreach item="cardId" collection="array" open="(" separator="," close=")">
+            #{cardId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserWechatMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserWechatMapper.xml
new file mode 100644
index 0000000..2248cd4
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkUserWechatMapper.xml
@@ -0,0 +1,85 @@
+<?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.segchk.mapper.SegchkUserWechatMapper">
+    
+    <resultMap type="SegchkUserWechat" id="SegchkUserWechatResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="openid"    column="openid"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectSegchkUserWechatVo">
+        select provider_id, user_id, openid, union_id, nick_name, icon_url, mod_time from segchk_user_wechat
+    </sql>
+
+    <select id="selectSegchkUserWechatList" parameterType="SegchkUserWechat" resultMap="SegchkUserWechatResult">
+        <include refid="selectSegchkUserWechatVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkUserWechatByUserId" parameterType="Long" resultMap="SegchkUserWechatResult">
+        <include refid="selectSegchkUserWechatVo"/>
+        where user_id = #{userId}
+    </select>
+        
+    <insert id="insertSegchkUserWechat" parameterType="SegchkUserWechat">
+        insert into segchk_user_wechat
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="openid != null and openid != ''">openid,</if>
+            <if test="unionId != null">union_id,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url,</if>
+            <if test="modTime != null">mod_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="openid != null and openid != ''">#{openid},</if>
+            <if test="unionId != null and unionId != ''">#{unionId},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">#{iconUrl},</if>
+            <if test="modTime != null">#{modTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkUserWechat" parameterType="SegchkUserWechat">
+        update segchk_user_wechat
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="openid != null and openid != ''">openid = #{openid},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url = #{iconUrl},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteSegchkUserWechatByUserId" parameterType="Long">
+        delete from segchk_user_wechat where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteSegchkUserWechatByUserIds" parameterType="String">
+        delete from segchk_user_wechat where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/segchk/SegchkVipSetInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/segchk/SegchkVipSetInfoMapper.xml
new file mode 100644
index 0000000..b43462b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/segchk/SegchkVipSetInfoMapper.xml
@@ -0,0 +1,87 @@
+<?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.segchk.mapper.SegchkVipSetInfoMapper">
+    
+    <resultMap type="SegchkVipSetInfo" id="SegchkVipSetInfoResult">
+        <result property="providerId"    column="provider_id"    />
+        <result property="modTime"    column="mod_time"    />
+        <result property="cashThrehold"    column="cash_threhold"    />
+        <result property="cashDay"    column="cash_day"    />
+        <result property="selfCharge"    column="self_charge"    />
+        <result property="effectiveRemind"    column="effective_remind"    />
+        <result property="modeId"    column="mode_id"    />
+        <result property="activeFlag"    column="active_flag"    />
+    </resultMap>
+
+    <sql id="selectSegchkVipSetInfoVo">
+        select provider_id, mod_time, cash_threhold, cash_day, self_charge, effective_remind, mode_id, active_flag from segchk_vip_set_info
+    </sql>
+
+    <select id="selectSegchkVipSetInfoList" parameterType="SegchkVipSetInfo" resultMap="SegchkVipSetInfoResult">
+        <include refid="selectSegchkVipSetInfoVo"/>
+        <where>  
+            <if test="providerId != null "> and provider_id = #{providerId}</if>
+            <if test="params.beginModTime != null and params.beginModTime != '' and params.endModTime != null and params.endModTime != ''"> and mod_time between #{params.beginModTime} and #{params.endModTime}</if>
+            <if test="params.beginCashThrehold != null and params.beginCashThrehold != '' and params.endCashThrehold != null and params.endCashThrehold != ''"> and cash_threhold between #{params.beginCashThrehold} and #{params.endCashThrehold}</if>
+            <if test="cashDay != null "> and cash_day = #{cashDay}</if>
+            <if test="selfCharge != null  and selfCharge != ''"> and self_charge = #{selfCharge}</if>
+            <if test="effectiveRemind != null "> and effective_remind = #{effectiveRemind}</if>
+            <if test="modeId != null "> and mode_id = #{modeId}</if>
+            <if test="activeFlag != null  and activeFlag != ''"> and active_flag = #{activeFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectSegchkVipSetInfoByModeId" parameterType="Integer" resultMap="SegchkVipSetInfoResult">
+        <include refid="selectSegchkVipSetInfoVo"/>
+        where mode_id = #{modeId}
+    </select>
+        
+    <insert id="insertSegchkVipSetInfo" parameterType="SegchkVipSetInfo" useGeneratedKeys="true" keyProperty="modeId">
+        insert into segchk_vip_set_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">provider_id,</if>
+            <if test="modTime != null">mod_time,</if>
+            <if test="cashThrehold != null">cash_threhold,</if>
+            <if test="cashDay != null">cash_day,</if>
+            <if test="selfCharge != null and selfCharge != ''">self_charge,</if>
+            <if test="effectiveRemind != null">effective_remind,</if>
+            <if test="activeFlag != null and activeFlag != ''">active_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="providerId != null">#{providerId},</if>
+            <if test="modTime != null">#{modTime},</if>
+            <if test="cashThrehold != null">#{cashThrehold},</if>
+            <if test="cashDay != null">#{cashDay},</if>
+            <if test="selfCharge != null and selfCharge != ''">#{selfCharge},</if>
+            <if test="effectiveRemind != null">#{effectiveRemind},</if>
+            <if test="activeFlag != null and activeFlag != ''">#{activeFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSegchkVipSetInfo" parameterType="SegchkVipSetInfo">
+        update segchk_vip_set_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="modTime != null">mod_time = #{modTime},</if>
+            <if test="cashThrehold != null">cash_threhold = #{cashThrehold},</if>
+            <if test="cashDay != null">cash_day = #{cashDay},</if>
+            <if test="selfCharge != null and selfCharge != ''">self_charge = #{selfCharge},</if>
+            <if test="effectiveRemind != null">effective_remind = #{effectiveRemind},</if>
+            <if test="activeFlag != null and activeFlag != ''">active_flag = #{activeFlag},</if>
+        </trim>
+        where mode_id = #{modeId}
+    </update>
+
+    <delete id="deleteSegchkVipSetInfoByModeId" parameterType="Integer">
+        delete from segchk_vip_set_info where mode_id = #{modeId}
+    </delete>
+
+    <delete id="deleteSegchkVipSetInfoByModeIds" parameterType="String">
+        delete from segchk_vip_set_info where mode_id in 
+        <foreach item="modeId" collection="array" open="(" separator="," close=")">
+            #{modeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
new file mode 100644
index 0000000..8b97906
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -0,0 +1,112 @@
+<?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.SysConfigMapper">
+    
+    <resultMap type="SysConfig" id="SysConfigResult">
+    	<id     property="configId"      column="config_id"      />
+        <result property="configName"    column="config_name"    />
+        <result property="configKey"     column="config_key"     />
+        <result property="configValue"   column="config_value"   />
+        <result property="configType"    column="config_type"    />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+    
+    <sql id="selectConfigVo">
+        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
+		from sys_config
+    </sql>
+    
+    <!-- 查询条件 -->
+	<sql id="sqlwhereSearch">
+		<where>
+			<if test="configId !=null">
+				and config_id = #{configId}
+			</if>
+			<if test="configKey !=null and configKey != ''">
+				and config_key = #{configKey}
+			</if>
+		</where>
+	</sql>
+    
+    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
+        <include refid="selectConfigVo"/>
+        <include refid="sqlwhereSearch"/>
+    </select>
+    
+    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
+        <include refid="selectConfigVo"/>
+        <where>
+			<if test="configName != null and configName != ''">
+				AND config_name like concat('%', #{configName}, '%')
+			</if>
+			<if test="configType != null and configType != ''">
+				AND config_type = #{configType}
+			</if>
+			<if test="configKey != null and configKey != ''">
+				AND config_key like concat('%', #{configKey}, '%')
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+    </select>
+    
+    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
+        <include refid="selectConfigVo"/>
+        where config_key = #{configKey} limit 1
+    </select>
+    
+    <insert id="insertConfig" parameterType="SysConfig">
+        insert into sys_config (
+			<if test="configName != null and configName != '' ">config_name,</if>
+			<if test="configKey != null and configKey != '' ">config_key,</if>
+			<if test="configValue != null and configValue != '' ">config_value,</if>
+			<if test="configType != null and configType != '' ">config_type,</if>
+			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			create_time
+        )values(
+			<if test="configName != null and configName != ''">#{configName},</if>
+			<if test="configKey != null and configKey != ''">#{configKey},</if>
+			<if test="configValue != null and configValue != ''">#{configValue},</if>
+			<if test="configType != null and configType != ''">#{configType},</if>
+			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			sysdate()
+		)
+    </insert>
+	 
+    <update id="updateConfig" parameterType="SysConfig">
+        update sys_config 
+        <set>
+            <if test="configName != null and configName != ''">config_name = #{configName},</if>
+            <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
+            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
+            <if test="configType != null and configType != ''">config_type = #{configType},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+ 			update_time = sysdate()
+        </set>
+        where config_id = #{configId}
+    </update>
+	
+    <delete id="deleteConfigById" parameterType="Long">
+        delete from sys_config where config_id = #{configId}
+    </delete>
+    
+    <delete id="deleteConfigByIds" parameterType="Long">
+        delete from sys_config where config_id in 
+        <foreach item="configId" collection="array" open="(" separator="," close=")">
+        	#{configId}
+        </foreach>
+    </delete>
+    
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
new file mode 100644
index 0000000..774c969
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -0,0 +1,154 @@
+<?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.SysDeptMapper">
+
+	<resultMap type="SysDept" id="SysDeptResult">
+		<id     property="deptId"     column="dept_id"     />
+		<result property="parentId"   column="parent_id"   />
+		<result property="ancestors"  column="ancestors"   />
+		<result property="deptName"   column="dept_name"   />
+		<result property="orderNum"   column="order_num"   />
+		<result property="leader"     column="leader"      />
+		<result property="phone"      column="phone"       />
+		<result property="email"      column="email"       />
+		<result property="status"     column="status"      />
+		<result property="delFlag"    column="del_flag"    />
+		<result property="parentName" column="parent_name" />
+		<result property="createBy"   column="create_by"   />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy"   column="update_by"   />
+		<result property="updateTime" column="update_time" />
+	</resultMap>
+	
+	<sql id="selectDeptVo">
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        from sys_dept d
+    </sql>
+    
+	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '0'
+        <if test="parentId != null and parentId != 0">
+			AND parent_id = #{parentId}
+		</if>
+		<if test="deptName != null and deptName != ''">
+			AND dept_name like concat('%', #{deptName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by d.parent_id, d.order_num
+    </select>
+    
+    <select id="selectDeptListByRoleId" resultType="Integer">
+		select d.dept_id
+		from sys_dept d
+            left join sys_role_dept rd on d.dept_id = rd.dept_id
+        where rd.role_id = #{roleId}
+            <if test="deptCheckStrictly">
+              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+            </if>
+		order by d.parent_id, d.order_num
+	</select>
+    
+    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where dept_id = #{deptId}
+	</select>
+    
+    <select id="checkDeptExistUser" parameterType="Long" resultType="int">
+		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+	</select>
+	
+	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
+		select count(1) from sys_dept
+		where del_flag = '0' and parent_id = #{deptId} limit 1
+	</select>
+	
+	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
+		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+	</select>
+	
+	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
+		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+	</select>
+	
+	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
+	    <include refid="selectDeptVo"/>
+		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
+	</select>
+    
+    <insert id="insertDept" parameterType="SysDept">
+ 		insert into sys_dept(
+ 			<if test="deptId != null and deptId != 0">dept_id,</if>
+ 			<if test="parentId != null and parentId != 0">parent_id,</if>
+ 			<if test="deptName != null and deptName != ''">dept_name,</if>
+ 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
+ 			<if test="orderNum != null and orderNum != ''">order_num,</if>
+ 			<if test="leader != null and leader != ''">leader,</if>
+ 			<if test="phone != null and phone != ''">phone,</if>
+ 			<if test="email != null and email != ''">email,</if>
+ 			<if test="status != null">status,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="deptId != null and deptId != 0">#{deptId},</if>
+ 			<if test="parentId != null and parentId != 0">#{parentId},</if>
+ 			<if test="deptName != null and deptName != ''">#{deptName},</if>
+ 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+ 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+ 			<if test="leader != null and leader != ''">#{leader},</if>
+ 			<if test="phone != null and phone != ''">#{phone},</if>
+ 			<if test="email != null and email != ''">#{email},</if>
+ 			<if test="status != null">#{status},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+	<update id="updateDept" parameterType="SysDept">
+ 		update sys_dept
+ 		<set>
+ 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+ 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+ 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+ 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+ 			<if test="leader != null">leader = #{leader},</if>
+ 			<if test="phone != null">phone = #{phone},</if>
+ 			<if test="email != null">email = #{email},</if>
+ 			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where dept_id = #{deptId}
+	</update>
+	
+	<update id="updateDeptChildren" parameterType="java.util.List">
+	    update sys_dept set ancestors =
+	    <foreach collection="depts" item="item" index="index"
+	        separator=" " open="case dept_id" close="end">
+	        when #{item.deptId} then #{item.ancestors}
+	    </foreach>
+	    where dept_id in
+	    <foreach collection="depts" item="item" index="index"
+	        separator="," open="(" close=")">
+	        #{item.deptId}
+	    </foreach>
+	</update>
+	 
+	<update id="updateDeptStatusNormal" parameterType="Long">
+ 	    update sys_dept set status = '0' where dept_id in 
+ 	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
+        	#{deptId}
+        </foreach>
+	</update>
+	
+	<delete id="deleteDeptById" parameterType="Long">
+		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+	</delete>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
new file mode 100644
index 0000000..8da9030
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -0,0 +1,124 @@
+<?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.SysDictDataMapper">
+	
+	<resultMap type="SysDictData" id="SysDictDataResult">
+		<id     property="dictCode"   column="dict_code"   />
+		<result property="dictSort"   column="dict_sort"   />
+		<result property="dictLabel"  column="dict_label"  />
+		<result property="dictValue"  column="dict_value"  />
+		<result property="dictType"   column="dict_type"   />
+		<result property="cssClass"   column="css_class"   />
+		<result property="listClass"  column="list_class"  />
+		<result property="isDefault"  column="is_default"  />
+		<result property="status"     column="status"      />
+		<result property="createBy"   column="create_by"   />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy"   column="update_by"   />
+		<result property="updateTime" column="update_time" />
+	</resultMap>
+	
+	<sql id="selectDictDataVo">
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+		from sys_dict_data
+    </sql>
+
+	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+	    <include refid="selectDictDataVo"/>
+		<where>
+		    <if test="dictType != null and dictType != ''">
+				AND dict_type = #{dictType}
+			</if>
+			<if test="dictLabel != null and dictLabel != ''">
+				AND dict_label like concat('%', #{dictLabel}, '%')
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+		</where>
+		order by dict_sort asc
+	</select>
+	
+	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+		<include refid="selectDictDataVo"/>
+		where status = '0' and dict_type = #{dictType} order by dict_sort asc
+	</select>
+	
+	<select id="selectDictLabel" resultType="String">
+		select dict_label from sys_dict_data
+		where dict_type = #{dictType} and dict_value = #{dictValue}
+	</select>
+	
+	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
+		<include refid="selectDictDataVo"/>
+		where dict_code = #{dictCode}
+	</select>
+	
+	<select id="countDictDataByType" resultType="Integer">
+	    select count(1) from sys_dict_data where dict_type=#{dictType}  
+	</select>
+	
+	<delete id="deleteDictDataById" parameterType="Long">
+ 		delete from sys_dict_data where dict_code = #{dictCode}
+ 	</delete>
+ 	
+ 	<delete id="deleteDictDataByIds" parameterType="Long">
+ 		delete from sys_dict_data where dict_code in
+ 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
+ 			#{dictCode}
+        </foreach> 
+ 	</delete>
+	
+	<update id="updateDictData" parameterType="SysDictData">
+ 		update sys_dict_data
+ 		<set>
+ 			<if test="dictSort != null">dict_sort = #{dictSort},</if>
+ 			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
+ 			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
+ 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+ 			<if test="cssClass != null">css_class = #{cssClass},</if>
+ 			<if test="listClass != null">list_class = #{listClass},</if>
+ 			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
+ 			<if test="status != null">status = #{status},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where dict_code = #{dictCode}
+	</update>
+	
+	<update id="updateDictDataType" parameterType="String">
+ 		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
+	</update>
+ 	
+ 	<insert id="insertDictData" parameterType="SysDictData">
+ 		insert into sys_dict_data(
+ 			<if test="dictSort != null">dict_sort,</if>
+ 			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
+ 			<if test="dictValue != null and dictValue != ''">dict_value,</if>
+ 			<if test="dictType != null and dictType != ''">dict_type,</if>
+ 			<if test="cssClass != null and cssClass != ''">css_class,</if>
+ 			<if test="listClass != null and listClass != ''">list_class,</if>
+ 			<if test="isDefault != null and isDefault != ''">is_default,</if>
+ 			<if test="status != null">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 		    <if test="dictSort != null">#{dictSort},</if>
+ 		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
+ 			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
+ 			<if test="dictType != null and dictType != ''">#{dictType},</if>
+ 			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
+ 			<if test="listClass != null and listClass != ''">#{listClass},</if>
+ 			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
+ 			<if test="status != null">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
new file mode 100644
index 0000000..55b4075
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -0,0 +1,105 @@
+<?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.SysDictTypeMapper">
+
+	<resultMap type="SysDictType" id="SysDictTypeResult">
+		<id     property="dictId"     column="dict_id"     />
+		<result property="dictName"   column="dict_name"   />
+		<result property="dictType"   column="dict_type"   />
+		<result property="status"     column="status"      />
+		<result property="createBy"   column="create_by"   />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy"   column="update_by"   />
+		<result property="updateTime" column="update_time" />
+	</resultMap>
+	
+	<sql id="selectDictTypeVo">
+        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
+		from sys_dict_type
+    </sql>
+
+	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+	    <include refid="selectDictTypeVo"/>
+		<where>
+		    <if test="dictName != null and dictName != ''">
+				AND dict_name like concat('%', #{dictName}, '%')
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="dictType != null and dictType != ''">
+				AND dict_type like concat('%', #{dictType}, '%')
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+	    </where>
+	</select>
+	
+	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
+		<include refid="selectDictTypeVo"/>
+	</select>
+	
+	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
+		<include refid="selectDictTypeVo"/>
+		where dict_id = #{dictId}
+	</select>
+	
+	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
+		<include refid="selectDictTypeVo"/>
+		where dict_type = #{dictType}
+	</select>
+	
+	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
+		<include refid="selectDictTypeVo"/>
+		where dict_type = #{dictType} limit 1
+	</select>
+	
+	<delete id="deleteDictTypeById" parameterType="Long">
+ 		delete from sys_dict_type where dict_id = #{dictId}
+ 	</delete>
+ 	
+ 	<delete id="deleteDictTypeByIds" parameterType="Long">
+ 		delete from sys_dict_type where dict_id in
+ 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
+ 			#{dictId}
+        </foreach> 
+ 	</delete>
+
+ 	<update id="updateDictType" parameterType="SysDictType">
+ 		update sys_dict_type
+ 		<set>
+ 			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
+ 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+ 			<if test="status != null">status = #{status},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where dict_id = #{dictId}
+	</update>
+ 	
+ 	<insert id="insertDictType" parameterType="SysDictType">
+ 		insert into sys_dict_type(
+ 			<if test="dictName != null and dictName != ''">dict_name,</if>
+ 			<if test="dictType != null and dictType != ''">dict_type,</if>
+ 			<if test="status != null">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="dictName != null and dictName != ''">#{dictName},</if>
+ 			<if test="dictType != null and dictType != ''">#{dictType},</if>
+ 			<if test="status != null">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
new file mode 100644
index 0000000..b8178fa
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -0,0 +1,57 @@
+<?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.SysLogininforMapper">
+
+	<resultMap type="SysLogininfor" id="SysLogininforResult">
+		<id     property="infoId"        column="info_id"           />
+		<result property="userName"      column="user_name"         />
+		<result property="status"        column="status"            />
+		<result property="ipaddr"        column="ipaddr"            />
+		<result property="loginLocation" column="login_location"    />
+		<result property="browser"       column="browser"           />
+		<result property="os"            column="os"                />
+		<result property="msg"           column="msg"               />
+		<result property="loginTime"     column="login_time"        />
+	</resultMap>
+
+	<insert id="insertLogininfor" parameterType="SysLogininfor">
+		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
+	</insert>
+	
+	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
+		<where>
+			<if test="ipaddr != null and ipaddr != ''">
+				AND ipaddr like concat('%', #{ipaddr}, '%')
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="userName != null and userName != ''">
+				AND user_name like concat('%', #{userName}, '%')
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+		order by info_id desc
+	</select>
+	
+	<delete id="deleteLogininforByIds" parameterType="Long">
+ 		delete from sys_logininfor where info_id in
+ 		<foreach collection="array" item="infoId" open="(" separator="," close=")">
+ 			#{infoId}
+        </foreach> 
+ 	</delete>
+    
+    <update id="cleanLogininfor">
+        truncate table sys_logininfor
+    </update>
+    
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
new file mode 100644
index 0000000..22a4cd1
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -0,0 +1,191 @@
+<?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.SysMenuMapper">
+
+	<resultMap type="SysMenu" id="SysMenuResult">
+		<id     property="menuId"         column="menu_id"        />
+		<result property="menuName"       column="menu_name"      />
+		<result property="parentName"     column="parent_name"    />
+		<result property="parentId"       column="parent_id"      />
+		<result property="orderNum"       column="order_num"      />
+		<result property="path"           column="path"           />
+		<result property="component"      column="component"      />
+		<result property="isFrame"        column="is_frame"       />
+		<result property="isCache"        column="is_cache"       />
+		<result property="menuType"       column="menu_type"      />
+		<result property="visible"        column="visible"        />
+		<result property="status"         column="status"         />
+		<result property="perms"          column="perms"          />
+		<result property="icon"           column="icon"           />
+		<result property="createBy"       column="create_by"      />
+		<result property="createTime"     column="create_time"    />
+		<result property="updateTime"     column="update_time"    />
+		<result property="updateBy"       column="update_by"      />
+		<result property="remark"         column="remark"         />
+	</resultMap>
+
+	<sql id="selectMenuVo">
+        select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+		from sys_menu
+    </sql>
+    
+    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
+		<include refid="selectMenuVo"/>
+		<where>
+			<if test="menuName != null and menuName != ''">
+				AND menu_name like concat('%', #{menuName}, '%')
+			</if>
+			<if test="visible != null and visible != ''">
+				AND visible = #{visible}
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+		</where>
+		order by parent_id, order_num
+	</select>
+	
+	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+		order by m.parent_id, m.order_num
+	</select>
+	
+	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m
+		left join sys_role_menu rm on m.menu_id = rm.menu_id
+		left join sys_user_role ur on rm.role_id = ur.role_id
+		left join sys_role ro on ur.role_id = ro.role_id
+		where ur.user_id = #{params.userId}
+		<if test="menuName != null and menuName != ''">
+            AND menu_name like concat('%', #{menuName}, '%')
+		</if>
+		<if test="visible != null and visible != ''">
+            AND visible = #{visible}
+		</if>
+		<if test="status != null and status != ''">
+            AND status = #{status}
+		</if>
+		order by m.parent_id, m.order_num
+	</select>
+    
+    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m
+			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_role ro on ur.role_id = ro.role_id
+			 left join sys_user u on ur.user_id = u.user_id
+		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
+		order by m.parent_id, m.order_num
+	</select>
+	
+	<select id="selectMenuListByRoleId" resultType="Integer">
+		select m.menu_id
+		from sys_menu m
+            left join sys_role_menu rm on m.menu_id = rm.menu_id
+        where rm.role_id = #{roleId}
+            <if test="menuCheckStrictly">
+              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+            </if>
+		order by m.parent_id, m.order_num
+	</select>
+	
+	<select id="selectMenuPerms" resultType="String">
+		select distinct m.perms
+		from sys_menu m
+			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_user_role ur on rm.role_id = ur.role_id
+	</select>
+
+	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+		select distinct m.perms
+		from sys_menu m
+			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_role r on r.role_id = ur.role_id
+		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
+	</select>
+	
+	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
+		<include refid="selectMenuVo"/>
+		where menu_id = #{menuId}
+	</select>
+	
+	<select id="hasChildByMenuId" resultType="Integer">
+	    select count(1) from sys_menu where parent_id = #{menuId}  
+	</select>
+	
+	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
+		<include refid="selectMenuVo"/>
+		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
+	</select>
+	
+	<update id="updateMenu" parameterType="SysMenu">
+		update sys_menu
+		<set>
+			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
+			<if test="parentId != null">parent_id = #{parentId},</if>
+			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+			<if test="path != null and path != ''">path = #{path},</if>
+			<if test="component != null">component = #{component},</if>
+			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
+			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
+			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
+			<if test="visible != null">visible = #{visible},</if>
+			<if test="status != null">status = #{status},</if>
+			<if test="perms !=null">perms = #{perms},</if>
+			<if test="icon !=null and icon != ''">icon = #{icon},</if>
+			<if test="remark != null and remark != ''">remark = #{remark},</if>
+			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			update_time = sysdate()
+		</set>
+		where menu_id = #{menuId}
+	</update>
+
+	<insert id="insertMenu" parameterType="SysMenu">
+		insert into sys_menu(
+		<if test="menuId != null and menuId != 0">menu_id,</if>
+		<if test="parentId != null and parentId != 0">parent_id,</if>
+		<if test="menuName != null and menuName != ''">menu_name,</if>
+		<if test="orderNum != null and orderNum != ''">order_num,</if>
+		<if test="path != null and path != ''">path,</if>
+		<if test="component != null and component != ''">component,</if>
+		<if test="isFrame != null and isFrame != ''">is_frame,</if>
+		<if test="isCache != null and isCache != ''">is_cache,</if>
+		<if test="menuType != null and menuType != ''">menu_type,</if>
+		<if test="visible != null">visible,</if>
+		<if test="status != null">status,</if>
+		<if test="perms !=null and perms != ''">perms,</if>
+		<if test="icon != null and icon != ''">icon,</if>
+		<if test="remark != null and remark != ''">remark,</if>
+		<if test="createBy != null and createBy != ''">create_by,</if>
+		create_time
+		)values(
+		<if test="menuId != null and menuId != 0">#{menuId},</if>
+		<if test="parentId != null and parentId != 0">#{parentId},</if>
+		<if test="menuName != null and menuName != ''">#{menuName},</if>
+		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+		<if test="path != null and path != ''">#{path},</if>
+		<if test="component != null and component != ''">#{component},</if>
+		<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
+		<if test="isCache != null and isCache != ''">#{isCache},</if>
+		<if test="menuType != null and menuType != ''">#{menuType},</if>
+		<if test="visible != null">#{visible},</if>
+		<if test="status != null">#{status},</if>
+		<if test="perms !=null and perms != ''">#{perms},</if>
+		<if test="icon != null and icon != ''">#{icon},</if>
+		<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		sysdate()
+		)
+	</insert>
+	
+	<delete id="deleteMenuById" parameterType="Long">
+	    delete from sys_menu where menu_id = #{menuId}
+	</delete>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
new file mode 100644
index 0000000..65d3079
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -0,0 +1,89 @@
+<?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.SysNoticeMapper">
+    
+    <resultMap type="SysNotice" id="SysNoticeResult">
+        <result property="noticeId"       column="notice_id"       />
+        <result property="noticeTitle"    column="notice_title"    />
+        <result property="noticeType"     column="notice_type"     />
+        <result property="noticeContent"  column="notice_content"  />
+        <result property="status"         column="status"          />
+        <result property="createBy"       column="create_by"       />
+        <result property="createTime"     column="create_time"     />
+        <result property="updateBy"       column="update_by"       />
+        <result property="updateTime"     column="update_time"     />
+        <result property="remark"         column="remark"          />
+    </resultMap>
+    
+    <sql id="selectNoticeVo">
+        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+		from sys_notice
+    </sql>
+    
+    <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
+        <include refid="selectNoticeVo"/>
+        where notice_id = #{noticeId}
+    </select>
+    
+    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
+        <include refid="selectNoticeVo"/>
+        <where>
+			<if test="noticeTitle != null and noticeTitle != ''">
+				AND notice_title like concat('%', #{noticeTitle}, '%')
+			</if>
+			<if test="noticeType != null and noticeType != ''">
+				AND notice_type = #{noticeType}
+			</if>
+			<if test="createBy != null and createBy != ''">
+				AND create_by like concat('%', #{createBy}, '%')
+			</if>
+		</where>
+    </select>
+    
+    <insert id="insertNotice" parameterType="SysNotice">
+        insert into sys_notice (
+			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
+			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
+			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
+			<if test="status != null and status != '' ">status, </if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
+			<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
+			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
+			<if test="status != null and status != ''">#{status}, </if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+		)
+    </insert>
+	 
+    <update id="updateNotice" parameterType="SysNotice">
+        update sys_notice 
+        <set>
+            <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
+            <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
+            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
+            <if test="status != null and status != ''">status = #{status}, </if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+        </set>
+        where notice_id = #{noticeId}
+    </update>
+	
+    <delete id="deleteNoticeById" parameterType="Long">
+        delete from sys_notice where notice_id = #{noticeId}
+    </delete>
+    
+    <delete id="deleteNoticeByIds" parameterType="Long">
+        delete from sys_notice where notice_id in 
+        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
+            #{noticeId}
+        </foreach>
+    </delete>
+    
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
new file mode 100644
index 0000000..f017ef8
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -0,0 +1,83 @@
+<?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.SysOperLogMapper">
+
+	<resultMap type="SysOperLog" id="SysOperLogResult">
+		<id     property="operId"         column="oper_id"        />
+		<result property="title"          column="title"          />
+		<result property="businessType"   column="business_type"  />
+		<result property="method"         column="method"         />
+		<result property="requestMethod"  column="request_method" />
+		<result property="operatorType"   column="operator_type"  />
+		<result property="operName"       column="oper_name"      />
+		<result property="deptName"       column="dept_name"      />
+		<result property="operUrl"        column="oper_url"       />
+		<result property="operIp"         column="oper_ip"        />
+		<result property="operLocation"   column="oper_location"  />
+		<result property="operParam"      column="oper_param"     />
+		<result property="jsonResult"     column="json_result"    />
+		<result property="status"         column="status"         />
+		<result property="errorMsg"       column="error_msg"      />
+		<result property="operTime"       column="oper_time"      />
+	</resultMap>
+
+	<sql id="selectOperLogVo">
+        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time
+        from sys_oper_log
+    </sql>
+    
+	<insert id="insertOperlog" parameterType="SysOperLog">
+		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
+	</insert>
+	
+	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+		<include refid="selectOperLogVo"/>
+		<where>
+			<if test="title != null and title != ''">
+				AND title like concat('%', #{title}, '%')
+			</if>
+			<if test="businessType != null and businessType != ''">
+				AND business_type = #{businessType}
+			</if>
+			<if test="businessTypes != null and businessTypes.length > 0">
+			    AND business_type in
+			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+		 			#{businessType}
+		        </foreach> 
+			</if>
+			<if test="status != null">
+				AND status = #{status}
+			</if>
+			<if test="operName != null and operName != ''">
+				AND oper_name like concat('%', #{operName}, '%')
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+		</where>
+		order by oper_id desc
+	</select>
+	
+	<delete id="deleteOperLogByIds" parameterType="Long">
+ 		delete from sys_oper_log where oper_id in
+ 		<foreach collection="array" item="operId" open="(" separator="," close=")">
+ 			#{operId}
+        </foreach> 
+ 	</delete>
+ 	
+ 	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
+		<include refid="selectOperLogVo"/>
+		where oper_id = #{operId}
+	</select>
+	
+	<update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
new file mode 100644
index 0000000..c82d808
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.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.SysPostMapper">
+
+	<resultMap type="SysPost" id="SysPostResult">
+		<id     property="postId"        column="post_id"       />
+		<result property="postCode"      column="post_code"     />
+		<result property="postName"      column="post_name"     />
+		<result property="postSort"      column="post_sort"     />
+		<result property="status"        column="status"        />
+		<result property="createBy"      column="create_by"     />
+		<result property="createTime"    column="create_time"   />
+		<result property="updateBy"      column="update_by"     />
+		<result property="updateTime"    column="update_time"   />
+		<result property="remark"        column="remark"        />
+	</resultMap>
+	
+	<sql id="selectPostVo">
+        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
+		from sys_post
+    </sql>
+	
+	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+	    <include refid="selectPostVo"/>
+		<where>
+			<if test="postCode != null and postCode != ''">
+				AND post_code like concat('%', #{postCode}, '%')
+			</if>
+			<if test="status != null and status != ''">
+				AND status = #{status}
+			</if>
+			<if test="postName != null and postName != ''">
+				AND post_name like concat('%', #{postName}, '%')
+			</if>
+		</where>
+	</select>
+	
+	<select id="selectPostAll" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+	</select>
+	
+	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+		where post_id = #{postId}
+	</select>
+	
+	<select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
+		select p.post_id
+        from sys_post p
+	        left join sys_user_post up on up.post_id = p.post_id
+	        left join sys_user u on u.user_id = up.user_id
+	    where u.user_id = #{userId}
+	</select>
+	
+	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
+		select p.post_id, p.post_name, p.post_code
+		from sys_post p
+			 left join sys_user_post up on up.post_id = p.post_id
+			 left join sys_user u on u.user_id = up.user_id
+		where u.user_name = #{userName}
+	</select>
+	
+	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+		 where post_name=#{postName} limit 1
+	</select>
+	
+	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+		 where post_code=#{postCode} limit 1
+	</select>
+	
+	<update id="updatePost" parameterType="SysPost">
+ 		update sys_post
+ 		<set>
+ 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
+ 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
+ 			<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
+ 			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where post_id = #{postId}
+	</update>
+ 	
+ 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+ 		insert into sys_post(
+ 			<if test="postId != null and postId != 0">post_id,</if>
+ 			<if test="postCode != null and postCode != ''">post_code,</if>
+ 			<if test="postName != null and postName != ''">post_name,</if>
+ 			<if test="postSort != null and postSort != ''">post_sort,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="postId != null and postId != 0">#{postId},</if>
+ 			<if test="postCode != null and postCode != ''">#{postCode},</if>
+ 			<if test="postName != null and postName != ''">#{postName},</if>
+ 			<if test="postSort != null and postSort != ''">#{postSort},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+	<delete id="deletePostById" parameterType="Long">
+		delete from sys_post where post_id = #{postId}
+	</delete>
+	
+	<delete id="deletePostByIds" parameterType="Long">
+ 		delete from sys_post where post_id in
+ 		<foreach collection="array" item="postId" open="(" separator="," close=")">
+ 			#{postId}
+        </foreach> 
+ 	</delete>
+
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
new file mode 100644
index 0000000..7c4139b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -0,0 +1,34 @@
+<?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.SysRoleDeptMapper">
+
+	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
+		<result property="roleId"     column="role_id"      />
+		<result property="deptId"     column="dept_id"      />
+	</resultMap>
+
+	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
+		delete from sys_role_dept where role_id=#{roleId}
+	</delete>
+	
+	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
+	    select count(1) from sys_role_dept where dept_id=#{deptId}
+	</select>
+	
+	<delete id="deleteRoleDept" parameterType="Long">
+ 		delete from sys_role_dept where role_id in
+ 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
+ 			#{roleId}
+        </foreach> 
+ 	</delete>
+	
+	<insert id="batchRoleDept">
+		insert into sys_role_dept(role_id, dept_id) values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(#{item.roleId},#{item.deptId})
+		</foreach>
+	</insert>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
new file mode 100644
index 0000000..3b85018
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -0,0 +1,149 @@
+<?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.SysRoleMapper">
+
+	<resultMap type="SysRole" id="SysRoleResult">
+		<id     property="roleId"             column="role_id"               />
+		<result property="roleName"           column="role_name"             />
+		<result property="roleKey"            column="role_key"              />
+		<result property="roleSort"           column="role_sort"             />
+		<result property="dataScope"          column="data_scope"            />
+		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
+		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
+		<result property="status"             column="status"                />
+		<result property="delFlag"            column="del_flag"              />
+		<result property="createBy"           column="create_by"             />
+		<result property="createTime"         column="create_time"           />
+		<result property="updateBy"           column="update_by"             />
+		<result property="updateTime"         column="update_time"           />
+		<result property="remark"             column="remark"                />
+	</resultMap>
+	
+	<sql id="selectRoleVo">
+	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+            r.status, r.del_flag, r.create_time, r.remark 
+        from sys_role r
+	        left join sys_user_role ur on ur.role_id = r.role_id
+	        left join sys_user u on u.user_id = ur.user_id
+	        left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+    
+    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		where r.del_flag = '0'
+		<if test="roleName != null and roleName != ''">
+			AND r.role_name like concat('%', #{roleName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND r.status = #{status}
+		</if>
+		<if test="roleKey != null and roleKey != ''">
+			AND r.role_key like concat('%', #{roleKey}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by r.role_sort
+	</select>
+    
+	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		WHERE r.del_flag = '0' and ur.user_id = #{userId}
+	</select>
+	
+	<select id="selectRoleAll" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+	</select>
+	
+	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+		select r.role_id
+        from sys_role r
+	        left join sys_user_role ur on ur.role_id = r.role_id
+	        left join sys_user u on u.user_id = ur.user_id
+	    where u.user_id = #{userId}
+	</select>
+	
+	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		where r.role_id = #{roleId}
+	</select>
+	
+	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		WHERE r.del_flag = '0' and u.user_name = #{userName}
+	</select>
+	
+	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		 where r.role_name=#{roleName} limit 1
+	</select>
+	
+	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		 where r.role_key=#{roleKey} limit 1
+	</select>
+	
+ 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+ 		insert into sys_role(
+ 			<if test="roleId != null and roleId != 0">role_id,</if>
+ 			<if test="roleName != null and roleName != ''">role_name,</if>
+ 			<if test="roleKey != null and roleKey != ''">role_key,</if>
+ 			<if test="roleSort != null and roleSort != ''">role_sort,</if>
+ 			<if test="dataScope != null and dataScope != ''">data_scope,</if>
+ 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
+ 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+ 			<if test="roleId != null and roleId != 0">#{roleId},</if>
+ 			<if test="roleName != null and roleName != ''">#{roleName},</if>
+ 			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
+ 			<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
+ 			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
+ 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
+ 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+	<update id="updateRole" parameterType="SysRole">
+ 		update sys_role
+ 		<set>
+ 			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
+ 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
+ 			<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
+ 			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
+ 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
+ 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
+ 			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where role_id = #{roleId}
+	</update>
+	
+	<delete id="deleteRoleById" parameterType="Long">
+		update sys_role set del_flag = '2' where role_id = #{roleId}
+ 	</delete>
+ 	
+ 	<delete id="deleteRoleByIds" parameterType="Long">
+ 	    update sys_role set del_flag = '2' where role_id in
+ 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
+ 			#{roleId}
+        </foreach> 
+ 	</delete>
+ 	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
new file mode 100644
index 0000000..cb60a85
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -0,0 +1,34 @@
+<?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.SysRoleMenuMapper">
+
+	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+		<result property="roleId"     column="role_id"      />
+		<result property="menuId"     column="menu_id"      />
+	</resultMap>
+	
+	<select id="checkMenuExistRole" resultType="Integer">
+	    select count(1) from sys_role_menu where menu_id = #{menuId}
+	</select>
+
+	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
+		delete from sys_role_menu where role_id=#{roleId}
+	</delete>
+	
+	<delete id="deleteRoleMenu" parameterType="Long">
+ 		delete from sys_role_menu where role_id in
+ 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
+ 			#{roleId}
+        </foreach> 
+ 	</delete>
+	
+	<insert id="batchRoleMenu">
+		insert into sys_role_menu(role_id, menu_id) values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(#{item.roleId},#{item.menuId})
+		</foreach>
+	</insert>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
new file mode 100644
index 0000000..25cf712
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -0,0 +1,217 @@
+<?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.SysUserMapper">
+
+	<resultMap type="SysUser" id="SysUserResult">
+		<id     property="userId"       column="user_id"      />
+		<result property="deptId"       column="dept_id"      />
+		<result property="userName"     column="user_name"    />
+		<result property="nickName"     column="nick_name"    />
+		<result property="email"        column="email"        />
+		<result property="phonenumber"  column="phonenumber"  />
+		<result property="sex"          column="sex"          />
+		<result property="avatar"       column="avatar"       />
+		<result property="password"     column="password"     />
+		<result property="status"       column="status"       />
+		<result property="delFlag"      column="del_flag"     />
+		<result property="loginIp"      column="login_ip"     />
+		<result property="loginDate"    column="login_date"   />
+		<result property="createBy"     column="create_by"    />
+		<result property="createTime"   column="create_time"  />
+		<result property="updateBy"     column="update_by"    />
+		<result property="updateTime"   column="update_time"  />
+		<result property="remark"       column="remark"       />
+		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
+	</resultMap>
+	
+	<resultMap id="deptResult" type="SysDept">
+		<id     property="deptId"   column="dept_id"     />
+		<result property="parentId" column="parent_id"   />
+		<result property="deptName" column="dept_name"   />
+		<result property="orderNum" column="order_num"   />
+		<result property="leader"   column="leader"      />
+		<result property="status"   column="dept_status" />
+	</resultMap>
+	
+	<resultMap id="RoleResult" type="SysRole">
+		<id     property="roleId"       column="role_id"        />
+		<result property="roleName"     column="role_name"      />
+		<result property="roleKey"      column="role_key"       />
+		<result property="roleSort"     column="role_sort"      />
+		<result property="dataScope"     column="data_scope"    />
+		<result property="status"       column="role_status"    />
+	</resultMap>
+	
+	<sql id="selectUserVo">
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        from sys_user u
+		    left join sys_dept d on u.dept_id = d.dept_id
+		    left join sys_user_role ur on u.user_id = ur.user_id
+		    left join sys_role r on r.role_id = ur.role_id
+    </sql>
+    
+    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+	
+	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    from sys_user u
+			 left join sys_dept d on u.dept_id = d.dept_id
+			 left join sys_user_role ur on u.user_id = ur.user_id
+			 left join sys_role r on r.role_id = ur.role_id
+	    where u.del_flag = '0' and r.role_id = #{roleId}
+	    <if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+	
+	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    from sys_user u
+			 left join sys_dept d on u.dept_id = d.dept_id
+			 left join sys_user_role ur on u.user_id = ur.user_id
+			 left join sys_role r on r.role_id = ur.role_id
+	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
+	    <if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+	
+	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+	    <include refid="selectUserVo"/>
+		where u.user_name = #{userName}
+	</select>
+	
+	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.user_id = #{userId}
+	</select>
+	
+	<select id="checkUserNameUnique" parameterType="String" resultType="int">
+		select count(1) from sys_user where user_name = #{userName} limit 1
+	</select>
+	
+	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
+		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
+	</select>
+	
+	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
+		select user_id, email from sys_user where email = #{email} limit 1
+	</select>
+	
+	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+ 		insert into sys_user(
+ 			<if test="userId != null and userId != 0">user_id,</if>
+ 			<if test="deptId != null and deptId != 0">dept_id,</if>
+ 			<if test="userName != null and userName != ''">user_name,</if>
+ 			<if test="nickName != null and nickName != ''">nick_name,</if>
+ 			<if test="email != null and email != ''">email,</if>
+ 			<if test="avatar != null and avatar != ''">avatar,</if>
+ 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+ 			<if test="sex != null and sex != ''">sex,</if>
+ 			<if test="password != null and password != ''">password,</if>
+ 			<if test="status != null and status != ''">status,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="remark != null and remark != ''">remark,</if>
+ 			create_time
+ 		)values(
+ 			<if test="userId != null and userId != ''">#{userId},</if>
+ 			<if test="deptId != null and deptId != ''">#{deptId},</if>
+ 			<if test="userName != null and userName != ''">#{userName},</if>
+ 			<if test="nickName != null and nickName != ''">#{nickName},</if>
+ 			<if test="email != null and email != ''">#{email},</if>
+ 			<if test="avatar != null and avatar != ''">#{avatar},</if>
+ 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+ 			<if test="sex != null and sex != ''">#{sex},</if>
+ 			<if test="password != null and password != ''">#{password},</if>
+ 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="remark != null and remark != ''">#{remark},</if>
+ 			sysdate()
+ 		)
+	</insert>
+	
+	<update id="updateUser" parameterType="SysUser">
+ 		update sys_user
+ 		<set>
+ 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+ 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
+ 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+ 			<if test="email != null ">email = #{email},</if>
+ 			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+ 			<if test="sex != null and sex != ''">sex = #{sex},</if>
+ 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+ 			<if test="password != null and password != ''">password = #{password},</if>
+ 			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+ 			<if test="loginDate != null">login_date = #{loginDate},</if>
+ 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
+ 			update_time = sysdate()
+ 		</set>
+ 		where user_id = #{userId}
+	</update>
+	
+	<update id="updateUserStatus" parameterType="SysUser">
+ 		update sys_user set status = #{status} where user_id = #{userId}
+	</update>
+	
+	<update id="updateUserAvatar" parameterType="SysUser">
+ 		update sys_user set avatar = #{avatar} where user_name = #{userName}
+	</update>
+	
+	<update id="resetUserPwd" parameterType="SysUser">
+ 		update sys_user set password = #{password} where user_name = #{userName}
+	</update>
+	
+	<delete id="deleteUserById" parameterType="Long">
+		update sys_user set del_flag = '2' where user_id = #{userId}
+ 	</delete>
+ 	
+ 	<delete id="deleteUserByIds" parameterType="Long">
+ 		update sys_user set del_flag = '2' where user_id in
+ 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+ 			#{userId}
+        </foreach> 
+ 	</delete>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
new file mode 100644
index 0000000..2b90bc4
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -0,0 +1,34 @@
+<?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.SysUserPostMapper">
+
+	<resultMap type="SysUserPost" id="SysUserPostResult">
+		<result property="userId"     column="user_id"      />
+		<result property="postId"     column="post_id"      />
+	</resultMap>
+
+	<delete id="deleteUserPostByUserId" parameterType="Long">
+		delete from sys_user_post where user_id=#{userId}
+	</delete>
+	
+	<select id="countUserPostById" resultType="Integer">
+	    select count(1) from sys_user_post where post_id=#{postId}  
+	</select>
+	
+	<delete id="deleteUserPost" parameterType="Long">
+ 		delete from sys_user_post where user_id in
+ 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+ 			#{userId}
+        </foreach> 
+ 	</delete>
+	
+	<insert id="batchUserPost">
+		insert into sys_user_post(user_id, post_id) values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(#{item.userId},#{item.postId})
+		</foreach>
+	</insert>
+	
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
new file mode 100644
index 0000000..dd72689
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -0,0 +1,44 @@
+<?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.SysUserRoleMapper">
+
+	<resultMap type="SysUserRole" id="SysUserRoleResult">
+		<result property="userId"     column="user_id"      />
+		<result property="roleId"     column="role_id"      />
+	</resultMap>
+
+	<delete id="deleteUserRoleByUserId" parameterType="Long">
+		delete from sys_user_role where user_id=#{userId}
+	</delete>
+	
+	<select id="countUserRoleByRoleId" resultType="Integer">
+	    select count(1) from sys_user_role where role_id=#{roleId}  
+	</select>
+	
+	<delete id="deleteUserRole" parameterType="Long">
+ 		delete from sys_user_role where user_id in
+ 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+ 			#{userId}
+        </foreach> 
+ 	</delete>
+	
+	<insert id="batchUserRole">
+		insert into sys_user_role(user_id, role_id) values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(#{item.userId},#{item.roleId})
+		</foreach>
+	</insert>
+	
+	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+	</delete>
+	
+	<delete id="deleteUserRoleInfos">
+	    delete from sys_user_role where role_id=#{roleId} and user_id in
+ 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+ 	        #{userId}
+            </foreach> 
+	</delete>
+</mapper> 
\ No newline at end of file
diff --git a/ruoyi-ui/.editorconfig b/ruoyi-ui/.editorconfig
new file mode 100644
index 0000000..7034f9b
--- /dev/null
+++ b/ruoyi-ui/.editorconfig
@@ -0,0 +1,22 @@
+# 告诉EditorConfig插件，这是根文件，不用继续往上查找
+root = true
+
+# 匹配全部文件
+[*]
+# 设置字符集
+charset = utf-8
+# 缩进风格，可选space、tab
+indent_style = space
+# 缩进的空格数
+indent_size = 2
+# 结尾换行符，可选lf、cr、crlf
+end_of_line = lf
+# 在文件结尾插入新行
+insert_final_newline = true
+# 删除一行中的前后空格
+trim_trailing_whitespace = true
+
+# 匹配md结尾的文件
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
new file mode 100644
index 0000000..3da4b01
--- /dev/null
+++ b/ruoyi-ui/.env.development
@@ -0,0 +1,14 @@
+# 页面标题
+VUE_APP_TITLE = 赛格核销管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 图片基地址
+VUE_APP_IMG_URL = ''
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
new file mode 100644
index 0000000..8f8d485
--- /dev/null
+++ b/ruoyi-ui/.env.production
@@ -0,0 +1,11 @@
+# 页面标题
+VUE_APP_TITLE = 赛格核销管理系统
+
+# 生产环境配置
+ENV = 'production'
+
+# 若依管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
+# 图片基地址
+VUE_APP_IMG_URL = 'http://221.195.106.155:8090'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
new file mode 100644
index 0000000..87b05fa
--- /dev/null
+++ b/ruoyi-ui/.env.staging
@@ -0,0 +1,10 @@
+# 页面标题
+VUE_APP_TITLE = 赛格核销管理系统
+
+NODE_ENV = production
+
+# 测试环境配置
+ENV = 'staging'
+
+# 若依管理系统/测试环境
+VUE_APP_BASE_API = '/stage-api'
diff --git a/ruoyi-ui/.eslintignore b/ruoyi-ui/.eslintignore
new file mode 100644
index 0000000..89be6f6
--- /dev/null
+++ b/ruoyi-ui/.eslintignore
@@ -0,0 +1,10 @@
+# 忽略build目录下类型为js的文件的语法检查
+build/*.js
+# 忽略src/assets目录下文件的语法检查
+src/assets
+# 忽略public目录下文件的语法检查
+public
+# 忽略当前目录下为js的文件的语法检查
+*.js
+# 忽略当前目录下为vue的文件的语法检查
+*.vue
\ No newline at end of file
diff --git a/ruoyi-ui/.eslintrc.js b/ruoyi-ui/.eslintrc.js
new file mode 100644
index 0000000..82bbdee
--- /dev/null
+++ b/ruoyi-ui/.eslintrc.js
@@ -0,0 +1,199 @@
+// ESlint 检查配置
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}
diff --git a/ruoyi-ui/.gitignore b/ruoyi-ui/.gitignore
new file mode 100644
index 0000000..78a752d
--- /dev/null
+++ b/ruoyi-ui/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock
diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md
new file mode 100644
index 0000000..a857617
--- /dev/null
+++ b/ruoyi-ui/README.md
@@ -0,0 +1,30 @@
+## 开发
+
+```bash
+# 克隆项目
+git clone https://gitee.com/y_project/RuoYi-Vue
+
+# 进入项目目录
+cd ruoyi-ui
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npm.taobao.org
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:80
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
\ No newline at end of file
diff --git a/ruoyi-ui/alais-config.js b/ruoyi-ui/alais-config.js
new file mode 100644
index 0000000..dd738a8
--- /dev/null
+++ b/ruoyi-ui/alais-config.js
@@ -0,0 +1,14 @@
+/* 此文件未使用，只是为了让idea可以识别实际位置 */
+const path = require('path')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+module.exports = {
+  resolve: {
+    alias: {
+      '@': resolve('src')
+    }
+  }
+}
diff --git a/ruoyi-ui/babel.config.js b/ruoyi-ui/babel.config.js
new file mode 100644
index 0000000..b99f001
--- /dev/null
+++ b/ruoyi-ui/babel.config.js
@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/cli-plugin-babel/preset'
+  ],
+  'env': {
+    'development': {
+      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+      'plugins': ['dynamic-import-node']
+    }
+  }
+}
diff --git a/ruoyi-ui/bin/build.bat b/ruoyi-ui/bin/build.bat
new file mode 100644
index 0000000..dda590d
--- /dev/null
+++ b/ruoyi-ui/bin/build.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ���Web���̣�����dist�ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:prod
+
+pause
\ No newline at end of file
diff --git a/ruoyi-ui/bin/package.bat b/ruoyi-ui/bin/package.bat
new file mode 100644
index 0000000..8281749
--- /dev/null
+++ b/ruoyi-ui/bin/package.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ��װWeb���̣�����node_modules�ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm install --registry=https://registry.npm.taobao.org
+
+pause
\ No newline at end of file
diff --git a/ruoyi-ui/bin/run-web.bat b/ruoyi-ui/bin/run-web.bat
new file mode 100644
index 0000000..d30deae
--- /dev/null
+++ b/ruoyi-ui/bin/run-web.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ʹ�� Vue CLI �������� Web ���̡�
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run dev
+
+pause
\ No newline at end of file
diff --git a/ruoyi-ui/build/index.js b/ruoyi-ui/build/index.js
new file mode 100644
index 0000000..96eec48
--- /dev/null
+++ b/ruoyi-ui/build/index.js
@@ -0,0 +1,36 @@
+const { run } = require('runjs')
+const chalk = require('chalk')
+const config = require('../vue.config.js')
+const rawArgv = process.argv.slice(2)
+const args = rawArgv.join(' ')
+
+if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
+  const report = rawArgv.includes('--report')
+
+  run(`vue-cli-service build ${args}`)
+
+  const port = 9526
+  const publicPath = config.publicPath
+
+  var connect = require('connect')
+  var serveStatic = require('serve-static')
+  const app = connect()
+
+  app.use(
+    publicPath,
+    serveStatic('./dist', {
+      index: ['index.html', '/']
+    })
+  )
+
+  app.listen(port, function () {
+    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    if (report) {
+      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+    }
+
+  })
+} else {
+  console.log("build with " + rawArgv)
+  run(`vue-cli-service build ${args}`)
+}
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
new file mode 100644
index 0000000..581fc94
--- /dev/null
+++ b/ruoyi-ui/package.json
@@ -0,0 +1,88 @@
+{
+  "name": "segchk",
+  "version": "1.0.0",
+  "description": "核销管理系统",
+  "author": "seg",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build --mode production",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+  },
+  "dependencies": {
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.21.0",
+    "clipboard": "2.0.6",
+    "core-js": "3.8.1",
+    "echarts": "4.9.0",
+    "element-ui": "2.15.5",
+    "file-saver": "2.0.4",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "js-beautify": "1.13.0",
+    "js-cookie": "2.2.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "nprogress": "0.2.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "vue": "2.6.12",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "^2.4.0",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "chalk": "4.1.0",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.0",
+    "sass-loader": "10.1.0",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}
diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico
new file mode 100644
index 0000000..e263760
Binary files /dev/null and b/ruoyi-ui/public/favicon.ico differ
diff --git a/ruoyi-ui/public/html/ie.html b/ruoyi-ui/public/html/ie.html
new file mode 100644
index 0000000..052ffcd
--- /dev/null
+++ b/ruoyi-ui/public/html/ie.html
@@ -0,0 +1,46 @@
+
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8" />
+    <title>请升级您的浏览器</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
+    <meta name="renderer" content="webkit">
+    <base target="_blank" />
+    <style type="text/css">
+        html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0}
+        a{text-decoration:none;color:#0072c6;}a:hover{text-decoration:none;color:#004d8c;}
+        body{width:960px;margin:0 auto;padding:10px;font-size:14px;line-height:24px;color:#454545;font-family:'Microsoft YaHei UI','Microsoft YaHei',DengXian,SimSun,'Segoe UI',Tahoma,Helvetica,sans-serif;overflow-y:scroll}
+        h1{font-size:40px;line-height:80px;font-weight:100;margin-bottom:10px;}
+        h2{font-size:20px;line-height:25px;font-weight:100;margin:10px 0;}
+        em{color:red}
+        p{margin-bottom:10px;}
+        hr{margin:20px 0;border:0;border-top:1px solid #dadada}
+        span{display:block;font-size:12px;line-height:12px;}
+        .clean{clear:both;}
+        .browser{padding:10px 10px;}
+        .browser li{width:auto;padding:0 80px;margin-top:30px;height:34px;line-height:22px;float:left;list-style:none;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAADMCAYAAAAWCXEwAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAC7ESURBVHja5Lx5dFRV1rBfgHwYRQQVtB26ZWhtabtfeUGxGxFbUGZF8RMHGkVbRkekVYiKisicVhE0gEwBokgDAhEMMSSQkAECwcxkrlRSqVTqJqnxzs/vj5t7qUyAvr9e37fWV2vtleSm6p6n9t5nn733OVU2RaUaEP5PiqJSbeMXPBTA5/Xhzk9Vnd9vo3HFx21E2LYJX9IRgh6npvyCe9uaqS4K4C3IpXHFx9S99CTuJ8Z0KLVjRlA7ZgTuJ8ZgXxmJL+kIlwAkXBQk6HFq9pWRVA8fSvXwodYgdS892a6EA1UNvouqwXdR99KTeAtyfz2IL+kI1cOHYh9wqwVwKWJqpXbMCOv19gG3Imzb1JF2OgZxfr/NukH4jcNVfyEAE8IU+4BbKet1PfaVke3BtA/i/H6b8aIBt7a4mWmaC0nr55vmqRp8F5V33Mm5LhHtwbQF8SUdsSDCb1I1+K42g1xIWgOYYh9wK+e6RCBs29QxSIWus37aJM51iWjx4so77mwD1d5AHQ1eecedlN9yuyVlva6nrNf14Q7cEmRn4W7u3T2E9ME3UX7L7W1uZg5Weced1s3sA2613ql5LXzQjuRclwjcT4wxTXQeRHC7GLdnHPeensiCVwa3e0PznZk3EbZtwluQa0kofz8NcVNxr++Ce30XnNuv61Bcu7viXt8Fvyu7JYipjfGHxzD+8Bh2j+7fAiZcC+Y0zPDIbCyD6DyV6DyVeDcIQR2C39J4oieNJ3oSOnkVcnZ35Ozu6MVdDHF0N6S4C43OqJYg/0ydzb27hzDx0FjuPT2R+asfa6OVsl7X40s6QoWus/CQk6fWZPHChhxe3lbMCxtyrN9TyxSQSwidvMoC0XK6tRGybPjSRmOuNUKVo4Zxe8YxIu4+Jh4ay/jDY7j39MQWWjnXJYLGFR9Toes8tSaLiavTrIHDxfxfapkCwW8hy9YuhCmhk1fR1FRnaCS1NM4yy8RDYy2tjIkZRXq/HtYsCnqc2sJDTkYsTrU00J6YkEJQR7M/eEGY0MmrcOenqjZA2JmyzTJLuJiOe65LBHUvPUmGR2bE4lQmrk7jqTVZHcrE1WkMWpRIdJ4KnpUXBCHLRl3e16EWIOEaMU00/vAY9na/gsYVH/NdgYe+8w9bMBeSQYsSWXjICcFvL2ga+dhlFwcJ10rjio/ZklprgbSWiavTWvzdd/5hXt5W/OtATC201sq9u4eQ+PVijmSW0nf+YQYtSmTQosR2gUYsTmXQokT6zj9saeRCpmkJ0hxD2gOZeGgsI+Lu45+ps7FXlFmDmDDtSd/5h+k7/zCpZQpa9cwOQciyIR+77LyzFhXlMyZmFOP2jLP8orVWRsTdR2ppHFtSa+k6ZZM1WHvSdcomwyxySceayO4OWTY88TdirygzUkWf18eL2//RQiutYcwYE/Q4tagDOUQ8uo6uUzbRZ3qMJV2nbCLi0XU8tSbrolNXzu6OfOyylgEN4NOkaO5acw/j9ozr0ET37h5imehIZimPL91rAfSZHsOQBfuISS7E7vaTETeX0MmrOoQInbwK+dhlNKWsahni0zPSuGvNPW1M1BrI1NrOwt0WkCn2ijJSS+MYt2ccuQk3oxd36RCi8URPY+HLT1VbgGiSzPsx71laCddMe2Yygf6ZOtuScXvG0XfJn/n8YL+LQnjibyQ34WZ8Xl/bfKSoKL+FVi4EYwKZcu/uIQzaPoExMaPQcrq1ADFX33AI1+6u1OV9HVI6ShU/TYqm75I/dwjTHtDEQ2MZt2ccg7ZPaGGScIDWEBlxc42UoSMQ00StYdoDCgcbtH0Cbx+8p40ZTIBwiFM7RmB3+y+exZvT2YRpDdR6ZoVrw1xRWwN44m/Euf06A6Ki7NLrmnDNmH7TEdSg7RP4/GA/yLK1GdwEKNzSk1M7RlDlqPl1JefOlG2MXTGmXaAxMaMsB/XE34h4tH+7ANlrB7T2iV8OAlDlqOH9mPcsIBPKlF3R16Ad7GwlxoVberYAKCrKv1ghfmkg5sPldLIzZVsLqLErxpC9doAlp3aMICNurlGyVpRdSAu/HqS1Q58rd1JUlI87P1UtKsrHXlGG3e1HCOoov+x2wiX3RxT+o49L1IgutXxVUCfDIxNfLraQDI+M3e3/NdCXbhohqBNfLrIsVzZqmoT6dmXG0SBLTrmJLxd/CVRLECXcDGFaSC1TmHE0yKg4B0P2uxiy38WoOAePHaptAfHYoVqG7HcxcGc5o+IcfFfgsbQUPoYoSa213BbE78oGucTSwpJTbobFFjNgbQHdvi6g8/Z6Om+vZ8h+VxsQE7T/97UMWFvA+Og0UvIryfDIZBQ4CeXvt8a5IAhAY/RImlJWUaHrPHaolhuXFXHN+8e58qNcbomq5P6t3xG973WePLzPgnnsUG0LiP7f1zJwZzk3LisyctfSOFxOJ4lfLzYToQubxu/KpmpWBFWzInguOokrP8ql7/zDRMxLpFfUabasHwlZNnITbmbgznI6b6+3Bu7/fa2lrW5fF9Ar6jQD1hYwLLaYx5fupdi+EiGok748koa4qa010xKkKWUV2UM7kd6vB7tH9yfpnUFkLzQiZOGWnmgHO9N4oie9ok5bA4YPbkqvqNNc8/5xIuYl8tSaLOLLRXambENXF+PxNJD0ziAanVHhYaEliH1lJD/1iqD0qSsIzu2M/N550TZ3QjvYmS3rR1qDtwdhgpgwnabGMj46zRjQsxJdXYw7P1X1pY0GuaRjkMKxPah5qxuV8y6nct7l1LzVDfdyo6miHexM+ou9mblwKfdv/Y77t37HNe8fbwMQDhIxL5FOU2PZklqLJjUYdU7wWxBuN+ricBAF0KQG6pcNovZpw0fCQao/MEBcu7tSOLYHjnu7EZzbmeDczqyfNokrP8ptMXi4XDnzAJ0n72TIgn1oUoMB4VlpgIjj24I0payi9KkrqHj+Ssth2wM5c38f8p68D2nbHKRtc3h86d42A/eZHsOVMw9Y0nXKJmxDvyS1NA70z8Gz0qh5hNvbzpr6ZYMofzyiBUwLkOVdjfR/eVcao0dSl/d1aHx0GhHzEi0TXDnzAJ2mxtJpaixdp2yypM/0GLrcs5D3Y94ztNDsK7qjuxmzDBBz2rYGqZoVQc1b3dr4yfppk+g8eWeLd91aAxGPrqPbyKV0G7mUiEfXMWdz+nmQ0Jsgn1AbT/SkMXrkeZC6vK9DpU9d0S5I5bzLqf6gq6UV7WBn5q9+zDJBuEQ8us4SE6LLPQvpcs9CjmSW4ndlo1XPNBxWLiE34WbSX+wNapEBEsrfT/njERSO7WGBmDA1b3Wj9KkrSO/Xg1WjBjJl/CT+8sQ8a0BT/eGDhwN0uWchXe94ia07YkE+oSLc3gxyQt2yfiSrRg0E+YRqgRSO7UHh2B4UT7ragqmcdznFk67mp14ROO7txpTxk7AN/bLFgN1GLsU29EvrejiACdG59xQjKgu3GzVP9UwIvcmCVwYb102NmBHVBDFNVDUrgjP39yF98E0E5xox5Dcj5lsDhwOYQObg4dK59xR2RV8D4njEo/0NIEd3dkVfgy9t9HkfMTWSO6pXG63kjupF8aSrqXj+SoJzO1M573KmjJ/Eb0bM5y9PzGPBK4Mp3GKUEFvWj+Q3I+a3AOjcewp/eWKesUQ0T1mz2att7oSU9+F5EE2SqXvpSbKHdrIGNmHCoapmRVgh33LezZ3QNncyloGDnVnwyuA2IFvWj0Q+dplREzu6Wy0r9/KubVvg9pWRpPfrwZn7+1haMSHCxdSM/J4RWWufjiC9Xw/m9PgtN9w0uo1JbrhpNI0njAXTrAIbT/TEvb4LjdEj2641vqQjpPfrQfrgm1qYKHxKlz51BbmjerFj4G2WtAYwtWDKglcGG2ZoXrldu43AWDUrAmnbnLaRVZMayHvyPn7qZThoa38pfeoKap+OIDi3M6tGDeSGm0a3GTT82g03jeaGm0bj3H4d8rHLrN0I93LDpDsG3kb68si2a425hfZTrwjSB9/UBiZcM+YM6ghoyvhJpL/Ym+yFhknc67tYQVF+z3gjc3r8Fuf32zpOFTMeHXpRGDNfMYF2j+7PqlEDWTVqIOkv9rZ8SNvcCff6LlTOu9yK1Okv9mZOj9+S8ehQNKmBDhs17vxU9adeES1gwoHKH49oFyhcwhfKynmXWzOu4vkryR7aieyhnQjl7+84QzNNJGzbxN7uV1gw7WmntYZaLw2mmNdrn44ge2gnztzfx9od7zBnDa9t0pdHtgsTDhRustaaCndwEyLj0aG481PVS9r3FSUJj6eBrConMZHvnodpntrh2gkHCgcLl/TBN7G3+xXGLMlIo0LXjU7ixeoaUZIQ3C7OlTtJya8kJvJddgy8DctvWgGFaylcHPd2Y2/3K5jT47esGjWQrTtiyapy4nI6jUrvUmpfUytFRfmkZ6SxdUcs66dNYsfA2ywNtQBrJeb/dgy8jZjId/kx4YgF4fP6Ln1L3uyhhWvnSGYpOw6lEBP5LuunTWLDAw+x4YGHrAi74YGHWD9tEuunTSIm8l227ohtAyBK0i8/pNDagTVJxuf1YXf7OVfuJKvKMF16RhrpGWkcySwlJb+SrCqn1awRgjqaJP9nO0b/Zxo1v+ahS0ZqKJ9QCX5rJMyhN42aRj6h/udB5BKjiAp+i64uNrJ2M0Vs3rUiy4aU92G42X49iCYZDZjUMoX4ctFIcILfGgVU6E0LwEyCxKP98aWNxpc2GvFof+RjlyHlfdjxWnOxh93tJya5kIWHnDx2qJbnopP4NCmaYvtKC0LL6WYkQps70RA3laaUVbjzU1V7RRn2ijK8BbkWUJsM7VIAog7k8MyuPKtD1AJA/9zQQpYN9/oubFk/kpkLl7J4a0KbtrdZa/vSRrfMWS8GcSSzlGd25TH5VIjptTpR9T5SS+OMsrHZD3RHd7SDnTm1YwSzY2KsTtL46DSei07iSGZpm/tKeR8a5gnf0+vI8zfE5zAstpjptTrvifBJeeZ5LTQDkGXDtbsr0fte59mjDmaWaUyv1ZlZpvH3XJlRcQ6Grj5OTHJhy/t7VhrpwMVAog7kMCrOwcs+nZWaccak2L7S0oLpC6d2jGDJiUyWN8E6FVZqsLwJ5ruwYO5O9jFoUSIb4nPOT+/gtxf3kZjkQobFFreAaHRGGZoQbm+hhWd25fHsUQevHilgbo7bAmoNM2S/i6Grj3Mks9Tolcgn1Hb39MzHuXInw9edZrJd4z3xPISuLrYgCrf0ZOuOWKLzVFLLFDIKmlfr5EJmHMxhfoWvDczkUyELxl5RduFUUZNkIvdm8+BpkZd9eocQPyYc6XDnocpRQ+TebObmuFmptdTK5FMhBqwt4K1vMi4cWTMKnIyKczDZrvFJeWaHEBdrbVc5aphxMIflTR1rJaPA2TFI1IEc7k72tZwdYRCLtyZc6h4MMcmF7WrlwRSRAWsLiNyb3T6Iz+vjmV15jIpztIHwxN/I7JgY4svFS47CHk9DG62Y5hm4s5zx0Wntb0CnlikMiy3m06ToFpFSO9iZnSnbeGZXHkcyS8kocF6SHMksZc7m9AuaJyW/si3IltRaZsfEGNM09KZVs2bEzWV5EyzLlXn1SEG7MuNgTruy5JS73dlzd7IvPMi1BIlJLmRnyjbLJFawar7ZHi5NdrSS9jRyd7KPXlGnzQDXyjSlcYY2mk1SuKUnS05kslI7f9M9/HKgdaoh74nn/cR02NV7M9t2A9A/t/qf2uZOvB/zHvNdxk3Mm0bV+36VzK8wxHTWVutPmEbkE6q1hjQ3/yefCvGeeB7k1SPGlLsUeeubDOtnezJnczpvfZPBuXJnGEjzAqSri9FyulG4pSf3b/3OCvErNQNmxsEczpU70ST5kuWXJc9yiZXemQ3du5N9TK/VedmnW1qZm+M+v3r+gpTS42nA42nA5XRa4vE0hFd8zSDBb63cInvtAAYtSuTuZB+T7ZoFYy7tz+zK6+igQZtHRoGTyL3ZLab4M7vyGB+dxpAF+1i8NaEliLmWyNndsa+MZPi60/T/vpaJhTKT7ZqllZWaoZW3vsnA42m4IMS5cifPRScxN8fNeyK87NOZXqszsdDITa55/3i4dgVb0OPUTG2IR/vjzk9Vt6Qau5R3J/uYWCi3MJEJM2dzOkcyS80Q3WKrPia50IIIX2cmnwrxYIpIr6jTPBed1Mo0apFgpv0NcVMR3C5ESWLO5nS6fV3Ag6fFdmHmV/iYcTCHyL3ZRB3IsSRybzbP7MpjfoWvXYj+39cyZME+c7aEgTQ36smy0RA31dostrv9DF193IIJ9xcTxgSam+O2xAQwg9fMMo2JhTIPnjYgBi1KbC+RPq8REyR8iT9X7rRgWptpvssYLBwqHGB6rc7fc2ULYsh+F4MWJbLjUErH09c8ytcaxNTMCxtyGLC2oIUDT6/VO5TJdkMLJsTAneUMWpTYNotvE0eaj3rKxy6zun2t69mdKdt4fOley4lN35ls11pIOIC51D8XnWQu9xcGUQCteibyscuM5n31TKNqD5fm1H9DfA7PRScxdPVxhsUWMyy22Dq4MGS/i2GxxQxfd9oC2HEopb1WVcdtCU2Sqcv7OmTWpGbRLOV9SCh/P0GPUwvPvDIKnMQkFxK5N5s5m9N5LjqJ56KTeOubDFbvzSQlv7LN1P5FxzZ8Xp918v8SWk5WsWStLbr0a5oLHRdY/+GjPP8vtq7+0yCiJOHz+hDcLlxOJ2bzxeV0Irhdlk/9x0B8Xh9VjhoEt6s5rZTaFU1qQHC7qHLU/PpZ05EGqhw1uJxO0CVESSIlv5KoAznM2ZxufTJgzuZ0og7kkJJfaR1mcjmdVDlqflkc6ahSs1eUWdMzJrmQQYsSrYMJNy4raiHmYQWzD2IC2SvKLpa/dAzi8/qsc6cZBU6GLNjHlTMPcEtUJVMSdd45qRGdp7KxDOvDPu+c1JhxNMgtUZVcOfMAQxbss0K7vaLsQqbq+GCtCbEhPodOU2O58qNcZhwNsrMK4t0Xlp1VMONokCs/yqXT1FgrE7sATPvbJK0hblxWxDsnNWugvc7zcqFry3JlbomqbANzSdskpk9kFDjpOmWTpQnzne6sMgbbWWWYY8kpN0tOuYnOU1v8z9TcOyc1blxWRNcpmwwz6dLFjxr7vD5rY+eO13YSMS+Rh/co1iAby4wBluXKLDnl5rsCD1lVxk7FdwUelpxysyxXbvHcjWUwYb9CxLxE7nhtp7X10spELUHMMiHqQA6dJ+9k8KYaJh1u6ZRLTrnZklrb+hS3lURtSa1lySm39fyNZTAlUWfwpho6T95p1rqtS5LzICapJsmWNkbEBpiSqLMs1/gY3DsntfAuT4tDlkrYtci92bxzUmNjmaG9KYk6I2IDbbTStsBqjhma1EBKfiVdp2xiwNoCHt6jMOmwxjsnNev46KWUkaIksfCQk2W5Mu+c1Jh0WGPCfoUBawvoOmWT1d4Miy3nQczIuXpvJp2mxjJ4Uw0T9hsg09KM6fhcdBIxyYWXJM9FJzHjaJBpaTDpsAEzeFMNnabGGhVec+RtA1LlqAFd4vGley0Q8wZTEnWmpWGdWX3sUC3PHnW0K+b/n0qoZ1oaTEszfCQc5PGle0GXwv0k7PxI87S9EMjMMo35rvMdILPDbErrzlA4iOmw4SBh0/iXgUxLg8mnQvw9V2Zmmdau/D1XtpoxpiYe3qPw8B6FW6IqreOCvwpkWhqMinMwaFEi46PTfrFMXG38HLr6OHe8ttPykXZNYzrr4q0JdJoay4C1BS2cdfCmGuZsTrd6Hv/T5ozZJ7no9L1xWZE1fU0bD193unXx3GESFZNcyIb4nDazaUN8Dh6PkTy1O307CmgT9itM2K9YWnkuOumi26wTV6dZR43NXOXKj3LpPHknEY+us0DaDWiWnwCr92bSdcomBm+q4eE9ShsThTXh2jRn5mxOZ/CmmjYzZkRsgE5TY40Q33bhu/iiF66VcJjh604TuTfbUnnk3myGrzttQZgzZtJhzQrvfabHWGNccNELnz2tfSUcJjxADVhbwIC1BdYsMyOp+fyH9yhWGnAks/TS0gDTV4qK8q2NxU5TY7klqrIFTDhQ6+gZ/hwzdoSbpKgo/9LPj5hnR8yUwEwVw810MRkRG7BSRXPpLyrKv/RUsT2YI5mlLZLnEbEBK1q2lhGxASt5vuO1nZY5ioryL5TJX7icENwuioryjV1rr4+oAzkMWbDvouXEkAX7iDqQg8/rQ5MaLgZxaQWWJslWSWkWWBkFzl9UYP2PvgjFPNrj8/osM/2YcIQfE46QnpFmfL7K7SLocWpBj1Mz6+D0jLQWzzPb3b/6aI8SVnCbvXTTVOZxno6kqCjfKlPNUH4pIP9XPGz/N319UFnrf2iKLGi6LmggqCBoIOi6JuiqIqCrgqIrgqyrgoYu6JpiiK4LKgigCpquCCEdQdVVAU0VdP2iMGW29tplmtbcQNQ1QEXXNDQdQGsWHZBbvdQsKkTQfaiaBJrc/PyLPpQ2zqqbL9U10GV0TUbTZUCyQAoaJPaVinx5RmbVKZnVWRpf56r8WKlQFww2Q4bf8VdMXwsEtfkdGb97xSAb8yRG7df4zYYQ3deEsK2WsK1UsK1U6LIqxJWfKQzcEODVw0GS7KbG1F8Pout6C7WuL5Dpv1PBtlLEFgWXfyHTY61Ery91rvkiwLWfB7h6jcxV/5LoskLF9gl0+tjLI7FesuuxzKnrHeqneQdL143Bjacj6wqg4ZFUph8JYvusCdsXIldvhGvXi/T+SuS6dQrXrZO4fp3Ib76UuH5NiD6fi1z/mcgNnwa5epWMbbHG1StEvsoSjbeoq2i60h6MYNN1XTAhNF1vdlBoVFSG7/Nh+1Ti2o1Brl8v03uDyDVfN3DDVz5u+FKh15cKvdbp9FoHvT5X6PW5wjVr4LrPda6NkugTJdL1EwXbIpkVx5sdGaXZ8S9gGgNIJ6ipPHgghO3TED23h+ixTafXZpmb1ofos0ml+9dw1VcaV3wapMvKIF1WSVz+qULPzxV6faZw9Wc613yq0Xt1iN9Ehei+WMG2QObz03JHDtxsGk07P2XRmZ/hx7ZG5rqtMjdubqTHFonrNov8doPMZRvA9pmPqz8X+MNWhb/tkrg/VuGWaJXLPmmk85Imen6m0+sz6BMlcsNqP9etVujysU63jwIcrwy1N6UFm6Zrgma4KKBxrE7lyq999PnaT58dcMNWjV5bFa7d6sP2lcj/+szP6/FNHK2SqQtpSKqIKItUN2psyJH52yYXtkV+uq9UuP5fMj1XqVy9WuWGFSE6LQgxbHMQv6kVXW92B12wKZouSEjGNNMVJvwgYdugcGOsym+2q/TZqnD9dh3bVz5u3h4guVJtnpJa808zkJlBMMS7SQG6vB/gimUKvVdK9Fmu0nu5zLXLZGzvaWzLDhggmoysqwYIKoKqG+rKqVO5douP62JUfvutxg2xCn1iZTpv0rgpRuF0XQAIgRJElSUURUWWZWRZRpFlgrIKeIEg7yaC7X2FXkslei+XDVkmY1sQ4pFNDaA3hwcdNF0XbGjNZwNQWXZaxrZV5XexMjftFLnpW4ne34rYNvjZUywBQUJqEEkMoEk6oqIgySqipCCKEt6Qis8fRNEaAB+TtijYInV6Lwtx7VKRPstkIj5S6PGBRGFtwFCgApquCDYFTQANXZeZkiARsVPnlu9kfhcr0/cbiYivA4w94DM0oet4VQVJUQiJGiFRIiTKBEMSAX+QhoBIvU/C1SQCfpIKGrl8kZerFitcu0Tkuk9ErlsiYXtDYuMpYyobE0gVbIouC6DiDsgMiwtx406Z/rs0+u6WGPCNSI8tIZbnSoCCEvITkBRkWSMUkAgEJbz+EE2+IA3eAPUNjTR6fNTWSni9PuoFN/d8KtBpkcg1n3jp82GQ3h/6sc33seAHb/P6pYOmCTY0VQCNEkHhrgMhfrdL5k/fafT/XqT/boU+sRI/2r0AhESFYFDCF1TwBSWa/CE8TQHcjQFcDX6cdQGq63w43PWU1AoEmup4emMjtvl+enzop/d7Aa57N4Btvo/Z37jCHBzBpuqaAHDOHWDo/iD99in8+XuZO/er/H6fxsB/h0irDgGqoYGAhOAL0eALUd/oo87TRK2nCUddI3anQKXTTUl1DUVVNXga6nh2mwvb6066L3Bz3btOekU2YXtd5MVNDmuVVtEFm6brAmiUu4OMPODnjv0idx+UGHpQ4q6DEnf928+h0iCg0egN0OgXqW8MUCd4cXm81LgbqHIJlDs9lFd5KK90U1hWQ3GlgLOqlrs/rsQ2q45rFjq57q0yukc6sL3iYc62akBDR0fRNcGmq5oAQYSAyuQEibsPhnjgkMYD8T4ePOTnv/ZrfJrtBTWE4A3ibvRTJ3hx1jdRXddApbOeMoebEruL3Ao3p8vqOVVSR1JuDZkFtbywvgDb0zl0eqmanm+Wct2bFdhmlvP2Po/hH6qIrmiCTdNUAVVElTVeyfTz10My435UGHNE5JGfJIYf1ZiV4kFo8uILBKirD+LwBHC43Dhq6ymurqfAUU9ORS05RSU0NHmQVRW/JCMqOho6354U6DEri04z8+nxWim2fxSx8ZgLEAlJCqoiCzZZUwVZVECDjUVNDD8s8sRRlSmJOs8mwbPHZJ466iO2yI8aDNJU56a8tpGqaicOZx2FVfWcLa8lq7CMBn8IHfAGZQKSik/SQAoBOjEZtdiezqTTS/l0fzmPrFIBNB9CUCcoSYJN0TTBKymgS5TXBXn8pwCTj8lMT1WZmarx+nGR2Rk680+GOFleh9/bgMtZR3V1HYWVLvJKajiTV0pVjRsV8IVEgrLaLApeERSCAAx5/xS2+48zZvlZAmKIQFMTHq+PppAi2DRdFQIyyKIfRImoMz6ePO7lpUyJl08r/PN0iMjTEh9kS6zNEUgp92GvaaDAXstZh4DLG0JoChAMyviDMn5Jxi/K+EISIVnFr0h4JWPZ33a8mNteSCI6vhpZbMDhaqChyYfHHxRsmhYURBECoRDoMvkukVfTFN7IlHk7W+aDXIlVOSHW5ob4qhi2F4v8WNLIiSov5wLgkVVERSUYMqa2LyTjF1UCkkpQ1vGLImJAxCsai2SdKFJQ6aG0ooqK+gBuVxOCTxBsuq4IkqQSFCVCkgyqzg8lXt5J9/H+WViVJ7G+KMSOEoVdJSp77DJxdRrH3Rq5goLDJyMERRqCIt6QbPiHqBAQFSRJJSCrhGSZJklDUs/nIefsNRRXe3DWefE0NjUf21BURFEiGDRWVH9I5Nu8Rt7Pk/lXocbWIpFvKzT2VSr8YJdIcEqk1Svke2TsPhV3SMYTEmkISngDCr6QTFBSCUkqQUnFL2kEJUNLflFF1aGuyUepow6HuxG34DdyVkVRkCQFUVLxBWR0ScEfFPmuuIG1hTIxpSr/rpA46FBIqJHJdGmcqVPJa1Co9MrUBiTcQQlPQKYhoNAUUvCJCn5JJSApBCTZEr8oEVJU/IpKiaOOmnov9Q1+QyOqqiErGqKiIYk6/mAATQ4QalRItPvZU+EnvkrmxxqJRJdIVp1KTr1GQaNChVei2idTE9BwBRTqAzKeoEyjKNMkKvglhaCkNAMZogAeX4DS6npcDQE8jYHmM0aajqLqyLJOSNbwSTJev0woEKCxyU9OdZCEkgAJ1UGSBYWsBo3cRihq0qj0KVT5ZBwBjdqQRn1IRhBVGiWVRlklqOiIikZQ1hAV4ytjJE2n0ummqt6LU/AjNAYEm64jaBqoqo6iaEiKhiirBESVhkAQr9eH0ChSUu3nVGkdGY4mUmt8ZLoC5DWoFDUplHpVKnw6VT6ZWn+IuqCEJ6TQEFINzUgSflXFJ8nUe304XALVdQ3UNwaob/TT5A0ZILoO4TCyrBKSZHxBGcEfxNPgpdETwO32U+ZoIKesnrPlHrLtbn6urCfPXk+B3U2R3cO5qgbOVTVQUilwrkKgtEqguLKe4sp6yhwNlNg9VLkEhKYgjd4QTX6RYFA+X2Dpuo6maaiqiqqqKIqGKKn4QwrekERjIIC70YenMUBjk0S9EKK23our3ovb48Xj8SI0BfD4ROq9IdyNQeoa/Lg8AZxuPzV1PuobRASfguAN0egP4Q1KBEMykqwKNkAxMnpDNM1oSxhQGrKiI6oqTapIkyTiDYUIiDLBkEwoICOGjHghKxqKqqCoEooqEVJFgkqIkBIiKIsEpBB+MYA/FMAXkgiICiHRmK2KoilWo6bZRIKu61bjRdd1QdEQVBVBkzRBlVRBFhVBVTRBUXRBknVB1hAUECQQNF0XUHVB13RB0XRBVDRBUjRBUTVBUlRBlBRBlGQhJGuCJOuCouiCpuqCqqpl/7Eemqor5HnS2Ja/hPezpvCP1PuYlfo3vvo5EnfA0baH9qs+CKZpBIIh7DUuyuw1lNprqHDU4mnwoqoamq5xyn2YVTkv8cKJO3n+TH+eTB7Ao/H9eSr+TnbmrfyfgdiddZzKKaK0yklhuYN6oWVfvabay+6Tu3gzaSJPpPZm9E9XMmnvH1n60wKSanZypuEg35WuZlrCMLb9vPSXgzicdWTkFLX7vya5Dq/spk62s8v1AW+cu53ns29kSd6z/Fi9mZ/L8tpqVFfZeHYxBe7MSwdJy85v8Xd1oJwDFRtZlTeTD88+wcKsMSzMGsv8rL8wNbMnc7LuJN6xg6AcsF6TW1xBkzfQct9P8pDrSkfT1QuDKKrKz8UV1t+V3kKi89/m1YyhvHlyMPOz/ouFZ4fwYe59fJAzjLfO3s66wuep8p7jbF0iUTkzOe76/rzZ6jxUVteGtch06gL2C4PIikJFtcv6e3/ZeuamDOHNU//NivwxfFY8jnXlE/iyYiKflz/Eh4WD2Gv/CL/YQIJjI2+dvJvXTt7FtJS+LPt5OvVBY383KEoUlFaGzSz5wqb5ubC0WSsyG3PfZUbKnXzw8wOsKX6EdWUT+NI+nq8cY1nrGMnikjuJd0Xhld1sr3iTt37+IyuLHmZN0WMszxnPzLSBvJnxMMWNPxv7vUITLrdw8VlzMswnNud+xD+O3cGy3LF8ce5R1pZN4IuKsXzlGM0X1SP4uPJ2jgpraJAcfFb+CJHnbuOz8pF8UT6OL0om8nnRJFblPcrLaXfxxolROHzGd2idq7xIHBEavTQFQwAcLNvMP5Lu5JOcsawpmsRnJROIKnuYtVWjWVP9Vz6q7McRz0pUTSa2Zh6LSgeytOJPfGa/j3UVY1lTMoFPz01kdcEjLM95hNmp/8UHmU+j6MYnlrJyz3UMknHW0IbDW8rLyfexIGs4nxU8zqqi8Xx07gGiKkfyheN+ltnvJEFYGdYOFWlUqjniWcGK8iFElQ1jTek4Pi2awOqCR1iZ9wgfnx3Hs4l9+aHc+BqH2voGRFFqC+JpaEKSjOR2Y84iZqX8majcx1ieN57Xc+/hvXPD+aziAZaX30VGY0yH0/1s00E+KR7KquL7+ezceFbnT2BFzkSW5Uzg7VP38UbKQ3hCdc1aKWoLktHsG06/nbnJ9/H+6VGsyJnIC9l38kreMNaUPsKSkkHsdy26aABMcK3lw4L/5l9FY1mdP56lOeP55Ox4Psh+mOeT7+BAyUZj17O8qiWIKMkUlNoBOFQaw4zkQSw+M5bZp+7in7mPsKnkFVade4DPSsfTJNVeFCSk+lhbPIVl+Q+wMnccS8+OY/GZsXxwZjTTj9/OkqwXACi3O/H5A+dBKhy1lFQac33t2bf5R/KdvJnxFxadnkSyYzuf5j3BssIR/Kt4DBvLp/NF2dOsqXiSNRVPsKbyCeNnxZN8XjaFz4ufJrr4Bf5V8Agr8h5iWc5YPs4ey4enR/P+6YeYnfZn3kh9CAUfqgz2Gtd5kLOFpZTYjUMHH516jmlJA3jjxHCO2XexteBtFpwZyqqC0awo+huLCv7Eu4W38V7x73mvtD/vl/Xl/bJ+vFfye94tuo2F+X/g3dw/szT/b6zIHcMnZ0fz0ZmHWXT6ISKzRvJq5mBeSh5MSeNZyzyyrBggWTlFlNsNssiMKYz9oQe7i/9FmmM/r6bezZKfx7Is5yGW5f+NFYUjWHXuflaXDmN12V+JKhtGVNkwVpX9lZXFw1lRNILl+Q/ySc6DfHRmFIuyRhF5ciRvZ/6NNzPvZ3baIJ5N+AM/1xsfXcg9V47XH2wLMidpFE/9eAcVQg7Lsp7j9fShfHTmIT4+M4rIrKG8ljGAeSf78eaZfszP7sc/z/bln9n9mH+mH29m9eO1jP7MPfF7ZibfxvSE3zP1UD+eiruVxw/cxIT9fRj+764Mje3M6bqjAOQVl+MPhgyQvHPllFQapnkhfgRf5y7haNV3PJvwe945+QDvnnyAf2bcQ0zR22S7fySzbj+Z7n2cdO/jZP1eTtbvI9O9j8y6fWS49pHm3Edq9T6OV+0luXIPRyt2k1C+i/jybzhYupUfSrfjV40wX1zhQNN0A8RR66bEbjjr5p+Xc9IRz9snJvJ88h94O/N+3s64j1dS7mJLXuT/v0e/vT6qa93nnVXXdXLOlRtJi6qSWLmL8Yd682rGvcxLG8qbJ4byRuoQXj56L+UNuRcdoDHk5kDJNvaXbuZA2Rb2l21hX9nX7C3byNaCKJKr4pqnbw3+QLBlQDttxn4dPsh4hseP3sjcjP/m5dRBvJYymNdTBjMtvh8rT865KMja0wsZvqsr4/f3ZNyBnjx88CpGxV3BiAM2bt5iY8PPKwz/KKlsG1lDooTgCRJAYPKR/jyb2pcZaQOZdfyPzDn+J145/l/MSfojU364lW05yzuE2F30FU/80JcZSQN5+fifmH38Tmam3MGM1Dt4LOE6pv90DyHFCGLZ+SXtL3pn88rJCR5hbPy1TEq6jqnJv2XGsduZdfwPzD52By8n/5FZSX9g8sGbeDflGU7VHMUTqKMhVM/Z2hMsSZ/JY3G38I/E25l77I/MOv4HZhy/nRkptzE1+Rbu+beNhMrvjLEKSi+cj0T+8AaPZfTi2eQ/8Gj89fz96C3MSB7AjOTfMzPpNmYn3c7MowN4/IdrmXKoPy8l3MtLP/2Fpw7fxiMHr+HFxH7MTrqNmUm/56XkAbyY3I/pyb/jr/tsRJ542hqnOGydaRdkxv6J/DXBxvflX/Fd0Rru2W3jmYTrmZnUnxlJ/ZhxtB+zjg5g1tH+vJBwM1Pjr+fZ+Ot5PuFmZiX2Y9ZR43kvJfXlpeR+PJ90M3/da2Nm4gME5MZ2c5F2QV5OeYA/7rZxrOYgANE/f8S933ViTFxXZiX1ZfbRvsxK7MusxFuZnXgrs8JkZuKtzEi8lZlHf8espL48Gd+Lu3fbeDVpLA1BY+kvc7T7ZTktQUQlyLQjg/nzv20cyo+zrsdX7OKR/bcybLeNp368hpd+uok5ib9lbuKtzfI75ib+jtmJv2PGT7fwfMJveOj7zty/O4JPs+YjKsYUdTc04Wloav/YRusLz/04lAeTIsgsPENewfnc0is1EH32Qx47MICH913F+O//F+O/t/H4wW7877gIHtnfhXHfd2Hs91cyZl9v3k19lgLPaev15TV1NDR6Oz4/0vrC26ceYVhcL45X/GB4d2Eljf7Q+cJI9pHqiGPVqVeZd+wRZicOZ0bCvbyS9DAfpD3PnnNfUuO3ny9NVI2T+eVI8oVPGrUB2ZsfzX1HehJTtMK6FgyJZOYW0+gXf1EIz8wro9LhvKTn2lrugkMoFOS5n/7C0APXYK8tb3GepMrh5HB8Cmknz5JbXEpBSQVlFbVU2N0UlVWRW1RK1s95/JCQzMkzPyPLMpqm4ff7CQQChEIhJElCURQ0TcPsVOm6fn6tCT+oUOkq4bGE27n/qzv4KeMIwVCQQCBAbV0ttXW1VFRWkJ19lrS0DJKSj5F4NInk5OOcPHmK/Px8amtrcbvd1NTU4HQ6cbvdNDU1WTCyLKOqaguYDmvfgNzE4bIYdpWv4UT5EezuMkQl9B877PT/DQC7cLwx8LR3hQAAAABJRU5ErkJggg==) no-repeat;padding-left:40px}
+        .browser .browser-firefox{background-position:0 -34px}
+        .browser .browser-ie{background-position:0 -68px;margin-left:0px}
+        .browser .browser-360{background-position:0 -170px;margin-left: -27px}
+    </style>
+</head>
+<body style="margin-top:50px">
+<h1>请升级您的浏览器，以便我们更好的为您提供服务！</h1>
+<p>您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。</p>
+<hr>
+<h2>请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束</h2>
+<p>自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 <a href="https://www.microsoft.com/zh-cn/WindowsForBusiness/End-of-IE-support">微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明</a> 。</p>
+<hr>
+<h2>您可以选择更先进的浏览器</h2>
+<p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。</p>
+<ul class="browser">
+    <li class="browser-chrome"><a href="https://www.google.cn/chrome/browser/desktop/index.html?hl=zh-CN&standalone=1"> 谷歌浏览器<span>Google Chrome</span></a></li>
+    <li class="browser-firefox"><a href="https://www.mozilla.org/zh-CN/firefox/new/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
+    <li class="browser-ie"><a href="https://windows.microsoft.com/zh-cn/internet-explorer/download-ie"> IE 11 浏览器<span>Internet Explorer</span></a></li>
+    <li class="browser-360"><a href="http://se.360.cn/"> 360安全浏览器<span>360 Chrome</span></a></li>
+    <div class="clean"></div>
+</ul>
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html
new file mode 100644
index 0000000..925455c
--- /dev/null
+++ b/ruoyi-ui/public/index.html
@@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= webpackConfig.name %></title>
+    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+	  <style>
+    html,
+    body,
+    #app {
+      height: 100%;
+      margin: 0px;
+      padding: 0px;
+    }
+    .chromeframe {
+      margin: 0.2em 0;
+      background: #ccc;
+      color: #000;
+      padding: 0.2em 0;
+    }
+
+    #loader-wrapper {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 999999;
+    }
+
+    #loader {
+      display: block;
+      position: relative;
+      left: 50%;
+      top: 50%;
+      width: 150px;
+      height: 150px;
+      margin: -75px 0 0 -75px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -webkit-animation: spin 2s linear infinite;
+      -ms-animation: spin 2s linear infinite;
+      -moz-animation: spin 2s linear infinite;
+      -o-animation: spin 2s linear infinite;
+      animation: spin 2s linear infinite;
+      z-index: 1001;
+    }
+
+    #loader:before {
+      content: "";
+      position: absolute;
+      top: 5px;
+      left: 5px;
+      right: 5px;
+      bottom: 5px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -webkit-animation: spin 3s linear infinite;
+      -moz-animation: spin 3s linear infinite;
+      -o-animation: spin 3s linear infinite;
+      -ms-animation: spin 3s linear infinite;
+      animation: spin 3s linear infinite;
+    }
+
+    #loader:after {
+      content: "";
+      position: absolute;
+      top: 15px;
+      left: 15px;
+      right: 15px;
+      bottom: 15px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -moz-animation: spin 1.5s linear infinite;
+      -o-animation: spin 1.5s linear infinite;
+      -ms-animation: spin 1.5s linear infinite;
+      -webkit-animation: spin 1.5s linear infinite;
+      animation: spin 1.5s linear infinite;
+    }
+
+
+    @-webkit-keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+
+    @keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+
+
+    #loader-wrapper .loader-section {
+      position: fixed;
+      top: 0;
+      width: 51%;
+      height: 100%;
+      background: #7171C6;
+      z-index: 1000;
+      -webkit-transform: translateX(0);
+      -ms-transform: translateX(0);
+      transform: translateX(0);
+    }
+
+    #loader-wrapper .loader-section.section-left {
+      left: 0;
+    }
+
+    #loader-wrapper .loader-section.section-right {
+      right: 0;
+    }
+
+
+    .loaded #loader-wrapper .loader-section.section-left {
+      -webkit-transform: translateX(-100%);
+      -ms-transform: translateX(-100%);
+      transform: translateX(-100%);
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+
+    .loaded #loader-wrapper .loader-section.section-right {
+      -webkit-transform: translateX(100%);
+      -ms-transform: translateX(100%);
+      transform: translateX(100%);
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+
+    .loaded #loader {
+      opacity: 0;
+      -webkit-transition: all 0.3s ease-out;
+      transition: all 0.3s ease-out;
+    }
+
+    .loaded #loader-wrapper {
+      visibility: hidden;
+      -webkit-transform: translateY(-100%);
+      -ms-transform: translateY(-100%);
+      transform: translateY(-100%);
+      -webkit-transition: all 0.3s 1s ease-out;
+      transition: all 0.3s 1s ease-out;
+    }
+
+    .no-js #loader-wrapper {
+      display: none;
+    }
+
+    .no-js h1 {
+      color: #222222;
+    }
+
+    #loader-wrapper .load_title {
+      font-family: 'Open Sans';
+      color: #FFF;
+      font-size: 19px;
+      width: 100%;
+      text-align: center;
+      z-index: 9999999999999;
+      position: absolute;
+      top: 60%;
+      opacity: 1;
+      line-height: 30px;
+    }
+
+    #loader-wrapper .load_title span {
+      font-weight: normal;
+      font-style: italic;
+      font-size: 13px;
+      color: #FFF;
+      opacity: 0.5;
+    }
+  </style>
+  </head>
+  <body>
+    <div id="app">
+	    <div id="loader-wrapper">
+		    <div id="loader"></div>
+		    <div class="loader-section section-left"></div>
+		    <div class="loader-section section-right"></div>
+		    <div class="load_title">正在加载系统资源，请耐心等待</div>
+        </div>
+	</div>
+  </body>
+</html>
diff --git a/ruoyi-ui/public/robots.txt b/ruoyi-ui/public/robots.txt
new file mode 100644
index 0000000..77470cb
--- /dev/null
+++ b/ruoyi-ui/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
\ No newline at end of file
diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
new file mode 100644
index 0000000..391d951
--- /dev/null
+++ b/ruoyi-ui/src/App.vue
@@ -0,0 +1,19 @@
+<template>
+  <div id="app">
+    <router-view />
+  </div>
+</template>
+
+<script>
+export default  {
+  name:  'App',
+    metaInfo() {
+        return {
+            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+            titleTemplate: title => {
+                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+            }
+        }
+    }
+}
+</script>
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
new file mode 100644
index 0000000..0650e04
--- /dev/null
+++ b/ruoyi-ui/src/api/login.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, code, uuid) {
+  const data = {
+    username,
+    password,
+    code,
+    uuid
+  }
+  return request({
+    url: '/login',
+    method: 'post',
+    data: data
+  })
+}
+
+// 注册方法
+export function register(data) {
+  return request({
+    url: '/register',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}
+
+// 退出方法
+export function logout() {
+  return request({
+    url: '/logout',
+    method: 'post'
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: '/captchaImage',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/menu.js b/ruoyi-ui/src/api/menu.js
new file mode 100644
index 0000000..faef101
--- /dev/null
+++ b/ruoyi-ui/src/api/menu.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取路由
+export const getRouters = () => {
+  return request({
+    url: '/getRouters',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/cache.js b/ruoyi-ui/src/api/monitor/cache.js
new file mode 100644
index 0000000..59d3505
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/cache.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询缓存详细
+export function getCache() {
+  return request({
+    url: '/monitor/cache',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/job.js b/ruoyi-ui/src/api/monitor/job.js
new file mode 100644
index 0000000..58c4343
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/job.js
@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+// 查询定时任务调度列表
+export function listJob(query) {
+  return request({
+    url: '/monitor/job/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询定时任务调度详细
+export function getJob(jobId) {
+  return request({
+    url: '/monitor/job/' + jobId,
+    method: 'get'
+  })
+}
+
+// 新增定时任务调度
+export function addJob(data) {
+  return request({
+    url: '/monitor/job',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改定时任务调度
+export function updateJob(data) {
+  return request({
+    url: '/monitor/job',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除定时任务调度
+export function delJob(jobId) {
+  return request({
+    url: '/monitor/job/' + jobId,
+    method: 'delete'
+  })
+}
+
+// 导出定时任务调度
+export function exportJob(query) {
+  return request({
+    url: '/monitor/job/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 任务状态修改
+export function changeJobStatus(jobId, status) {
+  const data = {
+    jobId,
+    status
+  }
+  return request({
+    url: '/monitor/job/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 定时任务立即执行一次
+export function runJob(jobId, jobGroup) {
+  const data = {
+    jobId,
+    jobGroup
+  }
+  return request({
+    url: '/monitor/job/run',
+    method: 'put',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/jobLog.js b/ruoyi-ui/src/api/monitor/jobLog.js
new file mode 100644
index 0000000..be1fffd
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/jobLog.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询调度日志列表
+export function listJobLog(query) {
+  return request({
+    url: '/monitor/jobLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除调度日志
+export function delJobLog(jobLogId) {
+  return request({
+    url: '/monitor/jobLog/' + jobLogId,
+    method: 'delete'
+  })
+}
+
+// 清空调度日志
+export function cleanJobLog() {
+  return request({
+    url: '/monitor/jobLog/clean',
+    method: 'delete'
+  })
+}
+
+// 导出调度日志
+export function exportJobLog(query) {
+  return request({
+    url: '/monitor/jobLog/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/ruoyi-ui/src/api/monitor/logininfor.js
new file mode 100644
index 0000000..383d61f
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/logininfor.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询登录日志列表
+export function list(query) {
+  return request({
+    url: '/monitor/logininfor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除登录日志
+export function delLogininfor(infoId) {
+  return request({
+    url: '/monitor/logininfor/' + infoId,
+    method: 'delete'
+  })
+}
+
+// 清空登录日志
+export function cleanLogininfor() {
+  return request({
+    url: '/monitor/logininfor/clean',
+    method: 'delete'
+  })
+}
+
+// 导出登录日志
+export function exportLogininfor(query) {
+  return request({
+    url: '/monitor/logininfor/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/online.js b/ruoyi-ui/src/api/monitor/online.js
new file mode 100644
index 0000000..bd22137
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/online.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询在线用户列表
+export function list(query) {
+  return request({
+    url: '/monitor/online/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 强退用户
+export function forceLogout(tokenId) {
+  return request({
+    url: '/monitor/online/' + tokenId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/ruoyi-ui/src/api/monitor/operlog.js
new file mode 100644
index 0000000..f09b8ed
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/operlog.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询操作日志列表
+export function list(query) {
+  return request({
+    url: '/monitor/operlog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除操作日志
+export function delOperlog(operId) {
+  return request({
+    url: '/monitor/operlog/' + operId,
+    method: 'delete'
+  })
+}
+
+// 清空操作日志
+export function cleanOperlog() {
+  return request({
+    url: '/monitor/operlog/clean',
+    method: 'delete'
+  })
+}
+
+// 导出操作日志
+export function exportOperlog(query) {
+  return request({
+    url: '/monitor/operlog/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/server.js b/ruoyi-ui/src/api/monitor/server.js
new file mode 100644
index 0000000..feed783
--- /dev/null
+++ b/ruoyi-ui/src/api/monitor/server.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询服务器详细
+export function getServer() {
+  return request({
+    url: '/monitor/server',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/basicinfo.js b/ruoyi-ui/src/api/segchk/basicinfo.js
new file mode 100644
index 0000000..3428215
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/basicinfo.js
@@ -0,0 +1,43 @@
+/**
+ * 基本信息设置路由
+ *
+ * @author 魔金商城 created on 2019/5/30
+ */
+
+import request from '@/utils/request';
+
+
+/**
+ * 查询基本信息设置
+ */
+export function queryBaseInfoSet() {
+  return request({
+    url: '/segchk/segchk_system_setting/query',
+    // url: '/infoset/baseinfoset',
+    method: 'get',
+  })
+}
+
+/**
+ * 修改基本信息设置
+ *
+ * @param baseInfoSet 基本信息设置
+ */
+export function updateBaseInfoSet(baseInfoSet) {
+  return request({
+    url: '/segchk/segchk_system_setting/update',
+    // url: '/baseinfoset',
+    method: 'put',
+    data: baseInfoSet
+  })
+}
+
+/**
+ * 获得基本信息
+ */
+export function getBaseInfoSet() {
+  return request({
+    url: '/baseinfoset',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_carouse_mgt.js b/ruoyi-ui/src/api/segchk/segchk_carouse_mgt.js
new file mode 100644
index 0000000..edbf2d0
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_carouse_mgt.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 查询seg首页轮播图管理列表
+export function listSegchk_carouse_mgt(query) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 修改seg首页标签管理状态
+export function updateSegchk_carouse_state(carouseId, mgtState) {
+  const data = {
+    carouseId,
+    mgtState
+  }
+  return request({
+    url: '/segchk/segchk_carouse_mgt/mgt_state',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询seg首页轮播图管理详细
+export function getSegchk_carouse_mgt(carouseId) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/' + carouseId,
+    method: 'get'
+  })
+}
+
+// 新增seg首页轮播图管理
+export function addSegchk_carouse_mgt(data) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg首页轮播图管理
+export function updateSegchk_carouse_mgt(data) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/edit_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg首页轮播图管理
+export function updateSegchk_carouse_sort(data) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/sort_update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg首页轮播图管理
+export function delSegchk_carouse_mgt(carouseId) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/' + carouseId,
+    method: 'delete'
+  })
+}
+
+// 导出seg首页轮播图管理
+export function exportSegchk_carouse_mgt(query) {
+  return request({
+    url: '/segchk/segchk_carouse_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_charge_card.js b/ruoyi-ui/src/api/segchk/segchk_charge_card.js
new file mode 100644
index 0000000..87076a0
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_charge_card.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg充值卡管理列表
+export function listSegchk_charge_card(query) {
+  return request({
+    url: '/segchk/segchk_charge_card/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg充值卡管理详细
+export function getSegchk_charge_card(providerId) {
+  return request({
+    url: '/segchk/segchk_charge_card/' + providerId,
+    method: 'get'
+  })
+}
+
+// 新增seg充值卡管理
+export function addSegchk_charge_card(data) {
+  return request({
+    url: '/segchk/segchk_charge_card',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg充值卡管理
+export function updateSegchk_charge_card(data) {
+  return request({
+    url: '/segchk/segchk_charge_card',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg充值卡管理
+export function delSegchk_charge_card(providerId) {
+  return request({
+    url: '/segchk/segchk_charge_card/' + providerId,
+    method: 'delete'
+  })
+}
+
+// 导出seg充值卡管理
+export function exportSegchk_charge_card(query) {
+  return request({
+    url: '/segchk/segchk_charge_card/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_comment_acc.js b/ruoyi-ui/src/api/segchk/segchk_comment_acc.js
new file mode 100644
index 0000000..41a4c1f
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_comment_acc.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商家累积评价列表
+export function listSegchk_comment_acc(query) {
+  return request({
+    url: '/segchk/segchk_comment_acc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家累积评价详细
+export function getSegchk_comment_acc(updateId) {
+  return request({
+    url: '/segchk/segchk_comment_acc/' + updateId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家累积评价
+export function addSegchk_comment_acc(data) {
+  return request({
+    url: '/segchk/segchk_comment_acc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家累积评价
+export function updateSegchk_comment_acc(data) {
+  return request({
+    url: '/segchk/segchk_comment_acc',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家累积评价
+export function delSegchk_comment_acc(updateId) {
+  return request({
+    url: '/segchk/segchk_comment_acc/' + updateId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家累积评价
+export function exportSegchk_comment_acc(query) {
+  return request({
+    url: '/segchk/segchk_comment_acc/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_district_info.js b/ruoyi-ui/src/api/segchk/segchk_district_info.js
new file mode 100644
index 0000000..8e65384
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_district_info.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg行政区域代码列表
+export function listSegchk_district_info(query) {
+  return request({
+    url: '/segchk/segchk_district_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg行政区域代码详细
+export function getSegchk_district_info(districtId) {
+  return request({
+    url: '/segchk/segchk_district_info/' + districtId,
+    method: 'get'
+  })
+}
+
+// 新增seg行政区域代码
+export function addSegchk_district_info(data) {
+  return request({
+    url: '/segchk/segchk_district_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg行政区域代码
+export function updateSegchk_district_info(data) {
+  return request({
+    url: '/segchk/segchk_district_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg行政区域代码
+export function delSegchk_district_info(districtId) {
+  return request({
+    url: '/segchk/segchk_district_info/' + districtId,
+    method: 'delete'
+  })
+}
+
+// 导出seg行政区域代码
+export function exportSegchk_district_info(query) {
+  return request({
+    url: '/segchk/segchk_district_info/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_get_simple_list.js b/ruoyi-ui/src/api/segchk/segchk_get_simple_list.js
new file mode 100644
index 0000000..e0b6550
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_get_simple_list.js
@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+var baseUrl = '/segchk/simple_list/'
+
+// 查询运营商简单列表
+export function segchk_get_provider_list(query) {
+  return request({
+    url: baseUrl + 'providerList',
+    method: 'get',
+    params: query
+  })
+}
+// 查询运营商简单列表
+export function segchk_get_distict_list(query) {
+  return request({
+    url: baseUrl + 'DistictList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商简单列表
+export function segchk_get_saler_list(query) {
+  return request({
+    url: baseUrl + 'salerList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商简单列表
+export function segchk_get_store_list(query) {
+  return request({
+    url: baseUrl + 'storeList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商简单列表
+export function segchk_get_chargecard_list(query) {
+  return request({
+    url: baseUrl + 'ChargeCardList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商简单列表
+export function segchk_get_keyword_list(query) {
+  return request({
+    url: baseUrl + 'KerwordList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商简单列表
+export function segchk_get_preference_lable_list(query) {
+  return request({
+    url: baseUrl + 'PreferenceLableList',
+    method: 'get',
+    params: query
+  })
+}
+
diff --git a/ruoyi-ui/src/api/segchk/segchk_keyword_lable.js b/ruoyi-ui/src/api/segchk/segchk_keyword_lable.js
new file mode 100644
index 0000000..6e0ec40
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_keyword_lable.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg关键字管理列表
+export function listSegchk_keyword_lable(query) {
+  return request({
+    url: '/segchk/segchk_keyword_lable/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg关键字管理详细
+export function getSegchk_keyword_lable(keywordId) {
+  return request({
+    url: '/segchk/segchk_keyword_lable/' + keywordId,
+    method: 'get'
+  })
+}
+
+// 新增seg关键字管理
+export function addSegchk_keyword_lable(data) {
+  return request({
+    url: '/segchk/segchk_keyword_lable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg关键字管理
+export function updateSegchk_keyword_lable(data) {
+  return request({
+    url: '/segchk/segchk_keyword_lable',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg关键字管理
+export function delSegchk_keyword_lable(providerId) {
+  return request({
+    url: '/segchk/segchk_keyword_lable/' + providerId,
+    method: 'delete'
+  })
+}
+
+// 导出seg关键字管理
+export function exportSegchk_keyword_lable(query) {
+  return request({
+    url: '/segchk/segchk_keyword_lable/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_lable_mgt.js b/ruoyi-ui/src/api/segchk/segchk_lable_mgt.js
new file mode 100644
index 0000000..4a0442b
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_lable_mgt.js
@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+
+
+// 查询seg首页标签管理列表
+export function listSegchk_lable_mgt(query) {
+  return request({
+    url: '/segchk/segchk_lable_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg首页标签管理详细
+export function getSegchk_lable_mgt(mgtId) {
+  return request({
+    url: '/segchk/segchk_lable_mgt/' + mgtId,
+    method: 'get'
+  })
+}
+
+// 新增seg首页标签管理
+export function addSegchk_lable_mgt(data) {
+  return request({
+    url: '/segchk/segchk_lable_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg首页标签管理
+export function updateSegchk_lable_mgt(data) {
+  return request({
+    url: '/segchk/segchk_lable_mgt/edit_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg首页标签管理状态
+export function updateSegchk_lable_mgt_state(mgtId, mgtState) {
+  const data = {
+    mgtId,
+    mgtState
+  }
+  return request({
+    url: '/segchk/segchk_lable_mgt/mgt_state',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg首页标签管理
+export function delSegchk_lable_mgt(mgtIds) {
+  return request({
+    url: '/segchk/segchk_lable_mgt/' + mgtIds,
+    method: 'delete'
+  })
+}
+
+// 导出seg首页标签管理
+export function exportSegchk_lable_mgt(query) {
+  return request({
+    url: '/segchk/segchk_lable_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_logion_detail.js b/ruoyi-ui/src/api/segchk/segchk_logion_detail.js
new file mode 100644
index 0000000..3090b7d
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_logion_detail.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg登录记录列表
+export function listSegchk_logion_detail(query) {
+  return request({
+    url: '/segchk/segchk_logion_detail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg登录记录详细
+export function getSegchk_logion_detail(loginId) {
+  return request({
+    url: '/segchk/segchk_logion_detail/' + loginId,
+    method: 'get'
+  })
+}
+
+// 新增seg登录记录
+export function addSegchk_logion_detail(data) {
+  return request({
+    url: '/segchk/segchk_logion_detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg登录记录
+export function updateSegchk_logion_detail(data) {
+  return request({
+    url: '/segchk/segchk_logion_detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg登录记录
+export function delSegchk_logion_detail(loginId) {
+  return request({
+    url: '/segchk/segchk_logion_detail/' + loginId,
+    method: 'delete'
+  })
+}
+
+// 导出seg登录记录
+export function exportSegchk_logion_detail(query) {
+  return request({
+    url: '/segchk/segchk_logion_detail/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_msg_detail.js b/ruoyi-ui/src/api/segchk/segchk_msg_detail.js
new file mode 100644
index 0000000..ebc6564
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_msg_detail.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg消息记录列表
+export function listSegchk_msg_detail(query) {
+  return request({
+    url: '/segchk/segchk_msg_detail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg消息记录详细
+export function getSegchk_msg_detail(msgId) {
+  return request({
+    url: '/segchk/segchk_msg_detail/' + msgId,
+    method: 'get'
+  })
+}
+
+// 新增seg消息记录
+export function addSegchk_msg_detail(data) {
+  return request({
+    url: '/segchk/segchk_msg_detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg消息记录
+export function updateSegchk_msg_detail(data) {
+  return request({
+    url: '/segchk/segchk_msg_detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg消息记录
+export function delSegchk_msg_detail(msgId) {
+  return request({
+    url: '/segchk/segchk_msg_detail/' + msgId,
+    method: 'delete'
+  })
+}
+
+// 导出seg消息记录
+export function exportSegchk_msg_detail(query) {
+  return request({
+    url: '/segchk/segchk_msg_detail/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_preference_lable.js b/ruoyi-ui/src/api/segchk/segchk_preference_lable.js
new file mode 100644
index 0000000..5c50b9a
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_preference_lable.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg优惠管理列表
+export function listSegchk_preference_lable(query) {
+  return request({
+    url: '/segchk/segchk_preference_lable/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg优惠管理详细
+export function getSegchk_preference_lable(providerId) {
+  return request({
+    url: '/segchk/segchk_preference_lable/' + providerId,
+    method: 'get'
+  })
+}
+
+// 新增seg优惠管理
+export function addSegchk_preference_lable(data) {
+  return request({
+    url: '/segchk/segchk_preference_lable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg优惠管理
+export function updateSegchk_preference_lable(data) {
+  return request({
+    url: '/segchk/segchk_preference_lable',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg优惠管理
+export function delSegchk_preference_lable(providerId) {
+  return request({
+    url: '/segchk/segchk_preference_lable/' + providerId,
+    method: 'delete'
+  })
+}
+
+// 导出seg优惠管理
+export function exportSegchk_preference_lable(query) {
+  return request({
+    url: '/segchk/segchk_preference_lable/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_provider_mgt.js b/ruoyi-ui/src/api/segchk/segchk_provider_mgt.js
new file mode 100644
index 0000000..5fb9d0d
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_provider_mgt.js
@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 查询seg运营商管理列表
+export function listSegchk_provider_mgt(query) {
+  return request({
+    url: '/segchk/segchk_provider_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg运营商管理详细
+export function getSegchk_provider_mgt(providerId) {
+  return request({
+    url: '/segchk/segchk_provider_mgt/' + providerId,
+    method: 'get'
+  })
+}
+
+// 新增seg运营商管理
+export function addSegchk_provider_mgt(data) {
+  return request({
+    url: '/segchk/segchk_provider_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg运营商管理
+export function updateSegchk_provider_mgt(data) {
+  return request({
+    url: '/segchk/segchk_provider_mgt/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 修改seg运营商管理
+export function updateSegchk_provider_service_state(providerId, flagId) {
+  const data = {
+    providerId,
+    flagId
+  }
+  return request({
+    url: '/segchk/segchk_provider_mgt/status',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg运营商管理
+export function delSegchk_provider_mgt(providerId) {
+  return request({
+    url: '/segchk/segchk_provider_mgt/' + providerId,
+    method: 'delete'
+  })
+}
+
+// 导出seg运营商管理
+export function exportSegchk_provider_mgt(query) {
+  return request({
+    url: '/segchk/segchk_provider_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_recommender_store.js b/ruoyi-ui/src/api/segchk/segchk_recommender_store.js
new file mode 100644
index 0000000..54d4daa
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_recommender_store.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询seg首页推荐商户列表
+export function listSegchk_recommender_store(query) {
+  return request({
+    url: '/segchk/segchk_recommender_store/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg首页推荐商户详细
+export function getSegchk_recommender_store(recommenderId) {
+  return request({
+    url: '/segchk/segchk_recommender_store/' + recommenderId,
+    method: 'get'
+  })
+}
+
+// 新增seg首页推荐商户
+export function addSegchk_recommender_store(data) {
+  return request({
+    url: '/segchk/segchk_recommender_store',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg首页推荐商户
+export function updateSegchk_recommender_store(data) {
+  return request({
+    url: '/segchk/segchk_recommender_store/edit_info',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 修改seg首页标签管理状态
+export function updateSegchk_recommender_state(recommenderId, mgtState) {
+  const data = {
+    recommenderId,
+    mgtState
+  }
+  return request({
+    url: '/segchk/segchk_recommender_store/mgt_state',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg首页推荐商户
+export function delSegchk_recommender_store(recommenderId) {
+  return request({
+    url: '/segchk/segchk_recommender_store/' + recommenderId,
+    method: 'delete'
+  })
+}
+
+// 导出seg首页推荐商户
+export function exportSegchk_recommender_store(query) {
+  return request({
+    url: '/segchk/segchk_recommender_store/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_saler_info.js b/ruoyi-ui/src/api/segchk/segchk_saler_info.js
new file mode 100644
index 0000000..4627dc0
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_saler_info.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询seg销售人员信息列表
+export function listSegchk_saler_info(query) {
+  return request({
+    url: '/segchk/segchk_saler_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg销售人员信息详细
+export function getSegchk_saler_info(salerId) {
+  return request({
+    url: '/segchk/segchk_saler_info/' + salerId,
+    method: 'get'
+  })
+}
+
+// 新增seg销售人员信息
+export function addSegchk_saler_info(data) {
+  return request({
+    url: '/segchk/segchk_saler_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg销售人员信息
+export function updateSegchk_saler_info(data) {
+  return request({
+    url: '/segchk/segchk_saler_info/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg销售人员信息
+export function updateSegchk_saler_status(providerId, salerId, salerState) {
+  const data = {
+    providerId,
+    salerId,
+    salerState
+  }
+  return request({
+    url: '/segchk/segchk_saler_info/update_status',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg销售人员信息
+export function delSegchk_saler_info(salerId) {
+  return request({
+    url: '/segchk/segchk_saler_info/' + salerId,
+    method: 'delete'
+  })
+}
+
+// 导出seg销售人员信息
+export function exportSegchk_saler_info(query) {
+  return request({
+    url: '/segchk/segchk_saler_info/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_self_service_chk.js b/ruoyi-ui/src/api/segchk/segchk_self_service_chk.js
new file mode 100644
index 0000000..b899df8
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_self_service_chk.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg自定义卡核消记录列表
+export function listSegchk_self_service_chk(query) {
+  return request({
+    url: '/segchk/segchk_self_service_chk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg自定义卡核消记录详细
+export function getSegchk_self_service_chk(chkServiceId) {
+  return request({
+    url: '/segchk/segchk_self_service_chk/' + chkServiceId,
+    method: 'get'
+  })
+}
+
+// 新增seg自定义卡核消记录
+export function addSegchk_self_service_chk(data) {
+  return request({
+    url: '/segchk/segchk_self_service_chk',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg自定义卡核消记录
+export function updateSegchk_self_service_chk(data) {
+  return request({
+    url: '/segchk/segchk_self_service_chk',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg自定义卡核消记录
+export function delSegchk_self_service_chk(chkServiceId) {
+  return request({
+    url: '/segchk/segchk_self_service_chk/' + chkServiceId,
+    method: 'delete'
+  })
+}
+
+// 导出seg自定义卡核消记录
+export function exportSegchk_self_service_chk(query) {
+  return request({
+    url: '/segchk/segchk_self_service_chk/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_service_chk.js b/ruoyi-ui/src/api/segchk/segchk_service_chk.js
new file mode 100644
index 0000000..743cef9
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_service_chk.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg核消记录列表
+export function listSegchk_service_chk(query) {
+  return request({
+    url: '/segchk/segchk_service_chk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg核消记录详细
+export function getSegchk_service_chk(chkServiceId) {
+  return request({
+    url: '/segchk/segchk_service_chk/' + chkServiceId,
+    method: 'get'
+  })
+}
+
+// 新增seg核消记录
+export function addSegchk_service_chk(data) {
+  return request({
+    url: '/segchk/segchk_service_chk',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg核消记录
+export function updateSegchk_service_chk(data) {
+  return request({
+    url: '/segchk/segchk_service_chk',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg核消记录
+export function delSegchk_service_chk(chkServiceId) {
+  return request({
+    url: '/segchk/segchk_service_chk/' + chkServiceId,
+    method: 'delete'
+  })
+}
+
+// 导出seg核消记录
+export function exportSegchk_service_chk(query) {
+  return request({
+    url: '/segchk/segchk_service_chk/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_service_comment.js b/ruoyi-ui/src/api/segchk/segchk_service_comment.js
new file mode 100644
index 0000000..0d5c940
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_service_comment.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg评价记录列表
+export function listSegchk_service_comment(query) {
+  return request({
+    url: '/segchk/segchk_service_comment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg评价记录详细
+export function getSegchk_service_comment(commentId) {
+  return request({
+    url: '/segchk/segchk_service_comment/' + commentId,
+    method: 'get'
+  })
+}
+
+// 新增seg评价记录
+export function addSegchk_service_comment(data) {
+  return request({
+    url: '/segchk/segchk_service_comment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg评价记录
+export function updateSegchk_service_comment(data) {
+  return request({
+    url: '/segchk/segchk_service_comment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg评价记录
+export function delSegchk_service_comment(commentId) {
+  return request({
+    url: '/segchk/segchk_service_comment/' + commentId,
+    method: 'delete'
+  })
+}
+
+// 导出seg评价记录
+export function exportSegchk_service_comment(query) {
+  return request({
+    url: '/segchk/segchk_service_comment/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_sms_detail.js b/ruoyi-ui/src/api/segchk/segchk_sms_detail.js
new file mode 100644
index 0000000..d0bfeca
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_sms_detail.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg短信记录列表
+export function listSegchk_sms_detail(query) {
+  return request({
+    url: '/segchk/segchk_sms_detail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg短信记录详细
+export function getSegchk_sms_detail(shortMsgId) {
+  return request({
+    url: '/segchk/segchk_sms_detail/' + shortMsgId,
+    method: 'get'
+  })
+}
+
+// 新增seg短信记录
+export function addSegchk_sms_detail(data) {
+  return request({
+    url: '/segchk/segchk_sms_detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg短信记录
+export function updateSegchk_sms_detail(data) {
+  return request({
+    url: '/segchk/segchk_sms_detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg短信记录
+export function delSegchk_sms_detail(shortMsgId) {
+  return request({
+    url: '/segchk/segchk_sms_detail/' + shortMsgId,
+    method: 'delete'
+  })
+}
+
+// 导出seg短信记录
+export function exportSegchk_sms_detail(query) {
+  return request({
+    url: '/segchk/segchk_sms_detail/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_account.js b/ruoyi-ui/src/api/segchk/segchk_store_account.js
new file mode 100644
index 0000000..a9c7d99
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_account.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商户余额信息列表
+export function listSegchk_store_account(query) {
+  return request({
+    url: '/segchk/segchk_store_account/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商户余额信息详细
+export function getSegchk_store_account(accountId) {
+  return request({
+    url: '/segchk/segchk_store_account/' + accountId,
+    method: 'get'
+  })
+}
+
+// 新增seg商户余额信息
+export function addSegchk_store_account(data) {
+  return request({
+    url: '/segchk/segchk_store_account',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商户余额信息
+export function updateSegchk_store_account(data) {
+  return request({
+    url: '/segchk/segchk_store_account',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商户余额信息
+export function delSegchk_store_account(accountId) {
+  return request({
+    url: '/segchk/segchk_store_account/' + accountId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商户余额信息
+export function exportSegchk_store_account(query) {
+  return request({
+    url: '/segchk/segchk_store_account/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_basic_info.js b/ruoyi-ui/src/api/segchk/segchk_store_basic_info.js
new file mode 100644
index 0000000..2f0952f
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_basic_info.js
@@ -0,0 +1,77 @@
+import request from '@/utils/request'
+
+// 查询seg商家基础信息列表
+export function listSegchk_store_basic_info(query) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家基础信息详细
+export function getSegchk_store_basic_info(storeId) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/' + storeId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家基础信息
+export function addSegchk_store_basic_info(data) {
+  return request({
+    url: '/segchk/segchk_store_basic_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家基础信息
+export function updateSegchk_store_basic_info(data) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/edit_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg商家基础信息
+export function update_store_detail(data) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/update_detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg商家基础服务状态
+export function updateSegchk_store_service_state(providerId, storeId, serviceState, withMsg) {
+  const data = {
+    providerId,
+    storeId,
+    serviceState,
+    withMsg
+  }
+  return request({
+    url: '/segchk/segchk_store_basic_info/service_state',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家基础信息
+export function delSegchk_store_basic_info(storeId) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/' + storeId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家基础信息
+export function exportSegchk_store_basic_info(query) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_cash.js b/ruoyi-ui/src/api/segchk/segchk_store_cash.js
new file mode 100644
index 0000000..41fdefd
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_cash.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商户户提现记录列表
+export function listSegchk_store_cash(query) {
+  return request({
+    url: '/segchk/segchk_store_cash/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商户户提现记录详细
+export function getSegchk_store_cash(cashId) {
+  return request({
+    url: '/segchk/segchk_store_cash/' + cashId,
+    method: 'get'
+  })
+}
+
+// 新增seg商户户提现记录
+export function addSegchk_store_cash(data) {
+  return request({
+    url: '/segchk/segchk_store_cash',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商户户提现记录
+export function updateSegchk_store_cash(data) {
+  return request({
+    url: '/segchk/segchk_store_cash',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商户户提现记录
+export function delSegchk_store_cash(cashId) {
+  return request({
+    url: '/segchk/segchk_store_cash/' + cashId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商户户提现记录
+export function exportSegchk_store_cash(query) {
+  return request({
+    url: '/segchk/segchk_store_cash/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_charge.js b/ruoyi-ui/src/api/segchk/segchk_store_charge.js
new file mode 100644
index 0000000..3eaf113
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_charge.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商户充值记录列表
+export function listSegchk_store_charge(query) {
+  return request({
+    url: '/segchk/segchk_store_charge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商户充值记录详细
+export function getSegchk_store_charge(chargeId) {
+  return request({
+    url: '/segchk/segchk_store_charge/' + chargeId,
+    method: 'get'
+  })
+}
+
+// 新增seg商户充值记录
+export function addSegchk_store_charge(data) {
+  return request({
+    url: '/segchk/segchk_store_charge',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商户充值记录
+export function updateSegchk_store_charge(data) {
+  return request({
+    url: '/segchk/segchk_store_charge',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商户充值记录
+export function delSegchk_store_charge(chargeId) {
+  return request({
+    url: '/segchk/segchk_store_charge/' + chargeId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商户充值记录
+export function exportSegchk_store_charge(query) {
+  return request({
+    url: '/segchk/segchk_store_charge/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_chk_mgt.js b/ruoyi-ui/src/api/segchk/segchk_store_chk_mgt.js
new file mode 100644
index 0000000..b13b020
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_chk_mgt.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商家核消卡管理列表
+export function listSegchk_store_chk_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家核消卡管理详细
+export function getSegchk_store_chk_mgt(mgtId) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt/' + mgtId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家核消卡管理
+export function addSegchk_store_chk_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家核消卡管理
+export function updateSegchk_store_chk_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家核消卡管理
+export function delSegchk_store_chk_mgt(mgtId) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt/' + mgtId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家核消卡管理
+export function exportSegchk_store_chk_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_chk_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_image.js b/ruoyi-ui/src/api/segchk/segchk_store_image.js
new file mode 100644
index 0000000..0e35e59
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_image.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商家图片信息列表
+export function listSegchk_store_image(query) {
+  return request({
+    url: '/segchk/segchk_store_image/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家图片信息详细
+export function getSegchk_store_image(storeId) {
+  return request({
+    url: '/segchk/segchk_store_image/' + storeId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家图片信息
+export function addSegchk_store_image(data) {
+  return request({
+    url: '/segchk/segchk_store_image',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家图片信息
+export function updateSegchk_store_image(data) {
+  return request({
+    url: '/segchk/segchk_store_image',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家图片信息
+export function delSegchk_store_image(storeId) {
+  return request({
+    url: '/segchk/segchk_store_image/' + storeId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家图片信息
+export function exportSegchk_store_image(query) {
+  return request({
+    url: '/segchk/segchk_store_image/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_lable_mgt.js b/ruoyi-ui/src/api/segchk/segchk_store_lable_mgt.js
new file mode 100644
index 0000000..199bedc
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_lable_mgt.js
@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+// 查询seg商家标签管理列表
+export function listSegchk_store_lable_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家标签管理详细
+export function getSegchk_store_lable_mgt(mgtId) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/' + mgtId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家标签管理
+export function addSegchk_store_lable_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家标签管理
+export function updateSegchk_store_lable_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改seg商家标签管理
+export function updateSegchk_store_lable_status(mgtId, mgtState) {
+  const data = {
+    mgtId,
+    mgtState
+  }
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/update_status',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家标签管理
+export function delSegchk_store_lable_mgt(mgtId) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/' + mgtId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家标签管理
+export function exportSegchk_store_lable_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_lable_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_reward.js b/ruoyi-ui/src/api/segchk/segchk_store_reward.js
new file mode 100644
index 0000000..8c15f69
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_reward.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商户奖励列表
+export function listSegchk_store_reward(query) {
+  return request({
+    url: '/segchk/segchk_store_reward/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商户奖励详细
+export function getSegchk_store_reward(rewardId) {
+  return request({
+    url: '/segchk/segchk_store_reward/' + rewardId,
+    method: 'get'
+  })
+}
+
+// 新增seg商户奖励
+export function addSegchk_store_reward(data) {
+  return request({
+    url: '/segchk/segchk_store_reward',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商户奖励
+export function updateSegchk_store_reward(data) {
+  return request({
+    url: '/segchk/segchk_store_reward',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商户奖励
+export function delSegchk_store_reward(rewardId) {
+  return request({
+    url: '/segchk/segchk_store_reward/' + rewardId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商户奖励
+export function exportSegchk_store_reward(query) {
+  return request({
+    url: '/segchk/segchk_store_reward/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_security.js b/ruoyi-ui/src/api/segchk/segchk_store_security.js
new file mode 100644
index 0000000..7e73d08
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_security.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商户密码列表
+export function listSegchk_store_security(query) {
+  return request({
+    url: '/segchk/segchk_store_security/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商户密码详细
+export function getSegchk_store_security(pwdId) {
+  return request({
+    url: '/segchk/segchk_store_security/' + pwdId,
+    method: 'get'
+  })
+}
+
+// 新增seg商户密码
+export function addSegchk_store_security(data) {
+  return request({
+    url: '/segchk/segchk_store_security',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商户密码
+export function updateSegchk_store_security(data) {
+  return request({
+    url: '/segchk/segchk_store_security',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商户密码
+export function delSegchk_store_security(pwdId) {
+  return request({
+    url: '/segchk/segchk_store_security/' + pwdId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商户密码
+export function exportSegchk_store_security(query) {
+  return request({
+    url: '/segchk/segchk_store_security/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_store_self_mgt.js b/ruoyi-ui/src/api/segchk/segchk_store_self_mgt.js
new file mode 100644
index 0000000..bd2dd16
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_store_self_mgt.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg商家自定义卡管理列表
+export function listSegchk_store_self_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg商家自定义卡管理详细
+export function getSegchk_store_self_mgt(freeCardId) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/' + freeCardId,
+    method: 'get'
+  })
+}
+
+// 新增seg商家自定义卡管理
+export function addSegchk_store_self_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg商家自定义卡管理
+export function updateSegchk_store_self_mgt(data) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg商家自定义卡管理
+export function delSegchk_store_self_mgt(freeCardId) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/' + freeCardId,
+    method: 'delete'
+  })
+}
+
+// 导出seg商家自定义卡管理
+export function exportSegchk_store_self_mgt(query) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_system_setting.js b/ruoyi-ui/src/api/segchk/segchk_system_setting.js
new file mode 100644
index 0000000..1eb4776
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_system_setting.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询系统设置列表
+export function listSegchk_system_setting(query) {
+  return request({
+    url: '/segchk/segchk_system_setting/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询系统设置详细
+export function getSegchk_system_setting(id) {
+  return request({
+    url: '/segchk/segchk_system_setting/' + id,
+    method: 'get'
+  })
+}
+
+// 新增系统设置
+export function addSegchk_system_setting(data) {
+  return request({
+    url: '/segchk/segchk_system_setting',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改系统设置
+export function updateSegchk_system_setting(data) {
+  return request({
+    url: '/segchk/segchk_system_setting/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除系统设置
+export function delSegchk_system_setting(id) {
+  return request({
+    url: '/segchk/segchk_system_setting/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出系统设置
+export function exportSegchk_system_setting(query) {
+  return request({
+    url: '/segchk/segchk_system_setting/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_account.js b/ruoyi-ui/src/api/segchk/segchk_user_account.js
new file mode 100644
index 0000000..a75209c
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_account.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户余额信息列表
+export function listSegchk_user_account(query) {
+  return request({
+    url: '/segchk/segchk_user_account/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户余额信息详细
+export function getSegchk_user_account(accountId) {
+  return request({
+    url: '/segchk/segchk_user_account/' + accountId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户余额信息
+export function addSegchk_user_account(data) {
+  return request({
+    url: '/segchk/segchk_user_account',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户余额信息
+export function updateSegchk_user_account(data) {
+  return request({
+    url: '/segchk/segchk_user_account',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户余额信息
+export function delSegchk_user_account(accountId) {
+  return request({
+    url: '/segchk/segchk_user_account/' + accountId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户余额信息
+export function exportSegchk_user_account(query) {
+  return request({
+    url: '/segchk/segchk_user_account/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_basic_info.js b/ruoyi-ui/src/api/segchk/segchk_user_basic_info.js
new file mode 100644
index 0000000..85fe912
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_basic_info.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户基本信息列表
+export function listSegchk_user_basic_info(query) {
+  return request({
+    url: '/segchk/segchk_user_basic_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户基本信息详细
+export function getSegchk_user_basic_info(userId) {
+  return request({
+    url: '/segchk/segchk_user_basic_info/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户基本信息
+export function addSegchk_user_basic_info(data) {
+  return request({
+    url: '/segchk/segchk_user_basic_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户基本信息
+export function updateSegchk_user_basic_info(data) {
+  return request({
+    url: '/segchk/segchk_user_basic_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户基本信息
+export function delSegchk_user_basic_info(userId) {
+  return request({
+    url: '/segchk/segchk_user_basic_info/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户基本信息
+export function exportSegchk_user_basic_info(query) {
+  return request({
+    url: '/segchk/segchk_user_basic_info/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_cash.js b/ruoyi-ui/src/api/segchk/segchk_user_cash.js
new file mode 100644
index 0000000..9be0bd4
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_cash.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户提现记录列表
+export function listSegchk_user_cash(query) {
+  return request({
+    url: '/segchk/segchk_user_cash/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户提现记录详细
+export function getSegchk_user_cash(cashId) {
+  return request({
+    url: '/segchk/segchk_user_cash/' + cashId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户提现记录
+export function addSegchk_user_cash(data) {
+  return request({
+    url: '/segchk/segchk_user_cash',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户提现记录
+export function updateSegchk_user_cash(data) {
+  return request({
+    url: '/segchk/segchk_user_cash',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户提现记录
+export function delSegchk_user_cash(cashId) {
+  return request({
+    url: '/segchk/segchk_user_cash/' + cashId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户提现记录
+export function exportSegchk_user_cash(query) {
+  return request({
+    url: '/segchk/segchk_user_cash/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_certification_info.js b/ruoyi-ui/src/api/segchk/segchk_user_certification_info.js
new file mode 100644
index 0000000..85c2e30
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_certification_info.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户实名认证信息列表
+export function listSegchk_user_certification_info(query) {
+  return request({
+    url: '/segchk/segchk_user_certification_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户实名认证信息详细
+export function getSegchk_user_certification_info(usercardId) {
+  return request({
+    url: '/segchk/segchk_user_certification_info/' + usercardId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户实名认证信息
+export function addSegchk_user_certification_info(data) {
+  return request({
+    url: '/segchk/segchk_user_certification_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户实名认证信息
+export function updateSegchk_user_certification_info(data) {
+  return request({
+    url: '/segchk/segchk_user_certification_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户实名认证信息
+export function delSegchk_user_certification_info(usercardId) {
+  return request({
+    url: '/segchk/segchk_user_certification_info/' + usercardId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户实名认证信息
+export function exportSegchk_user_certification_info(query) {
+  return request({
+    url: '/segchk/segchk_user_certification_info/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_charge.js b/ruoyi-ui/src/api/segchk/segchk_user_charge.js
new file mode 100644
index 0000000..0f52aa7
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_charge.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户充值记录列表
+export function listSegchk_user_charge(query) {
+  return request({
+    url: '/segchk/segchk_user_charge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户充值记录详细
+export function getSegchk_user_charge(chargeId) {
+  return request({
+    url: '/segchk/segchk_user_charge/' + chargeId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户充值记录
+export function addSegchk_user_charge(data) {
+  return request({
+    url: '/segchk/segchk_user_charge',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户充值记录
+export function updateSegchk_user_charge(data) {
+  return request({
+    url: '/segchk/segchk_user_charge',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户充值记录
+export function delSegchk_user_charge(chargeId) {
+  return request({
+    url: '/segchk/segchk_user_charge/' + chargeId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户充值记录
+export function exportSegchk_user_charge(query) {
+  return request({
+    url: '/segchk/segchk_user_charge/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_collect.js b/ruoyi-ui/src/api/segchk/segchk_user_collect.js
new file mode 100644
index 0000000..e612f91
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_collect.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户收藏记录列表
+export function listSegchk_user_collect(query) {
+  return request({
+    url: '/segchk/segchk_user_collect/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户收藏记录详细
+export function getSegchk_user_collect(collectId) {
+  return request({
+    url: '/segchk/segchk_user_collect/' + collectId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户收藏记录
+export function addSegchk_user_collect(data) {
+  return request({
+    url: '/segchk/segchk_user_collect',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户收藏记录
+export function updateSegchk_user_collect(data) {
+  return request({
+    url: '/segchk/segchk_user_collect',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户收藏记录
+export function delSegchk_user_collect(collectId) {
+  return request({
+    url: '/segchk/segchk_user_collect/' + collectId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户收藏记录
+export function exportSegchk_user_collect(query) {
+  return request({
+    url: '/segchk/segchk_user_collect/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_ext_info.js b/ruoyi-ui/src/api/segchk/segchk_user_ext_info.js
new file mode 100644
index 0000000..52860fe
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_ext_info.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户扩展信息列表
+export function listSegchk_user_ext_info(query) {
+  return request({
+    url: '/segchk/segchk_user_ext_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户扩展信息详细
+export function getSegchk_user_ext_info(userId) {
+  return request({
+    url: '/segchk/segchk_user_ext_info/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户扩展信息
+export function addSegchk_user_ext_info(data) {
+  return request({
+    url: '/segchk/segchk_user_ext_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户扩展信息
+export function updateSegchk_user_ext_info(data) {
+  return request({
+    url: '/segchk/segchk_user_ext_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户扩展信息
+export function delSegchk_user_ext_info(userId) {
+  return request({
+    url: '/segchk/segchk_user_ext_info/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户扩展信息
+export function exportSegchk_user_ext_info(query) {
+  return request({
+    url: '/segchk/segchk_user_ext_info/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_likego.js b/ruoyi-ui/src/api/segchk/segchk_user_likego.js
new file mode 100644
index 0000000..5e70ae0
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_likego.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户想去记录列表
+export function listSegchk_user_likego(query) {
+  return request({
+    url: '/segchk/segchk_user_likego/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户想去记录详细
+export function getSegchk_user_likego(likegoId) {
+  return request({
+    url: '/segchk/segchk_user_likego/' + likegoId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户想去记录
+export function addSegchk_user_likego(data) {
+  return request({
+    url: '/segchk/segchk_user_likego',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户想去记录
+export function updateSegchk_user_likego(data) {
+  return request({
+    url: '/segchk/segchk_user_likego',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户想去记录
+export function delSegchk_user_likego(likegoId) {
+  return request({
+    url: '/segchk/segchk_user_likego/' + likegoId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户想去记录
+export function exportSegchk_user_likego(query) {
+  return request({
+    url: '/segchk/segchk_user_likego/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_reward.js b/ruoyi-ui/src/api/segchk/segchk_user_reward.js
new file mode 100644
index 0000000..9fbae6d
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_reward.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户奖励列表
+export function listSegchk_user_reward(query) {
+  return request({
+    url: '/segchk/segchk_user_reward/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户奖励详细
+export function getSegchk_user_reward(rewardId) {
+  return request({
+    url: '/segchk/segchk_user_reward/' + rewardId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户奖励
+export function addSegchk_user_reward(data) {
+  return request({
+    url: '/segchk/segchk_user_reward',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户奖励
+export function updateSegchk_user_reward(data) {
+  return request({
+    url: '/segchk/segchk_user_reward',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户奖励
+export function delSegchk_user_reward(rewardId) {
+  return request({
+    url: '/segchk/segchk_user_reward/' + rewardId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户奖励
+export function exportSegchk_user_reward(query) {
+  return request({
+    url: '/segchk/segchk_user_reward/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_reward_ctl.js b/ruoyi-ui/src/api/segchk/segchk_user_reward_ctl.js
new file mode 100644
index 0000000..a1dae02
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_reward_ctl.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg会员推荐控制列表
+export function listSegchk_user_reward_ctl(query) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg会员推荐控制详细
+export function getSegchk_user_reward_ctl(rewardCtlId) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl/' + rewardCtlId,
+    method: 'get'
+  })
+}
+
+// 新增seg会员推荐控制
+export function addSegchk_user_reward_ctl(data) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg会员推荐控制
+export function updateSegchk_user_reward_ctl(data) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg会员推荐控制
+export function delSegchk_user_reward_ctl(rewardCtlId) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl/' + rewardCtlId,
+    method: 'delete'
+  })
+}
+
+// 导出seg会员推荐控制
+export function exportSegchk_user_reward_ctl(query) {
+  return request({
+    url: '/segchk/segchk_user_reward_ctl/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_security.js b/ruoyi-ui/src/api/segchk/segchk_user_security.js
new file mode 100644
index 0000000..a45ca7d
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_security.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户密码列表
+export function listSegchk_user_security(query) {
+  return request({
+    url: '/segchk/segchk_user_security/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户密码详细
+export function getSegchk_user_security(pwdId) {
+  return request({
+    url: '/segchk/segchk_user_security/' + pwdId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户密码
+export function addSegchk_user_security(data) {
+  return request({
+    url: '/segchk/segchk_user_security',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户密码
+export function updateSegchk_user_security(data) {
+  return request({
+    url: '/segchk/segchk_user_security',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户密码
+export function delSegchk_user_security(pwdId) {
+  return request({
+    url: '/segchk/segchk_user_security/' + pwdId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户密码
+export function exportSegchk_user_security(query) {
+  return request({
+    url: '/segchk/segchk_user_security/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_vip.js b/ruoyi-ui/src/api/segchk/segchk_user_vip.js
new file mode 100644
index 0000000..7b7d82f
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_vip.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg会员卡列表
+export function listSegchk_user_vip(query) {
+  return request({
+    url: '/segchk/segchk_user_vip/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg会员卡详细
+export function getSegchk_user_vip(cardId) {
+  return request({
+    url: '/segchk/segchk_user_vip/' + cardId,
+    method: 'get'
+  })
+}
+
+// 新增seg会员卡
+export function addSegchk_user_vip(data) {
+  return request({
+    url: '/segchk/segchk_user_vip',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg会员卡
+export function updateSegchk_user_vip(data) {
+  return request({
+    url: '/segchk/segchk_user_vip',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg会员卡
+export function delSegchk_user_vip(cardId) {
+  return request({
+    url: '/segchk/segchk_user_vip/' + cardId,
+    method: 'delete'
+  })
+}
+
+// 导出seg会员卡
+export function exportSegchk_user_vip(query) {
+  return request({
+    url: '/segchk/segchk_user_vip/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_user_wechat.js b/ruoyi-ui/src/api/segchk/segchk_user_wechat.js
new file mode 100644
index 0000000..8db59fa
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_user_wechat.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg用户微信信息列表
+export function listSegchk_user_wechat(query) {
+  return request({
+    url: '/segchk/segchk_user_wechat/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg用户微信信息详细
+export function getSegchk_user_wechat(userId) {
+  return request({
+    url: '/segchk/segchk_user_wechat/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增seg用户微信信息
+export function addSegchk_user_wechat(data) {
+  return request({
+    url: '/segchk/segchk_user_wechat',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg用户微信信息
+export function updateSegchk_user_wechat(data) {
+  return request({
+    url: '/segchk/segchk_user_wechat',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg用户微信信息
+export function delSegchk_user_wechat(userId) {
+  return request({
+    url: '/segchk/segchk_user_wechat/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出seg用户微信信息
+export function exportSegchk_user_wechat(query) {
+  return request({
+    url: '/segchk/segchk_user_wechat/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/segchk/segchk_vip_set_info.js b/ruoyi-ui/src/api/segchk/segchk_vip_set_info.js
new file mode 100644
index 0000000..fc52343
--- /dev/null
+++ b/ruoyi-ui/src/api/segchk/segchk_vip_set_info.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询seg会员卡设置列表
+export function listSegchk_vip_set_info(query) {
+  return request({
+    url: '/segchk/segchk_vip_set_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询seg会员卡设置详细
+export function getSegchk_vip_set_info(modeId) {
+  return request({
+    url: '/segchk/segchk_vip_set_info/' + modeId,
+    method: 'get'
+  })
+}
+
+// 新增seg会员卡设置
+export function addSegchk_vip_set_info(data) {
+  return request({
+    url: '/segchk/segchk_vip_set_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改seg会员卡设置
+export function updateSegchk_vip_set_info(data) {
+  return request({
+    url: '/segchk/segchk_vip_set_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除seg会员卡设置
+export function delSegchk_vip_set_info(modeId) {
+  return request({
+    url: '/segchk/segchk_vip_set_info/' + modeId,
+    method: 'delete'
+  })
+}
+
+// 导出seg会员卡设置
+export function exportSegchk_vip_set_info(query) {
+  return request({
+    url: '/segchk/segchk_vip_set_info/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/config.js b/ruoyi-ui/src/api/system/config.js
new file mode 100644
index 0000000..95af138
--- /dev/null
+++ b/ruoyi-ui/src/api/system/config.js
@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 查询参数列表
+export function listConfig(query) {
+  return request({
+    url: '/system/config/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询参数详细
+export function getConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'get'
+  })
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+  return request({
+    url: '/system/config/configKey/' + configKey,
+    method: 'get'
+  })
+}
+
+// 新增参数配置
+export function addConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改参数配置
+export function updateConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参数配置
+export function delConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'delete'
+  })
+}
+
+// 刷新参数缓存
+export function refreshCache() {
+  return request({
+    url: '/system/config/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/system/config/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/dept.js b/ruoyi-ui/src/api/system/dept.js
new file mode 100644
index 0000000..2804676
--- /dev/null
+++ b/ruoyi-ui/src/api/system/dept.js
@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+// 查询部门列表
+export function listDept(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listDeptExcludeChild(deptId) {
+  return request({
+    url: '/system/dept/list/exclude/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get'
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function roleDeptTreeselect(roleId) {
+  return request({
+    url: '/system/dept/roleDeptTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function delDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/dict/data.js b/ruoyi-ui/src/api/system/dict/data.js
new file mode 100644
index 0000000..d7aca89
--- /dev/null
+++ b/ruoyi-ui/src/api/system/dict/data.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}
+
+// 导出字典数据
+export function exportData(query) {
+  return request({
+    url: '/system/dict/data/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/dict/type.js b/ruoyi-ui/src/api/system/dict/type.js
new file mode 100644
index 0000000..947be41
--- /dev/null
+++ b/ruoyi-ui/src/api/system/dict/type.js
@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+  return request({
+    url: '/system/dict/type/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 导出字典类型
+export function exportType(query) {
+  return request({
+    url: '/system/dict/type/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/menu.js b/ruoyi-ui/src/api/system/menu.js
new file mode 100644
index 0000000..f6415c6
--- /dev/null
+++ b/ruoyi-ui/src/api/system/menu.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function listMenu(query) {
+  return request({
+    url: '/system/menu/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询菜单详细
+export function getMenu(menuId) {
+  return request({
+    url: '/system/menu/' + menuId,
+    method: 'get'
+  })
+}
+
+// 查询菜单下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/menu/treeselect',
+    method: 'get'
+  })
+}
+
+// 根据角色ID查询菜单下拉树结构
+export function roleMenuTreeselect(roleId) {
+  return request({
+    url: '/system/menu/roleMenuTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增菜单
+export function addMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改菜单
+export function updateMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除菜单
+export function delMenu(menuId) {
+  return request({
+    url: '/system/menu/' + menuId,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/notice.js b/ruoyi-ui/src/api/system/notice.js
new file mode 100644
index 0000000..c274ea5
--- /dev/null
+++ b/ruoyi-ui/src/api/system/notice.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公告列表
+export function listNotice(query) {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公告详细
+export function getNotice(noticeId) {
+  return request({
+    url: '/system/notice/' + noticeId,
+    method: 'get'
+  })
+}
+
+// 新增公告
+export function addNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告
+export function updateNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公告
+export function delNotice(noticeId) {
+  return request({
+    url: '/system/notice/' + noticeId,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/post.js b/ruoyi-ui/src/api/system/post.js
new file mode 100644
index 0000000..434cd35
--- /dev/null
+++ b/ruoyi-ui/src/api/system/post.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/system/post/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询岗位详细
+export function getPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'delete'
+  })
+}
+
+// 导出岗位
+export function exportPost(query) {
+  return request({
+    url: '/system/post/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js
new file mode 100644
index 0000000..0a4157d
--- /dev/null
+++ b/ruoyi-ui/src/api/system/role.js
@@ -0,0 +1,120 @@
+import request from '@/utils/request'
+
+// 查询角色列表
+export function listRole(query) {
+  return request({
+    url: '/system/role/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(roleId, status) {
+  const data = {
+    roleId,
+    status
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色已授权用户列表
+export function allocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/allocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色未授权用户列表
+export function unallocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/unallocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 取消用户授权角色
+export function authUserCancel(data) {
+  return request({
+    url: '/system/role/authUser/cancel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 批量取消用户授权角色
+export function authUserCancelAll(data) {
+  return request({
+    url: '/system/role/authUser/cancelAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 授权用户选择
+export function authUserSelectAll(data) {
+  return request({
+    url: '/system/role/authUser/selectAll',
+    method: 'put',
+    params: data
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
new file mode 100644
index 0000000..37f4eb3
--- /dev/null
+++ b/ruoyi-ui/src/api/system/user.js
@@ -0,0 +1,144 @@
+import request from '@/utils/request'
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + praseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出用户
+export function exportUser(query) {
+  return request({
+    url: '/system/user/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载用户导入模板
+export function importTemplate() {
+  return request({
+    url: '/system/user/importTemplate',
+    method: 'get'
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
diff --git a/ruoyi-ui/src/api/tool/gen.js b/ruoyi-ui/src/api/tool/gen.js
new file mode 100644
index 0000000..4506927
--- /dev/null
+++ b/ruoyi-ui/src/api/tool/gen.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 查询生成表数据
+export function listTable(query) {
+  return request({
+    url: '/tool/gen/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+  return request({
+    url: '/tool/gen/db/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/tool/gen/' + tableId,
+    method: 'get'
+  })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+  return request({
+    url: '/tool/gen',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导入表
+export function importTable(data) {
+  return request({
+    url: '/tool/gen/importTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/tool/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+  return request({
+    url: '/tool/gen/' + tableId,
+    method: 'delete'
+  })
+}
+
+// 生成代码（自定义路径）
+export function genCode(tableName) {
+  return request({
+    url: '/tool/gen/genCode/' + tableName,
+    method: 'get'
+  })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+  return request({
+    url: '/tool/gen/synchDb/' + tableName,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/ruoyi-ui/src/assets/401_images/401.gif
new file mode 100644
index 0000000..cd6e0d9
Binary files /dev/null and b/ruoyi-ui/src/assets/401_images/401.gif differ
diff --git a/ruoyi-ui/src/assets/404_images/404.png b/ruoyi-ui/src/assets/404_images/404.png
new file mode 100644
index 0000000..3d8e230
Binary files /dev/null and b/ruoyi-ui/src/assets/404_images/404.png differ
diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/ruoyi-ui/src/assets/404_images/404_cloud.png
new file mode 100644
index 0000000..c6281d0
Binary files /dev/null and b/ruoyi-ui/src/assets/404_images/404_cloud.png differ
diff --git a/ruoyi-ui/src/assets/icons/index.js b/ruoyi-ui/src/assets/icons/index.js
new file mode 100644
index 0000000..2c6b309
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/index.js
@@ -0,0 +1,9 @@
+import Vue from 'vue'
+import SvgIcon from '@/components/SvgIcon'// svg component
+
+// register globally
+Vue.component('svg-icon', SvgIcon)
+
+const req = require.context('./svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys().map(requireContext)
+requireAll(req)
diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/ruoyi-ui/src/assets/icons/svg/404.svg
new file mode 100644
index 0000000..6df5019
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/404.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M121.718 73.272v9.953c3.957-7.584 6.199-16.05 6.199-24.995C127.917 26.079 99.273 0 63.958 0 28.644 0 0 26.079 0 58.23c0 .403.028.806.028 1.21l22.97-25.953h13.34l-19.76 27.187h6.42V53.77l13.728-19.477v49.361H22.998V73.272H2.158c5.951 20.284 23.608 36.208 45.998 41.399-1.44 3.3-5.618 11.263-12.565 12.674-8.607 1.764 23.358.428 46.163-13.178 17.519-4.611 31.938-15.849 39.77-30.513h-13.506V73.272H85.02V59.464l22.998-25.977h13.008l-19.429 27.187h6.421v-7.433l13.727-19.402v39.433h-.027zm-78.24 2.822a10.516 10.516 0 0 1-.996-4.535V44.548c0-1.613.332-3.124.996-4.535a11.66 11.66 0 0 1 2.713-3.68c1.134-1.032 2.49-1.864 4.04-2.468 1.55-.605 3.21-.908 4.982-.908h11.292c1.77 0 3.431.303 4.981.908 1.522.604 2.85 1.41 3.986 2.418l-12.26 16.303v-2.898a1.96 1.96 0 0 0-.665-1.512c-.443-.403-.996-.604-1.66-.604-.665 0-1.218.201-1.661.604a1.96 1.96 0 0 0-.664 1.512v9.071L44.364 77.606a10.556 10.556 0 0 1-.886-1.512zm35.73-4.535c0 1.613-.332 3.124-.997 4.535a11.66 11.66 0 0 1-2.712 3.68c-1.134 1.032-2.49 1.864-4.04 2.469-1.55.604-3.21.907-4.982.907H55.185c-1.77 0-3.431-.303-4.981-.907-1.55-.605-2.906-1.437-4.041-2.47a12.49 12.49 0 0 1-1.384-1.512l13.727-18.217v6.375c0 .605.222 1.109.665 1.512.442.403.996.604 1.66.604.664 0 1.218-.201 1.66-.604a1.96 1.96 0 0 0 .665-1.512V53.87L75.97 36.838c.913.932 1.66 1.99 2.214 3.175.664 1.41.996 2.922.996 4.535v27.011h.028z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/ruoyi-ui/src/assets/icons/svg/bug.svg
new file mode 100644
index 0000000..05a150d
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/bug.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M127.88 73.143c0 1.412-.506 2.635-1.518 3.669-1.011 1.033-2.209 1.55-3.592 1.55h-17.887c0 9.296-1.783 17.178-5.35 23.645l16.609 17.044c1.011 1.034 1.517 2.257 1.517 3.67 0 1.412-.506 2.635-1.517 3.668-.958 1.033-2.155 1.55-3.593 1.55-1.438 0-2.635-.517-3.593-1.55l-15.811-16.063a15.49 15.49 0 0 1-1.196 1.06c-.532.434-1.65 1.208-3.353 2.322a50.104 50.104 0 0 1-5.192 2.974c-1.758.87-3.94 1.658-6.546 2.364-2.607.706-5.189 1.06-7.748 1.06V47.044H58.89v73.062c-2.716 0-5.417-.367-8.106-1.102-2.688-.734-5.003-1.631-6.945-2.692a66.769 66.769 0 0 1-5.268-3.179c-1.571-1.057-2.73-1.94-3.476-2.65L33.9 109.34l-14.611 16.877c-1.066 1.14-2.344 1.711-3.833 1.711-1.277 0-2.422-.434-3.434-1.304-1.012-.978-1.557-2.187-1.635-3.627-.079-1.44.333-2.705 1.236-3.794l16.129-18.51c-3.087-6.197-4.63-13.644-4.63-22.342H5.235c-1.383 0-2.58-.517-3.592-1.55S.125 74.545.125 73.132c0-1.412.506-2.635 1.518-3.668 1.012-1.034 2.21-1.55 3.592-1.55h17.887V43.939L9.308 29.833c-1.012-1.033-1.517-2.256-1.517-3.669 0-1.412.505-2.635 1.517-3.668 1.012-1.034 2.21-1.55 3.593-1.55s2.58.516 3.593 1.55l13.813 14.106h67.396l13.814-14.106c1.012-1.034 2.21-1.55 3.592-1.55 1.384 0 2.581.516 3.593 1.55 1.012 1.033 1.518 2.256 1.518 3.668 0 1.413-.506 2.636-1.518 3.67l-13.814 14.105v23.975h17.887c1.383 0 2.58.516 3.593 1.55 1.011 1.033 1.517 2.256 1.517 3.668l-.005.01zM89.552 26.175H38.448c0-7.23 2.489-13.386 7.466-18.469C50.892 2.623 56.92.082 64 .082c7.08 0 13.108 2.541 18.086 7.624 4.977 5.083 7.466 11.24 7.466 18.469z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/ruoyi-ui/src/assets/icons/svg/build.svg
new file mode 100644
index 0000000..97c4688
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/build.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899741379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2054" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M960 591.424V368.96c0-0.288 0.16-0.512 0.16-0.768S960 367.68 960 367.424V192a32 32 0 0 0-32-32H96a32 32 0 0 0-32 32v175.424c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768v222.464c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768V864a32 32 0 0 0 32 32h832a32 32 0 0 0 32-32v-271.04c0-0.288 0.16-0.512 0.16-0.768S960 591.68 960 591.424z m-560-31.232v-160H608v160h-208z m208 64V832h-208v-207.808H608z m-480-224h208v160H128v-160z m544 0h224v160h-224v-160zM896 224v112.192H128V224h768zM128 624.192h208V832H128v-207.808zM672 832v-207.808h224V832h-224z" p-id="2055"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/button.svg b/ruoyi-ui/src/assets/icons/svg/button.svg
new file mode 100644
index 0000000..904fddc
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/button.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588670460195" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1314" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M230.4 307.712c13.824 0 25.088-11.264 25.088-25.088 0-100.352 81.92-182.272 182.272-182.272s182.272 81.408 182.272 182.272c0 13.824 11.264 25.088 25.088 25.088s25.088-11.264 24.576-25.088c0-127.488-103.936-231.936-231.936-231.936S205.824 154.624 205.824 282.624c-0.512 14.336 10.752 25.088 24.576 25.088z m564.736 234.496c-11.264 0-21.504 2.048-31.232 6.144 0-44.544-40.448-81.92-88.064-81.92-14.848 0-28.16 3.584-39.936 10.24-13.824-28.16-44.544-48.128-78.848-48.128-12.288 0-24.576 2.56-35.328 7.68V284.16c0-45.568-37.888-81.92-84.48-81.92s-84.48 36.864-84.48 81.92v348.672l-69.12-112.64c-18.432-28.16-58.368-36.864-91.136-19.968-26.624 14.336-46.592 47.104-30.208 88.064 3.072 8.192 76.8 205.312 171.52 311.296 0 0 28.16 24.576 43.008 58.88 4.096 9.728 13.312 15.36 22.528 15.36 3.072 0 6.656-0.512 9.728-2.048 12.288-5.12 18.432-19.968 12.8-32.256-19.456-44.544-53.76-74.752-53.76-74.752C281.6 768 209.408 573.44 208.384 570.88c-5.12-12.8-2.56-20.992 7.168-26.112 9.216-4.608 21.504-4.608 26.112 2.56l113.152 184.32c4.096 8.704 12.8 14.336 22.528 14.336 13.824 0 25.088-10.752 25.088-25.088V284.16c0-17.92 15.36-32.256 34.816-32.256s34.816 14.336 34.816 32.256v284.16c0 13.824 10.24 25.088 24.576 25.088 13.824 0 25.088-11.264 25.088-25.088v-57.344c0-17.92 15.36-32.768 34.816-32.768 19.968 0 37.376 15.36 37.376 32.768v95.232c0 7.168 3.072 13.312 7.68 17.92 4.608 4.608 10.752 7.168 17.92 7.168 13.824 0 24.576-11.264 24.576-25.088V547.84c0-18.432 13.824-32.256 32.256-32.256 20.48 0 38.912 15.36 38.912 32.256v95.232c0 13.824 11.264 25.088 25.088 25.088s24.576-11.264 25.088-25.088v-18.944c0-18.944 12.8-32.256 30.72-32.256 18.432 0 22.528 18.944 22.528 31.744 0 1.024-11.776 99.84-50.688 173.056-30.72 58.368-45.056 112.128-51.2 146.944-2.56 13.312 6.656 26.112 19.968 28.672 1.536 0 3.072 0.512 4.608 0.512 11.776 0 22.016-8.192 24.064-20.48 5.632-31.232 18.432-79.36 46.08-132.608 43.52-81.92 55.808-186.88 56.32-193.536-0.512-50.688-29.696-83.968-72.704-83.968z"></path></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/ruoyi-ui/src/assets/icons/svg/cascader.svg
new file mode 100644
index 0000000..e256024
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/cascader.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576153230908" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="971" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M772.87036133 734.06115723c-43.34106445 0-80.00793458 27.93273926-93.76831055 66.57714843H475.90991211c-56.60705567 0-102.66723633-46.06018067-102.66723633-102.66723633V600.82446289h305.859375c13.76037598 38.64440918 50.42724609 66.57714844 93.76831055 66.57714844 55.12390137 0 99.94812012-44.82421875 99.94812012-99.94812012S827.9942627 467.50537109 772.87036133 467.50537109c-43.34106445 0-80.00793458 27.93273926-93.76831055 66.57714844H373.24267578V401.01062011h321.92687989c55.12390137 0 99.94812012-44.82421875 99.94812011-99.94812011V190.07312011C795.11767578 134.94921875 750.29345703 90.125 695.16955567 90.125H251.12963867C196.0057373 90.125 151.18151855 134.94921875 151.18151855 190.07312011V301.0625c0 55.12390137 44.82421875 99.94812012 99.94812012 99.94812012h55.53588867v296.96044921c0 93.35632325 75.97045898 169.32678223 169.32678224 169.32678223h203.19213866c13.76037598 38.64440918 50.42724609 66.57714844 93.76831055 66.57714844 55.12390137 0 99.94812012-44.82421875 99.94812012-99.94812012s-44.90661622-99.86572266-100.03051758-99.86572265z m0-199.89624024c18.37463379 0 33.28857422 14.91394043 33.28857422 33.28857423s-14.91394043 33.28857422-33.28857422 33.28857421-33.28857422-14.91394043-33.28857422-33.28857421 14.91394043-33.28857422 33.28857422-33.28857422zM217.75866699 301.0625V190.07312011c0-18.37463379 14.91394043-33.28857422 33.28857423-33.28857421h444.03991698c18.37463379 0 33.28857422 14.91394043 33.28857422 33.28857422V301.0625c0 18.37463379-14.91394043 33.28857422-33.28857422 33.28857422H251.12963867c-18.37463379 0-33.37097168-14.91394043-33.37097168-33.28857422z m555.11169434 566.23535156c-18.37463379 0-33.28857422-14.91394043-33.28857422-33.28857422 0-18.37463379 14.91394043-33.28857422 33.28857422-33.28857422s33.28857422 14.91394043 33.28857422 33.28857422c0.08239747 18.29223633-14.91394043 33.28857422-33.28857422 33.28857422z" p-id="972"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/ruoyi-ui/src/assets/icons/svg/chart.svg
new file mode 100644
index 0000000..27728fb
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/chart.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h36.571V128H0V54.857zM91.429 27.43H128V128H91.429V27.429zM45.714 0h36.572v128H45.714V0z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/ruoyi-ui/src/assets/icons/svg/checkbox.svg
new file mode 100644
index 0000000..013fd3a
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/checkbox.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575982282951" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="902" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M828.40625 90.125H195.59375C137.375 90.125 90.125 137.375 90.125 195.59375v632.8125c0 58.21875 47.25 105.46875 105.46875 105.46875h632.8125c58.21875 0 105.46875-47.25 105.46875-105.46875V195.59375c0-58.21875-47.25-105.46875-105.46875-105.46875z m52.734375 738.28125c0 29.16-23.57015625 52.734375-52.734375 52.734375H195.59375c-29.109375 0-52.734375-23.574375-52.734375-52.734375V195.59375c0-29.109375 23.625-52.734375 52.734375-52.734375h632.8125c29.16 0 52.734375 23.625 52.734375 52.734375v632.8125z" p-id="903"></path><path d="M421.52890625 709.55984375a36.28125 36.28125 0 0 1-27.55265625-12.66890625L205.17453125 476.613125a36.28546875 36.28546875 0 0 1 55.10109375-47.22890625l164.986875 192.4846875 342.16171875-298.48078125a36.2896875 36.2896875 0 0 1 47.70984375 54.68765625L445.3859375 700.6203125a36.3234375 36.3234375 0 0 1-23.85703125 8.93953125z" p-id="904"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/ruoyi-ui/src/assets/icons/svg/clipboard.svg
new file mode 100644
index 0000000..90923ff
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/clipboard.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/ruoyi-ui/src/assets/icons/svg/code.svg
new file mode 100644
index 0000000..ed4d23c
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/code.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" fill="#bfbfbf" p-id="2423"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/ruoyi-ui/src/assets/icons/svg/color.svg
new file mode 100644
index 0000000..44a81aa
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/color.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577252187056" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2508" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M747.59340925 691.12859384c11.51396329 0.25305413 22.43746719-0.21087818 40.74171707-1.51832482 29.35428085-2.10878421 35.84933734-2.36183835 46.47761114-0.8856895 24.71495444 3.37405491 41.12129828 21.76265671 32.47528161 47.95376084-85.57447632 258.19957947-442.00123984 249.76444099-628.67084683 50.73735554-153.47733892-159.33976008-153.09775772-414.41833795 0.92786545-573.42069196 159.71934128-162.67163983 424.03439521-166.59397897 565.78689185 0.63263534 80.38686649 94.81095318 108.34934958 169.16669549 89.11723508 230.57450162-15.01454608 47.99593598-50.61082928 77.68762207-119.77896259 114.63352789-4.89237973 2.65706845-29.35428085 15.52065436-35.84933652 19.02123633-46.94154346 25.30541465-63.51659033 41.20565021-62.20914449 58.45550757 2.95229856 39.13904114 24.16667102 52.7196135 70.98168823 53.81618115z m44.41100207 50.10472101c-19.82257471 1.43397372-32.05352527 1.940082-45.63409763 1.6448519-70.34905207-1.60267593-115.98314969-30.91478165-121.38163769-101.64341492-3.45840683-46.05585397 24.7571304-73.13264758 89.24376132-107.96976837 6.7902866-3.66928501 31.37871396-16.57504688 36.06021551-19.06341229 57.69634516-30.83042972 85.15271997-53.73183005 94.76877722-84.47790866 12.77923398-40.78389304-9.10994898-98.94417051-79.24812286-181.6507002-121.17075953-142.97559219-350.14258521-139.60153647-489.2380134 2.06660824-134.49827774 138.84237405-134.79350784 362.12048163-0.42175717 501.637667 158.53842169 168.99799328 451.9968783 181.18676788 534.57688175-11.80919339-4.68150156 0.2952301-10.71262573 0.67481131-18.72600705 1.26527069z" p-id="2509"></path><path d="M346.03865637 637.18588562a78.82636652 78.82636652 0 0 0 78.32025825-79.29029883c0-43.69401562-35.005823-79.29029883-78.32025825-79.29029882a78.82636652 78.82636652 0 0 0-78.36243338 79.29029882c0 43.69401562 35.005823 79.29029883 78.36243338 79.29029883z m0-51.7495729a27.07679361 27.07679361 0 0 1-26.5706845-27.54072593c0-15.30977536 11.97789643-27.54072593 26.5706845-27.54072592 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072592a27.07679361 27.07679361 0 0 1-26.57068533 27.54072593zM475.7289063 807.11174353a78.82636652 78.82636652 0 0 0 78.3624334-79.29029882c0-43.69401562-34.96364785-79.29029883-78.32025825-79.29029883a78.82636652 78.82636652 0 0 0-78.32025742 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029882z m0-51.74957208a27.07679361 27.07679361 0 0 1-26.57068532-27.54072674c0-15.30977536 12.06224753-27.54072593 26.57068532-27.54072593 14.59278892 0 26.57068533 12.23095057 26.57068453 27.54072593a27.07679361 27.07679361 0 0 1-26.57068453 27.54072674zM601.24376214 377.21492718a78.82636652 78.82636652 0 0 0 78.32025742-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025742-79.29029882a78.82636652 78.82636652 0 0 0-78.32025823 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025824 79.29029883z m1e-8-51.74957208a27.07679361 27.07679361 0 0 1-26.57068534-27.54072675c0-15.30977536 11.97789643-27.54072593 26.57068534-27.54072591 14.55061295 0 26.57068533 12.23095057 26.57068451 27.54072592a27.07679361 27.07679361 0 0 1-26.57068451 27.54072674zM378.80916809 433.85687983a78.82636652 78.82636652 0 0 0 78.32025824-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025824-79.29029802a78.82636652 78.82636652 0 0 0-78.32025742 79.29029802c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029883z m0-51.74957209a27.07679361 27.07679361 0 0 1-26.57068451-27.54072674c0-15.30977536 11.97789643-27.54072593 26.57068451-27.54072593 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072593a27.07679361 27.07679361 0 0 1-26.57068533 27.54072674z" p-id="2510"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/ruoyi-ui/src/assets/icons/svg/component.svg
new file mode 100644
index 0000000..29c3458
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/component.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575804206892" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3145" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M826.56 470.016c-32.896 0-64.384 12.288-89.984 35.52l0-104.96c0-62.208-50.496-112.832-112.64-113.088L623.936 287.04 519.552 287.104C541.824 262.72 554.56 230.72 554.56 197.12c0-73.536-59.904-133.44-133.504-133.44-73.472 0-133.376 59.904-133.376 133.44 0 32.896 12.224 64.256 35.52 89.984L175.232 287.104l0 0.576C113.728 288.704 64 338.88 64 400.576l0.32 0 0.32 116.48C60.864 544.896 70.592 577.728 100.8 588.48c12.736 4.608 37.632 7.488 60.864-25.28 12.992-18.368 34.24-29.248 56.64-29.248 38.336 0 69.504 31.104 69.504 69.312 0 38.4-31.168 69.504-69.504 69.504-22.656 0-44.032-11.264-57.344-30.4C138.688 610.112 112.576 615.36 102.464 619.136c-29.824 10.752-39.104 43.776-38.144 67.392l0 160.384L64 846.912C64 909.248 114.752 960 177.216 960l446.272 0c62.4 0 113.152-50.752 113.152-113.152l0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.536 0 133.44-59.904 133.44-133.504C960 529.92 900.096 470.016 826.56 470.016zM826.56 672.896c-22.72 0-44.032-11.264-57.344-30.4-22.272-32.384-48.448-27.136-58.56-23.36-29.824 10.752-39.04 43.776-38.08 67.392l0 160.384c0 27.136-22.016 49.152-49.152 49.152L177.216 896.064C150.08 896 128 873.984 128 846.848l0.32 0 0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.6 0 133.504-59.904 133.504-133.504 0-73.472-59.904-133.376-133.504-133.376-32.896 0-64.32 12.288-89.984 35.52l0-104.96L128 400.512c0-27.072 22.08-49.152 49.216-49.152L177.216 351.04 334.656 350.72c3.776 0.512 7.616 0.832 11.52 0.832 24.896 0 50.752-10.816 60.032-37.056 4.544-12.736 7.424-37.568-25.344-60.736C362.624 240.768 351.68 219.52 351.68 197.12c0-38.272 31.104-69.44 69.376-69.44 38.336 0 69.504 31.168 69.504 69.44 0 22.72-11.264 44.032-30.528 57.472C427.968 276.736 433.088 302.784 436.8 313.024c10.752 29.888 43.072 39.232 67.392 38.08l119.232 0 0 0.384c27.136 0 49.152 22.08 49.152 49.152l0.256 116.48c-3.776 27.84 6.016 60.736 36.224 71.488 12.736 4.608 37.632 7.488 60.8-25.28 13.056-18.368 34.24-29.248 56.704-29.248C864.832 534.016 896 565.12 896 603.392 896 641.728 864.832 672.896 826.56 672.896z" p-id="3146"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/ruoyi-ui/src/assets/icons/svg/dashboard.svg
new file mode 100644
index 0000000..5317d37
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/dashboard.svg
@@ -0,0 +1 @@
+<svg width="128" height="100" xmlns="http://www.w3.org/2000/svg"><path d="M27.429 63.638c0-2.508-.893-4.65-2.679-6.424-1.786-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.465 2.662-1.785 1.774-2.678 3.916-2.678 6.424 0 2.508.893 4.65 2.678 6.424 1.786 1.775 3.94 2.662 6.465 2.662 2.524 0 4.678-.887 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm13.714-31.801c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM71.714 65.98l7.215-27.116c.285-1.23.107-2.378-.536-3.443-.643-1.064-1.56-1.762-2.75-2.094-1.19-.33-2.333-.177-3.429.462-1.095.639-1.81 1.573-2.143 2.804l-7.214 27.116c-2.857.237-5.405 1.266-7.643 3.088-2.238 1.822-3.738 4.152-4.5 6.992-.952 3.644-.476 7.098 1.429 10.364 1.905 3.265 4.69 5.37 8.357 6.317 3.667.947 7.143.474 10.429-1.42 3.285-1.892 5.404-4.66 6.357-8.305.762-2.84.619-5.607-.429-8.305-1.047-2.697-2.762-4.85-5.143-6.46zm47.143-2.342c0-2.508-.893-4.65-2.678-6.424-1.786-1.775-3.94-2.662-6.465-2.662-2.524 0-4.678.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.786 1.775 3.94 2.662 6.464 2.662 2.524 0 4.679-.887 6.465-2.662 1.785-1.775 2.678-3.916 2.678-6.424zm-45.714-45.43c0-2.509-.893-4.65-2.679-6.425C68.68 10.01 66.524 9.122 64 9.122c-2.524 0-4.679.887-6.464 2.661-1.786 1.775-2.679 3.916-2.679 6.425 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm32 13.629c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM128 63.638c0 12.351-3.357 23.78-10.071 34.286-.905 1.372-2.19 2.058-3.858 2.058H13.93c-1.667 0-2.953-.686-3.858-2.058C3.357 87.465 0 76.037 0 63.638c0-8.613 1.69-16.847 5.071-24.703C8.452 31.08 13 24.312 18.714 18.634c5.715-5.68 12.524-10.199 20.429-13.559C47.048 1.715 55.333.035 64 .035c8.667 0 16.952 1.68 24.857 5.04 7.905 3.36 14.714 7.88 20.429 13.559 5.714 5.678 10.262 12.446 13.643 20.301 3.38 7.856 5.071 16.09 5.071 24.703z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/ruoyi-ui/src/assets/icons/svg/date-range.svg
new file mode 100644
index 0000000..fda571e
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/date-range.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774833889" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1376" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M887.466667 192.853333h-100.693334V119.466667c0-10.24-6.826667-17.066667-17.066666-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H303.786667V119.466667c0-10.24-6.826667-17.066667-17.066667-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H168.96c-46.08 0-85.333333 37.546667-85.333333 85.333334V836.266667c0 46.08 37.546667 85.333333 85.333333 85.333333H887.466667c46.08 0 85.333333-37.546667 85.333333-85.333333V278.186667c0-47.786667-37.546667-85.333333-85.333333-85.333334z m-718.506667 34.133334h100.693333v66.56c0 10.24 6.826667 17.066667 17.066667 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56h450.56v66.56c0 10.24 6.826667 17.066667 17.066666 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56H887.466667c27.306667 0 51.2 22.186667 51.2 51.2v88.746666H117.76v-88.746666c0-29.013333 22.186667-51.2 51.2-51.2zM887.466667 887.466667H168.96c-27.306667 0-51.2-22.186667-51.2-51.2V401.066667H938.666667V836.266667c0 27.306667-22.186667 51.2-51.2 51.2z" p-id="1377"></path><path d="M858.453333 493.226667H327.68c-10.24 0-17.066667 6.826667-17.066667 17.066666v114.346667h-116.053333c-10.24 0-17.066667 6.826667-17.066667 17.066667v133.12c0 10.24 6.826667 17.066667 17.066667 17.066666H460.8c10.24 0 17.066667-6.826667 17.066667-17.066666v-114.346667h380.586666c10.24 0 17.066667-6.826667 17.066667-17.066667v-133.12c0-10.24-6.826667-17.066667-17.066667-17.066666z m-413.013333 34.133333v97.28h-98.986667v-97.28h98.986667z m-230.4 131.413333h98.986667v98.986667h-98.986667v-98.986667z m131.413333 97.28v-97.28h98.986667v97.28h-98.986667z m133.12-228.693333h97.28v98.986667h-97.28v-98.986667z m131.413334 0h98.986666v98.986667h-98.986666v-98.986667z m230.4 97.28h-98.986667v-98.986667h98.986667v98.986667z" p-id="1378"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/ruoyi-ui/src/assets/icons/svg/date.svg
new file mode 100644
index 0000000..52dc73e
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/date.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577186573535" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1068" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M479.85714249 608.42857168h64.28571502c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285751s-12.85714249-32.14285751-32.14285664-32.14285664h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285662s12.85714249 32.14285751 32.14285664 32.14285753z m-2e-8 122.14285665h64.28571504c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285665s-12.85714249-32.14285751-32.14285664-32.14285751h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285751s12.85714249 32.14285751 32.14285664 32.14285664z m353.57142921-559.28571416h-128.57142921v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285664-32.14285753s-32.14285751 12.85714249-32.14285751 32.14285753v32.14285664h-257.14285665v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285752-32.14285753s-32.14285751 12.85714249-32.14285664 32.14285753v32.14285664h-128.57142919c-70.71428585 0-128.57142832 57.85714249-128.57142832 122.14285751v501.42857081c0 70.71428585 57.85714249 128.57142832 128.57142832 122.14285751h642.85714335c70.71428585 0 128.57142832-57.85714249 128.57142833-122.14285751v-501.42857081c0-70.71428585-57.85714249-122.14285753-128.57142833-122.14285751z m64.28571415 623.57142832c0 32.14285751-32.14285751 64.28571415-64.28571416 64.28571504h-642.85714335c-32.14285751 0-64.28571415-25.71428583-64.28571417-64.28571504v-372.85714249h771.42857168v372.85714249z m0-437.14285664h-771.42857168v-64.28571417c0-32.14285751 32.14285751-64.28571415 64.28571417-64.28571415h128.57142919v32.14285664c0 19.28571417 12.85714249 32.14285751 32.14285664 32.14285751s32.14285751-12.85714249 32.14285753-32.14285751v-32.14285664h257.14285665v32.14285664c0 19.28571417 12.85714249 32.14285751 32.1428575 32.14285751s32.14285751-12.85714249 32.14285664-32.14285751v-32.14285664h128.57142921c32.14285751 0 64.28571415 25.71428583 64.28571415 64.28571415v64.28571417z m-610.71428583 372.85714247h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285664s-12.85714249-32.14285751-32.14285753-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285751s12.85714249 32.14285751 32.14285751 32.14285665z m385.71428583-122.14285664h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285751s-12.85714249-32.14285751-32.14285751-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285664s12.85714249 32.14285751 32.14285753 32.14285751z m-385.71428583 0h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285751s-12.85714249-32.14285751-32.14285753-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285664s12.85714249 32.14285751 32.14285751 32.14285751z m385.71428583 122.14285665h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285665s-12.85714249-32.14285751-32.14285751-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285751s12.85714249 32.14285751 32.14285753 32.14285665z" p-id="1069"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/ruoyi-ui/src/assets/icons/svg/dict.svg
new file mode 100644
index 0000000..4849377
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/dict.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035680909" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3601" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1002.0848 744.672l-33.568 10.368c0.96 7.264 2.144 14.304 2.144 21.76 0 7.328-1.184 14.432-2.368 21.568l33.792 10.56c7.936 2.24 14.496 7.616 18.336 14.752 3.84 7.328 4.672 15.808 1.952 23.552-5.376 16-23.168 24.672-39.936 19.68l-34.176-10.624c-7.136 12.8-15.776 24.672-26.208 35.2l20.8 27.488a28.96 28.96 0 0 1 5.824 22.816 29.696 29.696 0 0 1-12.704 19.616 32.544 32.544 0 0 1-44.416-6.752l-20.8-27.552c-13.696 6.56-28.192 11.2-43.008 13.888v33.632c0 16.736-14.112 30.432-31.648 30.432-17.6 0-31.872-13.696-31.872-30.432v-33.632a167.616 167.616 0 0 1-42.88-13.888l-20.928 27.552c-10.72 13.76-30.08 16.64-44.288 6.752a29.632 29.632 0 0 1-12.704-19.616 29.28 29.28 0 0 1 5.696-22.816l20.896-27.808a166.72 166.72 0 0 1-27.008-34.688l-33.376 10.432c-16.8 5.184-34.56-3.552-39.936-19.616a29.824 29.824 0 0 1 20.224-38.24l33.472-10.432c-0.8-7.264-2.016-14.304-2.016-21.824 0-7.36 1.184-14.496 2.304-21.632l-33.792-10.368c-16.672-5.376-25.632-22.496-20.224-38.432 5.376-16 23.136-24.672 39.936-19.68l34.016 10.752c7.328-12.672 15.84-24.8 26.336-35.328l-20.8-27.552a29.44 29.44 0 0 1 6.944-42.432 32.704 32.704 0 0 1 44.384 6.752l20.832 27.616c13.696-6.432 28.224-11.2 43.104-13.952v-33.568c0-16.736 14.048-30.432 31.648-30.432 17.536 0 31.808 13.568 31.808 30.432v33.504c15.072 2.688 29.344 7.808 42.848 14.016l20.992-27.616a32.48 32.48 0 0 1 44.224-6.752 29.568 29.568 0 0 1 7.136 42.432l-21.024 27.808c10.432 10.432 19.872 21.888 27.04 34.752l33.376-10.432c16.768-5.12 34.56 3.68 39.936 19.68 5.536 15.936-3.712 33.056-20.32 38.304z m-206.016-74.432c-61.344 0-111.136 47.808-111.136 106.56 0 58.88 49.792 106.496 111.136 106.496 61.312 0 111.104-47.616 111.104-106.496 0-58.752-49.792-106.56-111.104-106.56z" p-id="3602"></path><path d="M802.7888 57.152h-76.448c0-22.08-21.024-38.24-42.848-38.24H39.3968a39.68 39.68 0 0 0-39.36 40.032v795.616s41.888 120.192 110.752 120.192H673.2848a227.488 227.488 0 0 1-107.04-97.44H117.6368s-40.608-13.696-40.608-41.248l470.304-0.256 1.664 3.36a227.68 227.68 0 0 1-12.64-73.632c0-60.576 24-118.624 66.88-161.44a228.352 228.352 0 0 1 123.552-63.392l-3.2 0.288 2.144-424.672h38.208l0.576 421.024c27.04 0 52.672 4.8 76.64 13.344V101.536c0.032 0-6.304-44.384-38.368-44.384zM149.7648 514.336H72.3888v-77.408H149.7648v77.408z m0-144.32H72.3888v-77.44H149.7648v77.44z m0-137.248H72.3888v-77.44H149.7648v77.44z m501.856 281.568H206.0848v-77.408h445.536v77.408z m0-144.32H206.0848v-77.44h445.536v77.44z m0-137.248H206.0848v-77.44h445.536v77.44z" p-id="3603"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/ruoyi-ui/src/assets/icons/svg/documentation.svg
new file mode 100644
index 0000000..7043122
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/documentation.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/ruoyi-ui/src/assets/icons/svg/download.svg
new file mode 100644
index 0000000..c896951
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/download.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/ruoyi-ui/src/assets/icons/svg/drag.svg
new file mode 100644
index 0000000..4185d3c
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/drag.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M73.137 29.08h-9.209 29.7L63.886.093 34.373 29.08h20.49v27.035H27.238v17.948h27.625v27.133h18.274V74.063h27.41V56.115h-27.41V29.08zm-9.245 98.827l27.518-26.711H36.59l27.302 26.71zM.042 64.982l27.196 27.029V38.167L.042 64.982zm100.505-26.815V92.01l27.41-27.029-27.41-26.815z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/ruoyi-ui/src/assets/icons/svg/druid.svg
new file mode 100644
index 0000000..a2b4b4e
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/druid.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036347051" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5853" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M832 128H192a64.19 64.19 0 0 0-64 64v640a64.19 64.19 0 0 0 64 64h640a64.19 64.19 0 0 0 64-64V192a64.19 64.19 0 0 0-64-64z m0 703.89l-0.11 0.11H192.11l-0.11-0.11V768h640zM832 544H720L605.6 696.54 442.18 435.07 333.25 544H192v-64h114.75l147.07-147.07L610.4 583.46 688 480h144z m0-288H192v-63.89l0.11-0.11h639.78l0.11 0.11z" p-id="5854"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/ruoyi-ui/src/assets/icons/svg/edit.svg
new file mode 100644
index 0000000..d26101f
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/edit.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M106.133 67.2a4.797 4.797 0 0 0-4.8 4.8c0 .187.014.36.027.533h-.027V118.4H9.6V26.667h50.133c2.654 0 4.8-2.147 4.8-4.8 0-2.654-2.146-4.8-4.8-4.8H9.6a9.594 9.594 0 0 0-9.6 9.6V118.4c0 5.307 4.293 9.6 9.6 9.6h91.733c5.307 0 9.6-4.293 9.6-9.6V72.533h-.026c.013-.173.026-.346.026-.533 0-2.653-2.146-4.8-4.8-4.8z"/><path d="M125.16 13.373L114.587 2.8c-3.747-3.747-9.854-3.72-13.6.027l-52.96 52.96a4.264 4.264 0 0 0-.907 1.36L33.813 88.533c-.746 1.76-.226 3.534.907 4.68 1.133 1.147 2.92 1.667 4.693.92l31.4-13.293c.507-.213.96-.52 1.36-.907l52.96-52.96c3.747-3.746 3.774-9.853.027-13.6zM66.107 72.4l-18.32 7.76 7.76-18.32L92.72 24.667l10.56 10.56L66.107 72.4zm52.226-52.227l-8.266 8.267-10.56-10.56 8.266-8.267.027-.026 10.56 10.56-.027.026z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/ruoyi-ui/src/assets/icons/svg/education.svg
new file mode 100644
index 0000000..7bfb01d
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/education.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M88.883 119.565c-7.284 0-19.434 2.495-21.333 8.25v.127c-4.232.13-5.222 0-7.108 0-1.895-5.76-14.045-8.256-21.333-8.256H0V0h42.523c9.179 0 17.109 5.47 21.47 13.551C68.352 5.475 76.295 0 85.478 0H128v119.57l-39.113-.005h-.004zM60.442 24.763c0-9.651-8.978-16.507-17.777-16.507H7.108V111.43H39.11c7.054-.14 18.177.082 21.333 6.12v-4.628c-.134-5.722-.004-13.522 0-13.832V27.413l.004-2.655-.004.005zm60.442-16.517h-35.55c-8.802 0-17.78 6.856-17.78 16.493v74.259c.004.32.138 8.115 0 13.813v4.627c3.155-6.022 14.279-6.26 21.333-6.114h32V8.25l-.003-.005z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/ruoyi-ui/src/assets/icons/svg/email.svg
new file mode 100644
index 0000000..74d25e2
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/email.svg
@@ -0,0 +1 @@
+<svg width="128" height="96" xmlns="http://www.w3.org/2000/svg"><path d="M64.125 56.975L120.188.912A12.476 12.476 0 0 0 115.5 0h-103c-1.588 0-3.113.3-4.513.838l56.138 56.137z"/><path d="M64.125 68.287l-62.3-62.3A12.42 12.42 0 0 0 0 12.5v71C0 90.4 5.6 96 12.5 96h103c6.9 0 12.5-5.6 12.5-12.5v-71a12.47 12.47 0 0 0-1.737-6.35L64.125 68.287z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/ruoyi-ui/src/assets/icons/svg/example.svg
new file mode 100644
index 0000000..46f42b5
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/example.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/ruoyi-ui/src/assets/icons/svg/excel.svg
new file mode 100644
index 0000000..74d97b8
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/excel.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg
new file mode 100644
index 0000000..485c128
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M49.217 41.329l-.136-35.24c-.06-2.715-2.302-4.345-5.022-4.405h-3.65c-2.712-.06-4.866 2.303-4.806 5.016l.152 19.164-24.151-23.79a6.698 6.698 0 0 0-9.499 0 6.76 6.76 0 0 0 0 9.526l23.93 23.713-18.345.074c-2.712-.069-5.228 1.813-5.64 5.02v3.462c.069 2.721 2.31 4.97 5.022 5.03l35.028-.207c.052.005.087.025.133.025l2.457.054a4.626 4.626 0 0 0 3.436-1.38c.88-.874 1.205-2.096 1.169-3.462l-.262-2.465c0-.048.182-.081.182-.136h.002zm52.523 51.212l18.32-.073c2.713.06 5.224-1.609 5.64-4.815v-3.462c-.068-2.722-2.317-4.97-5.021-5.04l-34.58.21c-.053 0-.086-.021-.138-.021l-2.451-.06a4.64 4.64 0 0 0-3.445 1.381c-.885.868-1.201 2.094-1.174 3.46l.27 2.46c.005.06-.177.095-.177.141l.141 34.697c.069 2.713 2.31 4.338 5.022 4.397l3.45.006c2.705.062 4.867-2.31 4.8-5.026l-.153-18.752 24.151 23.946a6.69 6.69 0 0 0 9.494 0 6.747 6.747 0 0 0 0-9.523L101.74 92.54v.001zM48.125 80.662a4.636 4.636 0 0 0-3.437-1.382l-2.457.06c-.05 0-.082.022-.137.022l-35.025-.21c-2.712.07-4.957 2.318-5.022 5.04v3.462c.409 3.206 2.925 4.874 5.633 4.814l18.554.06-24.132 23.928c-2.62 2.626-2.62 6.89 0 9.524a6.694 6.694 0 0 0 9.496 0l24.155-23.79-.155 18.866c-.06 2.722 2.094 5.093 4.801 5.025h3.65c2.72-.069 4.962-1.685 5.022-4.406l.141-34.956c0-.05-.182-.082-.182-.136l.262-2.46c.03-1.366-.286-2.592-1.166-3.46h-.001zM80.08 47.397a4.62 4.62 0 0 0 3.443 1.374l2.45-.054c.055 0 .088-.02.143-.028l35.08.21c2.712-.062 4.953-2.312 5.021-5.033l.009-3.463c-.417-3.211-2.937-5.084-5.64-5.025l-18.615-.073 23.917-23.715c2.63-2.623 2.63-6.879.008-9.513a6.691 6.691 0 0 0-9.494 0L92.251 26.016l.155-19.312c.065-2.713-2.097-5.085-4.802-5.025h-3.45c-2.713.069-4.954 1.693-5.022 4.406l-.139 35.247c0 .054.18.088.18.136l-.267 2.465c-.028 1.366.288 2.588 1.174 3.463v.001z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/ruoyi-ui/src/assets/icons/svg/eye-open.svg
new file mode 100644
index 0000000..88dcc98
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/eye-open.svg
@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M512 128q69.675 0 135.51 21.163t115.498 54.997 93.483 74.837 73.685 82.006 51.67 74.837 32.17 54.827L1024 512q-2.347 4.992-6.315 13.483T998.87 560.17t-31.658 51.669-44.331 59.99-56.832 64.34-69.504 60.16-82.347 51.5-94.848 34.687T512 896q-69.675 0-135.51-21.163t-115.498-54.826-93.483-74.326-73.685-81.493-51.67-74.496-32.17-54.997L0 513.707q2.347-4.992 6.315-13.483t18.816-34.816 31.658-51.84 44.331-60.33 56.832-64.683 69.504-60.331 82.347-51.84 94.848-34.816T512 128.085zm0 85.333q-46.677 0-91.648 12.331t-81.152 31.83-70.656 47.146-59.648 54.485-48.853 57.686-37.675 52.821-26.325 43.99q12.33 21.674 26.325 43.52t37.675 52.351 48.853 57.003 59.648 53.845T339.2 767.02t81.152 31.488T512 810.667t91.648-12.331 81.152-31.659 70.656-46.848 59.648-54.186 48.853-57.344 37.675-52.651T927.957 512q-12.33-21.675-26.325-43.648t-37.675-52.65-48.853-57.345-59.648-54.186-70.656-46.848-81.152-31.659T512 213.334zm0 128q70.656 0 120.661 50.006T682.667 512 632.66 632.661 512 682.667 391.339 632.66 341.333 512t50.006-120.661T512 341.333zm0 85.334q-35.328 0-60.33 25.002T426.666 512t25.002 60.33T512 597.334t60.33-25.002T597.334 512t-25.002-60.33T512 426.666z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/ruoyi-ui/src/assets/icons/svg/eye.svg
new file mode 100644
index 0000000..16ed2d8
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/eye.svg
@@ -0,0 +1 @@
+<svg width="128" height="64" xmlns="http://www.w3.org/2000/svg"><path d="M127.072 7.994c1.37-2.208.914-5.152-.914-6.87-2.056-1.717-4.797-1.226-6.396.982-.229.245-25.586 32.382-55.74 32.382-29.24 0-55.74-32.382-55.968-32.627-1.6-1.963-4.57-2.208-6.397-.49C-.17 3.086-.399 6.275 1.2 8.238c.457.736 5.94 7.36 14.62 14.72L4.17 35.96c-1.828 1.963-1.6 5.152.228 6.87.457.98 1.6 1.471 2.742 1.471s2.284-.49 3.198-1.472l12.564-13.983c5.94 4.416 13.021 8.587 20.788 11.53l-4.797 17.418c-.685 2.699.686 5.397 3.198 6.133h1.37c2.057 0 3.884-1.472 4.341-3.68L52.6 42.83c3.655.736 7.538 1.227 11.422 1.227 3.883 0 7.767-.49 11.422-1.227l4.797 17.173c.457 2.208 2.513 3.68 4.34 3.68.457 0 .914 0 1.143-.246 2.513-.736 3.883-3.434 3.198-6.133l-4.797-17.172c7.767-2.944 14.848-7.114 20.788-11.53l12.336 13.738c.913.981 2.056 1.472 3.198 1.472s2.284-.49 3.198-1.472c1.828-1.963 1.828-4.906.228-6.87l-11.65-13.001c9.366-7.36 14.849-14.474 14.849-14.474z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/ruoyi-ui/src/assets/icons/svg/form.svg
new file mode 100644
index 0000000..dcbaa18
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/form.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.068 23.784c-1.02 0-1.877-.32-2.572-.96a8.588 8.588 0 0 1-1.738-2.237 11.524 11.524 0 0 1-1.042-2.621c-.232-.895-.348-1.641-.348-2.238V0h.278c.834 0 1.622.085 2.363.256.742.17 1.645.575 2.711 1.214 1.066.64 2.363 1.535 3.892 2.686 1.53 1.15 3.453 2.664 5.77 4.54 2.502 2.045 4.494 3.771 5.977 5.178 1.483 1.406 2.618 2.6 3.406 3.58.787.98 1.274 1.812 1.46 2.494.185.682.277 1.278.277 1.79v2.046H84.068zM127.3 84.01c.278.682.464 1.535.556 2.558.093 1.023-.37 2.003-1.39 2.94-.463.427-.88.832-1.25 1.215-.372.384-.696.704-.974.96a6.69 6.69 0 0 1-.973.767l-11.816-10.741a44.331 44.331 0 0 0 1.877-1.535 31.028 31.028 0 0 1 1.737-1.406c1.112-.938 2.317-1.343 3.615-1.215 1.297.128 2.363.405 3.197.83.927.427 1.923 1.173 2.989 2.239 1.065 1.065 1.876 2.195 2.432 3.388zM78.23 95.902c2.038 0 3.752-.511 5.143-1.534l-26.969 25.83H18.037c-1.761 0-3.684-.47-5.77-1.407a24.549 24.549 0 0 1-5.838-3.709 21.373 21.373 0 0 1-4.518-5.306c-1.204-2.003-1.807-4.07-1.807-6.202V16.495c0-1.79.44-3.665 1.32-5.626A18.41 18.41 0 0 1 5.04 5.562a21.798 21.798 0 0 1 5.213-3.964C12.198.533 14.237 0 16.37 0h53.24v15.984c0 1.62.278 3.367.834 5.242a16.704 16.704 0 0 0 2.572 5.179c1.159 1.577 2.665 2.898 4.518 3.964 1.853 1.066 4.078 1.598 6.673 1.598h20.295v42.325L85.458 92.45c1.02-1.364 1.529-2.856 1.529-4.476 0-2.216-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1c-2.409 0-4.448.789-6.116 2.366-1.668 1.577-2.502 3.474-2.502 5.69 0 2.217.834 4.092 2.502 5.626 1.668 1.535 3.707 2.302 6.117 2.302h52.13zM26.1 47.951c-2.41 0-4.449.789-6.117 2.366-1.668 1.577-2.502 3.473-2.502 5.69 0 2.216.834 4.092 2.502 5.626 1.668 1.534 3.707 2.302 6.117 2.302h52.13c2.409 0 4.47-.768 6.185-2.302 1.715-1.534 2.572-3.41 2.572-5.626 0-2.217-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1zm52.407 64.063l1.807-1.663 3.476-3.196a479.75 479.75 0 0 0 4.587-4.284 500.757 500.757 0 0 1 5.004-4.667c3.985-3.666 8.48-7.758 13.485-12.276l11.677 10.741-13.485 12.404-5.004 4.603-4.587 4.22a179.46 179.46 0 0 0-3.267 3.068c-.88.853-1.367 1.322-1.46 1.407-.463.341-.973.703-1.529 1.087-.556.383-1.112.703-1.668.959-.556.256-1.413.575-2.572.959a83.5 83.5 0 0 1-3.545 1.087 72.2 72.2 0 0 1-3.475.895c-1.112.256-1.946.426-2.502.511-1.112.17-1.854.043-2.224-.383-.371-.426-.464-1.151-.278-2.174.092-.511.278-1.279.556-2.302.278-1.023.602-2.067.973-3.132l1.042-3.005c.325-.938.58-1.577.765-1.918a10.157 10.157 0 0 1 2.224-2.941z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/ruoyi-ui/src/assets/icons/svg/fullscreen.svg
new file mode 100644
index 0000000..0e86b6f
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/fullscreen.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/ruoyi-ui/src/assets/icons/svg/github.svg
new file mode 100644
index 0000000..db0a0d4
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/github.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238998885" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4187" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M511.542857 14.057143C228.914286 13.942857 0 242.742857 0 525.142857 0 748.457143 143.2 938.285714 342.628571 1008c26.857143 6.742857 22.742857-12.342857 22.742858-25.371429v-88.571428c-155.085714 18.171429-161.371429-84.457143-171.771429-101.6C172.571429 756.571429 122.857143 747.428571 137.714286 730.285714c35.314286-18.171429 71.314286 4.571429 113.028571 66.171429 30.171429 44.685714 89.028571 37.142857 118.857143 29.714286 6.514286-26.857143 20.457143-50.857143 39.657143-69.485715-160.685714-28.8-227.657143-126.857143-227.657143-243.428571 0-56.571429 18.628571-108.571429 55.2-150.514286-23.314286-69.142857 2.171429-128.342857 5.6-137.142857 66.4-5.942857 135.428571 47.542857 140.8 51.771429 37.714286-10.171429 80.8-15.542857 129.028571-15.542858 48.457143 0 91.657143 5.6 129.714286 15.885715 12.914286-9.828571 76.914286-55.771429 138.628572-50.171429 3.314286 8.8 28.228571 66.628571 6.285714 134.857143 37.028571 42.057143 55.885714 94.514286 55.885714 151.2 0 116.8-67.428571 214.971429-228.571428 243.314286a145.714286 145.714286 0 0 1 43.542857 104v128.571428c0.914286 10.285714 0 20.457143 17.142857 20.457143 202.4-68.228571 348.114286-259.428571 348.114286-484.685714 0-282.514286-229.028571-511.2-511.428572-511.2z" p-id="4188"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/ruoyi-ui/src/assets/icons/svg/guide.svg
new file mode 100644
index 0000000..b271001
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/guide.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.482 70.131l36.204 16.18 69.932-65.485-61.38 70.594 46.435 18.735c1.119.425 2.397-.17 2.797-1.363v-.085L127.998.047 1.322 65.874c-1.12.597-1.519 1.959-1.04 3.151.32.511.72.937 1.2 1.107zm44.676 57.821L64.22 107.26l-18.062-7.834v28.527z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/ruoyi-ui/src/assets/icons/svg/icon.svg
new file mode 100644
index 0000000..82be8ee
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/icon.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.147.062a13 13 0 0 1 4.94.945c1.55.63 2.907 1.526 4.069 2.688a13.148 13.148 0 0 1 2.761 4.069c.678 1.55 1.017 3.245 1.017 5.086v102.3c0 3.681-1.187 6.733-3.56 9.155-2.373 2.422-5.352 3.633-8.937 3.633H12.992c-3.875 0-7-1.26-9.373-3.779-2.373-2.518-3.56-5.667-3.56-9.445V12.704c0-3.39 1.163-6.345 3.488-8.863C5.872 1.32 8.972.062 12.847.062h102.3zM81.434 109.047c1.744 0 3.003-.412 3.778-1.235.775-.824 1.163-1.914 1.163-3.27 0-1.26-.388-2.325-1.163-3.197-.775-.872-2.034-1.307-3.778-1.307H72.57c.097-.194.145-.485.145-.872V27.09h9.01c1.743 0 2.954-.436 3.633-1.308.678-.872 1.017-1.938 1.017-3.197 0-1.26-.34-2.325-1.017-3.197-.679-.872-1.89-1.308-3.633-1.308H46.268c-1.743 0-2.954.436-3.632 1.308-.678.872-1.018 1.938-1.018 3.197 0 1.26.34 2.325 1.018 3.197.678.872 1.889 1.308 3.632 1.308h8.138v72.075c0 .193.024.339.073.436.048.096.072.242.072.436H46.56c-1.744 0-3.003.435-3.778 1.307-.775.872-1.163 1.938-1.163 3.197 0 1.356.388 2.446 1.163 3.27.775.823 2.034 1.235 3.778 1.235h34.875z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/ruoyi-ui/src/assets/icons/svg/input.svg
new file mode 100644
index 0000000..ab91381
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/input.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802859706" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3102" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 224H128c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V288c0-35.2-28.8-64-64-64z m0 480c0 19.2-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V320c0-19.2 12.8-32 32-32h704c19.2 0 32 12.8 32 32v384z" p-id="3103"></path><path d="M224 352c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V384c0-16-12.8-32-32-32z" p-id="3104"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/ruoyi-ui/src/assets/icons/svg/international.svg
new file mode 100644
index 0000000..e9b56ee
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/international.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M83.287 103.01c-1.57-3.84-6.778-10.414-15.447-19.548-2.327-2.444-2.182-4.306-1.338-9.862v-.64c.553-3.81 1.513-6.05 14.313-8.087 6.516-1.018 8.203 1.57 10.589 5.178l.785 1.193a12.625 12.625 0 0 0 6.43 5.207c1.134.524 2.53 1.164 4.421 2.24 4.596 2.53 4.596 5.41 4.596 11.753v.727a26.91 26.91 0 0 1-5.178 17.454 59.055 59.055 0 0 1-19.025 11.026c3.49-6.546.814-14.313 0-16.553l-.146-.087zM64 5.12a58.502 58.502 0 0 1 25.484 5.818 54.313 54.313 0 0 0-12.859 10.327c-.93 1.28-1.716 2.473-2.472 3.579-2.444 3.694-3.637 5.352-5.818 5.614a25.105 25.105 0 0 1-4.219 0c-4.276-.29-10.094-.64-11.956 4.422-1.193 3.23-1.396 11.956 2.444 16.495.66 1.077.778 2.4.32 3.578a7.01 7.01 0 0 1-2.066 3.229 18.938 18.938 0 0 1-2.909-2.91 18.91 18.91 0 0 0-8.32-6.603c-1.25-.349-2.647-.64-3.985-.93-3.782-.786-8.03-1.688-9.019-3.812a14.895 14.895 0 0 1-.727-5.818 21.935 21.935 0 0 0-1.396-9.25 8.873 8.873 0 0 0-5.557-4.946A58.705 58.705 0 0 1 64 5.12zM0 64c0 35.346 28.654 64 64 64 35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/ruoyi-ui/src/assets/icons/svg/job.svg
new file mode 100644
index 0000000..2a93a25
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/job.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036191400" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5472" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M934.912 1016.832H192c-14.336 0-25.6-11.264-25.6-25.6v-189.44c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v163.84h691.712V64H217.6v148.48c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6v-174.08c0-14.336 11.264-25.6 25.6-25.6h742.912c14.336 0 25.6 11.264 25.6 25.6v952.832c0 14.336-11.264 25.6-25.6 25.6z" p-id="5473"></path><path d="M232.96 371.2h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 540.16h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 698.88h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 762.88c-134.144 0-243.2-109.056-243.2-243.2S440.32 276.48 574.464 276.48s243.2 109.056 243.2 243.2-109.056 243.2-243.2 243.2z m0-435.2c-105.984 0-192 86.016-192 192S468.48 711.68 574.464 711.68s192-86.016 192-192S680.448 327.68 574.464 327.68z" p-id="5474"></path><path d="M663.04 545.28h-87.04c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h87.04c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="5475"></path><path d="M576 545.28c-14.336 0-25.6-11.264-25.6-25.6v-87.04c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v87.04c0 14.336-11.264 25.6-25.6 25.6z" p-id="5476"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/ruoyi-ui/src/assets/icons/svg/language.svg
new file mode 100644
index 0000000..0082b57
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/language.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.742 36.8c2.398 7.2 5.595 12.8 11.19 18.4 4.795-4.8 7.992-11.2 10.39-18.4h-21.58zm-52.748 40h20.78l-10.39-28-10.39 28z"/><path d="M111.916 0H16.009C7.218 0 .025 7.2.025 16v96c0 8.8 7.193 16 15.984 16h95.907c8.791 0 15.984-7.2 15.984-16V16c0-8.8-6.394-16-15.984-16zM72.754 103.2c-1.598 1.6-3.197 1.6-4.795 1.6-.8 0-2.398 0-3.197-.8-.8-.8-1.599 0-1.599-.8s-.799-1.6-1.598-3.2c-.8-1.6-.8-2.4-1.599-4l-3.196-8.8H28.797L25.6 96c-1.598 3.2-2.398 5.6-3.197 7.2-.8 1.6-2.398 1.6-4.795 1.6-1.599 0-3.197-.8-4.796-1.6-1.598-1.6-2.397-2.4-2.397-4 0-.8 0-1.6.799-3.2.8-1.6.8-2.4 1.598-4l17.583-44.8c.8-1.6.8-3.2 1.599-4.8.799-1.6 1.598-3.2 2.397-4 .8-.8 1.599-2.4 3.197-3.2 1.599-.8 3.197-.8 4.796-.8 1.598 0 3.196 0 4.795.8 1.598.8 2.398 1.6 3.197 3.2.799.8 1.598 2.4 2.397 4 .8 1.6 1.599 3.2 2.398 5.6l17.583 44c1.598 3.2 2.398 5.6 2.398 7.2-.8.8-1.599 2.4-2.398 4zM116.711 72c-8.791-3.2-15.185-7.2-20.78-12-5.594 5.6-12.787 9.6-21.579 12l-2.397-4c8.791-2.4 15.984-5.6 21.579-11.2C87.939 51.2 83.144 44 81.545 36h-7.992v-3.2h21.58c-1.6-2.4-3.198-5.6-4.796-8l2.397-.8c1.599 2.4 3.997 5.6 5.595 8.8h19.98v4h-7.992c-2.397 8-6.393 15.2-11.189 20 5.595 4.8 11.988 8.8 20.78 11.2l-3.197 4z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/ruoyi-ui/src/assets/icons/svg/link.svg
new file mode 100644
index 0000000..48197ba
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/link.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.625 127.937H.063V12.375h57.781v12.374H12.438v90.813h90.813V70.156h12.374z"/><path d="M116.426 2.821l8.753 8.753-56.734 56.734-8.753-8.745z"/><path d="M127.893 37.982h-12.375V12.375H88.706V0h39.187z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/ruoyi-ui/src/assets/icons/svg/list.svg
new file mode 100644
index 0000000..20259ed
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/list.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.585 12.087c0 6.616 3.974 11.98 8.877 11.98 4.902 0 8.877-5.364 8.877-11.98 0-6.616-3.975-11.98-8.877-11.98-4.903 0-8.877 5.364-8.877 11.98zM125.86.107H35.613c-1.268 0-2.114 1.426-2.114 2.852v18.255c0 1.712 1.057 2.853 2.114 2.853h90.247c1.268 0 2.114-1.426 2.114-2.853V2.96c0-1.711-1.057-2.852-2.114-2.852zM.106 62.86c0 6.615 3.974 11.979 8.876 11.979 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zM124.17 50.88H33.921c-1.268 0-2.114 1.425-2.114 2.851v18.256c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852V53.73c0-1.426-.846-2.852-2.114-2.852zM.106 115.913c0 6.616 3.974 11.98 8.876 11.98 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zm124.064-11.98H33.921c-1.268 0-2.114 1.426-2.114 2.853v18.255c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852v-18.255c0-1.427-.846-2.853-2.114-2.853z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/ruoyi-ui/src/assets/icons/svg/lock.svg
new file mode 100644
index 0000000..74fee54
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/lock.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M119.88 49.674h-7.987V39.52C111.893 17.738 90.45.08 63.996.08 37.543.08 16.1 17.738 16.1 39.52v10.154H8.113c-4.408 0-7.987 2.94-7.987 6.577v65.13c0 3.637 3.57 6.577 7.987 6.577H119.88c4.407 0 7.987-2.94 7.987-6.577v-65.13c-.008-3.636-3.58-6.577-7.987-6.577zm-23.953 0H32.065V39.52c0-14.524 14.301-26.295 31.931-26.295 17.63 0 31.932 11.777 31.932 26.295v10.153z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/ruoyi-ui/src/assets/icons/svg/log.svg
new file mode 100644
index 0000000..d879d33
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/log.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035943711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4805" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M208.736 566.336H64.384v59.328h144.352v-59.328z m0-336.096H165.44V74.592c0-7.968 4.896-14.848 10.464-14.848h502.016V0.448H175.936c-38.72 1.248-69.248 34.368-68.192 74.144v155.648H64.384V289.6h144.352V230.24z m0 168.096H64.384v59.328h144.352v-59.328z m714.656 76.576h-57.76v474.496c0 7.936-4.896 14.848-10.464 14.848H175.936c-5.568 0-10.464-6.912-10.464-14.848v-155.68h43.296v-59.296H64.384v59.296h43.328v155.68c-1.024 39.776 29.472 72.896 68.192 74.144h679.232c38.72-1.184 69.248-34.368 68.256-74.144V474.912z m14.944-290.336l-83.072-85.312a71.264 71.264 0 0 0-52.544-21.728 71.52 71.52 0 0 0-51.616 23.872L386.528 507.264a30.496 30.496 0 0 0-6.176 10.72L308.16 740.512a30.016 30.016 0 0 0 6.976 30.24c7.712 7.968 19.2 10.752 29.568 7.2l216.544-74.112a28.736 28.736 0 0 0 12.128-7.936L940.448 287.456a75.552 75.552 0 0 0-2.112-102.88z m-557.12 518.272l39.104-120.64 78.336 80.416-117.44 40.224z m170.048-70.016l-103.552-106.016 200.16-222.4 103.52 106.304-200.128 222.112zM897.952 247.072l-0.256 0.224-107.136 119.168-103.52-106.528 106.432-118.624a14.144 14.144 0 0 1 10.304-4.736 13.44 13.44 0 0 1 10.464 4.288l83.264 85.696c5.472 5.6 5.664 14.72 0.448 20.512z" p-id="4806"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/ruoyi-ui/src/assets/icons/svg/logininfor.svg
new file mode 100644
index 0000000..267f844
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/logininfor.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036016814" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5261" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 128h-85.333333a42.666667 42.666667 0 0 0 0 85.333333h42.666666v640H170.666667V213.333333h42.666666a42.666667 42.666667 0 0 0 0-85.333333H128a42.666667 42.666667 0 0 0-42.666667 42.666667v725.333333a42.666667 42.666667 0 0 0 42.666667 42.666667h768a42.666667 42.666667 0 0 0 42.666667-42.666667V170.666667a42.666667 42.666667 0 0 0-42.666667-42.666667z" p-id="5262"></path><path d="M341.333333 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666666 42.666667zM512 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333334 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM682.666667 298.666667a42.666667 42.666667 0 0 0 42.666666-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM341.333333 768a42.666667 42.666667 0 0 0 42.666667-42.666667 128 128 0 0 1 256 0 42.666667 42.666667 0 0 0 85.333333 0 213.333333 213.333333 0 0 0-107.52-184.32A128 128 0 0 0 640 469.333333a128 128 0 0 0-256 0 128 128 0 0 0 22.186667 71.68A213.333333 213.333333 0 0 0 298.666667 725.333333a42.666667 42.666667 0 0 0 42.666666 42.666667z m128-298.666667a42.666667 42.666667 0 1 1 42.666667 42.666667 42.666667 42.666667 0 0 1-42.666667-42.666667z" p-id="5263"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/ruoyi-ui/src/assets/icons/svg/message.svg
new file mode 100644
index 0000000..14ca817
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/message.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/ruoyi-ui/src/assets/icons/svg/money.svg
new file mode 100644
index 0000000..c1580de
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/money.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/ruoyi-ui/src/assets/icons/svg/monitor.svg
new file mode 100644
index 0000000..bc308cb
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/monitor.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827393750" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4695" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
+</style></defs><path d="M64 64V640H896V64H64zM0 0h960v704H0V0z" p-id="4696"></path><path d="M192 896H768v64H192zM448 640H512v256h-64z" p-id="4697"></path><path d="M479.232 561.604267l309.9904-348.330667-47.803733-42.5472-259.566934 291.669333L303.957333 240.008533 163.208533 438.6048l52.224 37.009067 91.6224-129.28z" p-id="4698"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/nested.svg b/ruoyi-ui/src/assets/icons/svg/nested.svg
new file mode 100644
index 0000000..06713a8
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/nested.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.002 9.2c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-5.043-3.58-9.132-7.997-9.132S.002 4.157.002 9.2zM31.997.066h95.981V18.33H31.997V.066zm0 45.669c0 5.044 3.58 9.132 7.998 9.132 4.417 0 7.997-4.088 7.997-9.132 0-3.263-1.524-6.278-3.998-7.91-2.475-1.63-5.524-1.63-7.998 0-2.475 1.632-4 4.647-4 7.91zM63.992 36.6h63.986v18.265H63.992V36.6zm-31.995 82.2c0 5.043 3.58 9.132 7.998 9.132 4.417 0 7.997-4.089 7.997-9.132 0-5.044-3.58-9.133-7.997-9.133s-7.998 4.089-7.998 9.133zm31.995-9.131h63.986v18.265H63.992V109.67zm0-27.404c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-3.263-1.524-6.277-3.998-7.909-2.475-1.631-5.524-1.631-7.998 0-2.475 1.632-4 4.646-4 7.91zm31.995-9.13h31.991V91.4H95.987V73.135z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/number.svg b/ruoyi-ui/src/assets/icons/svg/number.svg
new file mode 100644
index 0000000..ad5ce9a
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/number.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802851180" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2867" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M279.272727 791.272727h512a46.545455 46.545455 0 0 1 0 93.090909H279.272727a46.545455 46.545455 0 0 1 0-93.090909z m33.838546-617.984V651.636364H193.722182V395.170909c0-37.003636-0.884364-59.298909-2.653091-66.746182a24.948364 24.948364 0 0 0-14.615273-16.989091c-8.005818-3.863273-25.786182-5.771636-53.341091-5.771636h-11.822545v-55.854545c57.716364-12.381091 101.562182-37.888 131.490909-76.520728h70.283636z m303.709091 396.8V651.636364H354.164364v-68.235637c77.777455-127.255273 124.043636-206.010182 138.705454-236.218182 14.661818-30.254545 22.016-53.853091 22.016-70.74909 0-13.032727-2.234182-22.714182-6.656-29.137455-4.421818-6.376727-11.170909-9.588364-20.247273-9.588364a22.248727 22.248727 0 0 0-20.200727 10.612364c-4.468364 7.121455-6.656 21.178182-6.656 42.263273v45.521454H354.164364v-17.454545c0-26.763636 1.396364-47.941818 4.142545-63.348364 2.746182-15.499636 9.541818-30.72 20.386909-45.661091 10.798545-14.987636 24.901818-26.298182 42.216727-33.978182 17.361455-7.68 38.167273-11.543273 62.37091-11.543272 47.476364 0 83.316364 11.776 107.706181 35.328 24.296727 23.552 36.445091 53.341091 36.445091 89.367272 0 27.368727-6.842182 56.32-20.48 86.853819-13.730909 30.533818-54.039273 95.325091-121.018182 194.420363h130.885819z m270.615272-189.393454c18.152727 6.097455 31.650909 16.104727 40.494546 29.975272 8.843636 13.917091 13.312 46.452364 13.312 97.652364 0 38.027636-4.328727 67.490909-13.032727 88.529455-8.657455 20.945455-23.598545 36.910545-44.869819 47.848727-21.271273 10.938182-48.593455 16.384-81.873454 16.384-37.794909 0-67.490909-6.330182-89.088-19.083636-21.550545-12.660364-35.746909-28.253091-42.542546-46.638546-6.795636-18.432-10.193455-50.362182-10.193454-95.883636v-37.841455h119.389091v77.730909c0 20.666182 1.210182 33.838545 3.723636 39.424 2.420364 5.585455 7.912727 8.424727 16.337455 8.424728 9.309091 0 15.36-3.537455 18.338909-10.612364 2.932364-7.121455 4.421818-25.6 4.421818-55.575273v-33.047273c0-18.338909-2.048-31.744-6.190546-40.215272a30.72 30.72 0 0 0-18.338909-16.709818c-8.052364-2.653091-23.738182-4.189091-46.964363-4.561455V357.050182c28.392727 0 45.893818-1.070545 52.596363-3.258182a22.946909 22.946909 0 0 0 14.475637-14.149818c2.932364-7.307636 4.421818-18.711273 4.421818-34.257455v-26.624c0-16.756364-1.722182-27.741091-5.12-33.047272-3.490909-5.352727-8.843636-8.005818-16.151273-8.005819-8.285091 0-13.963636 2.792727-16.989091 8.378182-3.025455 5.632-4.561455 17.640727-4.561454 35.933091v39.284364h-119.389091v-40.773818c0-45.661091 10.472727-76.567273 31.325091-92.625455 20.898909-16.058182 54.085818-24.064 99.607272-24.064 56.878545 0 95.511273 11.170909 115.805091 33.373091 20.293818 22.248727 30.394182 53.201455 30.394182 92.765091 0 26.810182-3.630545 46.173091-10.891636 58.088727-7.307636 11.915636-20.107636 22.807273-38.446546 32.628364z" p-id="2868"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/online.svg b/ruoyi-ui/src/assets/icons/svg/online.svg
new file mode 100644
index 0000000..330a202
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/online.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899557259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="535" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M356.246145 681.56286c-68.156286-41.949414-107.246583-103.84102-107.246583-169.805384 0-65.966411 39.090297-127.860063 107.246583-169.809477 12.046361-7.414877 15.800871-23.190165 8.385994-35.236526-7.413853-12.046361-23.191188-15.801894-35.236526-8.387018-39.640836 24.399713-72.539106 56.044434-95.137801 91.515297-23.86657 37.461193-36.481889 79.620385-36.481889 121.917724 0 42.297338 12.615319 84.454484 36.481889 121.914654 22.598694 35.469839 55.496965 67.11456 95.137801 91.51325 4.185322 2.576685 8.821923 3.804652 13.400195 3.804652 8.598842 0 16.998139-4.329609 21.836331-12.190647C372.047016 704.752002 368.291482 688.976714 356.246145 681.56286zM263.943926 754.580874c-92.603071-61.111846-145.713686-149.623739-145.713686-242.840794 0-93.195565 53.094242-181.682899 145.667637-242.774279 11.805884-7.79043 15.061021-23.677259 7.269567-35.483142-7.79043-11.805884-23.677259-15.062044-35.483142-7.269567C128.487861 296.954249 67.006602 401.024489 67.006602 511.74008c0 110.73708 61.496609 214.830857 168.721703 285.593504 4.343935 2.867304 9.240455 4.238534 14.08274 4.238534 8.317433 0 16.476253-4.046153 21.400403-11.507078C279.003923 778.258133 275.748786 762.372328 263.943926 754.580874zM788.660552 226.213092c-11.80486-7.791453-27.692712-4.536316-35.483142 7.269567-7.79043 11.805884-4.536316 27.692712 7.269567 35.483142 92.575442 61.092403 145.670707 149.579737 145.670707 242.774279 0 93.216032-53.111638 181.727924-145.715733 242.840794-11.805884 7.79043-15.059997 23.678282-7.269567 35.484166 4.925173 7.461949 13.081946 11.507078 21.400403 11.507078 4.841262 0 9.739828-1.37123 14.083763-4.238534 107.22714-70.761624 168.724773-174.857447 168.724773-285.593504C957.341323 401.025513 895.860063 296.955272 788.660552 226.213092zM790.090111 633.67213c23.865547-37.459147 36.480866-79.617315 36.480866-121.914654 0-42.298362-12.615319-84.45653-36.480866-121.917724-22.598694-35.470863-55.496965-67.115584-95.139847-91.515297-12.047384-7.413853-27.821649-3.659343-35.236526 8.387018-7.414877 12.045337-3.659343 27.821649 8.385994 35.236526 68.156286 41.949414 107.247606 103.842043 107.247606 169.809477 0 65.964364-39.090297 127.85597-107.247606 169.804361-12.045337 7.414877-15.800871 23.190165-8.385994 35.237549 4.838192 7.861038 13.236466 12.190647 21.835308 12.190647 4.579295 0 9.215896-1.227967 13.400195-3.804652C734.591099 700.786691 767.490394 669.142993 790.090111 633.67213zM567.129086 518.274914c24.12342-17.150612 39.887452-45.305859 39.887452-77.07133 0-52.128241-42.452881-94.538143-94.634334-94.538143-52.18043 0-94.633311 42.408879-94.633311 94.538143 0 31.695886 15.696494 59.797921 39.730886 76.958766-49.875944 21.128203-84.917018 70.234621-84.917018 127.301338 0 2.366907 0.061398 4.762467 0.182149 7.119141l1.249457 24.296359 276.373515 0 1.238201-24.308639c0.119727-2.358721 0.181125-4.750187 0.181125-7.106862C651.786185 588.497255 616.865861 539.465538 567.129086 518.274914zM512.381182 397.889079c23.937179 0 43.411719 19.430538 43.411719 43.314505 0 23.882943-19.47454 43.313481-43.411719 43.313481-23.936155 0-43.409672-19.430538-43.409672-43.313481C468.971509 417.320641 488.445026 397.889079 512.381182 397.889079zM426.08884 625.656573c9.119705-38.542828 44.254923-67.337641 86.085634-67.337641s76.966952 28.794813 86.085634 67.337641L426.08884 625.656573z" p-id="536"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/password.svg b/ruoyi-ui/src/assets/icons/svg/password.svg
new file mode 100644
index 0000000..6c64def
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/password.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802846045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2750" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M868.593046 403.832442c-30.081109-28.844955-70.037123-44.753273-112.624057-44.753273L265.949606 359.079168c-42.554188 0-82.510202 15.908318-112.469538 44.690852-30.236652 28.782533-46.857191 67.222007-46.857191 108.198258l0 294.079782c0 40.977273 16.619516 79.414701 46.702672 108.136859 29.959336 28.844955 70.069869 44.814672 112.624057 44.814672l490.019383 0c42.585911 0 82.696444-15.969717 112.624057-44.814672 30.082132-28.844955 46.579875-67.222007 46.579875-108.136859L915.172921 511.968278C915.171897 471.053426 898.675178 432.677397 868.593046 403.832442zM841.821309 806.049083c0 22.098297-8.882298 42.772152-25.099654 58.306964-16.154935 15.661701-37.81935 24.203238-60.752666 24.203238L265.949606 888.559285c-22.934339 0-44.567032-8.54256-60.877509-24.264637-16.186657-15.474436-25.067932-36.148291-25.067932-58.246589L180.004165 511.968278c0-22.035876 8.881274-42.772152 25.192775-58.307987 16.186657-15.536858 37.81935-24.139793 60.753689-24.139793l490.019383 0c22.933315 0 44.597731 8.602935 60.752666 24.139793 16.21838 15.535835 25.099654 36.272112 25.099654 58.307987L841.822332 806.049083zM510.974136 135.440715c114.914216 0 208.318536 89.75214 208.318536 200.055338l73.350588 0c0-149.113109-126.366036-270.496667-281.669124-270.496667-155.333788 0-281.699824 121.383558-281.699824 270.496667l73.350588 0C302.623877 225.193879 396.059919 135.440715 510.974136 135.440715zM474.299865 747.244792l73.350588 0L547.650453 629.576859l-73.350588 0L474.299865 747.244792z" p-id="2751"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/pdf.svg b/ruoyi-ui/src/assets/icons/svg/pdf.svg
new file mode 100644
index 0000000..957aa0c
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/pdf.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path d="M869.073 277.307H657.111V65.344l211.962 211.963zm-238.232 26.27V65.344l-476.498-.054v416.957h714.73v-178.67H630.841zm-335.836 360.57c-5.07-3.064-10.944-5.133-17.61-6.201-6.67-1.064-13.603-1.6-20.81-1.6h-48.821v85.641h48.822c7.206 0 14.14-.532 20.81-1.6 6.665-1.065 12.54-3.133 17.609-6.202 5.064-3.063 9.134-7.406 12.208-13.007 3.065-5.602 4.6-12.937 4.6-22.011 0-9.07-1.535-16.408-4.6-22.01-3.074-5.603-7.144-9.94-12.208-13.01zM35.82 541.805v416.904h952.358V541.805H35.821zm331.421 191.179c-3.6 11.071-9.343 20.879-17.209 29.413-7.874 8.542-18.078 15.408-30.617 20.61-12.544 5.206-27.747 7.807-45.621 7.807h-66.036v102.45h-62.831V607.517h128.867c17.874 0 33.077 2.6 45.62 7.802 12.541 5.207 22.745 12.076 30.618 20.615 7.866 8.538 13.604 18.277 17.21 29.212 3.6 10.943 5.401 22.278 5.401 34.018 0 11.477-1.8 22.752-5.402 33.819zM644.9 806.417c-5.343 17.61-13.408 32.818-24.212 45.627-10.807 12.803-24.283 22.879-40.423 30.213-16.146 7.343-35.155 11.007-57.03 11.007h-123.26V607.518h123.26c18.41 0 35.552 2.941 51.428 8.808 15.873 5.869 29.618 14.671 41.22 26.412 11.608 11.744 20.674 26.411 27.217 44.02 6.535 17.61 9.803 38.288 9.803 62.035 0 20.81-2.67 40.02-8.003 57.624zm245.362-146.07h-138.07v66.03h119.66v48.829h-119.66v118.058h-62.83V607.518h200.9v52.829h-.001zm-318.2 25.611c-6.402-8.266-14.877-14.604-25.412-19.01-10.544-4.402-23.551-6.602-39.019-6.602h-44.825v180.088h56.029c9.07 0 17.872-1.463 26.415-4.401 8.535-2.932 16.14-7.802 22.812-14.609 6.665-6.8 12.007-15.667 16.007-26.61 4.003-10.94 6.003-24.275 6.003-40.021 0-14.408-1.4-27.416-4.202-39.019-2.8-11.607-7.406-21.542-13.808-29.816zm0 0"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/people.svg b/ruoyi-ui/src/assets/icons/svg/people.svg
new file mode 100644
index 0000000..2bd54ae
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/people.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M104.185 95.254c8.161 7.574 13.145 17.441 13.145 28.28 0 1.508-.098 2.998-.285 4.466h-10.784c.238-1.465.403-2.948.403-4.465 0-8.983-4.36-17.115-11.419-23.216C86 104.66 75.355 107.162 64 107.162c-11.344 0-21.98-2.495-31.22-6.83-7.064 6.099-11.444 14.218-11.444 23.203 0 1.517.165 3 .403 4.465H10.955a35.444 35.444 0 0 1-.285-4.465c0-10.838 4.974-20.713 13.127-28.291C9.294 85.42.003 70.417.003 53.58.003 23.99 28.656.001 64 .001s63.997 23.988 63.997 53.58c0 16.842-9.299 31.85-23.812 41.673zM64 36.867c-29.454 0-53.33-10.077-53.33 15.342 0 25.418 23.876 46.023 53.33 46.023 29.454 0 53.33-20.605 53.33-46.023 0-25.419-23.876-15.342-53.33-15.342zm24.888 25.644c-3.927 0-7.111-2.665-7.111-5.953 0-3.288 3.184-5.954 7.11-5.954 3.928 0 7.111 2.666 7.111 5.954s-3.183 5.953-7.11 5.953zm-3.556 16.372c0 4.11-9.55 7.442-21.332 7.442-11.781 0-21.332-3.332-21.332-7.442 0-1.06.656-2.064 1.8-2.976 3.295 2.626 10.79 4.465 19.532 4.465 8.743 0 16.237-1.84 19.531-4.465 1.145.912 1.801 1.916 1.801 2.976zm-46.22-16.372c-3.927 0-7.11-2.665-7.11-5.953 0-3.288 3.183-5.954 7.11-5.954 3.927 0 7.111 2.666 7.111 5.954s-3.184 5.953-7.11 5.953z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/peoples.svg b/ruoyi-ui/src/assets/icons/svg/peoples.svg
new file mode 100644
index 0000000..aab852e
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/peoples.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M95.648 118.762c0 5.035-3.563 9.121-7.979 9.121H7.98c-4.416 0-7.979-4.086-7.979-9.121C0 100.519 15.408 83.47 31.152 76.75c-9.099-6.43-15.216-17.863-15.216-30.987v-9.128c0-20.16 14.293-36.518 31.893-36.518s31.894 16.358 31.894 36.518v9.122c0 13.137-6.123 24.556-15.216 30.993 15.738 6.726 31.141 23.769 31.141 42.012z"/><path d="M106.032 118.252h15.867c3.376 0 6.101-3.125 6.101-6.972 0-13.957-11.787-26.984-23.819-32.123 6.955-4.919 11.638-13.66 11.638-23.704v-6.985c0-15.416-10.928-27.926-24.39-27.926-1.674 0-3.306.193-4.89.561 1.936 4.713 3.018 9.974 3.018 15.526v9.121c0 13.137-3.056 23.111-11.066 30.993 14.842 4.41 27.312 23.42 27.541 41.509z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/phone.svg b/ruoyi-ui/src/assets/icons/svg/phone.svg
new file mode 100644
index 0000000..ab8e8c4
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/phone.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1567417214476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2266" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M761.503029 2.90619 242.121921 2.90619c-32.405037 0-58.932204 26.060539-58.932204 58.527998l0 902.302287c0 32.156374 26.217105 58.216913 58.932204 58.216913l519.381108 0c32.344662 0 58.591443-26.060539 58.591443-58.216913L820.094472 61.123103C820.094472 28.966729 793.847691 2.90619 761.503029 2.90619M452.878996 61.123103l98.147344 0c6.780427 0 12.31549 5.536087 12.31549 12.253068 0 6.748704-5.535063 12.253068-12.31549 12.253068l-98.147344 0c-6.779404 0-12.345166-5.504364-12.345166-12.253068C440.532807 66.659189 446.099592 61.123103 452.878996 61.123103M501.641583 980.593398c-29.636994 0-53.987588-23.946388-53.987588-53.677527 0-29.356608 24.039509-53.614082 53.987588-53.614082 29.91738 0 53.987588 23.883967 53.987588 53.614082C555.629171 956.647009 531.559986 980.593398 501.641583 980.593398M766.35657 803.142893c0 16.23373-13.186324 29.107945-29.233811 29.107945l-470.618521 0c-16.35755 0-29.325909-13.186324-29.325909-29.107945L237.178329 163.500794c0-16.232706 13.279445-29.138644 29.325909-29.138644l470.246037 0c16.420995 0 29.357632 13.1853 29.357632 29.138644l0 639.642099L766.35657 803.142893zM766.35657 803.142893" p-id="2267"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/post.svg b/ruoyi-ui/src/assets/icons/svg/post.svg
new file mode 100644
index 0000000..2922c61
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/post.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035724641" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3998" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M136.4 434.3h77.7c21.5 0 38.9-17.4 38.9-38.9s-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9zM252.9 628.6c0-21.5-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9H214c21.5-0.1 38.9-17.5 38.9-38.9z" p-id="3999"></path><path d="M874.7 97.5H227c-28.6 0-51.8 23.2-51.8 51.8v194.3h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v129.5h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v194.3c0 28.6 23.2 51.8 51.8 51.8h647.7c28.6 0 51.8-23.2 51.8-51.8V149.3c0-28.6-23.2-51.8-51.8-51.8z m-311.3 723c-15.6 0-146.7-71.6-146.7-91 0-19.4 102-368.6 102-368.6l-83.6-104s-12.3-23.1 24.6-23.1h208.9c36.9 0 18.4 23.1 18.4 23.1l-79 104s102 351.3 102 368.6c0.1 17.3-131 91-146.6 91z m169.2-253.6l-27.9 40.2-74.5-240 103.4 171.7c4.6 7.9 4.2 20.6-1 28.1z" p-id="4000"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/qq.svg b/ruoyi-ui/src/assets/icons/svg/qq.svg
new file mode 100644
index 0000000..ee13d4e
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/qq.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M18.448 57.545l-.244-.744-.198-.968-.132-.53v-2.181l.236-.859.24-.908.317-.953.428-1.06.561-1.103.794-1.104v-.773l.077-.724.123-.984.34-1.106.313-1.194.25-.548.289-.511.371-.569.405-.423v-2.73l.234-1.407.236-1.633.42-1.955.577-2.035.43-1.118.426-1.217.468-1.135.559-1.216.57-1.332.655-1.247.737-1.331.929-1.33.43-.762.457-.624.995-1.406 1.025-1.403 1.163-1.444 1.246-1.405 1.352-1.384 1.41-1.423 1.708-1.536 1.083-.934 1.322-1.008 1.34-.89 1.448-.855 1.392-.76 1.57-.63 1.667-.775 1.657-.532 1.653-.552 1.787-.548 1.785-.417 1.876-.347L59.128.68l1.879-.245 1.876-.252 2.002-.106h5.912l1.97.243 1.981.231 2.019.207 1.874.441 1.979.413 1.857.475 2.035.53 1.862.646 1.782.738 1.904.78 1.736.853 1.689.95 1.655 1.044 1.425.971.662.548.693.401 1.323 1.1 1.115 1.064 1.112 1.1 1.083 1.214.894 1.178 1.064 1.217.74 1.306.752 1.162.798 1.352.661 1.175 1.113 2.489.546 1.286.428 1.192.428 1.294.384 1.217.267 1.047.347 1.231.607 2.198.388 1.924.253 1.861.217 1.497.342 2.28.077.362.274.41.737 1.18.473.8.42.832.534.892.472 1.07.307 1.093.334 1.2.252 1.232.115.605.106.746v.648l-.106.643v.8l-.192.774-.35 1.5-.403.76-.299.852v.213l.142.264.4.623 1.746 2.53 1.377 1.9.66 1.267.889 1.389.774 1.52.893 1.627.894 1.828 1.006 2.069.567 1.268.518 1.239.447 1.307.44 1.175.336 1.235.342 1.16.432 2.261.343 2.31.235 2.05v2.891l-.158 1.025-.226 1.768-.308 1.59-.48 1.44-.18.588-.336.707-.28.493-.375.607-.33.383-.42.494-.375.4-.401.34-.48.207-.432.207-.355.114h-.543l-.346-.114-.66-.32-.302-.212-.317-.223-.347-.304-.35-.342-.579-.63-.684-.89-.539-.917-.538-.734-.526-.855-.741-1.517-.833-1.579-.098-.055h-.138l-.338.247-.196.415-.326.516-.567 1.533-.856 2.182-1.096 2.626-.824 1.308-.864 1.366-1.027 1.536-1.09 1.503-.557.68-.676.743-1.555 1.497.136.135.21.214.777.446 3.235 1.524 1.41.779 1.347.756 1.332.953 1.187.982.574.443.432.511.445.593.367.643.198.533.242.64.105.554.115.647-.115.433v.44l-.105.454-.242.415-.092.325-.22.394-.587.784-.543.627-.42.47-.35.348-.893.638-1.01.556-1.077.532-1.155.511-1.287.495-.693.207-.608.167-1.496.342-1.545.325-1.552.323-1.689.27-1.74.072-1.785.21h-5.539l-1.998-.114-1.86-.168-2.005-.27-1.99-.209-2.095-.286-2.03-.495-1.981-.374-1.968-.552-2.019-.707-1.98-.585-1.044-.342-.927-.323-.586-.223-.582-.12h-1.647l-1.904-.131-.962-.096-1.24-.135-.795.705-1.085.665-1.471.701-1.628.875-.99.475-1.033.376-2.281.914-1.24.305-1.3.343-1.803.344-1.13.086-1.193.1-1.246.135-1.45.053h-5.926l-3.346-.053-3.25-.321-1.644-.23-1.589-.23-1.546-.227-1.547-.305-1.442-.456-1.434-.325-1.294-.51-1.223-.474-1.142-.533-.99-.583-.984-.71-.336-.343-.44-.415-.334-.362-.3-.417-.278-.415-.215-.42-.311-.89-.109-.46-.138-.51v-.473l.138-.533v-.53l.109-.53v-1.069l.052-.564.259-.647.215-.646.39-.779.286-.3.236-.348.615-.738.49-.38.464-.266.428-.338.676-.21.543-.324.676-.341.77-.227.775-.231.897-.192.85-.11 1.008-.13 1.093-.081.284-.092h.063l.137-.115v-.13l-.2-.266-.58-.27-1.45-1.231-.975-.761-1.127-.967-1.136-1.082-1.181-1.382-1.36-1.558-.508-.843-.672-.87-.58-1.007-.522-1.1-.704-1.047-.459-1.194-.547-1.192-.546-1.33-.397-1.273-.378-1.575-.112-.057h-.115l-.059-.113h-.14l-.23.113-.114.057-.158.264-.057.321-.119.286-.206.477-.664 1.157-.345.701-.546.612-.58.736-.641.816-.677.724-.795.701-.734.658-.814.524-.89.546-.855.325-1.008.247-.99.095h-.233l-.228-.095-.18-.384-.29-.188-.38-.912-.237-.493-.255-.707-.21-.734-.113-.724-.313-1.648-.12-.972v-3.185l.12-2.379.196-1.214.23-1.252.21-1.347.374-1.254.42-1.443.431-1.407.578-1.448.545-1.38.754-1.4.699-1.52.855-1.425 1.006-1.538 1.023-1.382 1.069-1.538.891-1.071 1.142-1.227 1.202-1.237.56-.59.678-.662.985-.836 1.012-.853 1.647-1.446 1.242-.889z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/question.svg b/ruoyi-ui/src/assets/icons/svg/question.svg
new file mode 100644
index 0000000..cf75bd4
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/question.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238842264" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1409" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 0C229.233778 0 0 229.233778 0 512s229.233778 512 512 512 512-229.233778 512-512A512 512 0 0 0 512 0z m0 938.666667C276.366222 938.666667 85.333333 747.633778 85.333333 512 85.333333 276.366222 276.366222 85.333333 512 85.333333c235.633778 0 426.666667 191.032889 426.666667 426.666667a426.666667 426.666667 0 0 1-426.666667 426.666667z m0-717.653334a170.666667 170.666667 0 0 0-170.666667 170.666667 42.666667 42.666667 0 0 0 85.333334 0 85.333333 85.333333 0 1 1 85.333333 85.333333 42.666667 42.666667 0 0 0-42.666667 42.666667v111.36a42.666667 42.666667 0 0 0 85.333334 0v-74.24A170.666667 170.666667 0 0 0 512 221.013333z m-42.666667 542.293334a42.666667 42.666667 0 1 0 85.333334 0 42.666667 42.666667 0 0 0-85.333334 0z" p-id="1410"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/radio.svg b/ruoyi-ui/src/assets/icons/svg/radio.svg
new file mode 100644
index 0000000..0cde345
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/radio.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575966775973" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="879" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M507.39346659 71.84873358c241.53533667 0 437.39770766 195.85422109 437.39770767 437.37442191 0 241.53766571-195.86237099 437.38955776-437.39770767 437.38955776-241.50040803 0-437.34997219-195.85189205-437.34997219-437.38955776C70.0434944 267.70295467 265.89189347 71.84873358 507.39346659 71.84873358L507.39346659 71.84873358zM507.39346659 282.81899805c-125.00686734 0-226.37039389 101.38914133-226.37039388 226.41813048 0 125.01268821 101.36352768 226.39717262 226.37039388 226.39717262 125.04295993 0 226.42395136-101.38448441 226.42395136-226.39717262C733.81625401 384.20813938 632.43642653 282.81899805 507.39346659 282.81899805L507.39346659 282.81899805zM507.39346659 120.78172615c-214.46664192 0-388.42047261 173.95150279-388.4204726 388.44026539 0 214.51204949 173.95499463 388.46122325 388.4204726 388.46122325 214.52369237 0 388.46005817-173.94800981 388.46005818-388.46122325C895.85236082 294.73322894 721.91715897 120.78172615 507.39346659 120.78172615z" p-id="880"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/rate.svg b/ruoyi-ui/src/assets/icons/svg/rate.svg
new file mode 100644
index 0000000..aa3b14d
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/rate.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577246781606" class="icon" viewBox="0 0 1069 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1098" xmlns:xlink="http://www.w3.org/1999/xlink" width="84.5595703125" height="81"><defs><style type="text/css"></style></defs><path d="M633.72929961 378.02038203l9.49872568 18.68789795 20.78025469 2.79745225 206.61592412 27.33248408a11.46496817 11.46496817 0 0 1 6.6095543 19.47324902l-147.2675168 147.35350284-14.89299345 14.89299345 3.8006376 20.68280244 37.84585956 204.89044571a11.46496817 11.46496817 0 0 1-16.4808914 12.2961788L554.68980898 751.84713388l-18.68789794-9.49299345-18.48726123 9.99171915-183.23885392 99.34968163a11.46496817 11.46496817 0 0 1-16.78471347-11.8662416l32.5433127-205.79617881 3.29617793-20.78598692-15.19108243-14.49172002-151.03375839-143.48407587a11.46496817 11.46496817 0 0 1 6.09936328-19.63949062l205.79617881-32.63503185 20.78598691-3.2961788L428.87898125 380.72038203 518.59235674 192.64331182a11.46496817 11.46496817 0 0 1 20.56815264-0.26369385l94.56879023 185.63503183zM496.64840732 85.52038203l-121.75796162 254.98089229L95.76433145 384.76178369A34.3949045 34.3949045 0 0 0 77.46050938 443.66879023l204.87324901 194.66369385-44.16879023 279.1146498a34.3949045 34.3949045 0 0 0 50.36560489 35.61592325l248.4-134.67898038 251.84522285 128.27579591a34.3949045 34.3949045 0 0 0 49.43694287-36.89426777l-51.30573223-277.85350284 199.73120977-199.90891758a34.3949045 34.3949045 0 0 0-19.82866201-58.40827998l-280.11783428-37.03184736L558.32993633 84.71210205a34.3949045 34.3949045 0 0 0-61.68152901 0.80254775z" p-id="1099"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/redis.svg b/ruoyi-ui/src/assets/icons/svg/redis.svg
new file mode 100644
index 0000000..2f1d62d
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/redis.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1605865043777" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="856" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1023.786667 611.84c-0.426667 9.770667-13.354667 20.693333-39.893334 34.56-54.613333 28.458667-337.749333 144.896-397.994666 176.298667-60.288 31.402667-93.738667 31.104-141.354667 8.32-47.616-22.741333-348.842667-144.469333-403.114667-170.368-27.093333-12.970667-40.917333-23.893333-41.386666-34.218667v103.509333c0 10.325333 14.250667 21.290667 41.386666 34.261334 54.272 25.941333 355.541333 147.626667 403.114667 170.368 47.616 22.784 81.066667 23.082667 141.354667-8.362667 60.245333-31.402667 343.338667-147.797333 397.994666-176.298667 27.776-14.464 40.106667-25.728 40.106667-35.925333v-102.058667l-0.213333-0.085333z m0-168.746667c-0.512 9.770667-13.397333 20.650667-39.893334 34.517334-54.613333 28.458667-337.749333 144.896-397.994666 176.298666-60.288 31.402667-93.738667 31.104-141.354667 8.362667-47.616-22.741333-348.842667-144.469333-403.114667-170.410667-27.093333-12.928-40.917333-23.893333-41.386666-34.176v103.509334c0 10.325333 14.250667 21.248 41.386666 34.218666 54.272 25.941333 355.498667 147.626667 403.114667 170.368 47.616 22.784 81.066667 23.082667 141.354667-8.32 60.245333-31.402667 343.338667-147.84 397.994666-176.298666 27.776-14.506667 40.106667-25.770667 40.106667-35.968v-102.058667l-0.256-0.042667z m0-175.018666c0.469333-10.410667-13.141333-19.541333-40.533334-29.610667-53.248-19.498667-334.634667-131.498667-388.522666-151.253333-53.888-19.712-75.818667-18.901333-139.093334 3.84C392.234667 113.706667 92.629333 231.253333 39.338667 252.074667c-26.666667 10.496-39.68 20.181333-39.253334 30.506666V386.133333c0 10.325333 14.250667 21.248 41.386667 34.218667 54.272 25.941333 355.498667 147.669333 403.114667 170.410667 47.616 22.741333 81.066667 23.04 141.354666-8.362667 60.245333-31.402667 343.338667-147.84 397.994667-176.298667 27.776-14.506667 40.106667-25.770667 40.106667-35.968V268.074667h-0.341334zM366.677333 366.08l237.269334-36.437333-71.68 105.088-165.546667-68.650667z m524.8-94.634667l-140.330666 55.466667-15.232 5.973333-140.245334-55.466666 155.392-61.44 140.373334 55.466666z m-411.989333-101.674666l-22.954667-42.325334 71.594667 27.989334 67.498667-22.101334-18.261334 43.733334 68.778667 25.770666-88.704 9.216-19.882667 47.786667-32.085333-53.290667-102.4-9.216 76.416-27.562666z m-176.768 59.733333c70.058667 0 126.805333 21.973333 126.805333 49.109333s-56.746667 49.152-126.805333 49.152-126.848-22.058667-126.848-49.152c0-27.136 56.789333-49.152 126.848-49.152z" p-id="857"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/row.svg b/ruoyi-ui/src/assets/icons/svg/row.svg
new file mode 100644
index 0000000..0780992
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/row.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579339929870" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1182" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M152 854.856875h325.7146875V237.715625H134.856875v600q0 6.99375 5.0746875 12.0684375T152 854.856875z m737.143125-17.1421875v-600H546.284375v617.1421875H872q6.99375 0 12.0684375-5.07375t5.0746875-12.0684375z m68.5715625-651.429375V837.715625q0 35.3821875-25.16625 60.5484375T872 923.4284375H152q-35.383125 0-60.5484375-25.1653125T66.284375 837.7146875V186.284375q0-35.3821875 25.16625-60.5484375T152 100.5715625h720q35.383125 0 60.5484375 25.1653125t25.16625 60.5484375z" p-id="1183"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/search.svg b/ruoyi-ui/src/assets/icons/svg/search.svg
new file mode 100644
index 0000000..84233dd
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/search.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M124.884 109.812L94.256 79.166c-.357-.357-.757-.629-1.129-.914a50.366 50.366 0 0 0 8.186-27.59C101.327 22.689 78.656 0 50.67 0 22.685 0 0 22.688 0 50.663c0 27.989 22.685 50.663 50.656 50.663 10.186 0 19.643-3.03 27.6-8.201.286.385.557.771.9 1.114l30.628 30.632a10.633 10.633 0 0 0 7.543 3.129c2.728 0 5.457-1.043 7.543-3.115 4.171-4.157 4.171-10.915.014-15.073M50.671 85.338C31.557 85.338 16 69.78 16 50.663c0-19.102 15.557-34.661 34.67-34.661 19.115 0 34.657 15.559 34.657 34.675 0 19.102-15.557 34.661-34.656 34.661"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/select.svg b/ruoyi-ui/src/assets/icons/svg/select.svg
new file mode 100644
index 0000000..d628382
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/select.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575803481213" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="804" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M62 511.97954521C62 263.86590869 263.90681826 62 511.97954521 62s449.97954521 201.825 449.97954521 449.97954521c0 248.19545479-201.90681826 449.97954521-449.97954521 449.97954521C263.90681826 962 62 760.175 62 511.97954521M901.98636348 511.97954521c0-215.24318174-175.00909131-390.41590869-390.00681827-390.41590869-215.03863652 0-389.96590869 175.17272695-389.96590868 390.41590869 0 215.28409131 175.00909131 390.45681826 389.96590868 390.45681826C727.01818174 902.47727305 901.98636348 727.30454521 901.98636348 511.97954521M264.17272695 430.28409131c0-5.76818174 2.12727305-11.51590869 6.64772696-15.87272696 8.71363652-8.75454521 22.88863652-8.75454521 31.725 0l209.4340913 208.22727305L721.45454521 414.53409131c8.75454521-8.71363652 22.97045479-8.71363652 31.90909132 0 8.71363652 8.75454521 8.71363652 22.88863652 0 31.60227304L511.97954521 685.74090869 270.71818174 446.01363653C266.27954521 441.77954521 264.17272695 436.05227305 264.17272695 430.28409131" p-id="805"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/server.svg b/ruoyi-ui/src/assets/icons/svg/server.svg
new file mode 100644
index 0000000..ca37b00
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/server.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1547360688278" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6717" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M890 120H134a70 70 0 0 0-70 70v500a70 70 0 0 0 70 70h756a70 70 0 0 0 70-70V190a70 70 0 0 0-70-70z m-10 520a40 40 0 0 1-40 40H712V448a40 40 0 0 0-80 0v232h-80V368a40 40 0 0 0-80 0v312h-80V512a40 40 0 0 0-80 0v168H184a40 40 0 0 1-40-40V240a40 40 0 0 1 40-40h656a40 40 0 0 1 40 40zM696 824H328a40 40 0 0 0 0 80h368a40 40 0 0 0 0-80z" fill="#bfbfbf" p-id="6718"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/shopping.svg b/ruoyi-ui/src/assets/icons/svg/shopping.svg
new file mode 100644
index 0000000..87513e7
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/shopping.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M42.913 101.36c1.642 0 3.198.332 4.667.996a12.28 12.28 0 0 1 3.89 2.772c1.123 1.184 1.987 2.582 2.592 4.193.605 1.612.908 3.318.908 5.118 0 1.8-.303 3.507-.908 5.118-.605 1.611-1.469 3.01-2.593 4.194a13.3 13.3 0 0 1-3.889 2.843 10.582 10.582 0 0 1-4.667 1.066c-1.729 0-3.306-.355-4.732-1.066a13.604 13.604 0 0 1-3.825-2.843c-1.123-1.185-1.988-2.583-2.593-4.194a14.437 14.437 0 0 1-.907-5.118c0-1.8.302-3.506.907-5.118.605-1.61 1.47-3.009 2.593-4.193a12.515 12.515 0 0 1 3.825-2.772c1.426-.664 3.003-.996 4.732-.996zm53.932.285c1.643 0 3.22.331 4.733.995a11.386 11.386 0 0 1 3.889 2.772c1.08 1.185 1.945 2.583 2.593 4.194.648 1.61.972 3.317.972 5.118 0 1.8-.324 3.506-.972 5.117-.648 1.611-1.513 3.01-2.593 4.194a12.253 12.253 0 0 1-3.89 2.843 11 11 0 0 1-4.732 1.066 10.58 10.58 0 0 1-4.667-1.066 12.478 12.478 0 0 1-3.824-2.843c-1.08-1.185-1.945-2.583-2.593-4.194a13.581 13.581 0 0 1-.973-5.117c0-1.801.325-3.507.973-5.118.648-1.611 1.512-3.01 2.593-4.194a11.559 11.559 0 0 1 3.824-2.772 11.212 11.212 0 0 1 4.667-.995zm21.781-80.747c2.42 0 4.3.355 5.64 1.066 1.34.71 2.29 1.587 2.852 2.63a6.427 6.427 0 0 1 .778 3.34c-.044 1.185-.195 2.204-.454 3.057-.26.853-.8 2.606-1.62 5.26a589.268 589.268 0 0 1-2.788 8.743 1236.373 1236.373 0 0 0-3.047 9.453c-.994 3.128-1.75 5.592-2.269 7.393-1.123 3.79-2.55 6.42-4.278 7.89-1.728 1.469-3.846 2.203-6.352 2.203H39.023l1.945 12.795h65.342c4.148 0 6.223 1.943 6.223 5.828 0 1.896-.41 3.53-1.232 4.905-.821 1.374-2.442 2.061-4.862 2.061H38.505c-1.729 0-3.176-.426-4.343-1.28-1.167-.852-2.14-1.966-2.917-3.34a21.277 21.277 0 0 1-1.88-4.478 44.128 44.128 0 0 1-1.102-4.55c-.087-.568-.324-1.942-.713-4.122-.39-2.18-.865-4.904-1.426-8.174l-1.88-10.947c-.692-4.027-1.383-8.079-2.075-12.154-1.642-9.572-3.5-20.234-5.574-31.986H6.87c-1.296 0-2.377-.356-3.24-1.067a9.024 9.024 0 0 1-2.14-2.558 10.416 10.416 0 0 1-1.167-3.2C.108 8.53 0 7.488 0 6.54c0-1.896.583-3.46 1.75-4.69C2.917.615 4.494 0 6.482 0h13.095c1.728 0 3.111.284 4.148.853 1.037.569 1.858 1.28 2.463 2.132a8.548 8.548 0 0 1 1.297 2.701c.26.948.475 1.754.648 2.417.173.758.346 1.825.519 3.199.173 1.374.345 2.772.518 4.193.26 1.706.519 3.507.778 5.403h88.678z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/size.svg b/ruoyi-ui/src/assets/icons/svg/size.svg
new file mode 100644
index 0000000..ddb25b8
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/size.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h54.796v18.286H36.531V128H18.265V73.143H0V54.857zm127.857-36.571H91.935V128H72.456V18.286H36.534V0h91.326l-.003 18.286z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/skill.svg b/ruoyi-ui/src/assets/icons/svg/skill.svg
new file mode 100644
index 0000000..a3b7312
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/skill.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M31.652 93.206h33.401c1.44 2.418 3.077 4.663 4.93 6.692h-38.33v-6.692zm0-10.586h28.914a44.8 44.8 0 0 1-1.264-6.688h-27.65v6.688zm0-17.27H59.39c.288-2.286.714-4.532 1.34-6.687H31.65v6.687h.003zm53.913 44.84v5.85c0 2.798-2.095 5.075-4.667 5.075h-70.07c-2.576 0-4.663-2.277-4.663-5.075V31.26l23.22-20.96v22.25H17.16v6.688h18.39V6.688h45.348c2.576 0 4.667 2.277 4.667 5.066v20.009c1.987-.675 4.053-1.128 6.17-1.445v-18.56C91.738 5.28 86.874 0 80.902 0H31.15L0 28.118v87.917c0 6.48 4.859 11.759 10.832 11.759h70.07c5.974 0 10.837-5.27 10.837-11.759v-4.41c-2.117-.312-4.183-.765-6.17-1.435h-.004zM23.279 58.667h-7.96v6.688h7.96v-6.688zm-7.956 41.23h7.96v-6.691h-7.96v6.692zm7.956-23.96h-7.96v6.687h7.96v-6.688zm89.718-15.042l-4.896-4.07-12.447 17.613-11.19-9.305-3.762 5.311 16.091 13.38 16.204-22.929zM128 70.978c0-18.632-13.97-33.782-31.147-33.782-17.168 0-31.135 15.155-31.135 33.782 0 18.628 13.97 33.783 31.135 33.783 17.172 0 31.143-15.15 31.143-33.783H128zm-6.17 0c0 14.933-11.203 27.1-24.981 27.1-13.77 0-24.987-12.158-24.987-27.1 0-14.941 11.195-27.099 24.987-27.099 13.778 0 24.982 12.158 24.982 27.1z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/slider.svg b/ruoyi-ui/src/assets/icons/svg/slider.svg
new file mode 100644
index 0000000..fbe4f39
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/slider.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577185310368" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1238" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M951.453125 476.84375H523.671875a131.8359375 131.8359375 0 0 0-254.1796875 0H72.546875v70.3125h196.9453125a131.8359375 131.8359375 0 0 0 254.1796875 0H951.453125z" p-id="1239"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/star.svg b/ruoyi-ui/src/assets/icons/svg/star.svg
new file mode 100644
index 0000000..6cf86e6
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/star.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M70.66 4.328l14.01 29.693c1.088 2.29 3.177 3.882 5.603 4.25l31.347 4.76c6.087.926 8.528 8.756 4.117 13.247L103.05 79.395c-1.75 1.78-2.544 4.352-2.132 6.867l5.352 32.641c1.043 6.337-5.33 11.182-10.778 8.19l-28.039-15.409a7.13 7.13 0 0 0-6.91 0l-28.039 15.41c-5.448 2.99-11.821-1.854-10.777-8.19l5.352-32.642c.415-2.515-.387-5.088-2.136-6.867L2.264 56.278C-2.146 51.787.286 43.957 6.38 43.031l31.343-4.76c2.419-.368 4.51-1.96 5.595-4.25L57.334 4.328c2.728-5.77 10.605-5.77 13.325 0z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/swagger.svg b/ruoyi-ui/src/assets/icons/svg/swagger.svg
new file mode 100644
index 0000000..05d4e7b
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/swagger.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036776944" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6463" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M64 223.995345h168.001164v47.997673c0 26.428509 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.569164 41.984-47.997673v-47.997673h504.003491a32.004655 32.004655 0 0 0 0-64.009309H455.996509V111.988364c0-26.428509-18.878836-47.997673-41.984-47.997673H273.985164c-23.095855 0-41.984 21.569164-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.009309zM288.004655 128h111.997672V256H288.004655V128zM960 479.995345H791.998836v-47.997672c0-26.372655-18.878836-47.997673-41.984-47.997673H609.978182c-23.095855 0-41.984 21.634327-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.00931h504.003491v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h168.001164a32.004655 32.004655 0 1 0-0.009309-64.00931zM735.995345 576H623.997673v-128h111.997672v128zM960 800.293236v-0.288581H455.996509v-47.997673c0-26.363345-18.878836-47.997673-41.984-47.997673H274.050327c-23.105164 0-41.984 21.634327-41.984 47.997673v47.997673H64v0.288581a32.004655 32.004655 0 0 0 0 64.009309c0.986764 0 1.917673-0.195491 2.885818-0.288581h165.115346v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h501.108364c0.968145 0.093091 1.899055 0.288582 2.895127 0.288581a32.004655 32.004655 0 1 0-0.009309-64.009309zM400.002327 896H288.004655V768h111.997672v128z" fill="" p-id="6464"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/switch.svg b/ruoyi-ui/src/assets/icons/svg/switch.svg
new file mode 100644
index 0000000..0ba61e3
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/switch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576042673958" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1110" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M692 792H332c-150 0-270-120-270-270s120-270 270-270h360c150 0 270 120 270 270 0 147-120 270-270 270zM332 312c-117 0-210 93-210 210s93 210 210 210h360c117 0 210-93 210-210s-93-210-210-210H332z" p-id="1111"></path><path d="M341 522m-150 0a150 150 0 1 0 300 0 150 150 0 1 0-300 0Z" p-id="1112"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/system.svg b/ruoyi-ui/src/assets/icons/svg/system.svg
new file mode 100644
index 0000000..dba28cf
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/system.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
+</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/tab.svg b/ruoyi-ui/src/assets/icons/svg/tab.svg
new file mode 100644
index 0000000..b4b48e4
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/tab.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.921.052H49.08c-1.865 0-3.198 1.599-3.198 3.464v6.661c0 1.865 1.6 3.464 3.198 3.464h29.84c1.865 0 3.198-1.599 3.198-3.464V3.516C82.385 1.65 80.786.052 78.92.052zm45.563 0H94.642c-1.865 0-3.464 1.599-3.464 3.464v6.661c0 1.865 1.599 3.464 3.464 3.464h29.842c1.865-.266 3.464-1.599 3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464zm0 22.382H40.02c-1.866 0-3.464-1.599-3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464H3.516C1.65.052.052 1.651.052 3.516V124.75c0 1.598 1.599 3.197 3.464 3.197h120.968c1.865 0 3.464-1.599 3.464-3.464V25.898c0-1.865-1.599-3.464-3.464-3.464z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/table.svg b/ruoyi-ui/src/assets/icons/svg/table.svg
new file mode 100644
index 0000000..0e3dc9d
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/table.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/textarea.svg b/ruoyi-ui/src/assets/icons/svg/textarea.svg
new file mode 100644
index 0000000..2709f29
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/textarea.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802855098" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2984" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 160H128c-35.2 0-64 28.8-64 64v576c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V224c0-35.2-28.8-64-64-64z m0 608c0 16-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V256c0-16 12.8-32 32-32h704c19.2 0 32 12.8 32 32v512z" p-id="2985"></path><path d="M224 288c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V320c0-16-12.8-32-32-32z m608 480c19.2 0 32-12.8 32-32V608L704 768h128z" p-id="2986"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/theme.svg b/ruoyi-ui/src/assets/icons/svg/theme.svg
new file mode 100644
index 0000000..5982a2f
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/theme.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M125.5 36.984L95.336 2.83C93.735 1.018 91.565 0 89.3 0c-2.263 0-4.433 1.018-6.033 2.83l-3.786 4.286c-1.6 1.812-3.77 2.83-6.032 2.831H54.553c-2.263 0-4.434-1.018-6.033-2.83L44.734 2.83C43.134 1.018 40.964 0 38.701 0c-2.263 0-4.434 1.018-6.034 2.83L2.5 36.984C.9 38.796 0 41.254 0 43.815c0 2.562.899 5.02 2.5 6.831L14.565 64.31c2.178 2.468 5.367 3.403 8.33 2.444 1.35-.435 2.709.592 2.709 2.18v49.407c0 5.313 3.84 9.66 8.532 9.66h59.726c4.693 0 8.532-4.347 8.532-9.66V68.934c0-1.59 1.36-2.616 2.71-2.181 2.962.96 6.15.024 8.329-2.444L125.5 50.646c1.6-1.811 2.499-4.269 2.499-6.83 0-2.563-.899-5.02-2.5-6.832z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/time-range.svg b/ruoyi-ui/src/assets/icons/svg/time-range.svg
new file mode 100644
index 0000000..13c1202
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/time-range.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774825624" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1248" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M498.595712 482.290351 345.420077 482.290351l0 57.307194 210.477712 0L555.897789 274.196942l-57.301054 0L498.596735 482.290351zM498.595712 482.290351" p-id="1249"></path><path d="M577.685002 644.98478l379.879913 0 0 57.302077L577.685002 702.286858 577.685002 644.98478 577.685002 644.98478zM577.685002 644.98478" p-id="1250"></path><path d="M577.685002 773.764795l379.879913 0 0 57.307194L577.685002 831.071989 577.685002 773.764795 577.685002 773.764795zM577.685002 773.764795" p-id="1251"></path><path d="M577.685002 902.549927l379.879913 0 0 57.307194L577.685002 959.857121 577.685002 902.549927 577.685002 902.549927zM577.685002 902.549927" p-id="1252"></path><path d="M102.523001 382.290823c4.450359 2.615571 9.470699 3.954055 14.530948 3.954055 2.969635 0 5.952572-0.461511 8.836249-1.394766l190.809767-61.886489c15.052834-4.882194 23.297612-21.040199 18.415418-36.08894-4.882194-15.052834-21.040199-23.297612-36.093033-18.415418L175.676092 308.458257c15.994276-26.115797 35.170011-50.537 57.370639-72.743768 73.767074-73.767074 171.845857-114.388237 276.16783-114.388237 104.32095 0 202.39564 40.622186 276.16169 114.388237s114.393353 171.845857 114.393353 276.16783c0 26.427906-2.615571 52.449559-7.709589 77.780481l58.302871 0c4.464685-25.499767 6.708795-51.470255 6.708795-77.780481 0-60.449767-11.845793-119.102608-35.204803-174.336584-22.559808-53.334719-54.850236-101.226472-95.968725-142.349055-41.122583-41.122583-89.017406-73.408917-142.348032-95.968725C628.317169 75.866898 569.659211 64.021106 509.215584 64.021106c-60.448744 0-119.106702 11.845793-174.336584 35.207873-53.334719 22.559808-101.230566 54.846142-142.349055 95.968725-23.980157 23.980157-44.934398 50.278103-62.727647 78.601172l-20.738323-105.655342c-3.043313-15.527648-18.105357-25.642007-33.631982-22.599717-15.527648 3.048429-25.64303 18.105357-22.599717 33.637098l36.102243 183.932126C90.51348 371.153158 95.460142 378.13313 102.523001 382.290823L102.523001 382.290823zM102.523001 382.290823" p-id="1253"></path><path d="M126.020158 587.9416 67.768453 587.9416c5.759167 33.679054 15.368012 66.544579 28.789697 98.278327 22.559808 53.333696 54.850236 101.225449 95.971795 142.348032 41.122583 41.122583 89.014336 73.408917 142.349055 95.968725 54.112432 22.88829 111.517863 34.71157 170.668031 35.18229L505.547031 902.395408c-102.94972-0.941442-199.594851-41.445948-272.499277-114.349351C177.545672 732.543975 140.810003 663.275355 126.020158 587.9416L126.020158 587.9416zM126.020158 587.9416" p-id="1254"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/time.svg b/ruoyi-ui/src/assets/icons/svg/time.svg
new file mode 100644
index 0000000..b376e32
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/time.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577099827399" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1008" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M520 559h204c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32H488c-17.673 0-32-14.327-32-32 0-0.167 0.001-0.334 0.004-0.5a32.65 32.65 0 0 1-0.004-0.5V277c0-17.673 14.327-32 32-32 17.673 0 32 14.327 32 32v282z m-8 401C264.576 960 64 759.424 64 512S264.576 64 512 64s448 200.576 448 448-200.576 448-448 448z m0-64c212.077 0 384-171.923 384-384S724.077 128 512 128 128 299.923 128 512s171.923 384 384 384z" p-id="1009"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/ruoyi-ui/src/assets/icons/svg/tool.svg
new file mode 100644
index 0000000..c813067
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/tool.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/tree-table.svg b/ruoyi-ui/src/assets/icons/svg/tree-table.svg
new file mode 100644
index 0000000..8aafdb8
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/tree-table.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M44.8 0h79.543C126.78 0 128 1.422 128 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H44.8c-2.438 0-3.657-1.422-3.657-4.267V4.267C41.143 1.422 42.362 0 44.8 0zm22.857 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 80 64 78.578 64 75.733V52.267C64 49.422 65.219 48 67.657 48zm0 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 128 64 126.578 64 123.733v-23.466C64 97.422 65.219 96 67.657 96zM50.286 68.267c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V32h6.4c2.02 0 3.658-1.91 3.658-4.267V4.267C27.429 1.91 25.79 0 23.77 0H3.657C1.637 0 0 1.91 0 4.267v23.466C0 30.09 1.637 32 3.657 32h6.4v80c0 2.356 1.638 4.267 3.657 4.267h36.572c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V68.267h32.915z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/tree.svg b/ruoyi-ui/src/assets/icons/svg/tree.svg
new file mode 100644
index 0000000..dd4b7dd
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/tree.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M126.713 90.023c.858.985 1.287 2.134 1.287 3.447v29.553c0 1.423-.429 2.6-1.287 3.53-.858.93-1.907 1.395-3.146 1.395H97.824c-1.145 0-2.146-.465-3.004-1.395-.858-.93-1.287-2.107-1.287-3.53V93.47c0-.875.19-1.696.572-2.462.382-.766.906-1.368 1.573-1.806a3.84 3.84 0 0 1 2.146-.657h9.725V69.007a3.84 3.84 0 0 0-.43-1.806 3.569 3.569 0 0 0-1.143-1.313 2.714 2.714 0 0 0-1.573-.492h-36.47v23.149h9.725c1.144 0 2.145.492 3.004 1.478.858.985 1.287 2.134 1.287 3.447v29.553c0 .876-.191 1.696-.573 2.463-.38.766-.905 1.368-1.573 1.806a3.84 3.84 0 0 1-2.145.656H51.915a3.84 3.84 0 0 1-2.145-.656c-.668-.438-1.216-1.04-1.645-1.806a4.96 4.96 0 0 1-.644-2.463V93.47c0-1.313.43-2.462 1.288-3.447.858-.986 1.907-1.478 3.146-1.478h9.582v-23.15h-37.9c-.953 0-1.74.356-2.359 1.068-.62.711-.93 1.56-.93 2.544v19.538h9.726c1.239 0 2.264.492 3.074 1.478.81.985 1.216 2.134 1.216 3.447v29.553c0 1.423-.405 2.6-1.216 3.53-.81.93-1.835 1.395-3.074 1.395H4.29c-.476 0-.93-.082-1.358-.246a4.1 4.1 0 0 1-1.144-.657 4.658 4.658 0 0 1-.93-1.067 5.186 5.186 0 0 1-.643-1.395 5.566 5.566 0 0 1-.215-1.56V93.47c0-.437.048-.875.143-1.313a3.95 3.95 0 0 1 .429-1.15c.19-.328.429-.656.715-.984.286-.329.572-.602.858-.821.286-.22.62-.383 1.001-.493.382-.11.763-.164 1.144-.164h9.726V61.619c0-.985.31-1.833.93-2.544.619-.712 1.358-1.068 2.216-1.068h44.335V39.62h-9.582c-1.24 0-2.288-.492-3.146-1.477a5.09 5.09 0 0 1-1.287-3.448V5.14c0-1.423.429-2.627 1.287-3.612.858-.985 1.907-1.477 3.146-1.477h25.743c.763 0 1.478.246 2.145.739a5.17 5.17 0 0 1 1.573 1.888c.382.766.573 1.587.573 2.462v29.553c0 1.313-.43 2.463-1.287 3.448-.859.985-1.86 1.477-3.004 1.477h-9.725v18.389h42.762c.954 0 1.74.355 2.36 1.067.62.711.93 1.56.93 2.545v26.925h9.582c1.239 0 2.288.492 3.146 1.478z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/upload.svg b/ruoyi-ui/src/assets/icons/svg/upload.svg
new file mode 100644
index 0000000..bae49c0
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/upload.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577540289643" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7922" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M530.944 458.24l4.8 3.456 122.176 106.816a32 32 0 0 1-37.44 51.584l-4.672-3.392L546.56 556.16v280.704a32 32 0 0 1-26.24 31.488l-5.76 0.512a32 32 0 0 1-31.424-26.24l-0.512-5.76-0.064-280.704-69.12 60.48a32 32 0 0 1-40.96 0.896l-4.16-3.968a32 32 0 0 1-0.96-40.96l4.032-4.16 122.176-106.816a32 32 0 0 1 37.312-3.456zM497.92 128c128.128 0 239.168 82.304 275.52 199.04 123.968 11.264 221.312 113.088 221.312 237.44 0 128.128-103.68 232.96-234.88 238.272h-5.888l-35.52 0.192a32 32 0 0 1-0.192-64l35.264-0.128 4.672-0.064c96.384-3.84 172.544-80.896 172.544-174.272 0-96.128-80.512-174.464-179.584-174.464h-1.984a32 32 0 0 1-32-25.28C695.872 264.96 604.736 192 497.92 192 381.824 192 285.44 277.76 274.816 388.48a32 32 0 0 1-28.352 28.8c-83.968 9.152-147.84 78.208-147.84 159.552l0.192 7.936c3.84 85.76 77.056 154.112 166.592 154.112h45.632a32 32 0 0 1 0 64h-45.632C142.016 802.944 40.32 708.032 34.88 586.88l-0.192-9.28c0-106.88 76.352-197.184 179.968-219.904C239.488 226.112 357.76 128 497.856 128z" p-id="7923"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/user.svg b/ruoyi-ui/src/assets/icons/svg/user.svg
new file mode 100644
index 0000000..0ba0716
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/user.svg
@@ -0,0 +1 @@
+<svg width="130" height="130" xmlns="http://www.w3.org/2000/svg"><path d="M63.444 64.996c20.633 0 37.359-14.308 37.359-31.953 0-17.649-16.726-31.952-37.359-31.952-20.631 0-37.36 14.303-37.358 31.952 0 17.645 16.727 31.953 37.359 31.953zM80.57 75.65H49.434c-26.652 0-48.26 18.477-48.26 41.27v2.664c0 9.316 21.608 9.325 48.26 9.325H80.57c26.649 0 48.256-.344 48.256-9.325v-2.663c0-22.794-21.605-41.271-48.256-41.271z" stroke="#979797"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/validCode.svg b/ruoyi-ui/src/assets/icons/svg/validCode.svg
new file mode 100644
index 0000000..cfb1021
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/validCode.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569580729849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1939" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M513.3 958.5c-142.2 0-397.9-222.1-401.6-440.5V268c1.7-39.6 31.7-72.3 71.1-77.3 49-4.6 97.1-16.5 142.7-35.3 47.8-14 91.9-38.3 129.4-71.1 30.3-24.4 72.9-26.3 105.3-4.6 39.9 30.7 83.8 55.9 130.5 74.6 48.6 14.7 98.2 25.9 148.4 33.7 38.5 7.6 67.1 40.3 69.5 79.5 3.3 84.9 2.5 169.9-2.6 254.7-33.7 281.6-253.7 436.4-392.7 436.3z m-0.1-813.7c-7.2-0.2-14.3 2-20 6.4-39.7 35.2-86.8 61.1-137.7 75.7-46.8 19.2-96.2 31-146.6 35.2-11 3.2-18.8 13-19.5 24.4v230.1c3.5 180.3 223.3 361 323.9 361s287.3-120.2 317.6-360.5c7.3-142.7 0-228.6 0-229.6-1.3-13.3-11-24.3-24-27.3-49.6-7.7-98.6-19-146.5-33.7-46.3-19.5-89.7-45.3-129-76.7-5.8-3.8-12.7-5.5-19.5-4.9l1.3-0.1z" fill="#C6CCDA" p-id="1940"></path><path d="M750.1 428L490.7 673.2c-11.7 11.1-29.5 12.9-43.1 4.2l-6.8-5.8-141.2-149.4c-9.3-9.3-12.7-22.9-9-35.5 3.8-12.6 14.1-22.1 27-24.8 12.9-2.7 26.1 1.9 34.6 11.9L469 597.5l233.7-221c14.6-12.8 36.8-11.6 49.9 2.7 13.2 14.2 11.5 35.3-2.5 48.8" fill="#C6CCDA" p-id="1941"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/wechat.svg b/ruoyi-ui/src/assets/icons/svg/wechat.svg
new file mode 100644
index 0000000..c586e55
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/wechat.svg
@@ -0,0 +1 @@
+<svg width="128" height="110" xmlns="http://www.w3.org/2000/svg"><path d="M86.635 33.334c1.467 0 2.917.113 4.358.283C87.078 14.392 67.58.111 45.321.111 20.44.111.055 17.987.055 40.687c0 13.104 6.781 23.863 18.115 32.209l-4.527 14.352 15.82-8.364c5.666 1.182 10.207 2.395 15.858 2.395 1.42 0 2.829-.073 4.227-.189-.886-3.19-1.398-6.53-1.398-9.996 0-20.845 16.98-37.76 38.485-37.76zm-24.34-12.936c3.407 0 5.665 2.363 5.665 5.954 0 3.576-2.258 5.97-5.666 5.97-3.392 0-6.795-2.395-6.795-5.97 0-3.591 3.403-5.954 6.795-5.954zM30.616 32.323c-3.393 0-6.818-2.395-6.818-5.971 0-3.591 3.425-5.954 6.818-5.954 3.392 0 5.65 2.363 5.65 5.954 0 3.576-2.258 5.97-5.65 5.97z"/><path d="M127.945 70.52c0-19.075-18.108-34.623-38.448-34.623-21.537 0-38.5 15.548-38.5 34.623 0 19.108 16.963 34.622 38.5 34.622 4.508 0 9.058-1.2 13.584-2.395l12.414 7.167-3.404-11.923c9.087-7.184 15.854-16.712 15.854-27.471zm-50.928-5.97c-2.254 0-4.53-2.362-4.53-4.773 0-2.378 2.276-4.771 4.53-4.771 3.422 0 5.665 2.393 5.665 4.771 0 2.41-2.243 4.773-5.665 4.773zm24.897 0c-2.24 0-4.498-2.362-4.498-4.773 0-2.378 2.258-4.771 4.498-4.771 3.392 0 5.665 2.393 5.665 4.771 0 2.41-2.273 4.773-5.665 4.773z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/zip.svg b/ruoyi-ui/src/assets/icons/svg/zip.svg
new file mode 100644
index 0000000..f806fc4
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/zip.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svgo.yml b/ruoyi-ui/src/assets/icons/svgo.yml
new file mode 100644
index 0000000..d11906a
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svgo.yml
@@ -0,0 +1,22 @@
+# replace default config
+
+# multipass: true
+# full: true
+
+plugins:
+
+  # - name
+  #
+  # or:
+  # - name: false
+  # - name: true
+  #
+  # or:
+  # - name:
+  #     param1: 1
+  #     param2: 2
+
+- removeAttrs:
+    attrs:
+      - 'fill'
+      - 'fill-rule'
diff --git a/ruoyi-ui/src/assets/images/dark.svg b/ruoyi-ui/src/assets/images/dark.svg
new file mode 100644
index 0000000..f646bd7
--- /dev/null
+++ b/ruoyi-ui/src/assets/images/dark.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" width="48" height="40" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" width="48" height="40" transform="translate(-1190.000000, -136.000000)">
+            <g id="Group-8" width="48" height="40" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5-Copy-5" filter="url(#filter-1)" transform="translate(25.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                    <rect id="Rectangle-18" fill="#303648" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/images/light.svg b/ruoyi-ui/src/assets/images/light.svg
new file mode 100644
index 0000000..ab7cc08
--- /dev/null
+++ b/ruoyi-ui/src/assets/images/light.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" transform="translate(-1254.000000, -136.000000)">
+            <g id="Group-8" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5" filter="url(#filter-1)" transform="translate(89.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-18" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background.jpg
new file mode 100644
index 0000000..8a89eb8
Binary files /dev/null and b/ruoyi-ui/src/assets/images/login-background.jpg differ
diff --git a/ruoyi-ui/src/assets/images/profile.jpg b/ruoyi-ui/src/assets/images/profile.jpg
new file mode 100644
index 0000000..b3a940b
Binary files /dev/null and b/ruoyi-ui/src/assets/images/profile.jpg differ
diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png
new file mode 100644
index 0000000..e263760
Binary files /dev/null and b/ruoyi-ui/src/assets/logo/logo.png differ
diff --git a/ruoyi-ui/src/assets/styles/btn.scss b/ruoyi-ui/src/assets/styles/btn.scss
new file mode 100644
index 0000000..e6ba1a8
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/btn.scss
@@ -0,0 +1,99 @@
+@import './variables.scss';
+
+@mixin colorBtn($color) {
+  background: $color;
+
+  &:hover {
+    color: $color;
+
+    &:before,
+    &:after {
+      background: $color;
+    }
+  }
+}
+
+.blue-btn {
+  @include colorBtn($blue)
+}
+
+.light-blue-btn {
+  @include colorBtn($light-blue)
+}
+
+.red-btn {
+  @include colorBtn($red)
+}
+
+.pink-btn {
+  @include colorBtn($pink)
+}
+
+.green-btn {
+  @include colorBtn($green)
+}
+
+.tiffany-btn {
+  @include colorBtn($tiffany)
+}
+
+.yellow-btn {
+  @include colorBtn($yellow)
+}
+
+.pan-btn {
+  font-size: 14px;
+  color: #fff;
+  padding: 14px 36px;
+  border-radius: 8px;
+  border: none;
+  outline: none;
+  transition: 600ms ease all;
+  position: relative;
+  display: inline-block;
+
+  &:hover {
+    background: #fff;
+
+    &:before,
+    &:after {
+      width: 100%;
+      transition: 600ms ease all;
+    }
+  }
+
+  &:before,
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 2px;
+    width: 0;
+    transition: 400ms ease all;
+  }
+
+  &::after {
+    right: inherit;
+    top: inherit;
+    left: 0;
+    bottom: 0;
+  }
+}
+
+.custom-button {
+  display: inline-block;
+  line-height: 1;
+  white-space: nowrap;
+  cursor: pointer;
+  background: #fff;
+  color: #fff;
+  -webkit-appearance: none;
+  text-align: center;
+  box-sizing: border-box;
+  outline: 0;
+  margin: 0;
+  padding: 10px 15px;
+  font-size: 14px;
+  border-radius: 4px;
+}
diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss
new file mode 100644
index 0000000..363092a
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/element-ui.scss
@@ -0,0 +1,92 @@
+// cover some element-ui styles
+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+.cell {
+  .el-tag {
+    margin-right: 0px;
+  }
+}
+
+.small-padding {
+  .cell {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
+.fixed-width {
+  .el-button--mini {
+    padding: 7px 10px;
+    width: 60px;
+  }
+}
+
+.status-col {
+  .cell {
+    padding: 0 10px;
+    text-align: center;
+
+    .el-tag {
+      margin-right: 0px;
+    }
+  }
+}
+
+// to fixed https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+// refine element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}
+
+// dropdown
+.el-dropdown-menu {
+  a {
+    display: block
+  }
+}
+
+// fix date-picker ui bug in filter-item
+.el-range-editor.el-input__inner {
+  display: inline-flex !important;
+}
+
+// to fix el-date-picker css style
+.el-range-separator {
+  box-sizing: content-box;
+}
+
+.el-menu--collapse
+  > div
+  > .el-submenu
+  > .el-submenu__title
+  .el-submenu__icon-arrow {
+  display: none;
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss
new file mode 100644
index 0000000..8b7a48e
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/element-variables.scss
@@ -0,0 +1,31 @@
+/**
+* I think element-ui's default theme color is too light for long-term use.
+* So I modified the default color and you can modify it to your liking.
+**/
+
+/* theme color */
+$--color-primary: #1890ff;
+$--color-success: #13ce66;
+$--color-warning: #ffba00;
+$--color-danger: #ff4949;
+// $--color-info: #1E1E1E;
+
+$--button-font-weight: 400;
+
+// $--color-text-regular: #1f2d3d;
+
+$--border-color-light: #dfe4ed;
+$--border-color-lighter: #e6ebf5;
+
+$--table-border:1px solid#dfe6ec;
+
+/* icon font path, required */
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
+
+@import "~element-ui/packages/theme-chalk/src/index";
+
+// the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+:export {
+  theme: $--color-primary;
+}
diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss
new file mode 100644
index 0000000..96095ef
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/index.scss
@@ -0,0 +1,191 @@
+@import './variables.scss';
+@import './mixin.scss';
+@import './transition.scss';
+@import './element-ui.scss';
+@import './sidebar.scss';
+@import './btn.scss';
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+label {
+  font-weight: 700;
+}
+
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+#app {
+  height: 100%;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+.no-padding {
+  padding: 0px !important;
+}
+
+.padding-content {
+  padding: 4px 0;
+}
+
+a:focus,
+a:active {
+  outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+}
+
+div:focus {
+  outline: none;
+}
+
+.fr {
+  float: right;
+}
+
+.fl {
+  float: left;
+}
+
+.pr-5 {
+  padding-right: 5px;
+}
+
+.pl-5 {
+  padding-left: 5px;
+}
+
+.block {
+  display: block;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.inlineBlock {
+  display: block;
+}
+
+.clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    font-size: 0;
+    content: " ";
+    clear: both;
+    height: 0;
+  }
+}
+
+aside {
+  background: #eef1f6;
+  padding: 8px 24px;
+  margin-bottom: 20px;
+  border-radius: 2px;
+  display: block;
+  line-height: 32px;
+  font-size: 16px;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  color: #2c3e50;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  a {
+    color: #337ab7;
+    cursor: pointer;
+
+    &:hover {
+      color: rgb(32, 160, 255);
+    }
+  }
+}
+
+//main-container全局样式
+.app-container {
+  padding: 20px;
+}
+
+.components-container {
+  margin: 30px 50px;
+  position: relative;
+}
+
+.pagination-container {
+  margin-top: 30px;
+}
+
+.text-center {
+  text-align: center
+}
+
+.sub-navbar {
+  height: 50px;
+  line-height: 50px;
+  position: relative;
+  width: 100%;
+  text-align: right;
+  padding-right: 20px;
+  transition: 600ms ease position;
+  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+  .subtitle {
+    font-size: 20px;
+    color: #fff;
+  }
+
+  &.draft {
+    background: #d0d0d0;
+  }
+
+  &.deleted {
+    background: #d0d0d0;
+  }
+}
+
+.link-type,
+.link-type:focus {
+  color: #337ab7;
+  cursor: pointer;
+
+  &:hover {
+    color: rgb(32, 160, 255);
+  }
+}
+
+.filter-container {
+  padding-bottom: 10px;
+
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+  }
+}
+
+//refine vue-multiselect plugin
+.multiselect {
+  line-height: 16px;
+}
+
+.multiselect--active {
+  z-index: 1000 !important;
+}
diff --git a/ruoyi-ui/src/assets/styles/mixin.scss b/ruoyi-ui/src/assets/styles/mixin.scss
new file mode 100644
index 0000000..06fa061
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/mixin.scss
@@ -0,0 +1,66 @@
+@mixin clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin scrollBar {
+  &::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #99a9bf;
+    border-radius: 20px;
+  }
+}
+
+@mixin relative {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+@mixin pct($pct) {
+  width: #{$pct};
+  position: relative;
+  margin: 0 auto;
+}
+
+@mixin triangle($width, $height, $color, $direction) {
+  $width: $width/2;
+  $color-border-style: $height solid $color;
+  $transparent-border-style: $width solid transparent;
+  height: 0;
+  width: 0;
+
+  @if $direction==up {
+    border-bottom: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==right {
+    border-left: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+
+  @else if $direction==down {
+    border-top: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==left {
+    border-right: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+}
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
new file mode 100644
index 0000000..c4b4365
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -0,0 +1,266 @@
+ /**
+ * 通用css样式布局处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+ /** 基础通用 **/
+.pt5 {
+	padding-top: 5px;
+}
+.pr5 {
+	padding-right: 5px;
+}
+.pb5 {
+	padding-bottom: 5px;
+}
+.mt5 {
+	margin-top: 5px;
+}
+.mr5 {
+	margin-right: 5px;
+}
+.mb5 {
+	margin-bottom: 5px;
+}
+.mb8 {
+	margin-bottom: 8px;
+}
+.ml5 {
+	margin-left: 5px;
+}
+.mt10 {
+	margin-top: 10px;
+}
+.mr10 {
+	margin-right: 10px;
+}
+.mb10 {
+	margin-bottom: 10px;
+}
+.ml0 {
+	margin-left: 10px;
+}
+.mt20 {
+	margin-top: 20px;
+}
+.mr20 {
+	margin-right: 20px;
+}
+.mb20 {
+	margin-bottom: 20px;
+}
+.m20 {
+	margin-left: 20px;
+}
+
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit;
+}
+
+.el-dialog:not(.is-fullscreen){
+	margin-top: 6vh !important;
+}
+
+.el-table {
+	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
+		th {
+			word-break: break-word;
+			background-color: #f8f8f9;
+			color: #515a6e;
+			height: 40px;
+			font-size: 13px;
+		}
+	}
+	.el-table__body-wrapper {
+		.el-button [class*="el-icon-"] + span {
+			margin-left: 1px;
+		}
+	}
+}
+
+/** 表单布局 **/
+.form-header {
+    font-size:15px;
+	color:#6379bb;
+	border-bottom:1px solid #ddd;
+	margin:8px 10px 25px 10px;
+	padding-bottom:5px
+}
+
+/** 表格布局 **/
+.pagination-container {
+	position: relative;
+	height: 25px;
+	margin-bottom: 10px;
+	margin-top: 15px;
+	padding: 10px 20px !important;
+}
+
+/* tree border */
+.tree-border {
+    margin-top: 5px;
+    border: 1px solid #e5e6e7;
+    background: #FFFFFF none;
+    border-radius:4px;
+}
+
+.pagination-container .el-pagination {
+	right: 0;
+	position: absolute;
+}
+
+@media ( max-width : 768px) {
+  .pagination-container .el-pagination > .el-pagination__jump {
+    display: none !important;
+  }
+  .pagination-container .el-pagination > .el-pagination__sizes {
+    display: none !important;
+  }
+}
+
+.el-table .fixed-width .el-button--mini {
+	padding-left: 0;
+	padding-right: 0;
+	width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link {
+	cursor: pointer;
+	color: #1890ff;
+	margin-left: 5px;
+}
+
+.el-table .el-dropdown, .el-icon-arrow-down {
+	font-size: 12px;
+}
+
+.el-tree-node__content > .el-checkbox {
+	margin-right: 8px;
+}
+
+.list-group-striped > .list-group-item {
+	border-left: 0;
+	border-right: 0;
+	border-radius: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.list-group {
+	padding-left: 0px;
+	list-style: none;
+}
+
+.list-group-item {
+	border-bottom: 1px solid #e7eaec;
+	border-top: 1px solid #e7eaec;
+	margin-bottom: -1px;
+	padding: 11px 0px;
+	font-size: 13px;
+}
+
+.pull-right {
+	float: right !important;
+}
+
+.el-card__header {
+	padding: 14px 15px 7px;
+	min-height: 40px;
+}
+
+.el-card__body {
+	padding: 15px 20px 20px 20px;
+}
+
+.card-box {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-bottom: 10px;
+}
+
+/* button color */
+.el-button--cyan.is-active,
+.el-button--cyan:active {
+  background: #20B2AA;
+  border-color: #20B2AA;
+  color: #FFFFFF;
+}
+
+.el-button--cyan:focus,
+.el-button--cyan:hover {
+  background: #48D1CC;
+  border-color: #48D1CC;
+  color: #FFFFFF;
+}
+
+.el-button--cyan {
+  background-color: #20B2AA;
+  border-color: #20B2AA;
+  color: #FFFFFF;
+}
+
+/* text color */
+.text-navy {
+	color: #1ab394;
+}
+
+.text-primary {
+	color: inherit;
+}
+
+.text-success {
+	color: #1c84c6;
+}
+
+.text-info {
+	color: #23c6c8;
+}
+
+.text-warning {
+	color: #f8ac59;
+}
+
+.text-danger {
+	color: #ed5565;
+}
+
+.text-muted {
+	color: #888888;
+}
+
+/* image */
+.img-circle {
+	border-radius: 50%;
+}
+
+.img-lg {
+	width: 120px;
+	height: 120px;
+}
+
+.avatar-upload-preview {
+	position: absolute;
+	top: 50%;
+	transform: translate(50%, -50%);
+	width: 200px;
+	height: 200px;
+	border-radius: 50%;
+	box-shadow: 0 0 4px #ccc;
+	overflow: hidden;
+}
+
+/* 拖拽列样式 */
+.sortable-ghost{
+	opacity: .8;
+	color: #fff!important;
+	background: #42b983!important;
+}
+
+.top-right-btn {
+	position: relative;
+	float: right;
+}
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
new file mode 100644
index 0000000..2f368c3
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -0,0 +1,223 @@
+#app {
+
+  .main-container {
+    min-height: 100%;
+    transition: margin-left .28s;
+    margin-left: $sideBarWidth;
+    position: relative;
+  }
+
+  .sidebar-container {
+    -webkit-transition: width .28s;
+    transition: width 0.28s;
+    width: $sideBarWidth !important;
+    background-color: $menuBg;
+    height: 100%;
+    position: fixed;
+    font-size: 0px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1001;
+    overflow: hidden;
+    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+
+    // reset element-ui css
+    .horizontal-collapse-transition {
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+    }
+
+    .scrollbar-wrapper {
+      overflow-x: hidden !important;
+    }
+
+    .el-scrollbar__bar.is-vertical {
+      right: 0px;
+    }
+
+    .el-scrollbar {
+      height: 100%;
+    }
+
+    &.has-logo {
+      .el-scrollbar {
+        height: calc(100% - 50px);
+      }
+    }
+
+    .is-horizontal {
+      display: none;
+    }
+
+    a {
+      display: inline-block;
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .svg-icon {
+      margin-right: 16px;
+    }
+
+    .el-menu {
+      border: none;
+      height: 100%;
+      width: 100% !important;
+    }
+
+    .el-menu-item, .el-submenu__title {
+      overflow: hidden !important;
+      text-overflow: ellipsis !important;
+      white-space: nowrap !important;
+    }
+
+    // menu hover
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: rgba(0, 0, 0, 0.06) !important;
+      }
+    }
+
+    & .theme-dark .is-active > .el-submenu__title {
+      color: $subMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      min-width: $sideBarWidth !important;
+
+      &:hover {
+        background-color: rgba(0, 0, 0, 0.06) !important;
+      }
+    }
+
+    & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
+    & .theme-dark .el-submenu .el-menu-item {
+      background-color: $subMenuBg !important;
+
+      &:hover {
+        background-color: $subMenuHover !important;
+      }
+    }
+  }
+
+  .hideSidebar {
+    .sidebar-container {
+      width: 54px !important;
+    }
+
+    .main-container {
+      margin-left: 54px;
+    }
+
+    .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 20px;
+        }
+      }
+    }
+
+    .el-submenu {
+      overflow: hidden;
+
+      &>.el-submenu__title {
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 20px;
+        }
+
+      }
+    }
+
+    .el-menu--collapse {
+      .el-submenu {
+        &>.el-submenu__title {
+          &>span {
+            height: 0;
+            width: 0;
+            overflow: hidden;
+            visibility: hidden;
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+
+  .el-menu--collapse .el-menu .el-submenu {
+    min-width: $sideBarWidth !important;
+  }
+
+  // mobile responsive
+  .mobile {
+    .main-container {
+      margin-left: 0px;
+    }
+
+    .sidebar-container {
+      transition: transform .28s;
+      width: $sideBarWidth !important;
+    }
+
+    &.hideSidebar {
+      .sidebar-container {
+        pointer-events: none;
+        transition-duration: 0.3s;
+        transform: translate3d(-$sideBarWidth, 0, 0);
+      }
+    }
+  }
+
+  .withoutAnimation {
+
+    .main-container,
+    .sidebar-container {
+      transition: none;
+    }
+  }
+}
+
+// when menu collapsed
+.el-menu--vertical {
+  &>.el-menu {
+    .svg-icon {
+      margin-right: 16px;
+    }
+  }
+
+  .nest-menu .el-submenu>.el-submenu__title,
+  .el-menu-item {
+    &:hover {
+      // you can use $subMenuHover
+      background-color: rgba(0, 0, 0, 0.06) !important;
+    }
+  }
+
+  // the scroll bar appears when the subMenu is too long
+  >.el-menu--popup {
+    max-height: 100vh;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar-track-piece {
+      background: #d3dce6;
+    }
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #99a9bf;
+      border-radius: 20px;
+    }
+  }
+}
diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/ruoyi-ui/src/assets/styles/transition.scss
new file mode 100644
index 0000000..4cb27cc
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/transition.scss
@@ -0,0 +1,48 @@
+// global transition css
+
+/* fade */
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.28s;
+}
+
+.fade-enter,
+.fade-leave-active {
+  opacity: 0;
+}
+
+/* fade-transform */
+.fade-transform-leave-active,
+.fade-transform-enter-active {
+  transition: all .5s;
+}
+
+.fade-transform-enter {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.fade-transform-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
+
+/* breadcrumb transition */
+.breadcrumb-enter-active,
+.breadcrumb-leave-active {
+  transition: all .5s;
+}
+
+.breadcrumb-enter,
+.breadcrumb-leave-active {
+  opacity: 0;
+  transform: translateX(20px);
+}
+
+.breadcrumb-move {
+  transition: all .5s;
+}
+
+.breadcrumb-leave-active {
+  position: absolute;
+}
diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/ruoyi-ui/src/assets/styles/variables.scss
new file mode 100644
index 0000000..452a1ec
--- /dev/null
+++ b/ruoyi-ui/src/assets/styles/variables.scss
@@ -0,0 +1,44 @@
+// base color
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+
+// sidebar
+$menuText:#bfcbd9;
+$menuActiveText:#409EFF;
+$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+
+$menuBg:#304156;
+$menuHover:#263445;
+$sidebarTitle: #ffffff;
+
+$menuLightBg:#ffffff;
+$menuLightHover:#f0f1f5;
+$sidebarLightTitle: #001529;
+
+$subMenuBg:#1f2d3d;
+$subMenuHover:#001528;
+
+$sideBarWidth: 200px;
+
+// the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+:export {
+  menuText: $menuText;
+  menuActiveText: $menuActiveText;
+  subMenuActiveText: $subMenuActiveText;
+  menuBg: $menuBg;
+  menuHover: $menuHover;
+  menuLightBg: $menuLightBg;
+  menuLightHover: $menuLightHover;
+  subMenuBg: $subMenuBg;
+  subMenuHover: $subMenuHover;
+  sideBarWidth: $sideBarWidth;
+  sidebarTitle: $sidebarTitle;
+  sidebarLightTitle: $sidebarLightTitle
+}
diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/ruoyi-ui/src/components/Breadcrumb/index.vue
new file mode 100644
index 0000000..1fbae5f
--- /dev/null
+++ b/ruoyi-ui/src/components/Breadcrumb/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <el-breadcrumb class="app-breadcrumb" separator="/">
+    <transition-group name="breadcrumb">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+      </el-breadcrumb-item>
+    </transition-group>
+  </el-breadcrumb>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      levelList: null
+    }
+  },
+  watch: {
+    $route(route) {
+      // if you go to the redirect page, do not update the breadcrumbs
+      if (route.path.startsWith('/redirect/')) {
+        return
+      }
+      this.getBreadcrumb()
+    }
+  },
+  created() {
+    this.getBreadcrumb()
+  },
+  methods: {
+    getBreadcrumb() {
+      // only show routes with meta.title
+      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+      const first = matched[0]
+
+      if (!this.isDashboard(first)) {
+        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+      }
+
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+    },
+    isDashboard(route) {
+      const name = route && route.name
+      if (!name) {
+        return false
+      }
+      return name.trim() === 'Index'
+    },
+    handleLink(item) {
+      const { redirect, path } = item
+      if (redirect) {
+        this.$router.push(redirect)
+        return
+      }
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+
+  .no-redirect {
+    color: #97a8be;
+    cursor: text;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
new file mode 100644
index 0000000..7431bbb
--- /dev/null
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <template v-for="(item, index) in options">
+      <template v-if="values.includes(item.dictValue)">
+        <span
+          v-if="item.listClass == 'default' || item.listClass == ''"
+          :key="item.dictValue"
+          :index="index"
+          :class="item.cssClass"
+          >{{ item.dictLabel }}</span
+        >
+        <el-tag
+          v-else
+          :key="item.dictValue"
+          :index="index"
+          :type="item.listClass == 'primary' ? '' : item.listClass"
+          :class="item.cssClass"
+        >
+          {{ item.dictLabel }}
+        </el-tag>
+      </template>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "DictTag",
+  props: {
+    options: {
+      type: Array,
+      default: null,
+    },
+    value: [String, Array],
+  },
+  computed: {
+    values() {
+      if (this.value) {
+        return Array.isArray(this.value) ? this.value : [this.value];
+      } else {
+        return [];
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
new file mode 100644
index 0000000..a7a69a6
--- /dev/null
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -0,0 +1,277 @@
+<template>
+  <div>
+    <el-upload
+      :action="uploadUrl"
+      :before-upload="handleBeforeUpload"
+      :on-success="handleUploadSuccess"
+      :on-error="handleUploadError"
+      name="file"
+      :show-file-list="false"
+      :headers="headers"
+      style="display: none"
+      ref="upload"
+      v-if="this.type == 'url'"
+    >
+    </el-upload>
+    <div class="editor" ref="editor" :style="styles"></div>
+  </div>
+</template>
+
+<script>
+import Quill from "quill";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+import { getToken } from "@/utils/auth";
+
+export default {
+  name: "Editor",
+  props: {
+    /* 编辑器的内容 */
+    value: {
+      type: String,
+      default: "",
+    },
+    /* 高度 */
+    height: {
+      type: Number,
+      default: null,
+    },
+    /* 最小高度 */
+    minHeight: {
+      type: Number,
+      default: null,
+    },
+    /* 只读 */
+    readOnly: {
+      type: Boolean,
+      default: false,
+    },
+    // 上传文件大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    /* 类型（base64格式、url格式） */
+    type: {
+      type: String,
+      default: "url",
+    }
+  },
+  data() {
+    return {
+      VUE_APP_IMG_URL: process.env.VUE_APP_IMG_URL,
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
+      Quill: null,
+      currentValue: "",
+      options: {
+        theme: "snow",
+        bounds: document.body,
+        debug: "warn",
+        modules: {
+          // 工具栏配置
+          toolbar: [
+            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
+            ["blockquote", "code-block"],                    // 引用  代码块
+            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
+            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
+            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
+            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
+            [{ align: [] }],                                 // 对齐方式
+            ["clean"],                                       // 清除文本格式
+            ["link", "image", "video"]                       // 链接、图片、视频
+          ],
+        },
+        placeholder: "请输入内容",
+        readOnly: this.readOnly,
+      },
+    };
+  },
+  computed: {
+    styles() {
+      let style = {};
+      if (this.minHeight) {
+        style.minHeight = `${this.minHeight}px`;
+      }
+      if (this.height) {
+        style.height = `${this.height}px`;
+      }
+      return style;
+    },
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val !== this.currentValue) {
+          this.currentValue = val === null ? "" : val;
+          if (this.Quill) {
+            this.Quill.pasteHTML(this.currentValue);
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  beforeDestroy() {
+    this.Quill = null;
+  },
+  methods: {
+    init() {
+      const editor = this.$refs.editor;
+      this.Quill = new Quill(editor, this.options);
+      // 如果设置了上传地址则自定义图片上传事件
+      if (this.type == 'url') {
+        let toolbar = this.Quill.getModule("toolbar");
+        toolbar.addHandler("image", (value) => {
+          this.uploadType = "image";
+          if (value) {
+            this.$refs.upload.$children[0].$refs.input.click();
+          } else {
+            this.quill.format("image", false);
+          }
+        });
+      }
+      this.Quill.pasteHTML(this.currentValue);
+      this.Quill.on("text-change", (delta, oldDelta, source) => {
+        const html = this.$refs.editor.children[0].innerHTML;
+        const text = this.Quill.getText();
+        const quill = this.Quill;
+        this.currentValue = html;
+        this.$emit("input", html);
+        this.$emit("on-change", { html, text, quill });
+      });
+      this.Quill.on("text-change", (delta, oldDelta, source) => {
+        this.$emit("on-text-change", delta, oldDelta, source);
+      });
+      this.Quill.on("selection-change", (range, oldRange, source) => {
+        this.$emit("on-selection-change", range, oldRange, source);
+      });
+      this.Quill.on("editor-change", (eventName, ...args) => {
+        this.$emit("on-editor-change", eventName, ...args);
+      });
+    },
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
+    handleUploadSuccess(res, file) {
+      // 获取富文本组件实例
+      let quill = this.Quill;
+      // 如果上传成功
+      if (res.code == 200) {
+        // 获取光标所在位置
+        let length = quill.getSelection().index;
+        // 插入图片  res.url为服务器返回的图片地址
+        /*quill.insertEmbed(length, "image", process.env.VUE_APP_IMG_URL + process.env.VUE_APP_BASE_API + res.fileName);
+        console.log("handleUploadSuccess with : " + process.env.VUE_APP_IMG_URL + process.env.VUE_APP_BASE_API + "---" + this.VUE_APP_IMG_URL)*/
+
+        // quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + '/' + res.fileName);
+        quill.insertEmbed(length, "image", res.url);
+        // 调整光标到最后
+        quill.setSelection(length + 1);
+      } else {
+        this.$message.error("图片插入失败");
+      }
+    },
+    handleUploadError() {
+      this.$message.error("图片插入失败");
+    },
+  },
+};
+</script>
+
+<style>
+.editor, .ql-toolbar {
+  white-space: pre-wrap !important;
+  line-height: normal !important;
+}
+.quill-img {
+  display: none;
+}
+.ql-snow .ql-tooltip[data-mode="link"]::before {
+  content: "请输入链接地址:";
+}
+.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
+  border-right: 0px;
+  content: "保存";
+  padding-right: 0px;
+}
+
+.ql-snow .ql-tooltip[data-mode="video"]::before {
+  content: "请输入视频地址:";
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+  content: "14px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
+  content: "10px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
+  content: "18px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
+  content: "32px";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item::before {
+  content: "文本";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
+  content: "标题1";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
+  content: "标题2";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
+  content: "标题3";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
+  content: "标题4";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
+  content: "标题5";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
+  content: "标题6";
+}
+
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+  content: "标准字体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
+  content: "衬线字体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
+  content: "等宽字体";
+}
+</style>
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
new file mode 100644
index 0000000..0d6ebc0
--- /dev/null
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="upload-file">
+    <el-upload
+      :action="uploadFileUrl"
+      :before-upload="handleBeforeUpload"
+      :file-list="fileList"
+      :limit="limit"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      :on-success="handleUploadSuccess"
+      :show-file-list="false"
+      :headers="headers"
+      class="upload-file-uploader"
+      ref="upload"
+    >
+      <!-- 上传按钮 -->
+      <el-button size="mini" type="primary">选取文件</el-button>
+      <!-- 上传提示 -->
+      <div class="el-upload__tip" slot="tip" v-if="showTip">
+        请上传
+        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        的文件
+      </div>
+    </el-upload>
+
+    <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
+        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+        </div>
+      </li>
+    </transition-group>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+
+export default {
+  name: "FileUpload",
+  props: {
+    // 值
+    value: [String, Object, Array],
+    // 数量限制
+    limit: {
+      type: Number,
+      default: 5,
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val) {
+          let temp = 1;
+          // 首先将值转为数组
+          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 然后将数组转为对象数组
+          this.fileList = list.map(item => {
+            if (typeof item === "string") {
+              item = { name: item, url: item };
+            }
+            item.uid = item.uid || new Date().getTime() + temp++;
+            return item;
+          });
+        } else {
+          this.fileList = [];
+          return [];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+  },
+  methods: {
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      if (this.fileType) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        const isTypeOk = this.fileType.some((type) => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+        if (!isTypeOk) {
+          this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          return false;
+        }
+      }
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$message.error("上传失败, 请重试");
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      this.$message.success("上传成功");
+      this.fileList.push({ name: res.fileName, url: res.fileName });
+      this.$emit("input", this.listToString(this.fileList));
+    },
+    // 删除文件
+    handleDelete(index) {
+      this.fileList.splice(index, 1);
+      this.$emit("input", this.listToString(this.fileList));
+    },
+    // 获取文件名称
+    getFileName(name) {
+      if (name.lastIndexOf("/") > -1) {
+        return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+      } else {
+        return "";
+      }
+    },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url + separator;
+      }
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/Hamburger/index.vue b/ruoyi-ui/src/components/Hamburger/index.vue
new file mode 100644
index 0000000..368b002
--- /dev/null
+++ b/ruoyi-ui/src/components/Hamburger/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <div style="padding: 0 15px;" @click="toggleClick">
+    <svg
+      :class="{'is-active':isActive}"
+      class="hamburger"
+      viewBox="0 0 1024 1024"
+      xmlns="http://www.w3.org/2000/svg"
+      width="64"
+      height="64"
+    >
+      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
+    </svg>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Hamburger',
+  props: {
+    isActive: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    toggleClick() {
+      this.$emit('toggleClick')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.hamburger {
+  display: inline-block;
+  vertical-align: middle;
+  width: 20px;
+  height: 20px;
+}
+
+.hamburger.is-active {
+  transform: rotate(180deg);
+}
+</style>
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
new file mode 100644
index 0000000..c44eff5
--- /dev/null
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -0,0 +1,190 @@
+<template>
+  <div :class="{'show':show}" class="header-search">
+    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+    <el-select
+      ref="headerSearchSelect"
+      v-model="search"
+      :remote-method="querySearch"
+      filterable
+      default-first-option
+      remote
+      placeholder="Search"
+      class="header-search-select"
+      @change="change"
+    >
+      <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+// fuse is a lightweight fuzzy-search module
+// make search results more in line with expectations
+import Fuse from 'fuse.js/dist/fuse.min.js'
+import path from 'path'
+
+export default {
+  name: 'HeaderSearch',
+  data() {
+    return {
+      search: '',
+      options: [],
+      searchPool: [],
+      show: false,
+      fuse: undefined
+    }
+  },
+  computed: {
+    routes() {
+      return this.$store.getters.permission_routes
+    }
+  },
+  watch: {
+    routes() {
+      this.searchPool = this.generateRoutes(this.routes)
+    },
+    searchPool(list) {
+      this.initFuse(list)
+    },
+    show(value) {
+      if (value) {
+        document.body.addEventListener('click', this.close)
+      } else {
+        document.body.removeEventListener('click', this.close)
+      }
+    }
+  },
+  mounted() {
+    this.searchPool = this.generateRoutes(this.routes)
+  },
+  methods: {
+    click() {
+      this.show = !this.show
+      if (this.show) {
+        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+      }
+    },
+    close() {
+      this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+      this.options = []
+      this.show = false
+    },
+    change(val) {
+      const path = val.path;
+      if(this.ishttp(val.path)) {
+        // http(s):// 路径新窗口打开
+        const pindex = path.indexOf("http");
+        window.open(path.substr(pindex, path.length), "_blank");
+      } else {
+        this.$router.push(val.path)
+      }
+      this.search = ''
+      this.options = []
+      this.$nextTick(() => {
+        this.show = false
+      })
+    },
+    initFuse(list) {
+      this.fuse = new Fuse(list, {
+        shouldSort: true,
+        threshold: 0.4,
+        location: 0,
+        distance: 100,
+        maxPatternLength: 32,
+        minMatchCharLength: 1,
+        keys: [{
+          name: 'title',
+          weight: 0.7
+        }, {
+          name: 'path',
+          weight: 0.3
+        }]
+      })
+    },
+    // Filter out the routes that can be displayed in the sidebar
+    // And generate the internationalized title
+    generateRoutes(routes, basePath = '/', prefixTitle = []) {
+      let res = []
+
+      for (const router of routes) {
+        // skip hidden router
+        if (router.hidden) { continue }
+
+        const data = {
+          path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
+          title: [...prefixTitle]
+        }
+
+        if (router.meta && router.meta.title) {
+          data.title = [...data.title, router.meta.title]
+
+          if (router.redirect !== 'noRedirect') {
+            // only push the routes with title
+            // special case: need to exclude parent router without redirect
+            res.push(data)
+          }
+        }
+
+        // recursive child routes
+        if (router.children) {
+          const tempRoutes = this.generateRoutes(router.children, data.path, data.title)
+          if (tempRoutes.length >= 1) {
+            res = [...res, ...tempRoutes]
+          }
+        }
+      }
+      return res
+    },
+    querySearch(query) {
+      if (query !== '') {
+        this.options = this.fuse.search(query)
+      } else {
+        this.options = []
+      }
+    },
+    ishttp(url) {
+      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.header-search {
+  font-size: 0 !important;
+
+  .search-icon {
+    cursor: pointer;
+    font-size: 18px;
+    vertical-align: middle;
+  }
+
+  .header-search-select {
+    font-size: 18px;
+    transition: width 0.2s;
+    width: 0;
+    overflow: hidden;
+    background: transparent;
+    border-radius: 0;
+    display: inline-block;
+    vertical-align: middle;
+
+    ::v-deep .el-input__inner {
+      border-radius: 0;
+      border: 0;
+      padding-left: 0;
+      padding-right: 0;
+      box-shadow: none !important;
+      border-bottom: 1px solid #d9d9d9;
+      vertical-align: middle;
+    }
+  }
+
+  &.show {
+    .header-search-select {
+      width: 210px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue
new file mode 100644
index 0000000..b0ec9fa
--- /dev/null
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -0,0 +1,68 @@
+<!-- @author zhengjie -->
+<template>
+  <div class="icon-body">
+    <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input.native="filterIcons">
+      <i slot="suffix" class="el-icon-search el-input__icon" />
+    </el-input>
+    <div class="icon-list">
+      <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
+        <svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
+        <span>{{ item }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import icons from './requireIcons'
+export default {
+  name: 'IconSelect',
+  data() {
+    return {
+      name: '',
+      iconList: icons
+    }
+  },
+  methods: {
+    filterIcons() {
+      this.iconList = icons
+      if (this.name) {
+        this.iconList = this.iconList.filter(item => item.includes(this.name))
+      }
+    },
+    selectedIcon(name) {
+      this.$emit('selected', name)
+      document.body.click()
+    },
+    reset() {
+      this.name = ''
+      this.iconList = icons
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .icon-body {
+    width: 100%;
+    padding: 10px;
+    .icon-list {
+      height: 200px;
+      overflow-y: scroll;
+      div {
+        height: 30px;
+        line-height: 30px;
+        margin-bottom: -5px;
+        cursor: pointer;
+        width: 33%;
+        float: left;
+      }
+      span {
+        display: inline-block;
+        vertical-align: -0.15em;
+        fill: currentColor;
+        overflow: hidden;
+      }
+    }
+  }
+</style>
diff --git a/ruoyi-ui/src/components/IconSelect/requireIcons.js b/ruoyi-ui/src/components/IconSelect/requireIcons.js
new file mode 100644
index 0000000..99e5c54
--- /dev/null
+++ b/ruoyi-ui/src/components/IconSelect/requireIcons.js
@@ -0,0 +1,11 @@
+
+const req = require.context('../../assets/icons/svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys()
+
+const re = /\.\/(.*)\.svg/
+
+const icons = requireAll(req).map(i => {
+  return i.match(re)[1]
+})
+
+export default icons
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
new file mode 100644
index 0000000..054cde1
--- /dev/null
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="component-upload-image">
+    <el-upload
+      :action="uploadImgUrl"
+      list-type="picture-card"
+      :on-success="handleUploadSuccess"
+      :before-upload="handleBeforeUpload"
+      :limit="limit"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      name="file"
+      :on-remove="handleRemove"
+      :show-file-list="true"
+      :headers="headers"
+      :file-list="fileList"
+      :on-preview="handlePictureCardPreview"
+      :class="{hide: this.fileList.length >= this.limit}"
+    >
+      <i class="el-icon-plus"></i>
+    </el-upload>
+
+    <!-- 上传提示 -->
+    <div class="el-upload__tip" slot="tip" v-if="showTip">
+      请上传
+      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      的文件
+    </div>
+
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="预览"
+      width="800"
+      append-to-body
+    >
+      <img
+        :src="dialogImageUrl"
+        style="display: block; max-width: 100%; margin: 0 auto"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: {
+    value: [String, Object, Array],
+    // 图片数量限制
+    limit: {
+      type: Number,
+      default: 5,
+    },
+    // 大小限制(MB)
+    fileSize: {
+       type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["png", "jpg", "jpeg", "gif"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogImageUrl: "",
+      dialogVisible: false,
+      hideUpload: false,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: []
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val) {
+          // 首先将值转为数组
+          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 然后将数组转为对象数组
+          this.fileList = list.map(item => {
+            // console.log("watch value handler ===> " + this.baseUrl + " ---> " + item)
+            if (typeof item === "string") {
+              if (item.indexOf(this.baseUrl) === -1) {
+                  item = { name: this.baseUrl + item, url: item };
+                  // item = { name: this.baseUrl + item, url: this.baseUrl + item };
+              } else {
+                  item = { name: item, url: item };
+              }
+            }
+            return item;
+          });
+        } else {
+          this.fileList = [];
+          return [];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+  },
+  methods: {
+    // 删除图片
+    handleRemove(file, fileList) {
+      const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      this.fileList.splice(findex, 1);
+      this.$emit("input", this.listToString(this.fileList));
+    },
+    // 上传成功回调
+    handleUploadSuccess(res) {
+      this.fileList.push({ name: res.fileName, url: res.url });
+      this.$emit("input", this.listToString(this.fileList));
+      this.loading.close();
+    },
+    // 上传前loading加载
+    handleBeforeUpload(file) {
+      let isImg = false;
+      if (this.fileType.length) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        isImg = this.fileType.some(type => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+      } else {
+        isImg = file.type.indexOf("image") > -1;
+      }
+
+      if (!isImg) {
+        this.$message.error(
+          `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`
+        );
+        return false;
+      }
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      this.loading = this.$loading({
+        lock: true,
+        text: "上传中",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+    // 上传失败
+    handleUploadError() {
+      this.$message({
+        type: "error",
+        message: "上传失败",
+      });
+      this.loading.close();
+    },
+    // 预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url.replace(this.baseUrl, "") + separator;
+      }
+      // console.log('listToString ===> ' + strs)
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+// .el-upload--picture-card 控制加号部分
+::v-deep.hide .el-upload--picture-card {
+    display: none;
+}
+// 去掉动画效果
+::v-deep .el-list-enter-active,
+::v-deep .el-list-leave-active {
+    transition: all 0s;
+}
+
+::v-deep .el-list-enter, .el-list-leave-active {
+    opacity: 0;
+    transform: translateY(0);
+}
+</style>
+
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
new file mode 100644
index 0000000..5e5d890
--- /dev/null
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -0,0 +1,107 @@
+<template>
+  <div :class="{'hidden':hidden}" class="pagination-container">
+    <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="pageSize"
+      :layout="layout"
+      :page-sizes="pageSizes"
+      :pager-count="pagerCount"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+import { scrollTo } from '@/utils/scroll-to'
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number
+    },
+    page: {
+      type: Number,
+      default: 1
+    },
+    limit: {
+      type: Number,
+      default: 20
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50]
+      }
+    },
+    // 移动端页码按钮的数量端默认值5
+    pagerCount: {
+      type: Number,
+      default: document.body.clientWidth < 992 ? 5 : 7
+    },
+    layout: {
+      type: String,
+      default: 'total, sizes, prev, pager, next, jumper'
+    },
+    background: {
+      type: Boolean,
+      default: true
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true
+    },
+    hidden: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page
+      },
+      set(val) {
+        this.$emit('update:page', val)
+      }
+    },
+    pageSize: {
+      get() {
+        return this.limit
+      },
+      set(val) {
+        this.$emit('update:limit', val)
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.$emit('pagination', { page: this.currentPage, limit: val })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    },
+    handleCurrentChange(val) {
+      this.$emit('pagination', { page: val, limit: this.pageSize })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>
diff --git a/ruoyi-ui/src/components/PanThumb/index.vue b/ruoyi-ui/src/components/PanThumb/index.vue
new file mode 100644
index 0000000..1bcf417
--- /dev/null
+++ b/ruoyi-ui/src/components/PanThumb/index.vue
@@ -0,0 +1,142 @@
+<template>
+  <div :style="{zIndex:zIndex,height:height,width:width}" class="pan-item">
+    <div class="pan-info">
+      <div class="pan-info-roles-container">
+        <slot />
+      </div>
+    </div>
+    <!-- eslint-disable-next-line -->
+    <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PanThumb',
+  props: {
+    image: {
+      type: String,
+      required: true
+    },
+    zIndex: {
+      type: Number,
+      default: 1
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pan-item {
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  display: inline-block;
+  position: relative;
+  cursor: default;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+.pan-info-roles-container {
+  padding: 20px;
+  text-align: center;
+}
+
+.pan-thumb {
+  width: 100%;
+  height: 100%;
+  background-position: center center;
+  background-size: cover;
+  border-radius: 50%;
+  overflow: hidden;
+  position: absolute;
+  transform-origin: 95% 40%;
+  transition: all 0.3s ease-in-out;
+}
+
+/* .pan-thumb:after {
+  content: '';
+  width: 8px;
+  height: 8px;
+  position: absolute;
+  border-radius: 50%;
+  top: 40%;
+  left: 95%;
+  margin: -4px 0 0 -4px;
+  background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
+  box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
+} */
+
+.pan-info {
+  position: absolute;
+  width: inherit;
+  height: inherit;
+  border-radius: 50%;
+  overflow: hidden;
+  box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
+}
+
+.pan-info h3 {
+  color: #fff;
+  text-transform: uppercase;
+  position: relative;
+  letter-spacing: 2px;
+  font-size: 18px;
+  margin: 0 60px;
+  padding: 22px 0 0 0;
+  height: 85px;
+  font-family: 'Open Sans', Arial, sans-serif;
+  text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
+}
+
+.pan-info p {
+  color: #fff;
+  padding: 10px 5px;
+  font-style: italic;
+  margin: 0 30px;
+  font-size: 12px;
+  border-top: 1px solid rgba(255, 255, 255, 0.5);
+}
+
+.pan-info p a {
+  display: block;
+  color: #333;
+  width: 80px;
+  height: 80px;
+  background: rgba(255, 255, 255, 0.3);
+  border-radius: 50%;
+  color: #fff;
+  font-style: normal;
+  font-weight: 700;
+  text-transform: uppercase;
+  font-size: 9px;
+  letter-spacing: 1px;
+  padding-top: 24px;
+  margin: 7px auto 0;
+  font-family: 'Open Sans', Arial, sans-serif;
+  opacity: 0;
+  transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
+  transform: translateX(60px) rotate(90deg);
+}
+
+.pan-info p a:hover {
+  background: rgba(255, 255, 255, 0.5);
+}
+
+.pan-item:hover .pan-thumb {
+  transform: rotate(-110deg);
+}
+
+.pan-item:hover .pan-info p a {
+  opacity: 1;
+  transform: translateX(0px) rotate(0deg);
+}
+</style>
diff --git a/ruoyi-ui/src/components/ParentView/index.vue b/ruoyi-ui/src/components/ParentView/index.vue
new file mode 100644
index 0000000..7bf6148
--- /dev/null
+++ b/ruoyi-ui/src/components/ParentView/index.vue
@@ -0,0 +1,3 @@
+<template >
+  <router-view />
+</template>
diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/ruoyi-ui/src/components/RightPanel/index.vue
new file mode 100644
index 0000000..fbf27eb
--- /dev/null
+++ b/ruoyi-ui/src/components/RightPanel/index.vue
@@ -0,0 +1,149 @@
+<template>
+  <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
+    <div class="rightPanel-background" />
+    <div class="rightPanel">
+      <div class="rightPanel-items">
+        <slot />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { addClass, removeClass } from '@/utils'
+
+export default {
+  name: 'RightPanel',
+  props: {
+    clickNotClose: {
+      default: false,
+      type: Boolean
+    },
+    buttonTop: {
+      default: 250,
+      type: Number
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.$store.state.settings.showSettings
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'showSettings',
+          value: val
+        })
+      }
+    },
+    theme() {
+      return this.$store.state.settings.theme
+    },
+  },
+  watch: {
+    show(value) {
+      if (value && !this.clickNotClose) {
+        this.addEventClick()
+      }
+      if (value) {
+        addClass(document.body, 'showRightPanel')
+      } else {
+        removeClass(document.body, 'showRightPanel')
+      }
+    }
+  },
+  mounted() {
+    this.insertToBody()
+    this.addEventClick()
+  },
+  beforeDestroy() {
+    const elx = this.$refs.rightPanel
+    elx.remove()
+  },
+  methods: {
+    addEventClick() {
+      window.addEventListener('click', this.closeSidebar)
+    },
+    closeSidebar(evt) {
+      const parent = evt.target.closest('.rightPanel')
+      if (!parent) {
+        this.show = false
+        window.removeEventListener('click', this.closeSidebar)
+      }
+    },
+    insertToBody() {
+      const elx = this.$refs.rightPanel
+      const body = document.querySelector('body')
+      body.insertBefore(elx, body.firstChild)
+    }
+  }
+}
+</script>
+
+<style>
+.showRightPanel {
+  overflow: hidden;
+  position: relative;
+  width: calc(100% - 15px);
+}
+</style>
+
+<style lang="scss" scoped>
+.rightPanel-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  opacity: 0;
+  transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
+  background: rgba(0, 0, 0, .2);
+  z-index: -1;
+}
+
+.rightPanel {
+  width: 100%;
+  max-width: 260px;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  right: 0;
+  box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05);
+  transition: all .25s cubic-bezier(.7, .3, .1, 1);
+  transform: translate(100%);
+  background: #fff;
+  z-index: 40000;
+}
+
+.show {
+  transition: all .3s cubic-bezier(.7, .3, .1, 1);
+
+  .rightPanel-background {
+    z-index: 20000;
+    opacity: 1;
+    width: 100%;
+    height: 100%;
+  }
+
+  .rightPanel {
+    transform: translate(0);
+  }
+}
+
+.handle-button {
+  width: 48px;
+  height: 48px;
+  position: absolute;
+  left: -48px;
+  text-align: center;
+  font-size: 24px;
+  border-radius: 6px 0 0 6px !important;
+  z-index: 0;
+  pointer-events: auto;
+  cursor: pointer;
+  color: #fff;
+  line-height: 48px;
+  i {
+    font-size: 24px;
+    line-height: 48px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
new file mode 100644
index 0000000..e3e1286
--- /dev/null
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="top-right-btn">
+    <el-row>
+      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
+        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
+        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
+        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
+      </el-tooltip>
+    </el-row>
+    <el-dialog :title="title" :visible.sync="open" append-to-body>
+      <el-transfer
+        :titles="['显示', '隐藏']"
+        v-model="value"
+        :data="columns"
+        @change="dataChange"
+      ></el-transfer>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "RightToolbar",
+  data() {
+    return {
+      // 显隐数据
+      value: [],
+      // 弹出层标题
+      title: "显示/隐藏",
+      // 是否显示弹出层
+      open: false,
+    };
+  },
+  props: {
+    showSearch: {
+      type: Boolean,
+      default: true,
+    },
+    columns: {
+      type: Array,
+    },
+  },
+  created() {
+    // 显隐列初始默认隐藏列
+    for (let item in this.columns) {
+      if (this.columns[item].visible === false) {
+        this.value.push(parseInt(item));
+      }
+    }
+  },
+  methods: {
+    // 搜索
+    toggleSearch() {
+      this.$emit("update:showSearch", !this.showSearch);
+    },
+    // 刷新
+    refresh() {
+      this.$emit("queryTable");
+    },
+    // 右侧列表元素变化
+    dataChange(data) {
+      for (var item in this.columns) {
+        const key = this.columns[item].key;
+        this.columns[item].visible = !data.includes(key);
+      }
+    },
+    // 打开显隐列dialog
+    showColumn() {
+      this.open = true;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-transfer__button {
+  border-radius: 50%;
+  padding: 12px;
+  display: block;
+  margin-left: 0px;
+}
+::v-deep .el-transfer__button:first-child {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/ruoyi-ui/src/components/RuoYi/Doc/index.vue
new file mode 100644
index 0000000..a6187f3
--- /dev/null
+++ b/ruoyi-ui/src/components/RuoYi/Doc/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <svg-icon icon-class="question" @click="goto"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RuoYiDoc',
+  data() {
+    return {
+      url: 'http://doc.ruoyi.vip/ruoyi-vue'
+    }
+  },
+  methods: {
+    goto() {
+      window.open(this.url)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue
new file mode 100644
index 0000000..1d09a77
--- /dev/null
+++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <svg-icon icon-class="github" @click="goto"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RuoYiGit',
+  data() {
+    return {
+      url: 'https://gitee.com/y_project/RuoYi-Vue'
+    }
+  },
+  methods: {
+    goto() {
+      window.open(this.url)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/ruoyi-ui/src/components/Screenfull/index.vue
new file mode 100644
index 0000000..d4e539c
--- /dev/null
+++ b/ruoyi-ui/src/components/Screenfull/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />
+  </div>
+</template>
+
+<script>
+import screenfull from 'screenfull'
+
+export default {
+  name: 'Screenfull',
+  data() {
+    return {
+      isFullscreen: false
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  beforeDestroy() {
+    this.destroy()
+  },
+  methods: {
+    click() {
+      if (!screenfull.isEnabled) {
+        this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
+        return false
+      }
+      screenfull.toggle()
+    },
+    change() {
+      this.isFullscreen = screenfull.isFullscreen
+    },
+    init() {
+      if (screenfull.isEnabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+    destroy() {
+      if (screenfull.isEnabled) {
+        screenfull.off('change', this.change)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.screenfull-svg {
+  display: inline-block;
+  cursor: pointer;
+  fill: #5a5e66;;
+  width: 20px;
+  height: 20px;
+  vertical-align: 10px;
+}
+</style>
diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/ruoyi-ui/src/components/SizeSelect/index.vue
new file mode 100644
index 0000000..e88065b
--- /dev/null
+++ b/ruoyi-ui/src/components/SizeSelect/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <el-dropdown trigger="click" @command="handleSetSize">
+    <div>
+      <svg-icon class-name="size-icon" icon-class="size" />
+    </div>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value">
+        {{
+          item.label }}
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      sizeOptions: [
+        { label: 'Default', value: 'default' },
+        { label: 'Medium', value: 'medium' },
+        { label: 'Small', value: 'small' },
+        { label: 'Mini', value: 'mini' }
+      ]
+    }
+  },
+  computed: {
+    size() {
+      return this.$store.getters.size
+    }
+  },
+  methods: {
+    handleSetSize(size) {
+      this.$ELEMENT.size = size
+      this.$store.dispatch('app/setSize', size)
+      this.refreshView()
+      this.$message({
+        message: 'Switch Size Success',
+        type: 'success'
+      })
+    },
+    refreshView() {
+      // In order to make the cached page re-rendered
+      this.$store.dispatch('tagsView/delAllCachedViews', this.$route)
+
+      const { fullPath } = this.$route
+
+      this.$nextTick(() => {
+        this.$router.replace({
+          path: '/redirect' + fullPath
+        })
+      })
+    }
+  }
+
+}
+</script>
diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/ruoyi-ui/src/components/SvgIcon/index.vue
new file mode 100644
index 0000000..e4bf5ad
--- /dev/null
+++ b/ruoyi-ui/src/components/SvgIcon/index.vue
@@ -0,0 +1,61 @@
+<template>
+  <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
+  <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
+    <use :xlink:href="iconName" />
+  </svg>
+</template>
+
+<script>
+import { isExternal } from '@/utils/validate'
+
+export default {
+  name: 'SvgIcon',
+  props: {
+    iconClass: {
+      type: String,
+      required: true
+    },
+    className: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    isExternal() {
+      return isExternal(this.iconClass)
+    },
+    iconName() {
+      return `#icon-${this.iconClass}`
+    },
+    svgClass() {
+      if (this.className) {
+        return 'svg-icon ' + this.className
+      } else {
+        return 'svg-icon'
+      }
+    },
+    styleExternalIcon() {
+      return {
+        mask: `url(${this.iconClass}) no-repeat 50% 50%`,
+        '-webkit-mask': `url(${this.iconClass}) no-repeat 50% 50%`
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+
+.svg-external-icon {
+  background-color: currentColor;
+  mask-size: cover!important;
+  display: inline-block;
+}
+</style>
diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/ruoyi-ui/src/components/ThemePicker/index.vue
new file mode 100644
index 0000000..b0df471
--- /dev/null
+++ b/ruoyi-ui/src/components/ThemePicker/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-color-picker
+    v-model="theme"
+    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    class="theme-picker"
+    popper-class="theme-picker-dropdown"
+  />
+</template>
+
+<script>
+const version = require('element-ui/package.json').version // element-ui version from node_modules
+const ORIGINAL_THEME = '#409EFF' // default color
+
+export default {
+  data() {
+    return {
+      chalk: '', // content of theme-chalk css
+      theme: ''
+    }
+  },
+  computed: {
+    defaultTheme() {
+      return this.$store.state.settings.theme
+    }
+  },
+  watch: {
+    defaultTheme: {
+      handler: function(val, oldVal) {
+        this.theme = val
+      },
+      immediate: true
+    },
+    async theme(val) {
+      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
+      if (typeof val !== 'string') return
+      const themeCluster = this.getThemeCluster(val.replace('#', ''))
+      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+
+      const $message = this.$message({
+        message: '  Compiling the theme',
+        customClass: 'theme-message',
+        type: 'success',
+        duration: 0,
+        iconClass: 'el-icon-loading'
+      })
+
+      const getHandler = (variable, id) => {
+        return () => {
+          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
+
+          let styleTag = document.getElementById(id)
+          if (!styleTag) {
+            styleTag = document.createElement('style')
+            styleTag.setAttribute('id', id)
+            document.head.appendChild(styleTag)
+          }
+          styleTag.innerText = newStyle
+        }
+      }
+
+      if (!this.chalk) {
+        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+        await this.getCSSString(url, 'chalk')
+      }
+
+      const chalkHandler = getHandler('chalk', 'chalk-style')
+
+      chalkHandler()
+
+      const styles = [].slice.call(document.querySelectorAll('style'))
+        .filter(style => {
+          const text = style.innerText
+          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        })
+      styles.forEach(style => {
+        const { innerText } = style
+        if (typeof innerText !== 'string') return
+        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
+      })
+
+      this.$emit('change', val)
+
+      $message.close()
+    }
+  },
+
+  methods: {
+    updateStyle(style, oldCluster, newCluster) {
+      let newStyle = style
+      oldCluster.forEach((color, index) => {
+        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+      })
+      return newStyle
+    },
+
+    getCSSString(url, variable) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+            resolve()
+          }
+        }
+        xhr.open('GET', url)
+        xhr.send()
+      })
+    },
+
+    getThemeCluster(theme) {
+      const tintColor = (color, tint) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        if (tint === 0) { // when primary color is in its rgb space
+          return [red, green, blue].join(',')
+        } else {
+          red += Math.round(tint * (255 - red))
+          green += Math.round(tint * (255 - green))
+          blue += Math.round(tint * (255 - blue))
+
+          red = red.toString(16)
+          green = green.toString(16)
+          blue = blue.toString(16)
+
+          return `#${red}${green}${blue}`
+        }
+      }
+
+      const shadeColor = (color, shade) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        red = Math.round((1 - shade) * red)
+        green = Math.round((1 - shade) * green)
+        blue = Math.round((1 - shade) * blue)
+
+        red = red.toString(16)
+        green = green.toString(16)
+        blue = blue.toString(16)
+
+        return `#${red}${green}${blue}`
+      }
+
+      const clusters = [theme]
+      for (let i = 0; i <= 9; i++) {
+        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+      }
+      clusters.push(shadeColor(theme, 0.1))
+      return clusters
+    }
+  }
+}
+</script>
+
+<style>
+.theme-message,
+.theme-picker-dropdown {
+  z-index: 99999 !important;
+}
+
+.theme-picker .el-color-picker__trigger {
+  height: 26px !important;
+  width: 26px !important;
+  padding: 2px;
+}
+
+.theme-picker-dropdown .el-color-dropdown__link-btn {
+  display: none;
+}
+</style>
diff --git a/ruoyi-ui/src/components/Tinymce/components/EditorImage.vue b/ruoyi-ui/src/components/Tinymce/components/EditorImage.vue
new file mode 100644
index 0000000..02701b8
--- /dev/null
+++ b/ruoyi-ui/src/components/Tinymce/components/EditorImage.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="upload-container">
+    <el-button icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
+      上传图片
+    </el-button>
+    <el-dialog :visible.sync="dialogVisible">
+      <el-upload
+        :multiple="true"
+        :file-list="fileList"
+        :show-file-list="true"
+        :on-remove="handleRemove"
+        :on-success="handleSuccess"
+        :before-upload="beforeUpload"
+        class="editor-slide-upload"
+        :action="uploadApi"
+        :headers="headers"
+        list-type="picture-card"
+        name="image"
+        accept=",.JPG,.jpeg,.png,.gif,.ico,.JPEG,.PNG,.GIF,.ICO,.jpg"
+      >
+        <i class="el-icon-plus"></i>
+      </el-upload>
+      <div style="text-align: right">
+        <el-button @click="dialogVisible = false">
+          取消
+        </el-button>
+        <el-button type="primary" @click="handleSubmit">
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { getToken } from '@/utils/auth'
+
+  export default {
+    name: 'EditorSlideUpload',
+    data() {
+      return {
+        uploadApi: process.env.VUE_APP_BASE_API+'/aliyun/oss/uploadToAliOss',  // 上传图片api
+        headers: {
+          Authorization: 'Bearer ' + getToken()
+        }, // 认证的头部
+        dialogVisible: false,
+        listObj: {},
+        fileList: []
+      }
+    },
+    methods: {
+      checkAllSuccess() {
+        return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
+      },
+      handleSubmit() {
+        const arr = Object.keys(this.listObj).map(v => this.listObj[v])
+        if (!this.checkAllSuccess()) {
+          this.$message('请等待所有图片上传成功。如果有网络问题，请刷新页面并再次上传！')
+          return
+        }
+        this.$emit('successCBK', arr)
+        this.listObj = {}
+        this.fileList = []
+        this.dialogVisible = false
+      },
+      handleSuccess(response, file) {
+        const uid = file.uid
+        const objKeyArr = Object.keys(this.listObj)
+        for (let i = 0, len = objKeyArr.length; i < len; i++) {
+          if (this.listObj[objKeyArr[i]].uid === uid) {
+            this.listObj[objKeyArr[i]].url = response;
+            this.listObj[objKeyArr[i]].hasSuccess = true
+            return
+          }
+        }
+      },
+      handleRemove(file) {
+        const uid = file.uid
+        const objKeyArr = Object.keys(this.listObj)
+        for (let i = 0, len = objKeyArr.length; i < len; i++) {
+          if (this.listObj[objKeyArr[i]].uid === uid) {
+            delete this.listObj[objKeyArr[i]]
+            return
+          }
+        }
+      },
+      beforeUpload(file) {
+        const _self = this
+        const _URL = window.URL || window.webkitURL
+        const fileName = file.uid
+        this.listObj[fileName] = {}
+        return new Promise((resolve, reject) => {
+          const img = new Image()
+          img.src = _URL.createObjectURL(file)
+          img.onload = function () {
+            _self.listObj[fileName] = {hasSuccess: false, uid: file.uid, width: this.width, height: this.height}
+          }
+          resolve(true)
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .editor-slide-upload {
+    margin-bottom: 20px;
+  }
+  /*/deep/*/
+  .el-upload--picture-card {
+    width: 100px;
+  }
+
+
+</style>
diff --git a/ruoyi-ui/src/components/Tinymce/dynamicLoadScript.js b/ruoyi-ui/src/components/Tinymce/dynamicLoadScript.js
new file mode 100644
index 0000000..837977a
--- /dev/null
+++ b/ruoyi-ui/src/components/Tinymce/dynamicLoadScript.js
@@ -0,0 +1,60 @@
+let callbacks = []
+
+function loadedTinymce() {
+  // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2144
+  // check is successfully downloaded script
+  return window.tinymce
+}
+
+const dynamicLoadScript = (src, callback) => {
+  const existingScript = document.getElementById(src)
+  const cb = callback || function () {
+  }
+
+  if (!existingScript) {
+    const script = document.createElement('script')
+    script.src = src // src url for the third-party library being loaded.
+    script.id = src
+    document.body.appendChild(script)
+    callbacks.push(cb)
+    const onEnd = 'onload' in script ? stdOnEnd : ieOnEnd
+    onEnd(script)
+  }
+
+  if (existingScript && cb) {
+    if (loadedTinymce()) {
+      cb(null, existingScript)
+    } else {
+      callbacks.push(cb)
+    }
+  }
+
+  function stdOnEnd(script) {
+    script.onload = function () {
+      // this.onload = null here is necessary
+      // because even IE9 works not like others
+      this.onerror = this.onload = null
+      for (const cb of callbacks) {
+        cb(null, script)
+      }
+      callbacks = null
+    }
+    script.onerror = function () {
+      this.onerror = this.onload = null
+      cb(new Error('Failed to load ' + src), script)
+    }
+  }
+
+  function ieOnEnd(script) {
+    script.onreadystatechange = function () {
+      if (this.readyState !== 'complete' && this.readyState !== 'loaded') return
+      this.onreadystatechange = null
+      for (const cb of callbacks) {
+        cb(null, script) // there is no way to catch loading errors in IE8
+      }
+      callbacks = null
+    }
+  }
+}
+
+export default dynamicLoadScript
diff --git a/ruoyi-ui/src/components/Tinymce/index.vue b/ruoyi-ui/src/components/Tinymce/index.vue
new file mode 100644
index 0000000..5bdbf5a
--- /dev/null
+++ b/ruoyi-ui/src/components/Tinymce/index.vue
@@ -0,0 +1,204 @@
+<template>
+  <div :class="{fullscreen:fullscreen}" class="tinymce-container" :style="{width:containerWidth}">
+    <textarea :id="tinymceId" class="tinymce-textarea" />
+    <div class="editor-custom-btn-container">
+      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
+    </div>
+  </div>
+</template>
+
+<script>
+/**
+ * docs:
+ * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
+ */
+import editorImage from './components/EditorImage'
+import plugins from './plugins'
+import toolbar from './toolbar'
+import load from './dynamicLoadScript'
+
+// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
+const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
+
+export default {
+  name: 'Tinymce',
+  components: { editorImage },
+  props: {
+    id: {
+      type: String,
+      default: function() {
+        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '')
+      }
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    toolbar: {
+      type: Array,
+      required: false,
+      default() {
+        return []
+      }
+    },
+    menubar: {
+      type: String,
+      default: 'file edit insert view format table'
+    },
+    height: {
+      type: [Number, String],
+      required: false,
+      default: 360
+    },
+    width: {
+      type: [Number, String],
+      required: false,
+      default: 'auto'
+    }
+  },
+  data() {
+    return {
+      hasChange: false,
+      hasInit: false,
+      tinymceId: this.id,
+      fullscreen: false,
+      languageTypeList: {
+        'en': 'en',
+        'zh': 'zh_CN',
+        'es': 'es_MX',
+        'ja': 'ja'
+      }
+    }
+  },
+  computed: {
+    containerWidth() {
+      const width = this.width
+      if (/^[\d]+(\.[\d]+)?$/.test(width)) { // matches `100`, `'100'`
+        return `${width}px`
+      }
+      return width
+    }
+  },
+  watch: {
+    value(val) {
+      if (!this.hasChange && this.hasInit) {
+        this.$nextTick(() =>
+          window.tinymce.get(this.tinymceId).setContent(val || ''))
+      }
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  activated() {
+    if (window.tinymce) {
+      this.initTinymce()
+    }
+  },
+  deactivated() {
+    this.destroyTinymce()
+  },
+  destroyed() {
+    this.destroyTinymce()
+  },
+  methods: {
+    init() {
+      // dynamic load tinymce from cdn
+      load(tinymceCDN, (err) => {
+        if (err) {
+          this.$message.error(err.message)
+          return
+        }
+        this.initTinymce()
+      })
+    },
+    initTinymce() {
+      const _this = this
+      window.tinymce.init({
+        selector: `#${this.tinymceId}`,
+        language: this.languageTypeList['zh'],
+        height: this.height,
+        body_class: 'panel-body ',
+        object_resizing: false,
+        toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
+        menubar: this.menubar,
+        plugins: plugins,
+        end_container_on_empty_block: true,
+        powerpaste_word_import: 'clean',
+        code_dialog_height: 450,
+        code_dialog_width: 1000,
+        advlist_bullet_styles: 'square',
+        advlist_number_styles: 'default',
+        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
+        default_link_target: '_blank',
+        link_title: false,
+        nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
+        init_instance_callback: editor => {
+          if (_this.value) {
+            editor.setContent(_this.value)
+          }
+          _this.hasInit = true
+          editor.on('NodeChange Change KeyUp SetContent', () => {
+            this.hasChange = true
+            this.$emit('input', editor.getContent())
+          })
+        },
+        setup(editor) {
+          editor.on('FullscreenStateChanged', (e) => {
+            _this.fullscreen = e.state
+          })
+        }
+      })
+    },
+    destroyTinymce() {
+      const tinymce = window.tinymce.get(this.tinymceId)
+      if (this.fullscreen) {
+        tinymce.execCommand('mceFullScreen')
+      }
+
+      if (tinymce) {
+        tinymce.destroy()
+      }
+    },
+    setContent(value) {
+      window.tinymce.get(this.tinymceId).setContent(value)
+    },
+    getContent() {
+      window.tinymce.get(this.tinymceId).getContent()
+    },
+    imageSuccessCBK(arr) {
+      const _this = this
+      arr.forEach(v => {
+        window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tinymce-container {
+  position: relative;
+  line-height: normal;
+}
+.tinymce-container>>>.mce-fullscreen {
+  z-index: 10000;
+}
+.tinymce-textarea {
+  visibility: hidden;
+  z-index: -1;
+}
+.editor-custom-btn-container {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  /*z-index: 2005;*/
+}
+.fullscreen .editor-custom-btn-container {
+  z-index: 10000;
+  position: fixed;
+}
+.editor-upload-btn {
+  display: inline-block;
+}
+</style>
diff --git a/ruoyi-ui/src/components/Tinymce/plugins.js b/ruoyi-ui/src/components/Tinymce/plugins.js
new file mode 100644
index 0000000..ba37b17
--- /dev/null
+++ b/ruoyi-ui/src/components/Tinymce/plugins.js
@@ -0,0 +1,7 @@
+// Any plugins you want to use has to be imported
+// Detail plugins list see https://www.tinymce.com/docs/plugins/
+// Custom builds see https://www.tinymce.com/download/custom-builds/
+
+const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr imagetools insertdatetime link lists nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+
+export default plugins
diff --git a/ruoyi-ui/src/components/Tinymce/toolbar.js b/ruoyi-ui/src/components/Tinymce/toolbar.js
new file mode 100644
index 0000000..b0dd578
--- /dev/null
+++ b/ruoyi-ui/src/components/Tinymce/toolbar.js
@@ -0,0 +1,6 @@
+// Here is a list of the toolbar
+// Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
+
+const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link charmap preview anchor pagebreak insertdatetime table emoticons forecolor backcolor fullscreen']
+
+export default toolbar
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
new file mode 100644
index 0000000..1b7c4d9
--- /dev/null
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -0,0 +1,195 @@
+<template>
+  <el-menu
+    :default-active="activeMenu"
+    mode="horizontal"
+    @select="handleSelect"
+  >
+    <template v-for="(item, index) in topMenus">
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
+        ><svg-icon :icon-class="item.meta.icon" />
+        {{ item.meta.title }}</el-menu-item
+      >
+    </template>
+
+    <!-- 顶部菜单超出数量折叠 -->
+    <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
+      <template slot="title">更多菜单</template>
+      <template v-for="(item, index) in topMenus">
+        <el-menu-item
+          :index="item.path"
+          :key="index"
+          v-if="index >= visibleNumber"
+          ><svg-icon :icon-class="item.meta.icon" />
+          {{ item.meta.title }}</el-menu-item
+        >
+      </template>
+    </el-submenu>
+  </el-menu>
+</template>
+
+<script>
+import { constantRoutes } from "@/router";
+
+export default {
+  data() {
+    return {
+      // 顶部栏初始数
+      visibleNumber: 5,
+      // 是否为首次加载
+      isFrist: false,
+      // 当前激活菜单的 index
+      currentIndex: undefined
+    };
+  },
+  computed: {
+    theme() {
+      return this.$store.state.settings.theme;
+    },
+    // 顶部显示菜单
+    topMenus() {
+      let topMenus = [];
+      this.routers.map((menu) => {
+        if (menu.hidden !== true) {
+          // 兼容顶部栏一级菜单内部跳转
+          if (menu.path === "/") {
+              topMenus.push(menu.children[0]);
+          } else {
+              topMenus.push(menu);
+          }
+        }
+      });
+      return topMenus;
+    },
+    // 所有的路由信息
+    routers() {
+      return this.$store.state.permission.topbarRouters;
+    },
+    // 设置子路由
+    childrenMenus() {
+      var childrenMenus = [];
+      this.routers.map((router) => {
+        for (var item in router.children) {
+          if (router.children[item].parentPath === undefined) {
+            if(router.path === "/") {
+              router.children[item].path = "/redirect/" + router.children[item].path;
+            } else {
+              if(!this.ishttp(router.children[item].path)) {
+                router.children[item].path = router.path + "/" + router.children[item].path;
+              }
+            }
+            router.children[item].parentPath = router.path;
+          }
+          childrenMenus.push(router.children[item]);
+        }
+      });
+      return constantRoutes.concat(childrenMenus);
+    },
+    // 默认激活的菜单
+    activeMenu() {
+      const path = this.$route.path;
+      let activePath = this.defaultRouter();
+      if (path.lastIndexOf("/") > 0) {
+        const tmpPath = path.substring(1, path.length);
+        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
+      } else if ("/index" == path || "" == path) {
+        if (!this.isFrist) {
+          this.isFrist = true;
+        } else {
+          activePath = "index";
+        }
+      }
+      var routes = this.activeRoutes(activePath);
+      if (routes.length === 0) {
+        activePath = this.currentIndex || this.defaultRouter()
+        this.activeRoutes(activePath);
+      }
+      return activePath;
+    },
+  },
+  beforeMount() {
+    window.addEventListener('resize', this.setVisibleNumber)
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.setVisibleNumber)
+  },
+  mounted() {
+    this.setVisibleNumber();
+  },
+  methods: {
+    // 根据宽度计算设置显示栏数
+    setVisibleNumber() {
+      const width = document.body.getBoundingClientRect().width / 3;
+      this.visibleNumber = parseInt(width / 85);
+    },
+    // 默认激活的路由
+    defaultRouter() {
+      let router;
+      Object.keys(this.routers).some((key) => {
+        if (!this.routers[key].hidden) {
+          router = this.routers[key].path;
+          return true;
+        }
+      });
+      return router;
+    },
+    // 菜单选择事件
+    handleSelect(key, keyPath) {
+      this.currentIndex = key;
+      if (this.ishttp(key)) {
+        // http(s):// 路径新窗口打开
+        window.open(key, "_blank");
+      } else if (key.indexOf("/redirect") !== -1) {
+        // /redirect 路径内部打开
+        this.$router.push({ path: key.replace("/redirect", "") });
+      } else {
+        // 显示左侧联动菜单
+        this.activeRoutes(key);
+      }
+    },
+    // 当前激活的路由
+    activeRoutes(key) {
+      var routes = [];
+      if (this.childrenMenus && this.childrenMenus.length > 0) {
+        this.childrenMenus.map((item) => {
+          if (key == item.parentPath || (key == "index" && "" == item.path)) {
+            routes.push(item);
+          }
+        });
+      }
+      if(routes.length > 0) {
+        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+      }
+      return routes;
+    },
+	ishttp(url) {
+      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+.topmenu-container.el-menu--horizontal > .el-menu-item {
+  float: left;
+  height: 50px !important;
+  line-height: 50px !important;
+  color: #999093 !important;
+  padding: 0 5px !important;
+  margin: 0 10px !important;
+}
+
+.topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
+  border-bottom: 2px solid #{'var(--theme)'} !important;
+  color: #303133;
+}
+
+/* submenu item */
+.topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
+  float: left;
+  height: 50px !important;
+  line-height: 50px !important;
+  color: #999093 !important;
+  padding: 0 5px !important;
+  margin: 0 10px !important;
+}
+</style>
diff --git a/ruoyi-ui/src/components/Upload/multiUpload.vue b/ruoyi-ui/src/components/Upload/multiUpload.vue
new file mode 100644
index 0000000..a905802
--- /dev/null
+++ b/ruoyi-ui/src/components/Upload/multiUpload.vue
@@ -0,0 +1,96 @@
+<template> 
+  <div>
+    <el-upload
+            :action="uploadApi"
+      :data="dataObj"
+      list-type="picture-card"
+      :file-list="fileList"
+      :before-upload="beforeUpload"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :on-preview="handlePreview"
+      :limit="maxCount"
+      :on-exceed="handleExceed"
+    >
+      <i class="el-icon-plus"></i>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+  export default {
+    name: 'multiUpload',
+    props: {
+      //图片属性数组
+      value: Array,
+      //最大上传图片数量
+      maxCount:{
+        type:Number,
+        default:5
+      }
+    },
+    data() {
+      return {
+       uploadApi: process.env.VUE_APP_BASE_API+'/aliyun/oss/uploadToAliOss',// 上传文件路由
+
+        dataObj: {
+          policy: '',
+          signature: '',
+          key: '',
+          ossaccessKeyId: '',
+          dir: '',
+          host: ''
+        },
+        dialogVisible: false,
+        dialogImageUrl:null
+      };
+    },
+    computed: {
+      fileList() {
+        let fileList=[];
+        for(let i=0;i<this.value.length;i++){
+          fileList.push({url:this.value[i]});
+        }
+        return fileList;
+      }
+    },
+    methods: {
+      emitInput(fileList) {
+        let value=[];
+        for(let i=0;i<fileList.length;i++){
+          value.push(fileList[i].url);
+        }
+        this.$emit('input', value)
+      },
+      handleRemove(file, fileList) {
+        this.emitInput(fileList);
+      },
+      handlePreview(file) {
+        this.dialogVisible = true;
+        this.dialogImageUrl=file.url;
+      },
+      beforeUpload(file) {
+
+      },
+      handleUploadSuccess(res, file) {
+        this.fileList.push({url: file.name,url:res.data});
+        this.emitInput(this.fileList);
+      },
+      handleExceed(files, fileList) {
+        this.$message({
+          message: '最多只能上传'+this.maxCount+'张图片',
+          type: 'warning',
+          duration:1000
+        });
+      },
+    }
+  }
+</script>
+<style>
+
+</style>
+
+
diff --git a/ruoyi-ui/src/components/Upload/singleUpload.vue b/ruoyi-ui/src/components/Upload/singleUpload.vue
new file mode 100644
index 0000000..206b1c9
--- /dev/null
+++ b/ruoyi-ui/src/components/Upload/singleUpload.vue
@@ -0,0 +1,103 @@
+<template> 
+  <div>
+    <el-upload
+            :action="uploadApi"
+      :data="dataObj"
+      list-type="picture"
+      :multiple="false"
+      :show-file-list="showFileList"
+      :file-list="fileList"
+      :before-upload="beforeUpload"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :headers="headers"
+      :on-preview="handlePreview">
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过10MB</div>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="fileList[0].url" alt="">
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+  import {getToken} from "@/utils/auth";
+
+  export default {
+    name: 'singleUpload',
+    props: {
+      value: String
+    },
+    computed: {
+      imageUrl() {
+        return this.value;
+      },
+      imageName() {
+        if (this.value != null && this.value !== '') {
+          return this.value.substr(this.value.lastIndexOf("/") + 1);
+        } else {
+          return null;
+        }
+      },
+      fileList() {
+        return [{
+          name: this.imageName,
+          url: this.imageUrl
+        }]
+      },
+      showFileList: {
+        get: function () {
+          return this.value !== null && this.value !== ''&& this.value!==undefined;
+        },
+        set: function (newValue) {
+        }
+      }
+    },
+    data() {
+      return {
+       uploadApi: process.env.VUE_APP_BASE_API + "/common/upload",// 上传文件路由
+       // uploadApi: process.env.VUE_APP_BASE_API+'/aliyun/oss/uploadToAliOss',// 上传文件路由
+        dataObj: {
+          policy: '',
+          signature: '',
+          key: '',
+          ossaccessKeyId: '',
+          dir: '',
+          host: ''
+        },
+        dialogVisible: false,
+        headers: {
+          Authorization: "Bearer " + getToken(),
+        }
+      };
+    },
+    methods: {
+      emitInput(val) {
+        this.$emit('input', val)
+      },
+      handleRemove(file, fileList) {
+        this.emitInput('');
+      },
+      handlePreview(file) {
+        this.dialogVisible = true;
+      },
+      beforeUpload(file) {
+
+      },
+      handleUploadSuccess(res, file) {
+      console.log(res)
+        console.log(file)
+        this.showFileList = true;
+        this.fileList.pop();
+        this.fileList.push({name: res.fileName, url: res.url});
+        this.emitInput(this.fileList[0].url);
+      }
+    }
+  }
+</script>
+<style>
+
+</style>
+
+
diff --git a/ruoyi-ui/src/components/iFrame/index.vue b/ruoyi-ui/src/components/iFrame/index.vue
new file mode 100644
index 0000000..426857f
--- /dev/null
+++ b/ruoyi-ui/src/components/iFrame/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <div v-loading="loading" :style="'height:' + height">
+    <iframe
+      :src="src"
+      frameborder="no"
+      style="width: 100%; height: 100%"
+      scrolling="auto"
+    />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    src: {
+      type: String,
+      required: true
+    },
+  },
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 94.5 + "px;",
+      loading: true,
+      url: this.src
+    };
+  },
+  mounted: function () {
+    setTimeout(() => {
+      this.loading = false;
+    }, 300);
+    const that = this;
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 94.5 + "px;";
+    };
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/directive/dialog/drag.js b/ruoyi-ui/src/directive/dialog/drag.js
new file mode 100644
index 0000000..2e82346
--- /dev/null
+++ b/ruoyi-ui/src/directive/dialog/drag.js
@@ -0,0 +1,64 @@
+/**
+* v-dialogDrag 弹窗拖拽
+* Copyright (c) 2019 ruoyi
+*/
+
+export default {
+  bind(el, binding, vnode, oldVnode) {
+    const value = binding.value
+    if (value == false) return
+    // 获取拖拽内容头部
+    const dialogHeaderEl = el.querySelector('.el-dialog__header');
+    const dragDom = el.querySelector('.el-dialog');
+    dialogHeaderEl.style.cursor = 'move';
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+    dragDom.style.position = 'absolute';
+    dragDom.style.marginTop = 0;
+    let width = dragDom.style.width;
+    if (width.includes('%')) {
+      width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100);
+    } else {
+      width = +width.replace(/\px/g, '');
+    }
+    dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`;
+    // 鼠标按下事件
+    dialogHeaderEl.onmousedown = (e) => {
+      // 鼠标按下，计算当前元素距离可视区的距离 (鼠标点击位置距离可视窗口的距离)
+      const disX = e.clientX - dialogHeaderEl.offsetLeft;
+      const disY = e.clientY - dialogHeaderEl.offsetTop;
+
+      // 获取到的值带px 正则匹配替换
+      let styL, styT;
+
+      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+      if (sty.left.includes('%')) {
+        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
+        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+      } else {
+        styL = +sty.left.replace(/\px/g, '');
+        styT = +sty.top.replace(/\px/g, '');
+      };
+
+      // 鼠标拖拽事件
+      document.onmousemove = function (e) {
+        // 通过事件委托，计算移动的距离 （开始拖拽至结束拖拽的距离）
+        const l = e.clientX - disX;
+        const t = e.clientY - disY;
+
+        let finallyL = l + styL
+        let finallyT = t + styT
+
+        // 移动当前元素
+        dragDom.style.left = `${finallyL}px`;
+        dragDom.style.top = `${finallyT}px`;
+
+      };
+
+      document.onmouseup = function (e) {
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    }
+  }
+};
\ No newline at end of file
diff --git a/ruoyi-ui/src/directive/index.js b/ruoyi-ui/src/directive/index.js
new file mode 100644
index 0000000..550109b
--- /dev/null
+++ b/ruoyi-ui/src/directive/index.js
@@ -0,0 +1,18 @@
+import hasRole from './permission/hasRole'
+import hasPermi from './permission/hasPermi'
+import dialogDrag from './dialog/drag'
+
+const install = function(Vue) {
+  Vue.directive('hasRole', hasRole)
+  Vue.directive('hasPermi', hasPermi)
+  Vue.directive('dialogDrag', dialogDrag)
+}
+
+if (window.Vue) {
+  window['hasRole'] = hasRole
+  window['hasPermi'] = hasPermi
+  window['dialogDrag'] = dialogDrag
+  Vue.use(install); // eslint-disable-line
+}
+
+export default install
diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/ruoyi-ui/src/directive/permission/hasPermi.js
new file mode 100644
index 0000000..719536c
--- /dev/null
+++ b/ruoyi-ui/src/directive/permission/hasPermi.js
@@ -0,0 +1,28 @@
+ /**
+ * v-hasPermi 操作权限处理
+ * Copyright (c) 2019 ruoyi
+ */
+ 
+import store from '@/store'
+
+export default {
+  inserted(el, binding, vnode) {
+    const { value } = binding
+    const all_permission = "*:*:*";
+    const permissions = store.getters && store.getters.permissions
+
+    if (value && value instanceof Array && value.length > 0) {
+      const permissionFlag = value
+
+      const hasPermissions = permissions.some(permission => {
+        return all_permission === permission || permissionFlag.includes(permission)
+      })
+
+      if (!hasPermissions) {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      throw new Error(`请设置操作权限标签值`)
+    }
+  }
+}
diff --git a/ruoyi-ui/src/directive/permission/hasRole.js b/ruoyi-ui/src/directive/permission/hasRole.js
new file mode 100644
index 0000000..eec4a5b
--- /dev/null
+++ b/ruoyi-ui/src/directive/permission/hasRole.js
@@ -0,0 +1,28 @@
+ /**
+ * v-hasRole 角色权限处理
+ * Copyright (c) 2019 ruoyi
+ */
+ 
+import store from '@/store'
+
+export default {
+  inserted(el, binding, vnode) {
+    const { value } = binding
+    const super_admin = "admin";
+    const roles = store.getters && store.getters.roles
+
+    if (value && value instanceof Array && value.length > 0) {
+      const roleFlag = value
+
+      const hasRole = roles.some(role => {
+        return super_admin === role || roleFlag.includes(role)
+      })
+
+      if (!hasRole) {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      throw new Error(`请设置角色权限标签值"`)
+    }
+  }
+}
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
new file mode 100644
index 0000000..0c6f4b7
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -0,0 +1,57 @@
+<template>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+      <keep-alive :include="cachedViews">
+        <router-view :key="key" />
+      </keep-alive>
+    </transition>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'AppMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews
+    },
+    key() {
+      return this.$route.path
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 50= navbar  50  */
+  min-height: calc(100vh - 50px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header+.app-main {
+  padding-top: 50px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 50 + 34 */
+    min-height: calc(100vh - 84px);
+  }
+
+  .fixed-header+.app-main {
+    padding-top: 84px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 17px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/layout/components/InnerLink/index.vue b/ruoyi-ui/src/layout/components/InnerLink/index.vue
new file mode 100644
index 0000000..a45d1a4
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/InnerLink/index.vue
@@ -0,0 +1,27 @@
+<script>
+export default {
+  data() {
+    return {};
+  },
+  render() {
+    const { $route: { meta: { link } }, } = this;
+    if ({ link }.link === "") {
+      return "404";
+    }
+    let url = { link }.link;
+    const height = document.documentElement.clientHeight - 94.5 + "px";
+    const style = { height: height };
+
+    return (
+      <div style={style}>
+        <iframe
+          src={url}
+          frameborder="no"
+          style="width: 100%; height: 100%"
+          scrolling="auto"
+        ></iframe>
+      </div>
+    );
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
new file mode 100644
index 0000000..39b3dad
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -0,0 +1,200 @@
+<template>
+  <div class="navbar">
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+
+    <div class="right-menu">
+      <template v-if="device!=='mobile'">
+        <search id="header-search" class="right-menu-item" />
+        
+        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+
+        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+          <size-select id="size-select" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+      </template>
+
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="avatar" class="user-avatar">
+          <i class="el-icon-caret-bottom" />
+        </div>
+        <el-dropdown-menu slot="dropdown">
+          <router-link to="/user/profile">
+            <el-dropdown-item>个人中心</el-dropdown-item>
+          </router-link>
+          <el-dropdown-item @click.native="setting = true">
+            <span>布局设置</span>
+          </el-dropdown-item>
+          <el-dropdown-item divided @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import TopNav from '@/components/TopNav'
+import Hamburger from '@/components/Hamburger'
+import Screenfull from '@/components/Screenfull'
+import SizeSelect from '@/components/SizeSelect'
+import Search from '@/components/HeaderSearch'
+import RuoYiGit from '@/components/RuoYi/Git'
+import RuoYiDoc from '@/components/RuoYi/Doc'
+
+export default {
+  components: {
+    Breadcrumb,
+    TopNav,
+    Hamburger,
+    Screenfull,
+    SizeSelect,
+    Search,
+    RuoYiGit,
+    RuoYiDoc
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'device'
+    ]),
+    setting: {
+      get() {
+        return this.$store.state.settings.showSettings
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'showSettings',
+          value: val
+        })
+      }
+    },
+    topNav: {
+      get() {
+        return this.$store.state.settings.topNav
+      }
+    }
+  },
+  methods: {
+    toggleSideBar() {
+      this.$store.dispatch('app/toggleSideBar')
+    },
+    async logout() {
+      this.$confirm('确定注销并退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          location.href = '/index';
+        })
+      }).catch(() => {});
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.navbar {
+  height: 50px;
+  overflow: hidden;
+  position: relative;
+  background: #fff;
+  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+
+  .hamburger-container {
+    line-height: 46px;
+    height: 100%;
+    float: left;
+    cursor: pointer;
+    transition: background .3s;
+    -webkit-tap-highlight-color:transparent;
+
+    &:hover {
+      background: rgba(0, 0, 0, .025)
+    }
+  }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .topmenu-container {
+    position: absolute;
+    left: 50px;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
+    line-height: 50px;
+
+    &:focus {
+      outline: none;
+    }
+
+    .right-menu-item {
+      display: inline-block;
+      padding: 0 8px;
+      height: 100%;
+      font-size: 18px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+
+      &.hover-effect {
+        cursor: pointer;
+        transition: background .3s;
+
+        &:hover {
+          background: rgba(0, 0, 0, .025)
+        }
+      }
+    }
+
+    .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        margin-top: 5px;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 40px;
+          height: 40px;
+          border-radius: 10px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 25px;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
new file mode 100644
index 0000000..cd00c54
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -0,0 +1,268 @@
+<template>
+  <div class="drawer-container">
+    <div>
+      <div class="setting-drawer-content">
+        <div class="setting-drawer-title">
+          <h3 class="drawer-title">主题风格设置</h3>
+        </div>
+        <div class="setting-drawer-block-checbox">
+          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+            <img src="@/assets/images/dark.svg" alt="dark">
+            <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+              <i aria-label="图标: check" class="anticon anticon-check">
+                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
+                     focusable="false" class="">
+                  <path
+                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+                </svg>
+              </i>
+            </div>
+          </div>
+          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
+            <img src="@/assets/images/light.svg" alt="light">
+            <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+              <i aria-label="图标: check" class="anticon anticon-check">
+                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
+                     focusable="false" class="">
+                  <path
+                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+                </svg>
+              </i>
+            </div>
+          </div>
+        </div>
+
+        <div class="drawer-item">
+          <span>主题颜色</span>
+          <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
+        </div>
+      </div>
+
+      <el-divider/>
+
+      <h3 class="drawer-title">系统布局配置</h3>
+      
+      <div class="drawer-item">
+        <span>开启 TopNav</span>
+        <el-switch v-model="topNav" class="drawer-switch" />
+      </div>
+
+      <div class="drawer-item">
+        <span>开启 Tags-Views</span>
+        <el-switch v-model="tagsView" class="drawer-switch" />
+      </div>
+
+      <div class="drawer-item">
+        <span>固定 Header</span>
+        <el-switch v-model="fixedHeader" class="drawer-switch" />
+      </div>
+
+      <div class="drawer-item">
+        <span>显示 Logo</span>
+        <el-switch v-model="sidebarLogo" class="drawer-switch" />
+      </div>
+
+      <div class="drawer-item">
+        <span>动态标题</span>
+        <el-switch v-model="dynamicTitle" class="drawer-switch" />
+      </div>
+
+      <el-divider/>
+
+      <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
+      <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import ThemePicker from '@/components/ThemePicker'
+
+export default {
+  components: { ThemePicker },
+  data() {
+    return {
+      theme: this.$store.state.settings.theme,
+      sideTheme: this.$store.state.settings.sideTheme
+    };
+  },
+  computed: {
+    fixedHeader: {
+      get() {
+        return this.$store.state.settings.fixedHeader
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'fixedHeader',
+          value: val
+        })
+      }
+    },
+    topNav: {
+      get() {
+        return this.$store.state.settings.topNav
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'topNav',
+          value: val
+        })
+        if (!val) {
+          this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
+        }
+      }
+    },
+    tagsView: {
+      get() {
+        return this.$store.state.settings.tagsView
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'tagsView',
+          value: val
+        })
+      }
+    },
+    sidebarLogo: {
+      get() {
+        return this.$store.state.settings.sidebarLogo
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'sidebarLogo',
+          value: val
+        })
+      }
+    },
+    dynamicTitle: {
+      get() {
+        return this.$store.state.settings.dynamicTitle
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'dynamicTitle',
+          value: val
+        })
+      }
+    },
+  },
+  methods: {
+    themeChange(val) {
+      this.$store.dispatch('settings/changeSetting', {
+        key: 'theme',
+        value: val
+      })
+      this.theme = val;
+    },
+    handleTheme(val) {
+      this.$store.dispatch('settings/changeSetting', {
+        key: 'sideTheme',
+        value: val
+      })
+      this.sideTheme = val;
+    },
+    saveSetting() {
+      const loading = this.$loading({
+        lock: true,
+        fullscreen: false,
+        text: "正在保存到本地，请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      localStorage.setItem(
+        "layout-setting",
+        `{
+            "topNav":${this.topNav},
+            "tagsView":${this.tagsView},
+            "fixedHeader":${this.fixedHeader},
+            "sidebarLogo":${this.sidebarLogo},
+            "dynamicTitle":${this.dynamicTitle},
+            "sideTheme":"${this.sideTheme}",
+            "theme":"${this.theme}"
+          }`
+      );
+      setTimeout(loading.close(), 1000)
+    },
+    resetSetting() {
+      this.$loading({
+        lock: true,
+        fullscreen: false,
+        text: "正在清除设置缓存并刷新，请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      localStorage.removeItem("layout-setting")
+      setTimeout("window.location.reload()", 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .setting-drawer-content {
+    .setting-drawer-title {
+      margin-bottom: 12px;
+      color: rgba(0, 0, 0, .85);
+      font-size: 14px;
+      line-height: 22px;
+      font-weight: bold;
+    }
+
+    .setting-drawer-block-checbox {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      margin-top: 10px;
+      margin-bottom: 20px;
+
+      .setting-drawer-block-checbox-item {
+        position: relative;
+        margin-right: 16px;
+        border-radius: 2px;
+        cursor: pointer;
+
+        img {
+          width: 48px;
+          height: 48px;
+        }
+
+        .setting-drawer-block-checbox-selectIcon {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 100%;
+          height: 100%;
+          padding-top: 15px;
+          padding-left: 24px;
+          color: #1890ff;
+          font-weight: 700;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+
+  .drawer-container {
+    padding: 24px;
+    font-size: 14px;
+    line-height: 1.5;
+    word-wrap: break-word;
+
+    .drawer-title {
+      margin-bottom: 12px;
+      color: rgba(0, 0, 0, .85);
+      font-size: 14px;
+      line-height: 22px;
+    }
+
+    .drawer-item {
+      color: rgba(0, 0, 0, .65);
+      font-size: 14px;
+      padding: 12px 0;
+    }
+
+    .drawer-switch {
+      float: right
+    }
+  }
+</style>
diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js
new file mode 100644
index 0000000..6823726
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js
@@ -0,0 +1,25 @@
+export default {
+  computed: {
+    device() {
+      return this.$store.state.app.device
+    }
+  },
+  mounted() {
+    // In order to fix the click on menu on the ios device will trigger the mouseleave bug
+    this.fixBugIniOS()
+  },
+  methods: {
+    fixBugIniOS() {
+      const $subMenu = this.$refs.subMenu
+      if ($subMenu) {
+        const handleMouseleave = $subMenu.handleMouseleave
+        $subMenu.handleMouseleave = (e) => {
+          if (this.device === 'mobile') {
+            return
+          }
+          handleMouseleave(e)
+        }
+      }
+    }
+  }
+}
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
new file mode 100644
index 0000000..b515f61
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
@@ -0,0 +1,29 @@
+<script>
+export default {
+  name: 'MenuItem',
+  functional: true,
+  props: {
+    icon: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  render(h, context) {
+    const { icon, title } = context.props
+    const vnodes = []
+
+    if (icon) {
+      vnodes.push(<svg-icon icon-class={icon}/>)
+    }
+
+    if (title) {
+      vnodes.push(<span slot='title'>{(title)}</span>)
+    }
+    return vnodes
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/ruoyi-ui/src/layout/components/Sidebar/Link.vue
new file mode 100644
index 0000000..530b3d5
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/Link.vue
@@ -0,0 +1,43 @@
+<template>
+  <component :is="type" v-bind="linkProps(to)">
+    <slot />
+  </component>
+</template>
+
+<script>
+import { isExternal } from '@/utils/validate'
+
+export default {
+  props: {
+    to: {
+      type: String,
+      required: true
+    }
+  },
+  computed: {
+    isExternal() {
+      return isExternal(this.to)
+    },
+    type() {
+      if (this.isExternal) {
+        return 'a'
+      }
+      return 'router-link'
+    }
+  },
+  methods: {
+    linkProps(to) {
+      if (this.isExternal) {
+        return {
+          href: to,
+          target: '_blank',
+          rel: 'noopener'
+        }
+      }
+      return {
+        to: to
+      }
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
new file mode 100644
index 0000000..a0e3cb2
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
+    <transition name="sidebarLogoFade">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
+      </router-link>
+      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
+      </router-link>
+    </transition>
+  </div>
+</template>
+
+<script>
+import logoImg from '@/assets/logo/logo.png'
+import variables from '@/assets/styles/variables.scss'
+
+//  2021/11/3  16:26   yzy,增加对logo的根据运营商显示
+import store from "@/store";
+
+export default {
+  name: 'SidebarLogo',
+  props: {
+    collapse: {
+      type: Boolean,
+      required: true
+    }
+  },
+  computed: {
+    variables() {
+      return variables;
+    },
+	sideTheme() {
+      return this.$store.state.settings.sideTheme
+    }
+  },
+  data() {
+    return {
+      title: store.getters.providerId == null ? '赛格核销管理系统' : store.getters.deptName + '核销管理系统',
+      logo: logoImg
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.sidebarLogoFade-enter-active {
+  transition: opacity 1.5s;
+}
+
+.sidebarLogoFade-enter,
+.sidebarLogoFade-leave-to {
+  opacity: 0;
+}
+
+.sidebar-logo-container {
+  position: relative;
+  width: 100%;
+  height: 50px;
+  line-height: 50px;
+  background: #2b2f3a;
+  text-align: center;
+  overflow: hidden;
+
+  & .sidebar-logo-link {
+    height: 100%;
+    width: 100%;
+
+    & .sidebar-logo {
+      width: 32px;
+      height: 32px;
+      vertical-align: middle;
+      margin-right: 12px;
+    }
+
+    & .sidebar-title {
+      display: inline-block;
+      margin: 0;
+      color: #fff;
+      font-weight: 600;
+      line-height: 50px;
+      font-size: 14px;
+      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+      vertical-align: middle;
+    }
+  }
+
+  &.collapse {
+    .sidebar-logo {
+      margin-right: 0px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
new file mode 100644
index 0000000..c4febee
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
@@ -0,0 +1,96 @@
+<template>
+  <div v-if="!item.hidden">
+    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+        </el-menu-item>
+      </app-link>
+    </template>
+
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+      <template slot="title">
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+      </template>
+      <sidebar-item
+        v-for="child in item.children"
+        :key="child.path"
+        :is-nest="true"
+        :item="child"
+        :base-path="resolvePath(child.path)"
+        class="nest-menu"
+      />
+    </el-submenu>
+  </div>
+</template>
+
+<script>
+import path from 'path'
+import { isExternal } from '@/utils/validate'
+import Item from './Item'
+import AppLink from './Link'
+import FixiOSBug from './FixiOSBug'
+
+export default {
+  name: 'SidebarItem',
+  components: { Item, AppLink },
+  mixins: [FixiOSBug],
+  props: {
+    // route object
+    item: {
+      type: Object,
+      required: true
+    },
+    isNest: {
+      type: Boolean,
+      default: false
+    },
+    basePath: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    this.onlyOneChild = null
+    return {}
+  },
+  methods: {
+    hasOneShowingChild(children = [], parent) {
+      if (!children) {
+        children = [];
+      }
+      const showingChildren = children.filter(item => {
+        if (item.hidden) {
+          return false
+        } else {
+          // Temp set(will be used if only has one showing child)
+          this.onlyOneChild = item
+          return true
+        }
+      })
+
+      // When there is only one child router, the child router is displayed by default
+      if (showingChildren.length === 1) {
+        return true
+      }
+
+      // Show parent if there are no child router to display
+      if (showingChildren.length === 0) {
+        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        return true
+      }
+
+      return false
+    },
+    resolvePath(routePath) {
+      if (isExternal(routePath)) {
+        return routePath
+      }
+      if (isExternal(this.basePath)) {
+        return this.basePath
+      }
+      return path.resolve(this.basePath, routePath)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/layout/components/Sidebar/index.vue
new file mode 100644
index 0000000..9e5d2bb
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/Sidebar/index.vue
@@ -0,0 +1,57 @@
+<template>
+    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
+        <logo v-if="showLogo" :collapse="isCollapse" />
+        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
+            <el-menu
+                :default-active="activeMenu"
+                :collapse="isCollapse"
+                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg"
+                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuText : 'rgba(0,0,0,.65)'"
+                :unique-opened="true"
+                :active-text-color="settings.theme"
+                :collapse-transition="false"
+                mode="vertical"
+            >
+                <sidebar-item
+                    v-for="(route, index) in sidebarRouters"
+                    :key="route.path  + index"
+                    :item="route"
+                    :base-path="route.path"
+                />
+            </el-menu>
+        </el-scrollbar>
+    </div>
+</template>
+
+<script>
+import { mapGetters, mapState } from "vuex";
+import Logo from "./Logo";
+import SidebarItem from "./SidebarItem";
+import variables from "@/assets/styles/variables.scss";
+
+export default {
+    components: { SidebarItem, Logo },
+    computed: {
+        ...mapState(["settings"]),
+        ...mapGetters(["sidebarRouters", "sidebar"]),
+        activeMenu() {
+            const route = this.$route;
+            const { meta, path } = route;
+            // if set path, the sidebar will highlight the path you set
+            if (meta.activeMenu) {
+                return meta.activeMenu;
+            }
+            return path;
+        },
+        showLogo() {
+            return this.$store.state.settings.sidebarLogo;
+        },
+        variables() {
+            return variables;
+        },
+        isCollapse() {
+            return !this.sidebar.opened;
+        }
+    }
+};
+</script>
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
new file mode 100644
index 0000000..bb753a1
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
+    <slot />
+  </el-scrollbar>
+</template>
+
+<script>
+const tagAndTagSpacing = 4 // tagAndTagSpacing
+
+export default {
+  name: 'ScrollPane',
+  data() {
+    return {
+      left: 0
+    }
+  },
+  computed: {
+    scrollWrapper() {
+      return this.$refs.scrollContainer.$refs.wrap
+    }
+  },
+  mounted() {
+    this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)
+  },
+  beforeDestroy() {
+    this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
+  },
+  methods: {
+    handleScroll(e) {
+      const eventDelta = e.wheelDelta || -e.deltaY * 40
+      const $scrollWrapper = this.scrollWrapper
+      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
+    },
+    emitScroll() {
+      this.$emit('scroll')
+    },
+    moveToTarget(currentTag) {
+      const $container = this.$refs.scrollContainer.$el
+      const $containerWidth = $container.offsetWidth
+      const $scrollWrapper = this.scrollWrapper
+      const tagList = this.$parent.$refs.tag
+
+      let firstTag = null
+      let lastTag = null
+
+      // find first tag and last tag
+      if (tagList.length > 0) {
+        firstTag = tagList[0]
+        lastTag = tagList[tagList.length - 1]
+      }
+
+      if (firstTag === currentTag) {
+        $scrollWrapper.scrollLeft = 0
+      } else if (lastTag === currentTag) {
+        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
+      } else {
+        // find preTag and nextTag
+        const currentIndex = tagList.findIndex(item => item === currentTag)
+        const prevTag = tagList[currentIndex - 1]
+        const nextTag = tagList[currentIndex + 1]
+
+        // the tag's offsetLeft after of nextTag
+        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
+
+        // the tag's offsetLeft before of prevTag
+        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
+
+        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
+          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
+        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
+          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.scroll-container {
+  white-space: nowrap;
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  ::v-deep {
+    .el-scrollbar__bar {
+      bottom: 0px;
+    }
+    .el-scrollbar__wrap {
+      height: 49px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
new file mode 100644
index 0000000..6caf350
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <div id="tags-view-container" class="tags-view-container">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+      <router-link
+        v-for="tag in visitedViews"
+        ref="tag"
+        :key="tag.path"
+        :class="isActive(tag)?'active':''"
+        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+        tag="span"
+        class="tags-view-item"
+        :style="activeStyle(tag)"
+        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
+        @contextmenu.prevent.native="openMenu(tag,$event)"
+      >
+        {{ tag.title }}
+        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+      </router-link>
+    </scroll-pane>
+    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭当前</li>
+      <li @click="closeOthersTags">关闭其他</li>
+      <li v-if="!isLastView()" @click="closeRightTags">关闭右侧</li>
+      <li @click="closeAllTags(selectedTag)">关闭所有</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import ScrollPane from './ScrollPane'
+import path from 'path'
+
+export default {
+  components: { ScrollPane },
+  data() {
+    return {
+      visible: false,
+      top: 0,
+      left: 0,
+      selectedTag: {},
+      affixTags: []
+    }
+  },
+  computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
+    routes() {
+      return this.$store.state.permission.routes
+    },
+    theme() {
+      return this.$store.state.settings.theme;
+    }
+  },
+  watch: {
+    $route() {
+      this.addTags()
+      this.moveToCurrentTag()
+    },
+    visible(value) {
+      if (value) {
+        document.body.addEventListener('click', this.closeMenu)
+      } else {
+        document.body.removeEventListener('click', this.closeMenu)
+      }
+    }
+  },
+  mounted() {
+    this.initTags()
+    this.addTags()
+  },
+  methods: {
+    isActive(route) {
+      return route.path === this.$route.path
+    },
+    activeStyle(tag) {
+      if (!this.isActive(tag)) return {};
+      return {
+        "background-color": this.theme,
+        "border-color": this.theme
+      };
+    },
+    isAffix(tag) {
+      return tag.meta && tag.meta.affix
+    },
+    isLastView() {
+      try {
+        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+      } catch (err) {
+        return false
+      }
+    },
+    filterAffixTags(routes, basePath = '/') {
+      let tags = []
+      routes.forEach(route => {
+        if (route.meta && route.meta.affix) {
+          const tagPath = path.resolve(basePath, route.path)
+          tags.push({
+            fullPath: tagPath,
+            path: tagPath,
+            name: route.name,
+            meta: { ...route.meta }
+          })
+        }
+        if (route.children) {
+          const tempTags = this.filterAffixTags(route.children, route.path)
+          if (tempTags.length >= 1) {
+            tags = [...tags, ...tempTags]
+          }
+        }
+      })
+      return tags
+    },
+    initTags() {
+      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
+      for (const tag of affixTags) {
+        // Must have tag name
+        if (tag.name) {
+          this.$store.dispatch('tagsView/addVisitedView', tag)
+        }
+      }
+    },
+    addTags() {
+      const { name } = this.$route
+      if (name) {
+        this.$store.dispatch('tagsView/addView', this.$route)
+      }
+      return false
+    },
+    moveToCurrentTag() {
+      const tags = this.$refs.tag
+      this.$nextTick(() => {
+        for (const tag of tags) {
+          if (tag.to.path === this.$route.path) {
+            this.$refs.scrollPane.moveToTarget(tag)
+            // when query is different then update
+            if (tag.to.fullPath !== this.$route.fullPath) {
+              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+            }
+            break
+          }
+        }
+      })
+    },
+    refreshSelectedTag(view) {
+      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
+        const { fullPath } = view
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/redirect' + fullPath
+          })
+        })
+      })
+    },
+    closeSelectedTag(view) {
+      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+        if (this.isActive(view)) {
+          this.toLastView(visitedViews, view)
+        }
+      })
+    },
+    closeRightTags() {
+      this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => {
+        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+          this.toLastView(visitedViews)
+        }
+      })
+    },
+    closeOthersTags() {
+      this.$router.push(this.selectedTag).catch(()=>{});
+      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
+        this.moveToCurrentTag()
+      })
+    },
+    closeAllTags(view) {
+      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
+        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
+          return
+        }
+        this.toLastView(visitedViews, view)
+      })
+    },
+    toLastView(visitedViews, view) {
+      const latestView = visitedViews.slice(-1)[0]
+      if (latestView) {
+        this.$router.push(latestView.fullPath)
+      } else {
+        // now the default is to redirect to the home page if there is no tags-view,
+        // you can adjust it according to your needs.
+        if (view.name === 'Dashboard') {
+          // to reload home page
+          this.$router.replace({ path: '/redirect' + view.fullPath })
+        } else {
+          this.$router.push('/')
+        }
+      }
+    },
+    openMenu(tag, e) {
+      const menuMinWidth = 105
+      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+      const offsetWidth = this.$el.offsetWidth // container width
+      const maxLeft = offsetWidth - menuMinWidth // left boundary
+      const left = e.clientX - offsetLeft + 15 // 15: margin right
+
+      if (left > maxLeft) {
+        this.left = maxLeft
+      } else {
+        this.left = left
+      }
+
+      this.top = e.clientY
+      this.visible = true
+      this.selectedTag = tag
+    },
+    closeMenu() {
+      this.visible = false
+    },
+    handleScroll() {
+      this.closeMenu()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tags-view-container {
+  height: 34px;
+  width: 100%;
+  background: #fff;
+  border-bottom: 1px solid #d8dce5;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  .tags-view-wrapper {
+    .tags-view-item {
+      display: inline-block;
+      position: relative;
+      cursor: pointer;
+      height: 26px;
+      line-height: 26px;
+      border: 1px solid #d8dce5;
+      color: #495060;
+      background: #fff;
+      padding: 0 8px;
+      font-size: 12px;
+      margin-left: 5px;
+      margin-top: 4px;
+      &:first-of-type {
+        margin-left: 15px;
+      }
+      &:last-of-type {
+        margin-right: 15px;
+      }
+      &.active {
+        background-color: #42b983;
+        color: #fff;
+        border-color: #42b983;
+        &::before {
+          content: '';
+          background: #fff;
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          position: relative;
+          margin-right: 2px;
+        }
+      }
+    }
+  }
+  .contextmenu {
+    margin: 0;
+    background: #fff;
+    z-index: 3000;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    li {
+      margin: 0;
+      padding: 7px 16px;
+      cursor: pointer;
+      &:hover {
+        background: #eee;
+      }
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+//reset element css of el-icon-close
+.tags-view-wrapper {
+  .tags-view-item {
+    .el-icon-close {
+      width: 16px;
+      height: 16px;
+      vertical-align: 2px;
+      border-radius: 50%;
+      text-align: center;
+      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transform-origin: 100% 50%;
+      &:before {
+        transform: scale(.6);
+        display: inline-block;
+        vertical-align: -3px;
+      }
+      &:hover {
+        background-color: #b4bccc;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/layout/components/index.js b/ruoyi-ui/src/layout/components/index.js
new file mode 100644
index 0000000..104bd3a
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/index.js
@@ -0,0 +1,5 @@
+export { default as AppMain } from './AppMain'
+export { default as Navbar } from './Navbar'
+export { default as Settings } from './Settings'
+export { default as Sidebar } from './Sidebar/index.vue'
+export { default as TagsView } from './TagsView/index.vue'
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
new file mode 100644
index 0000000..2db1a9b
--- /dev/null
+++ b/ruoyi-ui/src/layout/index.vue
@@ -0,0 +1,107 @@
+<template>
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <div :class="{'fixed-header':fixedHeader}">
+        <navbar />
+        <tags-view v-if="needTagsView" />
+      </div>
+      <app-main />
+      <right-panel>
+        <settings />
+      </right-panel>
+    </div>
+  </div>
+</template>
+
+<script>
+import RightPanel from '@/components/RightPanel'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+import variables from '@/assets/styles/variables.scss'
+
+export default {
+  name: 'Layout',
+  components: {
+    AppMain,
+    Navbar,
+    RightPanel,
+    Settings,
+    Sidebar,
+    TagsView
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    ...mapState({
+      theme: state => state.settings.theme,
+      sideTheme: state => state.settings.sideTheme,
+      sidebar: state => state.app.sidebar,
+      device: state => state.app.device,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    }),
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    },
+    variables() {
+      return variables;
+    }
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
+
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
+  }
+
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
+
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
+
+  .mobile .fixed-header {
+    width: 100%;
+  }
+</style>
diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/ruoyi-ui/src/layout/mixin/ResizeHandler.js
new file mode 100644
index 0000000..e8d0df8
--- /dev/null
+++ b/ruoyi-ui/src/layout/mixin/ResizeHandler.js
@@ -0,0 +1,45 @@
+import store from '@/store'
+
+const { body } = document
+const WIDTH = 992 // refer to Bootstrap's responsive design
+
+export default {
+  watch: {
+    $route(route) {
+      if (this.device === 'mobile' && this.sidebar.opened) {
+        store.dispatch('app/closeSideBar', { withoutAnimation: false })
+      }
+    }
+  },
+  beforeMount() {
+    window.addEventListener('resize', this.$_resizeHandler)
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.$_resizeHandler)
+  },
+  mounted() {
+    const isMobile = this.$_isMobile()
+    if (isMobile) {
+      store.dispatch('app/toggleDevice', 'mobile')
+      store.dispatch('app/closeSideBar', { withoutAnimation: true })
+    }
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_isMobile() {
+      const rect = body.getBoundingClientRect()
+      return rect.width - 1 < WIDTH
+    },
+    $_resizeHandler() {
+      if (!document.hidden) {
+        const isMobile = this.$_isMobile()
+        store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop')
+
+        if (isMobile) {
+          store.dispatch('app/closeSideBar', { withoutAnimation: true })
+        }
+      }
+    }
+  }
+}
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
new file mode 100644
index 0000000..d07dead
--- /dev/null
+++ b/ruoyi-ui/src/main.js
@@ -0,0 +1,88 @@
+import Vue from 'vue'
+
+import Cookies from 'js-cookie'
+
+import Element from 'element-ui'
+import './assets/styles/element-variables.scss'
+
+import '@/assets/styles/index.scss' // global css
+import '@/assets/styles/ruoyi.scss' // ruoyi css
+import App from './App'
+import store from './store'
+import router from './router'
+import directive from './directive' //directive
+
+import './assets/icons' // icon
+import './permission' // permission control
+import { getDicts } from "@/api/system/dict/data";
+import { getConfigKey } from "@/api/system/config";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
+import Pagination from "@/components/Pagination";
+// 自定义表格工具组件
+import RightToolbar from "@/components/RightToolbar"
+// 富文本组件
+import Editor from "@/components/Editor"
+// 文件上传组件
+import FileUpload from "@/components/FileUpload"
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
+// 字典标签组件
+import DictTag from '@/components/DictTag'
+// 头部标签组件
+import VueMeta from 'vue-meta'
+
+// 全局方法挂载
+Vue.prototype.getDicts = getDicts
+Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.parseTime = parseTime
+Vue.prototype.resetForm = resetForm
+Vue.prototype.addDateRange = addDateRange
+Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.download = download
+Vue.prototype.handleTree = handleTree
+
+Vue.prototype.msgSuccess = function (msg) {
+  this.$message({ showClose: true, message: msg, type: "success" });
+}
+
+Vue.prototype.msgError = function (msg) {
+  this.$message({ showClose: true, message: msg, type: "error" });
+}
+
+Vue.prototype.msgInfo = function (msg) {
+  this.$message.info(msg);
+}
+
+// 全局组件挂载
+Vue.component('DictTag', DictTag)
+Vue.component('Pagination', Pagination)
+Vue.component('RightToolbar', RightToolbar)
+Vue.component('Editor', Editor)
+Vue.component('FileUpload', FileUpload)
+Vue.component('ImageUpload', ImageUpload)
+
+Vue.use(directive)
+Vue.use(VueMeta)
+
+/**
+ * If you don't want to use mock-server
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
+ *
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online! ! !
+ */
+
+Vue.use(Element, {
+  size: Cookies.get('size') || 'medium' // set element-ui default size
+})
+
+Vue.config.productionTip = false
+
+new Vue({
+  el: '#app',
+  router,
+  store,
+  render: h => h(App)
+})
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
new file mode 100644
index 0000000..7e770d4
--- /dev/null
+++ b/ruoyi-ui/src/permission.js
@@ -0,0 +1,53 @@
+import router from './router'
+import store from './store'
+import { Message } from 'element-ui'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import { getToken } from '@/utils/auth'
+
+NProgress.configure({ showSpinner: false })
+
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+
+router.beforeEach((to, from, next) => {
+  NProgress.start()
+  if (getToken()) {
+    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    /* has token*/
+    if (to.path === '/login') {
+      next({ path: '/' })
+      NProgress.done()
+    } else {
+      if (store.getters.roles.length === 0) {
+        // 判断当前用户是否已拉取完user_info信息
+        store.dispatch('GetInfo').then(() => {
+          store.dispatch('GenerateRoutes').then(accessRoutes => {
+            // 根据roles权限生成可访问的路由表
+            router.addRoutes(accessRoutes) // 动态添加可访问路由表
+            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+          })
+        }).catch(err => {
+            store.dispatch('LogOut').then(() => {
+              Message.error(err)
+              next({ path: '/' })
+            })
+          })
+      } else {
+        next()
+      }
+    }
+  } else {
+    // 没有token
+    if (whiteList.indexOf(to.path) !== -1) {
+      // 在免登录白名单，直接进入
+      next()
+    } else {
+      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      NProgress.done()
+    }
+  }
+})
+
+router.afterEach(() => {
+  NProgress.done()
+})
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
new file mode 100644
index 0000000..f46694b
--- /dev/null
+++ b/ruoyi-ui/src/router/index.js
@@ -0,0 +1,159 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+Vue.use(Router)
+
+/* Layout */
+import Layout from '@/layout'
+
+/**
+ * Note: 路由配置项
+ *
+ * hidden: true                   // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
+ * alwaysShow: true               // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+ *                                // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
+ *                                // 若你想不管路由下面的 children 声明的个数都显示你的根路由
+ *                                // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
+ * redirect: noRedirect           // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+ * name:'router-name'             // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
+ * meta : {
+    noCache: true                // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+    title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
+    icon: 'svg-name'             // 设置该路由的图标，对应路径src/assets/icons/svg
+    breadcrumb: false            // 如果设置为false，则不会在breadcrumb面包屑中显示
+    activeMenu: '/system/user'   // 当路由设置了该属性，则会高亮相对应的侧边栏。
+  }
+ */
+
+// 公共路由
+export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        component: (resolve) => require(['@/views/redirect'], resolve)
+      }
+    ]
+  },
+  {
+    path: '/login',
+    component: (resolve) => require(['@/views/login'], resolve),
+    hidden: true
+  },
+  {
+    path: '/register',
+    component: (resolve) => require(['@/views/register'], resolve),
+    hidden: true
+  },
+  {
+    path: '/404',
+    component: (resolve) => require(['@/views/error/404'], resolve),
+    hidden: true
+  },
+  {
+    path: '/401',
+    component: (resolve) => require(['@/views/error/401'], resolve),
+    hidden: true
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'index',
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/index'], resolve),
+        name: 'Index',
+        meta: { title: '首页', icon: 'dashboard', affix: true }
+      }
+    ]
+  },
+  {
+    path: '/user',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'profile',
+        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+        name: 'Profile',
+        meta: { title: '个人中心', icon: 'user' }
+      }
+    ]
+  },
+  {
+    path: '/system/user-auth',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'role/:userId(\\d+)',
+        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+        name: 'AuthRole',
+        meta: { title: '分配角色', activeMenu: '/system/user'}
+      }
+    ]
+  },
+  {
+    path: '/system/role-auth',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'user/:roleId(\\d+)',
+        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+        name: 'AuthUser',
+        meta: { title: '分配用户', activeMenu: '/system/role'}
+      }
+    ]
+  },
+  {
+    path: '/system/dict-data',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index/:dictId(\\d+)',
+        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        name: 'Data',
+        meta: { title: '字典数据', activeMenu: '/system/dict'}
+      }
+    ]
+  },
+  {
+    path: '/monitor/job-log',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+        name: 'JobLog',
+        meta: { title: '调度日志', activeMenu: '/monitor/job'}
+      }
+    ]
+  },
+  {
+    path: '/tool/gen-edit',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index/:tableId(\\d+)',
+        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+        name: 'GenEdit',
+        meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
+      }
+    ]
+  }
+]
+
+export default new Router({
+  mode: 'hash', // 去掉url中的#
+  scrollBehavior: () => ({ y: 0 }),
+  routes: constantRoutes
+})
diff --git a/ruoyi-ui/src/settings.js b/ruoyi-ui/src/settings.js
new file mode 100644
index 0000000..6a0b09f
--- /dev/null
+++ b/ruoyi-ui/src/settings.js
@@ -0,0 +1,44 @@
+module.exports = {
+  /**
+   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
+   */
+  sideTheme: 'theme-dark',
+
+  /**
+   * 是否系统布局配置
+   */
+  showSettings: false,
+
+  /**
+   * 是否显示顶部导航
+   */
+  topNav: false,
+
+  /**
+   * 是否显示 tagsView
+   */
+  tagsView: true,
+
+  /**
+   * 是否固定头部
+   */
+  fixedHeader: false,
+
+  /**
+   * 是否显示logo
+   */
+  sidebarLogo: true,
+
+  /**
+   * 是否显示动态标题
+   */
+  dynamicTitle: false,
+
+  /**
+   * @type {string | array} 'production' | ['production', 'development']
+   * @description Need show err logs component.
+   * The default is only used in the production env
+   * If you want to also use it in dev, you can pass ['production', 'development']
+   */
+  errorLog: 'production'
+}
diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js
new file mode 100644
index 0000000..4ed933d
--- /dev/null
+++ b/ruoyi-ui/src/store/getters.js
@@ -0,0 +1,21 @@
+const getters = {
+  sidebar: state => state.app.sidebar,
+  size: state => state.app.size,
+  device: state => state.app.device,
+  visitedViews: state => state.tagsView.visitedViews,
+  cachedViews: state => state.tagsView.cachedViews,
+  token: state => state.user.token,
+  avatar: state => state.user.avatar,
+  //  2021/11/3  15:26   yzy 增加providerId，在登录时获取
+  providerId: state => state.user.providerId,
+  deptName: state => state.user.deptName,
+  name: state => state.user.name,
+  introduction: state => state.user.introduction,
+  roles: state => state.user.roles,
+  permissions: state => state.user.permissions,
+  permission_routes: state => state.permission.routes,
+  topbarRouters:state => state.permission.topbarRouters,
+  defaultRoutes:state => state.permission.defaultRoutes,
+  sidebarRouters:state => state.permission.sidebarRouters,
+}
+export default getters
diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js
new file mode 100644
index 0000000..b14c535
--- /dev/null
+++ b/ruoyi-ui/src/store/index.js
@@ -0,0 +1,27 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import app from './modules/app'
+import user from './modules/user'
+import tagsView from './modules/tagsView'
+import permission from './modules/permission'
+import settings from './modules/settings'
+import getters from './getters'
+
+// 用于进行平台后台的信息设置 yzy 尹志颖
+import baseinfoset from './modules/baseinfoset';
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+  modules: {
+    app,
+    user,
+    tagsView,
+    baseinfoset,
+    permission,
+    settings
+  },
+  getters
+})
+
+export default store
diff --git a/ruoyi-ui/src/store/modules/app.js b/ruoyi-ui/src/store/modules/app.js
new file mode 100644
index 0000000..45d89bb
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/app.js
@@ -0,0 +1,56 @@
+import Cookies from 'js-cookie'
+
+const state = {
+  sidebar: {
+    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+    withoutAnimation: false
+  },
+  device: 'desktop',
+  size: Cookies.get('size') || 'medium'
+}
+
+const mutations = {
+  TOGGLE_SIDEBAR: state => {
+    state.sidebar.opened = !state.sidebar.opened
+    state.sidebar.withoutAnimation = false
+    if (state.sidebar.opened) {
+      Cookies.set('sidebarStatus', 1)
+    } else {
+      Cookies.set('sidebarStatus', 0)
+    }
+  },
+  CLOSE_SIDEBAR: (state, withoutAnimation) => {
+    Cookies.set('sidebarStatus', 0)
+    state.sidebar.opened = false
+    state.sidebar.withoutAnimation = withoutAnimation
+  },
+  TOGGLE_DEVICE: (state, device) => {
+    state.device = device
+  },
+  SET_SIZE: (state, size) => {
+    state.size = size
+    Cookies.set('size', size)
+  }
+}
+
+const actions = {
+  toggleSideBar({ commit }) {
+    commit('TOGGLE_SIDEBAR')
+  },
+  closeSideBar({ commit }, { withoutAnimation }) {
+    commit('CLOSE_SIDEBAR', withoutAnimation)
+  },
+  toggleDevice({ commit }, device) {
+    commit('TOGGLE_DEVICE', device)
+  },
+  setSize({ commit }, size) {
+    commit('SET_SIZE', size)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/ruoyi-ui/src/store/modules/baseinfoset.js b/ruoyi-ui/src/store/modules/baseinfoset.js
new file mode 100644
index 0000000..66ba7b3
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/baseinfoset.js
@@ -0,0 +1,36 @@
+/**
+ * Created by 魔金商城 on 2019/5/14.
+ * 基础设置
+ */
+
+import {getBaseInfoSet} from '@/api/segchk/basicinfo'
+
+const baseinfoset = {
+  state: {
+    baseinfoset: false,
+  },
+  mutations: {
+    SET_BASEINFO_SET: (state, baseinfoset) => {
+      state.baseinfoset = baseinfoset;
+    }
+  },
+  actions: {
+
+    /**
+     * 查询基础配置信息
+     */
+    getBaseInfoSet({commit}) {
+      return new Promise((resolve, reject) => {
+        getBaseInfoSet().then(response => {
+          commit('SET_BASEINFO_SET', response);
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+
+}
+
+export default baseinfoset
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
new file mode 100644
index 0000000..81026f3
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -0,0 +1,113 @@
+import { constantRoutes } from '@/router'
+import { getRouters } from '@/api/menu'
+import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView';
+import InnerLink from '@/layout/components/InnerLink'
+
+const permission = {
+  state: {
+    routes: [],
+    addRoutes: [],
+    defaultRoutes: [],
+    topbarRouters: [],
+    sidebarRouters: []
+  },
+  mutations: {
+    SET_ROUTES: (state, routes) => {
+      state.addRoutes = routes
+      state.routes = constantRoutes.concat(routes)
+    },
+    SET_DEFAULT_ROUTES: (state, routes) => {
+      state.defaultRoutes = constantRoutes.concat(routes)
+    },
+    SET_TOPBAR_ROUTES: (state, routes) => {
+      // 顶部导航菜单默认添加统计报表栏指向首页
+      const index = [{
+        path: 'index',
+        meta: { title: '统计报表', icon: 'dashboard'}
+      }]
+      state.topbarRouters = routes.concat(index);
+    },
+    SET_SIDEBAR_ROUTERS: (state, routes) => {
+      state.sidebarRouters = routes
+    },
+  },
+  actions: {
+    // 生成路由
+    GenerateRoutes({ commit }) {
+      return new Promise(resolve => {
+        // 向后端请求路由数据
+        getRouters().then(res => {
+          const sdata = JSON.parse(JSON.stringify(res.data))
+          const rdata = JSON.parse(JSON.stringify(res.data))
+          const sidebarRoutes = filterAsyncRouter(sdata)
+          const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+          commit('SET_ROUTES', rewriteRoutes)
+          commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
+          commit('SET_DEFAULT_ROUTES', sidebarRoutes)
+          commit('SET_TOPBAR_ROUTES', sidebarRoutes)
+          resolve(rewriteRoutes)
+        })
+      })
+    }
+  }
+}
+
+// 遍历后台传来的路由字符串，转换为组件对象
+function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
+  return asyncRouterMap.filter(route => {
+    if (type && route.children) {
+      route.children = filterChildren(route.children)
+    }
+    if (route.component) {
+      // Layout ParentView 组件特殊处理
+      if (route.component === 'Layout') {
+        route.component = Layout
+      } else if (route.component === 'ParentView') {
+        route.component = ParentView
+      } else if (route.component === 'InnerLink') {
+        route.component = InnerLink
+      } else {
+        route.component = loadView(route.component)
+      }
+    }
+    if (route.children != null && route.children && route.children.length) {
+      route.children = filterAsyncRouter(route.children, route, type)
+    } else {
+      delete route['children']
+      delete route['redirect']
+    }
+    return true
+  })
+}
+
+function filterChildren(childrenMap, lastRouter = false) {
+  var children = []
+  childrenMap.forEach((el, index) => {
+    if (el.children && el.children.length) {
+      if (el.component === 'ParentView') {
+        el.children.forEach(c => {
+          c.path = el.path + '/' + c.path
+          if (c.children && c.children.length) {
+            children = children.concat(filterChildren(c.children, c))
+            return
+          }
+          children.push(c)
+        })
+        return
+      }
+    }
+    if (lastRouter) {
+      el.path = lastRouter.path + '/' + el.path
+    }
+    children = children.concat(el)
+  })
+  return children
+}
+
+export const loadView = (view) => { // 路由懒加载
+  return (resolve) => require([`@/views/${view}`], resolve)
+}
+
+export default permission
diff --git a/ruoyi-ui/src/store/modules/settings.js b/ruoyi-ui/src/store/modules/settings.js
new file mode 100644
index 0000000..647a8ce
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/settings.js
@@ -0,0 +1,43 @@
+import variables from '@/assets/styles/element-variables.scss'
+import defaultSettings from '@/settings'
+
+const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+
+const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
+const state = {
+  title: '',
+  theme: storageSetting.theme || variables.theme,
+  sideTheme: storageSetting.sideTheme || sideTheme,
+  showSettings: showSettings,
+  topNav:  storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
+  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
+  sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
+  dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
+}
+const mutations = {
+  CHANGE_SETTING: (state, { key, value }) => {
+    if (state.hasOwnProperty(key)) {
+      state[key] = value
+    }
+  }
+}
+
+const actions = {
+  // 修改布局设置
+  changeSetting({ commit }, data) {
+    commit('CHANGE_SETTING', data)
+  },
+  // 设置网页标题
+  setTitle({ commit }, title) {
+    state.title = title
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/ruoyi-ui/src/store/modules/tagsView.js
new file mode 100644
index 0000000..a6cfdd9
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/tagsView.js
@@ -0,0 +1,183 @@
+const state = {
+  visitedViews: [],
+  cachedViews: []
+}
+
+const mutations = {
+  ADD_VISITED_VIEW: (state, view) => {
+    if (state.visitedViews.some(v => v.path === view.path)) return
+    state.visitedViews.push(
+      Object.assign({}, view, {
+        title: view.meta.title || 'no-name'
+      })
+    )
+  },
+  ADD_CACHED_VIEW: (state, view) => {
+    if (state.cachedViews.includes(view.name)) return
+    if (!view.meta.noCache) {
+      state.cachedViews.push(view.name)
+    }
+  },
+
+  DEL_VISITED_VIEW: (state, view) => {
+    for (const [i, v] of state.visitedViews.entries()) {
+      if (v.path === view.path) {
+        state.visitedViews.splice(i, 1)
+        break
+      }
+    }
+  },
+  DEL_CACHED_VIEW: (state, view) => {
+    const index = state.cachedViews.indexOf(view.name)
+    index > -1 && state.cachedViews.splice(index, 1)
+  },
+
+  DEL_OTHERS_VISITED_VIEWS: (state, view) => {
+    state.visitedViews = state.visitedViews.filter(v => {
+      return v.meta.affix || v.path === view.path
+    })
+  },
+  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
+    const index = state.cachedViews.indexOf(view.name)
+    if (index > -1) {
+      state.cachedViews = state.cachedViews.slice(index, index + 1)
+    } else {
+      state.cachedViews = []
+    }
+  },
+
+  DEL_ALL_VISITED_VIEWS: state => {
+    // keep affix tags
+    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    state.visitedViews = affixTags
+  },
+  DEL_ALL_CACHED_VIEWS: state => {
+    state.cachedViews = []
+  },
+
+  UPDATE_VISITED_VIEW: (state, view) => {
+    for (let v of state.visitedViews) {
+      if (v.path === view.path) {
+        v = Object.assign(v, view)
+        break
+      }
+    }
+  },
+  
+  DEL_RIGHT_VIEWS: (state, view) => {
+    const index = state.visitedViews.findIndex(v => v.path === view.path)
+    if (index === -1) {
+      return
+    }
+    state.visitedViews = state.visitedViews.filter((item, idx) => {
+      if (idx <= index || (item.meta && item.meta.affix)) {
+        return true
+      }
+      const i = state.cachedViews.indexOf(item.name)
+      if (i > -1) {
+        state.cachedViews.splice(i, 1)
+      }
+      return false
+    })
+  }
+}
+
+const actions = {
+  addView({ dispatch }, view) {
+    dispatch('addVisitedView', view)
+    dispatch('addCachedView', view)
+  },
+  addVisitedView({ commit }, view) {
+    commit('ADD_VISITED_VIEW', view)
+  },
+  addCachedView({ commit }, view) {
+    commit('ADD_CACHED_VIEW', view)
+  },
+
+  delView({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delVisitedView', view)
+      dispatch('delCachedView', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delVisitedView({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_VISITED_VIEW', view)
+      resolve([...state.visitedViews])
+    })
+  },
+  delCachedView({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_CACHED_VIEW', view)
+      resolve([...state.cachedViews])
+    })
+  },
+
+  delOthersViews({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delOthersVisitedViews', view)
+      dispatch('delOthersCachedViews', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delOthersVisitedViews({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_OTHERS_VISITED_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  },
+  delOthersCachedViews({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_OTHERS_CACHED_VIEWS', view)
+      resolve([...state.cachedViews])
+    })
+  },
+
+  delAllViews({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delAllVisitedViews', view)
+      dispatch('delAllCachedViews', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delAllVisitedViews({ commit, state }) {
+    return new Promise(resolve => {
+      commit('DEL_ALL_VISITED_VIEWS')
+      resolve([...state.visitedViews])
+    })
+  },
+  delAllCachedViews({ commit, state }) {
+    return new Promise(resolve => {
+      commit('DEL_ALL_CACHED_VIEWS')
+      resolve([...state.cachedViews])
+    })
+  },
+
+  updateVisitedView({ commit }, view) {
+    commit('UPDATE_VISITED_VIEW', view)
+  },
+
+  delRightTags({ commit }, view) {
+    return new Promise(resolve => {
+      commit('DEL_RIGHT_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
new file mode 100644
index 0000000..7d80b8b
--- /dev/null
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -0,0 +1,110 @@
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
+
+
+//  2021/11/3  15:25   yzy 增加providerId,deptName，在登录时获取
+const user = {
+  state: {
+    token: getToken(),
+    name: '',
+    providerId: '',
+    deptName: '',
+    avatar: '',
+    roles: [],
+    permissions: []
+  },
+
+  mutations: {
+    SET_TOKEN: (state, token) => {
+      state.token = token
+    },
+    SET_NAME: (state, name) => {
+      state.name = name
+    },
+    SET_PROVIDERID: (state, providerId) => {
+      state.providerId = providerId
+    },
+    SET_DEPART: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ROLES: (state, roles) => {
+      state.roles = roles
+    },
+    SET_PERMISSIONS: (state, permissions) => {
+      state.permissions = permissions
+    }
+  },
+
+  actions: {
+    // 登录
+    Login({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      const password = userInfo.password
+      const code = userInfo.code
+      const uuid = userInfo.uuid
+      return new Promise((resolve, reject) => {
+        login(username, password, code, uuid).then(res => {
+          setToken(res.token)
+          commit('SET_TOKEN', res.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 获取用户信息
+    GetInfo({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getInfo().then(res => {
+          const user = res.user
+          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLES', res.roles)
+            commit('SET_PERMISSIONS', res.permissions)
+          } else {
+            commit('SET_ROLES', ['ROLE_DEFAULT'])
+          }
+          commit('SET_NAME', user.userName)
+          commit('SET_PROVIDERID', user.providerId)
+          commit('SET_DEPART', user.dept.deptName)
+          commit('SET_AVATAR', avatar)
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 退出系统
+    LogOut({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        logout(state.token).then(() => {
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          commit('SET_PERMISSIONS', [])
+          commit('SET_PROVIDERID', '')
+          commit('SET_DEPART', '')
+          removeToken()
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 前端 登出
+    FedLogOut({ commit }) {
+      return new Promise(resolve => {
+        commit('SET_TOKEN', '')
+        removeToken()
+        resolve()
+      })
+    }
+  }
+}
+
+export default user
diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js
new file mode 100644
index 0000000..08a43d6
--- /dev/null
+++ b/ruoyi-ui/src/utils/auth.js
@@ -0,0 +1,15 @@
+import Cookies from 'js-cookie'
+
+const TokenKey = 'Admin-Token'
+
+export function getToken() {
+  return Cookies.get(TokenKey)
+}
+
+export function setToken(token) {
+  return Cookies.set(TokenKey, token)
+}
+
+export function removeToken() {
+  return Cookies.remove(TokenKey)
+}
diff --git a/ruoyi-ui/src/utils/errorCode.js b/ruoyi-ui/src/utils/errorCode.js
new file mode 100644
index 0000000..d2111ee
--- /dev/null
+++ b/ruoyi-ui/src/utils/errorCode.js
@@ -0,0 +1,6 @@
+export default {
+  '401': '认证失败，无法访问系统资源',
+  '403': '当前操作没有权限',
+  '404': '访问资源不存在',
+  'default': '系统未知错误，请反馈给管理员'
+}
diff --git a/ruoyi-ui/src/utils/generator/config.js b/ruoyi-ui/src/utils/generator/config.js
new file mode 100644
index 0000000..7abf227
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/config.js
@@ -0,0 +1,438 @@
+export const formConf = {
+  formRef: 'elForm',
+  formModel: 'formData',
+  size: 'medium',
+  labelPosition: 'right',
+  labelWidth: 100,
+  formRules: 'rules',
+  gutter: 15,
+  disabled: false,
+  span: 24,
+  formBtns: true
+}
+
+export const inputComponents = [
+  {
+    label: '单行文本',
+    tag: 'el-input',
+    tagIcon: 'input',
+    placeholder: '请输入',
+    defaultValue: undefined,
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    clearable: true,
+    prepend: '',
+    append: '',
+    'prefix-icon': '',
+    'suffix-icon': '',
+    maxlength: null,
+    'show-word-limit': false,
+    readonly: false,
+    disabled: false,
+    required: true,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/input'
+  },
+  {
+    label: '多行文本',
+    tag: 'el-input',
+    tagIcon: 'textarea',
+    type: 'textarea',
+    placeholder: '请输入',
+    defaultValue: undefined,
+    span: 24,
+    labelWidth: null,
+    autosize: {
+      minRows: 4,
+      maxRows: 4
+    },
+    style: { width: '100%' },
+    maxlength: null,
+    'show-word-limit': false,
+    readonly: false,
+    disabled: false,
+    required: true,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/input'
+  },
+  {
+    label: '密码',
+    tag: 'el-input',
+    tagIcon: 'password',
+    placeholder: '请输入',
+    defaultValue: undefined,
+    span: 24,
+    'show-password': true,
+    labelWidth: null,
+    style: { width: '100%' },
+    clearable: true,
+    prepend: '',
+    append: '',
+    'prefix-icon': '',
+    'suffix-icon': '',
+    maxlength: null,
+    'show-word-limit': false,
+    readonly: false,
+    disabled: false,
+    required: true,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/input'
+  },
+  {
+    label: '计数器',
+    tag: 'el-input-number',
+    tagIcon: 'number',
+    placeholder: '',
+    defaultValue: undefined,
+    span: 24,
+    labelWidth: null,
+    min: undefined,
+    max: undefined,
+    step: undefined,
+    'step-strictly': false,
+    precision: undefined,
+    'controls-position': '',
+    disabled: false,
+    required: true,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/input-number'
+  }
+]
+
+export const selectComponents = [
+  {
+    label: '下拉选择',
+    tag: 'el-select',
+    tagIcon: 'select',
+    placeholder: '请选择',
+    defaultValue: undefined,
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    clearable: true,
+    disabled: false,
+    required: true,
+    filterable: false,
+    multiple: false,
+    options: [{
+      label: '选项一',
+      value: 1
+    }, {
+      label: '选项二',
+      value: 2
+    }],
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/select'
+  },
+  {
+    label: '级联选择',
+    tag: 'el-cascader',
+    tagIcon: 'cascader',
+    placeholder: '请选择',
+    defaultValue: [],
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    props: {
+      props: {
+        multiple: false
+      }
+    },
+    'show-all-levels': true,
+    disabled: false,
+    clearable: true,
+    filterable: false,
+    required: true,
+    options: [{
+      id: 1,
+      value: 1,
+      label: '选项1',
+      children: [{
+        id: 2,
+        value: 2,
+        label: '选项1-1'
+      }]
+    }],
+    dataType: 'dynamic',
+    labelKey: 'label',
+    valueKey: 'value',
+    childrenKey: 'children',
+    separator: '/',
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/cascader'
+  },
+  {
+    label: '单选框组',
+    tag: 'el-radio-group',
+    tagIcon: 'radio',
+    defaultValue: undefined,
+    span: 24,
+    labelWidth: null,
+    style: {},
+    optionType: 'default',
+    border: false,
+    size: 'medium',
+    disabled: false,
+    required: true,
+    options: [{
+      label: '选项一',
+      value: 1
+    }, {
+      label: '选项二',
+      value: 2
+    }],
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/radio'
+  },
+  {
+    label: '多选框组',
+    tag: 'el-checkbox-group',
+    tagIcon: 'checkbox',
+    defaultValue: [],
+    span: 24,
+    labelWidth: null,
+    style: {},
+    optionType: 'default',
+    border: false,
+    size: 'medium',
+    disabled: false,
+    required: true,
+    options: [{
+      label: '选项一',
+      value: 1
+    }, {
+      label: '选项二',
+      value: 2
+    }],
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/checkbox'
+  },
+  {
+    label: '开关',
+    tag: 'el-switch',
+    tagIcon: 'switch',
+    defaultValue: false,
+    span: 24,
+    labelWidth: null,
+    style: {},
+    disabled: false,
+    required: true,
+    'active-text': '',
+    'inactive-text': '',
+    'active-color': null,
+    'inactive-color': null,
+    'active-value': true,
+    'inactive-value': false,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/switch'
+  },
+  {
+    label: '滑块',
+    tag: 'el-slider',
+    tagIcon: 'slider',
+    defaultValue: null,
+    span: 24,
+    labelWidth: null,
+    disabled: false,
+    required: true,
+    min: 0,
+    max: 100,
+    step: 1,
+    'show-stops': false,
+    range: false,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/slider'
+  },
+  {
+    label: '时间选择',
+    tag: 'el-time-picker',
+    tagIcon: 'time',
+    placeholder: '请选择',
+    defaultValue: null,
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    disabled: false,
+    clearable: true,
+    required: true,
+    'picker-options': {
+      selectableRange: '00:00:00-23:59:59'
+    },
+    format: 'HH:mm:ss',
+    'value-format': 'HH:mm:ss',
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/time-picker'
+  },
+  {
+    label: '时间范围',
+    tag: 'el-time-picker',
+    tagIcon: 'time-range',
+    defaultValue: null,
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    disabled: false,
+    clearable: true,
+    required: true,
+    'is-range': true,
+    'range-separator': '至',
+    'start-placeholder': '开始时间',
+    'end-placeholder': '结束时间',
+    format: 'HH:mm:ss',
+    'value-format': 'HH:mm:ss',
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/time-picker'
+  },
+  {
+    label: '日期选择',
+    tag: 'el-date-picker',
+    tagIcon: 'date',
+    placeholder: '请选择',
+    defaultValue: null,
+    type: 'date',
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    disabled: false,
+    clearable: true,
+    required: true,
+    format: 'yyyy-MM-dd',
+    'value-format': 'yyyy-MM-dd',
+    readonly: false,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/date-picker'
+  },
+  {
+    label: '日期范围',
+    tag: 'el-date-picker',
+    tagIcon: 'date-range',
+    defaultValue: null,
+    span: 24,
+    labelWidth: null,
+    style: { width: '100%' },
+    type: 'daterange',
+    'range-separator': '至',
+    'start-placeholder': '开始日期',
+    'end-placeholder': '结束日期',
+    disabled: false,
+    clearable: true,
+    required: true,
+    format: 'yyyy-MM-dd',
+    'value-format': 'yyyy-MM-dd',
+    readonly: false,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/date-picker'
+  },
+  {
+    label: '评分',
+    tag: 'el-rate',
+    tagIcon: 'rate',
+    defaultValue: 0,
+    span: 24,
+    labelWidth: null,
+    style: {},
+    max: 5,
+    'allow-half': false,
+    'show-text': false,
+    'show-score': false,
+    disabled: false,
+    required: true,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/rate'
+  },
+  {
+    label: '颜色选择',
+    tag: 'el-color-picker',
+    tagIcon: 'color',
+    defaultValue: null,
+    labelWidth: null,
+    'show-alpha': false,
+    'color-format': '',
+    disabled: false,
+    required: true,
+    size: 'medium',
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/color-picker'
+  },
+  {
+    label: '上传',
+    tag: 'el-upload',
+    tagIcon: 'upload',
+    action: 'https://jsonplaceholder.typicode.com/posts/',
+    defaultValue: null,
+    labelWidth: null,
+    disabled: false,
+    required: true,
+    accept: '',
+    name: 'file',
+    'auto-upload': true,
+    showTip: false,
+    buttonText: '点击上传',
+    fileSize: 2,
+    sizeUnit: 'MB',
+    'list-type': 'text',
+    multiple: false,
+    regList: [],
+    changeTag: true,
+    document: 'https://element.eleme.cn/#/zh-CN/component/upload'
+  }
+]
+
+export const layoutComponents = [
+  {
+    layout: 'rowFormItem',
+    tagIcon: 'row',
+    type: 'default',
+    justify: 'start',
+    align: 'top',
+    label: '行容器',
+    layoutTree: true,
+    children: [],
+    document: 'https://element.eleme.cn/#/zh-CN/component/layout'
+  },
+  {
+    layout: 'colFormItem',
+    label: '按钮',
+    changeTag: true,
+    labelWidth: null,
+    tag: 'el-button',
+    tagIcon: 'button',
+    span: 24,
+    default: '主要按钮',
+    type: 'primary',
+    icon: 'el-icon-search',
+    size: 'medium',
+    disabled: false,
+    document: 'https://element.eleme.cn/#/zh-CN/component/button'
+  }
+]
+
+// 组件rule的触发方式，无触发方式的组件不生成rule
+export const trigger = {
+  'el-input': 'blur',
+  'el-input-number': 'blur',
+  'el-select': 'change',
+  'el-radio-group': 'change',
+  'el-checkbox-group': 'change',
+  'el-cascader': 'change',
+  'el-time-picker': 'change',
+  'el-date-picker': 'change',
+  'el-rate': 'change'
+}
diff --git a/ruoyi-ui/src/utils/generator/css.js b/ruoyi-ui/src/utils/generator/css.js
new file mode 100644
index 0000000..c1c62e6
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/css.js
@@ -0,0 +1,18 @@
+const styles = {
+  'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}',
+  'el-upload': '.el-upload__tip{line-height: 1.2;}'
+}
+
+function addCss(cssList, el) {
+  const css = styles[el.tag]
+  css && cssList.indexOf(css) === -1 && cssList.push(css)
+  if (el.children) {
+    el.children.forEach(el2 => addCss(cssList, el2))
+  }
+}
+
+export function makeUpCss(conf) {
+  const cssList = []
+  conf.fields.forEach(el => addCss(cssList, el))
+  return cssList.join('\n')
+}
diff --git a/ruoyi-ui/src/utils/generator/drawingDefalut.js b/ruoyi-ui/src/utils/generator/drawingDefalut.js
new file mode 100644
index 0000000..09f133c
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/drawingDefalut.js
@@ -0,0 +1,29 @@
+export default [
+  {
+    layout: 'colFormItem',
+    tagIcon: 'input',
+    label: '手机号',
+    vModel: 'mobile',
+    formId: 6,
+    tag: 'el-input',
+    placeholder: '请输入手机号',
+    defaultValue: '',
+    span: 24,
+    style: { width: '100%' },
+    clearable: true,
+    prepend: '',
+    append: '',
+    'prefix-icon': 'el-icon-mobile',
+    'suffix-icon': '',
+    maxlength: 11,
+    'show-word-limit': true,
+    readonly: false,
+    disabled: false,
+    required: true,
+    changeTag: true,
+    regList: [{
+      pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
+      message: '手机号格式错误'
+    }]
+  }
+]
diff --git a/ruoyi-ui/src/utils/generator/html.js b/ruoyi-ui/src/utils/generator/html.js
new file mode 100644
index 0000000..ebf628d
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/html.js
@@ -0,0 +1,359 @@
+/* eslint-disable max-len */
+import { trigger } from './config'
+
+let confGlobal
+let someSpanIsNot24
+
+export function dialogWrapper(str) {
+  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile">
+    ${str}
+    <div slot="footer">
+      <el-button @click="close">取消</el-button>
+      <el-button type="primary" @click="handelConfirm">确定</el-button>
+    </div>
+  </el-dialog>`
+}
+
+export function vueTemplate(str) {
+  return `<template>
+    <div>
+      ${str}
+    </div>
+  </template>`
+}
+
+export function vueScript(str) {
+  return `<script>
+    ${str}
+  </script>`
+}
+
+export function cssStyle(cssStr) {
+  return `<style>
+    ${cssStr}
+  </style>`
+}
+
+function buildFormTemplate(conf, child, type) {
+  let labelPosition = ''
+  if (conf.labelPosition !== 'right') {
+    labelPosition = `label-position="${conf.labelPosition}"`
+  }
+  const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : ''
+  let str = `<el-form ref="${conf.formRef}" :model="${conf.formModel}" :rules="${conf.formRules}" size="${conf.size}" ${disabled} label-width="${conf.labelWidth}px" ${labelPosition}>
+      ${child}
+      ${buildFromBtns(conf, type)}
+    </el-form>`
+  if (someSpanIsNot24) {
+    str = `<el-row :gutter="${conf.gutter}">
+        ${str}
+      </el-row>`
+  }
+  return str
+}
+
+function buildFromBtns(conf, type) {
+  let str = ''
+  if (conf.formBtns && type === 'file') {
+    str = `<el-form-item size="large">
+          <el-button type="primary" @click="submitForm">提交</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </el-form-item>`
+    if (someSpanIsNot24) {
+      str = `<el-col :span="24">
+          ${str}
+        </el-col>`
+    }
+  }
+  return str
+}
+
+// span不为24的用el-col包裹
+function colWrapper(element, str) {
+  if (someSpanIsNot24 || element.span !== 24) {
+    return `<el-col :span="${element.span}">
+      ${str}
+    </el-col>`
+  }
+  return str
+}
+
+const layouts = {
+  colFormItem(element) {
+    let labelWidth = ''
+    if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
+      labelWidth = `label-width="${element.labelWidth}px"`
+    }
+    const required = !trigger[element.tag] && element.required ? 'required' : ''
+    const tagDom = tags[element.tag] ? tags[element.tag](element) : null
+    let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}>
+        ${tagDom}
+      </el-form-item>`
+    str = colWrapper(element, str)
+    return str
+  },
+  rowFormItem(element) {
+    const type = element.type === 'default' ? '' : `type="${element.type}"`
+    const justify = element.type === 'default' ? '' : `justify="${element.justify}"`
+    const align = element.type === 'default' ? '' : `align="${element.align}"`
+    const gutter = element.gutter ? `gutter="${element.gutter}"` : ''
+    const children = element.children.map(el => layouts[el.layout](el))
+    let str = `<el-row ${type} ${justify} ${align} ${gutter}>
+      ${children.join('\n')}
+    </el-row>`
+    str = colWrapper(element, str)
+    return str
+  }
+}
+
+const tags = {
+  'el-button': el => {
+    const {
+      tag, disabled
+    } = attrBuilder(el)
+    const type = el.type ? `type="${el.type}"` : ''
+    const icon = el.icon ? `icon="${el.icon}"` : ''
+    const size = el.size ? `size="${el.size}"` : ''
+    let child = buildElButtonChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
+  },
+  'el-input': el => {
+    const {
+      disabled, vModel, clearable, placeholder, width
+    } = attrBuilder(el)
+    const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
+    const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
+    const readonly = el.readonly ? 'readonly' : ''
+    const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : ''
+    const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : ''
+    const showPassword = el['show-password'] ? 'show-password' : ''
+    const type = el.type ? `type="${el.type}"` : ''
+    const autosize = el.autosize && el.autosize.minRows
+      ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"`
+      : ''
+    let child = buildElInputChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}</${el.tag}>`
+  },
+  'el-input-number': el => {
+    const { disabled, vModel, placeholder } = attrBuilder(el)
+    const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : ''
+    const min = el.min ? `:min='${el.min}'` : ''
+    const max = el.max ? `:max='${el.max}'` : ''
+    const step = el.step ? `:step='${el.step}'` : ''
+    const stepStrictly = el['step-strictly'] ? 'step-strictly' : ''
+    const precision = el.precision ? `:precision='${el.precision}'` : ''
+
+    return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}></${el.tag}>`
+  },
+  'el-select': el => {
+    const {
+      disabled, vModel, clearable, placeholder, width
+    } = attrBuilder(el)
+    const filterable = el.filterable ? 'filterable' : ''
+    const multiple = el.multiple ? 'multiple' : ''
+    let child = buildElSelectChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}</${el.tag}>`
+  },
+  'el-radio-group': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const size = `size="${el.size}"`
+    let child = buildElRadioGroupChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${vModel} ${size} ${disabled}>${child}</${el.tag}>`
+  },
+  'el-checkbox-group': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const size = `size="${el.size}"`
+    const min = el.min ? `:min="${el.min}"` : ''
+    const max = el.max ? `:max="${el.max}"` : ''
+    let child = buildElCheckboxGroupChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}</${el.tag}>`
+  },
+  'el-switch': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : ''
+    const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : ''
+    const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : ''
+    const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : ''
+    const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : ''
+    const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : ''
+
+    return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}></${el.tag}>`
+  },
+  'el-cascader': el => {
+    const {
+      disabled, vModel, clearable, placeholder, width
+    } = attrBuilder(el)
+    const options = el.options ? `:options="${el.vModel}Options"` : ''
+    const props = el.props ? `:props="${el.vModel}Props"` : ''
+    const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"'
+    const filterable = el.filterable ? 'filterable' : ''
+    const separator = el.separator === '/' ? '' : `separator="${el.separator}"`
+
+    return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}></${el.tag}>`
+  },
+  'el-slider': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const min = el.min ? `:min='${el.min}'` : ''
+    const max = el.max ? `:max='${el.max}'` : ''
+    const step = el.step ? `:step='${el.step}'` : ''
+    const range = el.range ? 'range' : ''
+    const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : ''
+
+    return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}></${el.tag}>`
+  },
+  'el-time-picker': el => {
+    const {
+      disabled, vModel, clearable, placeholder, width
+    } = attrBuilder(el)
+    const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
+    const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
+    const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
+    const isRange = el['is-range'] ? 'is-range' : ''
+    const format = el.format ? `format="${el.format}"` : ''
+    const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
+    const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : ''
+
+    return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}></${el.tag}>`
+  },
+  'el-date-picker': el => {
+    const {
+      disabled, vModel, clearable, placeholder, width
+    } = attrBuilder(el)
+    const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
+    const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
+    const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
+    const format = el.format ? `format="${el.format}"` : ''
+    const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
+    const type = el.type === 'date' ? '' : `type="${el.type}"`
+    const readonly = el.readonly ? 'readonly' : ''
+
+    return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}></${el.tag}>`
+  },
+  'el-rate': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const max = el.max ? `:max='${el.max}'` : ''
+    const allowHalf = el['allow-half'] ? 'allow-half' : ''
+    const showText = el['show-text'] ? 'show-text' : ''
+    const showScore = el['show-score'] ? 'show-score' : ''
+
+    return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}></${el.tag}>`
+  },
+  'el-color-picker': el => {
+    const { disabled, vModel } = attrBuilder(el)
+    const size = `size="${el.size}"`
+    const showAlpha = el['show-alpha'] ? 'show-alpha' : ''
+    const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : ''
+
+    return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}></${el.tag}>`
+  },
+  'el-upload': el => {
+    const disabled = el.disabled ? ':disabled=\'true\'' : ''
+    const action = el.action ? `:action="${el.vModel}Action"` : ''
+    const multiple = el.multiple ? 'multiple' : ''
+    const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : ''
+    const accept = el.accept ? `accept="${el.accept}"` : ''
+    const name = el.name !== 'file' ? `name="${el.name}"` : ''
+    const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : ''
+    const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"`
+    const fileList = `:file-list="${el.vModel}fileList"`
+    const ref = `ref="${el.vModel}"`
+    let child = buildElUploadChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.tag}>`
+  }
+}
+
+function attrBuilder(el) {
+  return {
+    vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`,
+    clearable: el.clearable ? 'clearable' : '',
+    placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
+    width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
+    disabled: el.disabled ? ':disabled=\'true\'' : ''
+  }
+}
+
+// el-buttin 子级
+function buildElButtonChild(conf) {
+  const children = []
+  if (conf.default) {
+    children.push(conf.default)
+  }
+  return children.join('\n')
+}
+
+// el-input innerHTML
+function buildElInputChild(conf) {
+  const children = []
+  if (conf.prepend) {
+    children.push(`<template slot="prepend">${conf.prepend}</template>`)
+  }
+  if (conf.append) {
+    children.push(`<template slot="append">${conf.append}</template>`)
+  }
+  return children.join('\n')
+}
+
+function buildElSelectChild(conf) {
+  const children = []
+  if (conf.options && conf.options.length) {
+    children.push(`<el-option v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>`)
+  }
+  return children.join('\n')
+}
+
+function buildElRadioGroupChild(conf) {
+  const children = []
+  if (conf.options && conf.options.length) {
+    const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
+    const border = conf.border ? 'border' : ''
+    children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
+  }
+  return children.join('\n')
+}
+
+function buildElCheckboxGroupChild(conf) {
+  const children = []
+  if (conf.options && conf.options.length) {
+    const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
+    const border = conf.border ? 'border' : ''
+    children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
+  }
+  return children.join('\n')
+}
+
+function buildElUploadChild(conf) {
+  const list = []
+  if (conf['list-type'] === 'picture-card') list.push('<i class="el-icon-plus"></i>')
+  else list.push(`<el-button size="small" type="primary" icon="el-icon-upload">${conf.buttonText}</el-button>`)
+  if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件</div>`)
+  return list.join('\n')
+}
+
+export function makeUpHtml(conf, type) {
+  const htmlList = []
+  confGlobal = conf
+  someSpanIsNot24 = conf.fields.some(item => item.span !== 24)
+  conf.fields.forEach(el => {
+    htmlList.push(layouts[el.layout](el))
+  })
+  const htmlStr = htmlList.join('\n')
+
+  let temp = buildFormTemplate(conf, htmlStr, type)
+  if (type === 'dialog') {
+    temp = dialogWrapper(temp)
+  }
+  confGlobal = null
+  return temp
+}
diff --git a/ruoyi-ui/src/utils/generator/icon.json b/ruoyi-ui/src/utils/generator/icon.json
new file mode 100644
index 0000000..2d9999a
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/icon.json
@@ -0,0 +1 @@
+["platform-eleme","eleme","delete-solid","delete","s-tools","setting","user-solid","user","phone","phone-outline","more","more-outline","star-on","star-off","s-goods","goods","warning","warning-outline","question","info","remove","circle-plus","success","error","zoom-in","zoom-out","remove-outline","circle-plus-outline","circle-check","circle-close","s-help","help","minus","plus","check","close","picture","picture-outline","picture-outline-round","upload","upload2","download","camera-solid","camera","video-camera-solid","video-camera","message-solid","bell","s-cooperation","s-order","s-platform","s-fold","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-marketing","s-flag","s-comment","s-finance","s-claim","s-custom","s-opportunity","s-data","s-check","s-grid","menu","share","d-caret","caret-left","caret-right","caret-bottom","caret-top","bottom-left","bottom-right","back","right","bottom","top","top-left","top-right","arrow-left","arrow-right","arrow-down","arrow-up","d-arrow-left","d-arrow-right","video-pause","video-play","refresh","refresh-right","refresh-left","finished","sort","sort-up","sort-down","rank","loading","view","c-scale-to-original","date","edit","edit-outline","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","takeaway-box","search","monitor","attract","mobile","scissors","umbrella","headset","brush","mouse","coordinate","magic-stick","reading","data-line","data-board","pie-chart","data-analysis","collection-tag","film","suitcase","suitcase-1","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","house","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","sold-out","sell","present","box","bank-card","money","coin","wallet","discount","price-tag","news","guide","male","female","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bangzhu","time","odometer","crop","aim","switch-button","full-screen","copy-document","mic","stopwatch","medal-1","medal","trophy","trophy-1","first-aid-kit","discover","place","location","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer","watch-1","watch","lock","unlock","key","service","mobile-phone","bicycle","truck","ship","basketball","football","soccer","baseball","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","dish","dish-1","food","chicken","fork-spoon","knife-fork","burger","tableware","sugar","dessert","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","coffee","ice-tea","ice-drink","milk-tea","potato-strips","lollipop","ice-cream-square","ice-cream-round"]
\ No newline at end of file
diff --git a/ruoyi-ui/src/utils/generator/js.js b/ruoyi-ui/src/utils/generator/js.js
new file mode 100644
index 0000000..c6c06a9
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/js.js
@@ -0,0 +1,236 @@
+import { isArray } from 'util'
+import { exportDefault, titleCase } from '@/utils/index'
+import { trigger } from './config'
+
+const units = {
+  KB: '1024',
+  MB: '1024 / 1024',
+  GB: '1024 / 1024 / 1024'
+}
+let confGlobal
+const inheritAttrs = {
+  file: '',
+  dialog: 'inheritAttrs: false,'
+}
+
+
+export function makeUpJs(conf, type) {
+  confGlobal = conf = JSON.parse(JSON.stringify(conf))
+  const dataList = []
+  const ruleList = []
+  const optionsList = []
+  const propsList = []
+  const methodList = mixinMethod(type)
+  const uploadVarList = []
+
+  conf.fields.forEach(el => {
+    buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
+  })
+
+  const script = buildexport(
+    conf,
+    type,
+    dataList.join('\n'),
+    ruleList.join('\n'),
+    optionsList.join('\n'),
+    uploadVarList.join('\n'),
+    propsList.join('\n'),
+    methodList.join('\n')
+  )
+  confGlobal = null
+  return script
+}
+
+function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) {
+  buildData(el, dataList)
+  buildRules(el, ruleList)
+
+  if (el.options && el.options.length) {
+    buildOptions(el, optionsList)
+    if (el.dataType === 'dynamic') {
+      const model = `${el.vModel}Options`
+      const options = titleCase(model)
+      buildOptionMethod(`get${options}`, model, methodList)
+    }
+  }
+
+  if (el.props && el.props.props) {
+    buildProps(el, propsList)
+  }
+
+  if (el.action && el.tag === 'el-upload') {
+    uploadVarList.push(
+      `${el.vModel}Action: '${el.action}',
+      ${el.vModel}fileList: [],`
+    )
+    methodList.push(buildBeforeUpload(el))
+    if (!el['auto-upload']) {
+      methodList.push(buildSubmitUpload(el))
+    }
+  }
+
+  if (el.children) {
+    el.children.forEach(el2 => {
+      buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
+    })
+  }
+}
+
+function mixinMethod(type) {
+  const list = []; const
+    minxins = {
+      file: confGlobal.formBtns ? {
+        submitForm: `submitForm() {
+        this.$refs['${confGlobal.formRef}'].validate(valid => {
+          if(!valid) return
+          // TODO 提交表单
+        })
+      },`,
+        resetForm: `resetForm() {
+        this.$refs['${confGlobal.formRef}'].resetFields()
+      },`
+      } : null,
+      dialog: {
+        onOpen: 'onOpen() {},',
+        onClose: `onClose() {
+        this.$refs['${confGlobal.formRef}'].resetFields()
+      },`,
+        close: `close() {
+        this.$emit('update:visible', false)
+      },`,
+        handelConfirm: `handelConfirm() {
+        this.$refs['${confGlobal.formRef}'].validate(valid => {
+          if(!valid) return
+          this.close()
+        })
+      },`
+      }
+    }
+
+  const methods = minxins[type]
+  if (methods) {
+    Object.keys(methods).forEach(key => {
+      list.push(methods[key])
+    })
+  }
+
+  return list
+}
+
+function buildData(conf, dataList) {
+  if (conf.vModel === undefined) return
+  let defaultValue
+  if (typeof (conf.defaultValue) === 'string' && !conf.multiple) {
+    defaultValue = `'${conf.defaultValue}'`
+  } else {
+    defaultValue = `${JSON.stringify(conf.defaultValue)}`
+  }
+  dataList.push(`${conf.vModel}: ${defaultValue},`)
+}
+
+function buildRules(conf, ruleList) {
+  if (conf.vModel === undefined) return
+  const rules = []
+  if (trigger[conf.tag]) {
+    if (conf.required) {
+      const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
+      let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
+      if (message === undefined) message = `${conf.label}不能为空`
+      rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
+    }
+    if (conf.regList && isArray(conf.regList)) {
+      conf.regList.forEach(item => {
+        if (item.pattern) {
+          rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`)
+        }
+      })
+    }
+    ruleList.push(`${conf.vModel}: [${rules.join(',')}],`)
+  }
+}
+
+function buildOptions(conf, optionsList) {
+  if (conf.vModel === undefined) return
+  if (conf.dataType === 'dynamic') { conf.options = [] }
+  const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},`
+  optionsList.push(str)
+}
+
+function buildProps(conf, propsList) {
+  if (conf.dataType === 'dynamic') {
+    conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey)
+    conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey)
+    conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey)
+  }
+  const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},`
+  propsList.push(str)
+}
+
+function buildBeforeUpload(conf) {
+  const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
+    returnList = []
+  if (conf.fileSize) {
+    rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
+    if(!isRightSize){
+      this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
+    }`
+    returnList.push('isRightSize')
+  }
+  if (conf.accept) {
+    acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type)
+    if(!isAccept){
+      this.$message.error('应该选择${conf.accept}类型的文件')
+    }`
+    returnList.push('isAccept')
+  }
+  const str = `${conf.vModel}BeforeUpload(file) {
+    ${rightSizeCode}
+    ${acceptCode}
+    return ${returnList.join('&&')}
+  },`
+  return returnList.length ? str : ''
+}
+
+function buildSubmitUpload(conf) {
+  const str = `submitUpload() {
+    this.$refs['${conf.vModel}'].submit()
+  },`
+  return str
+}
+
+function buildOptionMethod(methodName, model, methodList) {
+  const str = `${methodName}() {
+    // TODO 发起请求获取数据
+    this.${model}
+  },`
+  methodList.push(str)
+}
+
+function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) {
+  const str = `${exportDefault}{
+  ${inheritAttrs[type]}
+  components: {},
+  props: [],
+  data () {
+    return {
+      ${conf.formModel}: {
+        ${data}
+      },
+      ${conf.formRules}: {
+        ${rules}
+      },
+      ${uploadVar}
+      ${selectOptions}
+      ${props}
+    }
+  },
+  computed: {},
+  watch: {},
+  created () {},
+  mounted () {},
+  methods: {
+    ${methods}
+  }
+}`
+  return str
+}
diff --git a/ruoyi-ui/src/utils/generator/render.js b/ruoyi-ui/src/utils/generator/render.js
new file mode 100644
index 0000000..e8640f0
--- /dev/null
+++ b/ruoyi-ui/src/utils/generator/render.js
@@ -0,0 +1,126 @@
+import { makeMap } from '@/utils/index'
+
+// 参考https://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js
+const isAttr = makeMap(
+  'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,'
+  + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,'
+  + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,'
+  + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,'
+  + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,'
+  + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,'
+  + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,'
+  + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,'
+  + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,'
+  + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,'
+  + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,'
+  + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,'
+  + 'target,title,type,usemap,value,width,wrap'
+)
+
+function vModel(self, dataObject, defaultValue) {
+  dataObject.props.value = defaultValue
+
+  dataObject.on.input = val => {
+    self.$emit('input', val)
+  }
+}
+
+const componentChild = {
+  'el-button': {
+    default(h, conf, key) {
+      return conf[key]
+    },
+  },
+  'el-input': {
+    prepend(h, conf, key) {
+      return <template slot="prepend">{conf[key]}</template>
+    },
+    append(h, conf, key) {
+      return <template slot="append">{conf[key]}</template>
+    }
+  },
+  'el-select': {
+    options(h, conf, key) {
+      const list = []
+      conf.options.forEach(item => {
+        list.push(<el-option label={item.label} value={item.value} disabled={item.disabled}></el-option>)
+      })
+      return list
+    }
+  },
+  'el-radio-group': {
+    options(h, conf, key) {
+      const list = []
+      conf.options.forEach(item => {
+        if (conf.optionType === 'button') list.push(<el-radio-button label={item.value}>{item.label}</el-radio-button>)
+        else list.push(<el-radio label={item.value} border={conf.border}>{item.label}</el-radio>)
+      })
+      return list
+    }
+  },
+  'el-checkbox-group': {
+    options(h, conf, key) {
+      const list = []
+      conf.options.forEach(item => {
+        if (conf.optionType === 'button') {
+          list.push(<el-checkbox-button label={item.value}>{item.label}</el-checkbox-button>)
+        } else {
+          list.push(<el-checkbox label={item.value} border={conf.border}>{item.label}</el-checkbox>)
+        }
+      })
+      return list
+    }
+  },
+  'el-upload': {
+    'list-type': (h, conf, key) => {
+      const list = []
+      if (conf['list-type'] === 'picture-card') {
+        list.push(<i class="el-icon-plus"></i>)
+      } else {
+        list.push(<el-button size="small" type="primary" icon="el-icon-upload">{conf.buttonText}</el-button>)
+      }
+      if (conf.showTip) {
+        list.push(<div slot="tip" class="el-upload__tip">只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件</div>)
+      }
+      return list
+    }
+  }
+}
+
+export default {
+  render(h) {
+    const dataObject = {
+      attrs: {},
+      props: {},
+      on: {},
+      style: {}
+    }
+    const confClone = JSON.parse(JSON.stringify(this.conf))
+    const children = []
+
+    const childObjs = componentChild[confClone.tag]
+    if (childObjs) {
+      Object.keys(childObjs).forEach(key => {
+        const childFunc = childObjs[key]
+        if (confClone[key]) {
+          children.push(childFunc(h, confClone, key))
+        }
+      })
+    }
+
+    Object.keys(confClone).forEach(key => {
+      const val = confClone[key]
+      if (key === 'vModel') {
+        vModel(this, dataObject, confClone.defaultValue)
+      } else if (dataObject[key]) {
+        dataObject[key] = val
+      } else if (!isAttr(key)) {
+        dataObject.props[key] = val
+      } else {
+        dataObject.attrs[key] = val
+      }
+    })
+    return h(this.conf.tag, dataObject, children)
+  },
+  props: ['conf']
+}
diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
new file mode 100644
index 0000000..918580f
--- /dev/null
+++ b/ruoyi-ui/src/utils/index.js
@@ -0,0 +1,390 @@
+import { parseTime } from './ruoyi'
+
+/**
+ * 表格时间格式化
+ */
+export function formatDate(cellValue) {
+  if (cellValue == null || cellValue == "") return "";
+  var date = new Date(cellValue) 
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+  return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+}
+
+/**
+ * @param {number} time
+ * @param {string} option
+ * @returns {string}
+ */
+export function formatTime(time, option) {
+  if (('' + time).length === 10) {
+    time = parseInt(time) * 1000
+  } else {
+    time = +time
+  }
+  const d = new Date(time)
+  const now = Date.now()
+
+  const diff = (now - d) / 1000
+
+  if (diff < 30) {
+    return '刚刚'
+  } else if (diff < 3600) {
+    // less 1 hour
+    return Math.ceil(diff / 60) + '分钟前'
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + '小时前'
+  } else if (diff < 3600 * 24 * 2) {
+    return '1天前'
+  }
+  if (option) {
+    return parseTime(time, option)
+  } else {
+    return (
+      d.getMonth() +
+      1 +
+      '月' +
+      d.getDate() +
+      '日' +
+      d.getHours() +
+      '时' +
+      d.getMinutes() +
+      '分'
+    )
+  }
+}
+
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function getQueryObject(url) {
+  url = url == null ? window.location.href : url
+  const search = url.substring(url.lastIndexOf('?') + 1)
+  const obj = {}
+  const reg = /([^?&=]+)=([^?&=]*)/g
+  search.replace(reg, (rs, $1, $2) => {
+    const name = decodeURIComponent($1)
+    let val = decodeURIComponent($2)
+    val = String(val)
+    obj[name] = val
+    return rs
+  })
+  return obj
+}
+
+/**
+ * @param {string} input value
+ * @returns {number} output value
+ */
+export function byteLength(str) {
+  // returns the byte length of an utf8 string
+  let s = str.length
+  for (var i = str.length - 1; i >= 0; i--) {
+    const code = str.charCodeAt(i)
+    if (code > 0x7f && code <= 0x7ff) s++
+    else if (code > 0x7ff && code <= 0xffff) s += 2
+    if (code >= 0xDC00 && code <= 0xDFFF) i--
+  }
+  return s
+}
+
+/**
+ * @param {Array} actual
+ * @returns {Array}
+ */
+export function cleanArray(actual) {
+  const newArray = []
+  for (let i = 0; i < actual.length; i++) {
+    if (actual[i]) {
+      newArray.push(actual[i])
+    }
+  }
+  return newArray
+}
+
+/**
+ * @param {Object} json
+ * @returns {Array}
+ */
+export function param(json) {
+  if (!json) return ''
+  return cleanArray(
+    Object.keys(json).map(key => {
+      if (json[key] === undefined) return ''
+      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+    })
+  ).join('&')
+}
+
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function param2Obj(url) {
+  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  if (!search) {
+    return {}
+  }
+  const obj = {}
+  const searchArr = search.split('&')
+  searchArr.forEach(v => {
+    const index = v.indexOf('=')
+    if (index !== -1) {
+      const name = v.substring(0, index)
+      const val = v.substring(index + 1, v.length)
+      obj[name] = val
+    }
+  })
+  return obj
+}
+
+/**
+ * @param {string} val
+ * @returns {string}
+ */
+export function html2Text(val) {
+  const div = document.createElement('div')
+  div.innerHTML = val
+  return div.textContent || div.innerText
+}
+
+/**
+ * Merges two objects, giving the last one precedence
+ * @param {Object} target
+ * @param {(Object|Array)} source
+ * @returns {Object}
+ */
+export function objectMerge(target, source) {
+  if (typeof target !== 'object') {
+    target = {}
+  }
+  if (Array.isArray(source)) {
+    return source.slice()
+  }
+  Object.keys(source).forEach(property => {
+    const sourceProperty = source[property]
+    if (typeof sourceProperty === 'object') {
+      target[property] = objectMerge(target[property], sourceProperty)
+    } else {
+      target[property] = sourceProperty
+    }
+  })
+  return target
+}
+
+/**
+ * @param {HTMLElement} element
+ * @param {string} className
+ */
+export function toggleClass(element, className) {
+  if (!element || !className) {
+    return
+  }
+  let classString = element.className
+  const nameIndex = classString.indexOf(className)
+  if (nameIndex === -1) {
+    classString += '' + className
+  } else {
+    classString =
+      classString.substr(0, nameIndex) +
+      classString.substr(nameIndex + className.length)
+  }
+  element.className = classString
+}
+
+/**
+ * @param {string} type
+ * @returns {Date}
+ */
+export function getTime(type) {
+  if (type === 'start') {
+    return new Date().getTime() - 3600 * 1000 * 24 * 90
+  } else {
+    return new Date(new Date().toDateString())
+  }
+}
+
+/**
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
+export function debounce(func, wait, immediate) {
+  let timeout, args, context, timestamp, result
+
+  const later = function() {
+    // 据上一次触发时间间隔
+    const last = +new Date() - timestamp
+
+    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
+    if (last < wait && last > 0) {
+      timeout = setTimeout(later, wait - last)
+    } else {
+      timeout = null
+      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+      if (!immediate) {
+        result = func.apply(context, args)
+        if (!timeout) context = args = null
+      }
+    }
+  }
+
+  return function(...args) {
+    context = this
+    timestamp = +new Date()
+    const callNow = immediate && !timeout
+    // 如果延时不存在，重新设定延时
+    if (!timeout) timeout = setTimeout(later, wait)
+    if (callNow) {
+      result = func.apply(context, args)
+      context = args = null
+    }
+
+    return result
+  }
+}
+
+/**
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source
+ * @returns {Object}
+ */
+export function deepClone(source) {
+  if (!source && typeof source !== 'object') {
+    throw new Error('error arguments', 'deepClone')
+  }
+  const targetObj = source.constructor === Array ? [] : {}
+  Object.keys(source).forEach(keys => {
+    if (source[keys] && typeof source[keys] === 'object') {
+      targetObj[keys] = deepClone(source[keys])
+    } else {
+      targetObj[keys] = source[keys]
+    }
+  })
+  return targetObj
+}
+
+/**
+ * @param {Array} arr
+ * @returns {Array}
+ */
+export function uniqueArr(arr) {
+  return Array.from(new Set(arr))
+}
+
+/**
+ * @returns {string}
+ */
+export function createUniqueString() {
+  const timestamp = +new Date() + ''
+  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+  return (+(randomNum + timestamp)).toString(32)
+}
+
+/**
+ * Check if an element has a class
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ * @returns {boolean}
+ */
+export function hasClass(ele, cls) {
+  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+}
+
+/**
+ * Add class to element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
+export function addClass(ele, cls) {
+  if (!hasClass(ele, cls)) ele.className += ' ' + cls
+}
+
+/**
+ * Remove class from element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
+export function removeClass(ele, cls) {
+  if (hasClass(ele, cls)) {
+    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
+    ele.className = ele.className.replace(reg, ' ')
+  }
+}
+
+export function makeMap(str, expectsLowerCase) {
+  const map = Object.create(null)
+  const list = str.split(',')
+  for (let i = 0; i < list.length; i++) {
+    map[list[i]] = true
+  }
+  return expectsLowerCase
+    ? val => map[val.toLowerCase()]
+    : val => map[val]
+}
+ 
+export const exportDefault = 'export default '
+
+export const beautifierConf = {
+  html: {
+    indent_size: '2',
+    indent_char: ' ',
+    max_preserve_newlines: '-1',
+    preserve_newlines: false,
+    keep_array_indentation: false,
+    break_chained_methods: false,
+    indent_scripts: 'separate',
+    brace_style: 'end-expand',
+    space_before_conditional: true,
+    unescape_strings: false,
+    jslint_happy: false,
+    end_with_newline: true,
+    wrap_line_length: '110',
+    indent_inner_html: true,
+    comma_first: false,
+    e4x: true,
+    indent_empty_lines: true
+  },
+  js: {
+    indent_size: '2',
+    indent_char: ' ',
+    max_preserve_newlines: '-1',
+    preserve_newlines: false,
+    keep_array_indentation: false,
+    break_chained_methods: false,
+    indent_scripts: 'normal',
+    brace_style: 'end-expand',
+    space_before_conditional: true,
+    unescape_strings: false,
+    jslint_happy: true,
+    end_with_newline: true,
+    wrap_line_length: '110',
+    indent_inner_html: true,
+    comma_first: false,
+    e4x: true,
+    indent_empty_lines: true
+  }
+}
+
+// 首字母大小
+export function titleCase(str) {
+  return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
+}
+
+// 下划转驼峰
+export function camelCase(str) {
+  return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+}
+
+export function isNumberStr(str) {
+  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
+}
+ 
diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/ruoyi-ui/src/utils/jsencrypt.js
new file mode 100644
index 0000000..78d9523
--- /dev/null
+++ b/ruoyi-ui/src/utils/jsencrypt.js
@@ -0,0 +1,30 @@
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+
+// 密钥对生成 http://web.chacuo.net/netrsakeypair
+
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
+  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+
+const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
+  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
+  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
+  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
+  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
+  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
+  'UP8iWi1Qw0Y='
+
+// 加密
+export function encrypt(txt) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(publicKey) // 设置公钥
+  return encryptor.encrypt(txt) // 对数据进行加密
+}
+
+// 解密
+export function decrypt(txt) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPrivateKey(privateKey) // 设置私钥
+  return encryptor.decrypt(txt) // 对数据进行解密
+}
+
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
new file mode 100644
index 0000000..1730e33
--- /dev/null
+++ b/ruoyi-ui/src/utils/permission.js
@@ -0,0 +1,51 @@
+import store from '@/store'
+
+/**
+ * 字符权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkPermi(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const permissions = store.getters && store.getters.permissions
+    const permissionDatas = value
+    const all_permission = "*:*:*";
+
+    const hasPermission = permissions.some(permission => {
+      return all_permission === permission || permissionDatas.includes(permission)
+    })
+
+    if (!hasPermission) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
+    return false
+  }
+}
+
+/**
+ * 角色权限校验
+ * @param {Array} value 校验值
+ * @returns {Boolean}
+ */
+export function checkRole(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const roles = store.getters && store.getters.roles
+    const permissionRoles = value
+    const super_admin = "admin";
+
+    const hasRole = roles.some(role => {
+      return super_admin === role || permissionRoles.includes(role)
+    })
+
+    if (!hasRole) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like checkRole="['admin','editor']"`)
+    return false
+  }
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
new file mode 100644
index 0000000..e4418b1
--- /dev/null
+++ b/ruoyi-ui/src/utils/request.js
@@ -0,0 +1,106 @@
+import axios from 'axios'
+import { Notification, MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+// 创建axios实例
+const service = axios.create({
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_BASE_API,
+  // 超时
+  timeout: 10000
+})
+// request拦截器
+service.interceptors.request.use(config => {
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  // get请求映射params参数
+  if (config.method === 'get' && config.params) {
+    let url = config.url + '?';
+    for (const propName of Object.keys(config.params)) {
+      const value = config.params[propName];
+      var part = encodeURIComponent(propName) + "=";
+      if (value !== null && typeof(value) !== "undefined") {
+        if (typeof value === 'object') {
+          for (const key of Object.keys(value)) {
+            if (value[key] !== null && typeof (value[key]) !== 'undefined') {
+              let params = propName + '[' + key + ']';
+              let subPart = encodeURIComponent(params) + '=';
+              url += subPart + encodeURIComponent(value[key]) + '&';
+            }
+          }
+        } else {
+          url += part + encodeURIComponent(value) + "&";
+        }
+      }
+    }
+    url = url.slice(0, -1);
+    config.params = {};
+    config.url = url;
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+})
+
+// 响应拦截器
+service.interceptors.response.use(res => {
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200;
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    if (code === 401) {
+      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        store.dispatch('LogOut').then(() => {
+          location.href = '/index';
+        })
+      }).catch(() => {});
+      return Promise.reject('令牌验证失败')
+    } else if (code === 500) {
+      Message({
+        message: msg,
+        type: 'error'
+      })
+      return Promise.reject(new Error(msg))
+    } else if (code !== 200) {
+      Notification.error({
+        title: msg
+      })
+      return Promise.reject('error')
+    } else {
+      return res.data
+    }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "后端接口连接异常";
+    }
+    else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    }
+    else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+export default service
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
new file mode 100644
index 0000000..f2765f0
--- /dev/null
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -0,0 +1,174 @@
+/**
+ * 通用js方法封装处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+const baseURL = process.env.VUE_APP_BASE_API
+
+// 日期格式化
+export function parseTime(time, pattern) {
+	if (arguments.length === 0 || !time) {
+		return null
+	}
+	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+	let date
+	if (typeof time === 'object') {
+		date = time
+	} else {
+		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+			time = parseInt(time)
+		} else if (typeof time === 'string') {
+			time = time.replace(new RegExp(/-/gm), '/');
+		}
+		if ((typeof time === 'number') && (time.toString().length === 10)) {
+			time = time * 1000
+		}
+		date = new Date(time)
+	}
+	const formatObj = {
+		y: date.getFullYear(),
+		m: date.getMonth() + 1,
+		d: date.getDate(),
+		h: date.getHours(),
+		i: date.getMinutes(),
+		s: date.getSeconds(),
+		a: date.getDay()
+	}
+	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+		let value = formatObj[key]
+		// Note: getDay() returns 0 on Sunday
+		if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+		if (result.length > 0 && value < 10) {
+			value = '0' + value
+		}
+		return value || 0
+	})
+	return time_str
+}
+
+// 表单重置
+export function resetForm(refName) {
+	if (this.$refs[refName]) {
+		this.$refs[refName].resetFields();
+	}
+}
+
+// 添加日期范围
+export function addDateRange(params, dateRange, propName) {
+	let search = params;
+	search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+	dateRange = Array.isArray(dateRange) ? dateRange : [];
+	if (typeof (propName) === 'undefined') {
+		search.params['beginTime'] = dateRange[0];
+		search.params['endTime'] = dateRange[1];
+	} else {
+		search.params['begin' + propName] = dateRange[0];
+		search.params['end' + propName] = dateRange[1];
+	}
+	return search;
+}
+
+// 回显数据字典
+export function selectDictLabel(datas, value) {
+	var actions = [];
+	Object.keys(datas).some((key) => {
+		if (datas[key].dictValue == ('' + value)) {
+			actions.push(datas[key].dictLabel);
+			return true;
+		}
+	})
+	return actions.join('');
+}
+
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+	var actions = [];
+	var currentSeparator = undefined === separator ? "," : separator;
+	var temp = value.split(currentSeparator);
+	Object.keys(value.split(currentSeparator)).some((val) => {
+		Object.keys(datas).some((key) => {
+			if (datas[key].dictValue == ('' + temp[val])) {
+				actions.push(datas[key].dictLabel + currentSeparator);
+			}
+		})
+	})
+	return actions.join('').substring(0, actions.join('').length - 1);
+}
+
+// 通用下载方法
+export function download(fileName) {
+	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
+}
+
+// 字符串格式化(%s )
+export function sprintf(str) {
+	var args = arguments, flag = true, i = 1;
+	str = str.replace(/%s/g, function () {
+		var arg = args[i++];
+		if (typeof arg === 'undefined') {
+			flag = false;
+			return '';
+		}
+		return arg;
+	});
+	return flag ? str : '';
+}
+
+// 转换字符串，undefined,null等转化为""
+export function praseStrEmpty(str) {
+	if (!str || str == "undefined" || str == "null") {
+		return "";
+	}
+	return str;
+}
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ */
+export function handleTree(data, id, parentId, children) {
+	let config = {
+		id: id || 'id',
+		parentId: parentId || 'parentId',
+		childrenList: children || 'children'
+	};
+
+	var childrenListMap = {};
+	var nodeIds = {};
+	var tree = [];
+
+	for (let d of data) {
+		let parentId = d[config.parentId];
+		if (childrenListMap[parentId] == null) {
+			childrenListMap[parentId] = [];
+		}
+		nodeIds[d[config.id]] = d;
+		childrenListMap[parentId].push(d);
+	}
+
+	for (let d of data) {
+		let parentId = d[config.parentId];
+		if (nodeIds[parentId] == null) {
+			tree.push(d);
+		}
+	}
+
+	for (let t of tree) {
+		adaptToChildrenList(t);
+	}
+
+	function adaptToChildrenList(o) {
+		if (childrenListMap[o[config.id]] !== null) {
+			o[config.childrenList] = childrenListMap[o[config.id]];
+		}
+		if (o[config.childrenList]) {
+			for (let c of o[config.childrenList]) {
+				adaptToChildrenList(c);
+			}
+		}
+	}
+	return tree;
+}
diff --git a/ruoyi-ui/src/utils/scroll-to.js b/ruoyi-ui/src/utils/scroll-to.js
new file mode 100644
index 0000000..c5d8e04
--- /dev/null
+++ b/ruoyi-ui/src/utils/scroll-to.js
@@ -0,0 +1,58 @@
+Math.easeInOutQuad = function(t, b, c, d) {
+  t /= d / 2
+  if (t < 1) {
+    return c / 2 * t * t + b
+  }
+  t--
+  return -c / 2 * (t * (t - 2) - 1) + b
+}
+
+// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
+var requestAnimFrame = (function() {
+  return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
+})()
+
+/**
+ * Because it's so fucking difficult to detect the scrolling element, just move them all
+ * @param {number} amount
+ */
+function move(amount) {
+  document.documentElement.scrollTop = amount
+  document.body.parentNode.scrollTop = amount
+  document.body.scrollTop = amount
+}
+
+function position() {
+  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+}
+
+/**
+ * @param {number} to
+ * @param {number} duration
+ * @param {Function} callback
+ */
+export function scrollTo(to, duration, callback) {
+  const start = position()
+  const change = to - start
+  const increment = 20
+  let currentTime = 0
+  duration = (typeof (duration) === 'undefined') ? 500 : duration
+  var animateScroll = function() {
+    // increment the time
+    currentTime += increment
+    // find the value with the quadratic in-out easing function
+    var val = Math.easeInOutQuad(currentTime, start, change, duration)
+    // move the document.body
+    move(val)
+    // do the animation unless its over
+    if (currentTime < duration) {
+      requestAnimFrame(animateScroll)
+    } else {
+      if (callback && typeof (callback) === 'function') {
+        // the animation is done so lets callback
+        callback()
+      }
+    }
+  }
+  animateScroll()
+}
diff --git a/ruoyi-ui/src/utils/validate.js b/ruoyi-ui/src/utils/validate.js
new file mode 100644
index 0000000..adfa254
--- /dev/null
+++ b/ruoyi-ui/src/utils/validate.js
@@ -0,0 +1,83 @@
+/**
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUsername(str) {
+  const valid_map = ['admin', 'editor']
+  return valid_map.indexOf(str.trim()) >= 0
+}
+
+/**
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function validURL(url) {
+  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  return reg.test(url)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validLowerCase(str) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUpperCase(str) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validAlphabets(str) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} email
+ * @returns {Boolean}
+ */
+export function validEmail(email) {
+  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return reg.test(email)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function isString(str) {
+  if (typeof str === 'string' || str instanceof String) {
+    return true
+  }
+  return false
+}
+
+/**
+ * @param {Array} arg
+ * @returns {Boolean}
+ */
+export function isArray(arg) {
+  if (typeof Array.isArray === 'undefined') {
+    return Object.prototype.toString.call(arg) === '[object Array]'
+  }
+  return Array.isArray(arg)
+}
diff --git a/ruoyi-ui/src/utils/zipdownload.js b/ruoyi-ui/src/utils/zipdownload.js
new file mode 100644
index 0000000..52afcc6
--- /dev/null
+++ b/ruoyi-ui/src/utils/zipdownload.js
@@ -0,0 +1,42 @@
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
+
+const mimeMap = {
+  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  zip: 'application/zip'
+}
+
+const baseUrl = process.env.VUE_APP_BASE_API
+export function downLoadZip(str, filename) {
+  var url = baseUrl + str
+  axios({
+    method: 'get',
+    url: url,
+    responseType: 'blob',
+    headers: { 'Authorization': 'Bearer ' + getToken() }
+  }).then(res => {
+    resolveBlob(res, mimeMap.zip)
+  })
+}
+/**
+ * 解析blob响应内容并下载
+ * @param {*} res blob响应内容
+ * @param {String} mimeType MIME类型
+ */
+export function resolveBlob(res, mimeType) {
+  const aLink = document.createElement('a')
+  var blob = new Blob([res.data], { type: mimeType })
+  // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
+  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+  var contentDisposition = decodeURI(res.headers['content-disposition'])
+  var result = patt.exec(contentDisposition)
+  var fileName = result[1]
+  fileName = fileName.replace(/\"/g, '')
+  aLink.style.display = 'none'
+  aLink.href = URL.createObjectURL(blob)
+  aLink.setAttribute('download', fileName) // 设置下载文件名称
+  document.body.appendChild(aLink)
+  aLink.click()
+  URL.revokeObjectURL(aLink.href);//清除引用
+  document.body.removeChild(aLink);
+}
diff --git a/ruoyi-ui/src/views/components/icons/element-icons.js b/ruoyi-ui/src/views/components/icons/element-icons.js
new file mode 100644
index 0000000..9ea4d63
--- /dev/null
+++ b/ruoyi-ui/src/views/components/icons/element-icons.js
@@ -0,0 +1,3 @@
+const elementIcons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round']
+
+export default elementIcons
diff --git a/ruoyi-ui/src/views/components/icons/index.vue b/ruoyi-ui/src/views/components/icons/index.vue
new file mode 100644
index 0000000..d3c9a71
--- /dev/null
+++ b/ruoyi-ui/src/views/components/icons/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="icons-container">
+    <aside>
+      <a href="#" target="_blank">Add and use
+      </a>
+    </aside>
+    <el-tabs type="border-card">
+      <el-tab-pane label="Icons">
+        <div v-for="item of svgIcons" :key="item">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ generateIconCode(item) }}
+            </div>
+            <div class="icon-item">
+              <svg-icon :icon-class="item" class-name="disabled" />
+              <span>{{ item }}</span>
+            </div>
+          </el-tooltip>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="Element-UI Icons">
+        <div v-for="item of elementIcons" :key="item">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ generateElementIconCode(item) }}
+            </div>
+            <div class="icon-item">
+              <i :class="'el-icon-' + item" />
+              <span>{{ item }}</span>
+            </div>
+          </el-tooltip>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import svgIcons from './svg-icons'
+import elementIcons from './element-icons'
+
+export default {
+  name: 'Icons',
+  data() {
+    return {
+      svgIcons,
+      elementIcons
+    }
+  },
+  methods: {
+    generateIconCode(symbol) {
+      return `<svg-icon icon-class="${symbol}" />`
+    },
+    generateElementIconCode(symbol) {
+      return `<i class="el-icon-${symbol}" />`
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.icons-container {
+  margin: 10px 20px 0;
+  overflow: hidden;
+
+  .icon-item {
+    margin: 20px;
+    height: 85px;
+    text-align: center;
+    width: 100px;
+    float: left;
+    font-size: 30px;
+    color: #24292e;
+    cursor: pointer;
+  }
+
+  span {
+    display: block;
+    font-size: 16px;
+    margin-top: 10px;
+  }
+
+  .disabled {
+    pointer-events: none;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/components/icons/svg-icons.js b/ruoyi-ui/src/views/components/icons/svg-icons.js
new file mode 100644
index 0000000..724cd8e
--- /dev/null
+++ b/ruoyi-ui/src/views/components/icons/svg-icons.js
@@ -0,0 +1,10 @@
+const req = require.context('../../../assets/icons/svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys()
+
+const re = /\.\/(.*)\.svg/
+
+const svgIcons = requireAll(req).map(i => {
+  return i.match(re)[1]
+})
+
+export default svgIcons
diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/ruoyi-ui/src/views/dashboard/BarChart.vue
new file mode 100644
index 0000000..be0af34
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/BarChart.vue
@@ -0,0 +1,102 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          top: 10,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: 'pageA',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [79, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageB',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [80, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageC',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [30, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/ruoyi-ui/src/views/dashboard/LineChart.vue
new file mode 100644
index 0000000..e654168
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/LineChart.vue
@@ -0,0 +1,135 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    },
+    setOptions({ expectedData, actualData } = {}) {
+      this.chart.setOption({
+        xAxis: {
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          boundaryGap: false,
+          axisTick: {
+            show: false
+          }
+        },
+        grid: {
+          left: 10,
+          right: 10,
+          bottom: 20,
+          top: 30,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          padding: [5, 10]
+        },
+        yAxis: {
+          axisTick: {
+            show: false
+          }
+        },
+        legend: {
+          data: ['expected', 'actual']
+        },
+        series: [{
+          name: 'expected', itemStyle: {
+            normal: {
+              color: '#FF005A',
+              lineStyle: {
+                color: '#FF005A',
+                width: 2
+              }
+            }
+          },
+          smooth: true,
+          type: 'line',
+          data: expectedData,
+          animationDuration: 2800,
+          animationEasing: 'cubicInOut'
+        },
+        {
+          name: 'actual',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#3888fa',
+              lineStyle: {
+                color: '#3888fa',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data: actualData,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/ruoyi-ui/src/views/dashboard/PanelGroup.vue
new file mode 100644
index 0000000..1a1081f
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/PanelGroup.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-row :gutter="40" class="panel-group">
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            访客
+          </div>
+          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('messages')">
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon icon-class="message" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            消息
+          </div>
+          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon icon-class="money" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            金额
+          </div>
+          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            订单
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+
+export default {
+  components: {
+    CountTo
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit('handleSetLineChartData', type)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.panel-group {
+  margin-top: 18px;
+
+  .card-panel-col {
+    margin-bottom: 32px;
+  }
+
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+
+      .icon-people {
+        background: #40c9c6;
+      }
+
+      .icon-message {
+        background: #36a3f7;
+      }
+
+      .icon-money {
+        background: #f4516c;
+      }
+
+      .icon-shopping {
+        background: #34bfa3
+      }
+    }
+
+    .icon-people {
+      color: #40c9c6;
+    }
+
+    .icon-message {
+      color: #36a3f7;
+    }
+
+    .icon-money {
+      color: #f4516c;
+    }
+
+    .icon-shopping {
+      color: #34bfa3
+    }
+
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+
+@media (max-width:550px) {
+  .card-panel-description {
+    display: none;
+  }
+
+  .card-panel-icon-wrapper {
+    float: none !important;
+    width: 100%;
+    height: 100%;
+    margin: 0 !important;
+
+    .svg-icon {
+      display: block;
+      margin: 14px auto !important;
+      float: none !important;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/ruoyi-ui/src/views/dashboard/PieChart.vue
new file mode 100644
index 0000000..4d2ef32
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/PieChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+        },
+        series: [
+          {
+            name: 'WEEKLY WRITE ARTICLES',
+            type: 'pie',
+            roseType: 'radius',
+            radius: [15, 95],
+            center: ['50%', '38%'],
+            data: [
+              { value: 320, name: 'Industries' },
+              { value: 240, name: 'Technology' },
+              { value: 149, name: 'Forex' },
+              { value: 100, name: 'Gold' },
+              { value: 59, name: 'Forecasts' }
+            ],
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/ruoyi-ui/src/views/dashboard/RaddarChart.vue
new file mode 100644
index 0000000..6823af3
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RaddarChart.vue
@@ -0,0 +1,116 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 3000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Techology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/mixins/resize.js b/ruoyi-ui/src/views/dashboard/mixins/resize.js
new file mode 100644
index 0000000..b1e76e9
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/mixins/resize.js
@@ -0,0 +1,56 @@
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.initListener()
+  },
+  activated() {
+    if (!this.$_resizeHandler) {
+      // avoid duplication init
+      this.initListener()
+    }
+
+    // when keep-alive chart activated, auto resize
+    this.resize()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  },
+  deactivated() {
+    this.destroyListener()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    initListener() {
+      this.$_resizeHandler = debounce(() => {
+        this.resize()
+      }, 100)
+      window.addEventListener('resize', this.$_resizeHandler)
+
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    destroyListener() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+      this.$_resizeHandler = null
+
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    resize() {
+      const { chart } = this
+      chart && chart.resize()
+    }
+  }
+}
diff --git a/ruoyi-ui/src/views/error/401.vue b/ruoyi-ui/src/views/error/401.vue
new file mode 100644
index 0000000..448b6ec
--- /dev/null
+++ b/ruoyi-ui/src/views/error/401.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="errPage-container">
+    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
+      返回
+    </el-button>
+    <el-row>
+      <el-col :span="12">
+        <h1 class="text-jumbo text-ginormous">
+          401错误!
+        </h1>
+        <h2>您没有访问权限！</h2>
+        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
+        <ul class="list-unstyled">
+          <li class="link-type">
+            <router-link to="/">
+              回首页
+            </router-link>
+          </li>
+        </ul>
+      </el-col>
+      <el-col :span="12">
+        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import errGif from '@/assets/401_images/401.gif'
+
+export default {
+  name: 'Page401',
+  data() {
+    return {
+      errGif: errGif + '?' + +new Date()
+    }
+  },
+  methods: {
+    back() {
+      if (this.$route.query.noGoBack) {
+        this.$router.push({ path: '/' })
+      } else {
+        this.$router.go(-1)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .errPage-container {
+    width: 800px;
+    max-width: 100%;
+    margin: 100px auto;
+    .pan-back-btn {
+      background: #008489;
+      color: #fff;
+      border: none!important;
+    }
+    .pan-gif {
+      margin: 0 auto;
+      display: block;
+    }
+    .pan-img {
+      display: block;
+      margin: 0 auto;
+      width: 100%;
+    }
+    .text-jumbo {
+      font-size: 60px;
+      font-weight: 700;
+      color: #484848;
+    }
+    .list-unstyled {
+      font-size: 14px;
+      li {
+        padding-bottom: 5px;
+      }
+      a {
+        color: #008489;
+        text-decoration: none;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+</style>
diff --git a/ruoyi-ui/src/views/error/404.vue b/ruoyi-ui/src/views/error/404.vue
new file mode 100644
index 0000000..96f075c
--- /dev/null
+++ b/ruoyi-ui/src/views/error/404.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="wscn-http404-container">
+    <div class="wscn-http404">
+      <div class="pic-404">
+        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
+        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+      </div>
+      <div class="bullshit">
+        <div class="bullshit__oops">
+          404错误!
+        </div>
+        <div class="bullshit__headline">
+          {{ message }}
+        </div>
+        <div class="bullshit__info">
+          对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
+        </div>
+        <router-link to="/" class="bullshit__return-home">
+          返回首页
+        </router-link>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Page404',
+  computed: {
+    message() {
+      return '找不到网页！'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wscn-http404-container{
+  transform: translate(-50%,-50%);
+  position: absolute;
+  top: 40%;
+  left: 50%;
+}
+.wscn-http404 {
+  position: relative;
+  width: 1200px;
+  padding: 0 50px;
+  overflow: hidden;
+  .pic-404 {
+    position: relative;
+    float: left;
+    width: 600px;
+    overflow: hidden;
+    &__parent {
+      width: 100%;
+    }
+    &__child {
+      position: absolute;
+      &.left {
+        width: 80px;
+        top: 17px;
+        left: 220px;
+        opacity: 0;
+        animation-name: cloudLeft;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+      &.mid {
+        width: 46px;
+        top: 10px;
+        left: 420px;
+        opacity: 0;
+        animation-name: cloudMid;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1.2s;
+      }
+      &.right {
+        width: 62px;
+        top: 100px;
+        left: 500px;
+        opacity: 0;
+        animation-name: cloudRight;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+      @keyframes cloudLeft {
+        0% {
+          top: 17px;
+          left: 220px;
+          opacity: 0;
+        }
+        20% {
+          top: 33px;
+          left: 188px;
+          opacity: 1;
+        }
+        80% {
+          top: 81px;
+          left: 92px;
+          opacity: 1;
+        }
+        100% {
+          top: 97px;
+          left: 60px;
+          opacity: 0;
+        }
+      }
+      @keyframes cloudMid {
+        0% {
+          top: 10px;
+          left: 420px;
+          opacity: 0;
+        }
+        20% {
+          top: 40px;
+          left: 360px;
+          opacity: 1;
+        }
+        70% {
+          top: 130px;
+          left: 180px;
+          opacity: 1;
+        }
+        100% {
+          top: 160px;
+          left: 120px;
+          opacity: 0;
+        }
+      }
+      @keyframes cloudRight {
+        0% {
+          top: 100px;
+          left: 500px;
+          opacity: 0;
+        }
+        20% {
+          top: 120px;
+          left: 460px;
+          opacity: 1;
+        }
+        80% {
+          top: 180px;
+          left: 340px;
+          opacity: 1;
+        }
+        100% {
+          top: 200px;
+          left: 300px;
+          opacity: 0;
+        }
+      }
+    }
+  }
+  .bullshit {
+    position: relative;
+    float: left;
+    width: 300px;
+    padding: 30px 0;
+    overflow: hidden;
+    &__oops {
+      font-size: 32px;
+      font-weight: bold;
+      line-height: 40px;
+      color: #1482f0;
+      opacity: 0;
+      margin-bottom: 20px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-fill-mode: forwards;
+    }
+    &__headline {
+      font-size: 20px;
+      line-height: 24px;
+      color: #222;
+      font-weight: bold;
+      opacity: 0;
+      margin-bottom: 10px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.1s;
+      animation-fill-mode: forwards;
+    }
+    &__info {
+      font-size: 13px;
+      line-height: 21px;
+      color: grey;
+      opacity: 0;
+      margin-bottom: 30px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.2s;
+      animation-fill-mode: forwards;
+    }
+    &__return-home {
+      display: block;
+      float: left;
+      width: 110px;
+      height: 36px;
+      background: #1482f0;
+      border-radius: 100px;
+      text-align: center;
+      color: #ffffff;
+      opacity: 0;
+      font-size: 14px;
+      line-height: 36px;
+      cursor: pointer;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.3s;
+      animation-fill-mode: forwards;
+    }
+    @keyframes slideUp {
+      0% {
+        transform: translateY(60px);
+        opacity: 0;
+      }
+      100% {
+        transform: translateY(0);
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
new file mode 100644
index 0000000..56b6921
--- /dev/null
+++ b/ruoyi-ui/src/views/index.vue
@@ -0,0 +1,683 @@
+<template>
+  <div class="app-container home">
+    欢迎进入赛格核销平台！！！
+    <!--<el-row :gutter="20">
+      <el-col :sm="24" :lg="24">
+        <blockquote class="text-warning" style="font-size: 14px">
+          领取阿里云通用云产品1888优惠券
+          <br />
+          <el-link
+            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
+            type="primary"
+            target="_blank"
+            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
+          >
+          <br />
+          领取腾讯云通用云产品2860优惠券
+          <br />
+          <el-link
+            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
+            type="primary"
+            target="_blank"
+            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
+          >
+          <br />
+          阿里云服务器折扣区
+          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
+            >>☛☛点我进入☚☚</el-link
+          >
+          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
+          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
+            >>☛☛点我进入☚☚</el-link
+          ><br />
+          <h4 class="text-danger">
+            云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
+          </h4>
+        </blockquote>
+
+        <hr />
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :sm="24" :lg="12" style="padding-left: 20px">
+        <h2>若依后台管理框架</h2>
+        <p>
+          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+        </p>
+        <p>
+          <b>当前版本:</b> <span>v{{ version }}</span>
+        </p>
+        <p>
+          <el-tag type="danger">&yen;免费开源</el-tag>
+        </p>
+        <p>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-cloudy"
+            plain
+            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
+            >访问码云</el-button
+          >
+          <el-button
+            size="mini"
+            icon="el-icon-s-home"
+            plain
+            @click="goTarget('http://ruoyi.vip')"
+            >访问主页</el-button
+          >
+        </p>
+      </el-col>
+
+      <el-col :sm="24" :lg="12" style="padding-left: 50px">
+        <el-row>
+          <el-col :span="12">
+            <h2>技术选型</h2>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <h4>后端技术</h4>
+            <ul>
+              <li>SpringBoot</li>
+              <li>Spring Security</li>
+              <li>JWT</li>
+              <li>MyBatis</li>
+              <li>Druid</li>
+              <li>Fastjson</li>
+              <li>...</li>
+            </ul>
+          </el-col>
+          <el-col :span="6">
+            <h4>前端技术</h4>
+            <ul>
+              <li>Vue</li>
+              <li>Vuex</li>
+              <li>Element-ui</li>
+              <li>Axios</li>
+              <li>Sass</li>
+              <li>Quill</li>
+              <li>...</li>
+            </ul>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <el-divider />
+    <el-row :gutter="20">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>联系信息</span>
+          </div>
+          <div class="body">
+            <p>
+              <i class="el-icon-s-promotion"></i> 官网：<el-link
+                href="http://www.ruoyi.vip"
+                target="_blank"
+                >http://www.ruoyi.vip</el-link
+              >
+            </p>
+            <p>
+              <i class="el-icon-user-solid"></i> QQ群：<s>满937441</s>
+              <s>满887144332</s> <s>满180251782</s> <s>满104180207</s>
+              <s>满186866453</s> <s>满201396349</s>
+              <a href="https://jq.qq.com/?_wv=1027&k=TULPgzYe" target="_blank">
+                101456076</a
+              >
+            </p>
+            <p>
+              <i class="el-icon-chat-dot-round"></i> 微信：<a
+                href="javascript:;"
+                >/ *若依</a
+              >
+            </p>
+            <p>
+              <i class="el-icon-money"></i> 支付宝：<a
+                href="javascript:;"
+                class="支付宝信息"
+                >/ *若依</a
+              >
+            </p>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>更新日志</span>
+          </div>
+          <el-collapse accordion>
+            <el-collapse-item title="v3.6.0 - 2021-07-12">
+              <ol>
+                <li>角色管理新增分配用户功能</li>
+                <li>用户管理新增分配角色功能</li>
+                <li>日志列表支持排序操作</li>
+                <li>优化参数&字典缓存操作</li>
+                <li>系统布局配置支持动态标题开关</li>
+                <li>菜单路由配置支持内链访问</li>
+                <li>默认访问后端首页新增提示语</li>
+                <li>富文本默认上传返回url类型</li>
+                <li>新增自定义弹窗拖拽指令</li>
+                <li>全局注册常用通用组件</li>
+                <li>全局挂载字典标签组件</li>
+                <li>ImageUpload组件支持多图片上传</li>
+                <li>FileUpload组件支持多文件上传</li>
+                <li>文件上传组件添加数量限制属性</li>
+                <li>富文本编辑组件添加类型属性</li>
+                <li>富文本组件工具栏配置视频</li>
+                <li>封装通用iframe组件</li>
+                <li>限制超级管理员不允许操作</li>
+                <li>用户信息长度校验限制</li>
+                <li>分页组件新增pagerCount属性</li>
+                <li>添加bat脚本执行应用</li>
+                <li>升级oshi到最新版本v5.7.4</li>
+                <li>升级element-ui到最新版本2.15.2</li>
+                <li>升级pagehelper到最新版1.3.1</li>
+                <li>升级commons.io到最新版本v2.10.0</li>
+                <li>升级commons.fileupload到最新版本v1.4</li>
+                <li>升级swagger到最新版本v3.0.0</li>
+                <li>修复关闭confirm提示框控制台报错问题</li>
+                <li>修复存在的SQL注入漏洞问题</li>
+                <li>定时任务屏蔽rmi远程调用</li>
+                <li>修复用户搜索分页变量错误</li>
+                <li>修复导出角色数据范围翻译缺少仅本人</li>
+                <li>修复表单构建选择下拉选择控制台报错问题</li>
+                <li>优化图片工具类读取文件</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.5.0 - 2021-05-25">
+              <ol>
+                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
+                <li>布局设置支持保存&重置配置</li>
+                <li>修复树表数据显示不全&加载慢问题</li>
+                <li>新增IE浏览器版本过低提示页面</li>
+                <li>用户登录后记录最后登录IP&时间</li>
+                <li>页面导出按钮点击之后添加遮罩</li>
+                <li>富文本编辑器支持自定义上传地址</li>
+                <li>富文本编辑组件新增readOnly属性</li>
+                <li>页签TagsView新增关闭右侧功能</li>
+                <li>显隐列组件加载初始默认隐藏列</li>
+                <li>关闭头像上传窗口还原默认图片</li>
+                <li>个人信息添加手机&邮箱重复验证</li>
+                <li>代码生成模板导出按钮点击后添加遮罩</li>
+                <li>代码生成模板树表操作列添加新增按钮</li>
+                <li>代码生成模板修复主子表字段重名问题</li>
+                <li>升级fastjson到最新版1.2.76</li>
+                <li>升级druid到最新版本v1.2.6</li>
+                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
+                <li>升级oshi到最新版本v5.6.0</li>
+                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
+                <li>数据监控页默认账户密码防止越权访问</li>
+                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
+                <li>修正后端导入表权限标识</li>
+                <li>修正前端操作日志&登录日志权限标识</li>
+                <li>设置Redis配置HashKey序列化</li>
+                <li>删除操作日志记录信息</li>
+                <li>上传媒体类型添加视频格式</li>
+                <li>修复请求形参未传值记录日志异常问题</li>
+                <li>优化xss校验json请求条件</li>
+                <li>树级结构更新子节点使用replaceFirst</li>
+                <li>优化ExcelUtil空值处理</li>
+                <li>日志记录过滤BindingResult对象，防止异常</li>
+                <li>修改主题后mini类型按钮无效问题</li>
+                <li>优化通用下载完成后删除节点</li>
+                <li>通用Controller添加响应返回消息</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.4.0 - 2021-02-22">
+              <ol>
+                <li>代码生成模板支持主子表</li>
+                <li>表格右侧工具栏组件支持显隐列</li>
+                <li>图片组件添加预览&移除功能</li>
+                <li>Excel注解支持Image图片导出</li>
+                <li>操作按钮组调整为朴素按钮样式</li>
+                <li>代码生成支持文件上传组件</li>
+                <li>代码生成日期控件区分范围</li>
+                <li>代码生成数据库文本类型生成表单文本域</li>
+                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
+                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
+                <li>升级druid到最新版本v1.2.4</li>
+                <li>升级fastjson到最新版1.2.75</li>
+                <li>升级element-ui到最新版本2.15.0</li>
+                <li>修复IE11浏览器报错问题</li>
+                <li>优化多级菜单之间切换无法缓存的问题</li>
+                <li>修复四级菜单无法显示问题</li>
+                <li>修正侧边栏静态路由丢失问题</li>
+                <li>修复角色管理-编辑角色-功能权限显示异常</li>
+                <li>配置文件新增redis数据库索引属性</li>
+                <li>权限工具类增加admin判断</li>
+                <li>角色非自定义权限范围清空选择值</li>
+                <li>修复导入数据为负浮点数时丢失精度问题</li>
+                <li>移除path-to-regexp正则匹配插件</li>
+                <li>修复生成树表代码异常</li>
+                <li>修改ip字段长度防止ipv6地址长度不够</li>
+                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
+                <li>登录后push添加catch防止出现检查错误</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.3.0 - 2020-12-14">
+              <ol>
+                <li>新增缓存监控功能</li>
+                <li>支持主题风格配置</li>
+                <li>修复多级菜单之间切换无法缓存的问题</li>
+                <li>多级菜单自动配置组件</li>
+                <li>代码生成预览支持高亮显示</li>
+                <li>支持Get请求映射Params参数</li>
+                <li>删除用户和角色解绑关联</li>
+                <li>去除用户手机邮箱部门必填验证</li>
+                <li>Excel支持注解align对齐方式</li>
+                <li>Excel支持导入Boolean型数据</li>
+                <li>优化头像样式，鼠标移入悬停遮罩</li>
+                <li>代码生成预览提供滚动机制</li>
+                <li>代码生成删除多余的数字float类型</li>
+                <li>修正转换字符串的目标字符集属性</li>
+                <li>回显数据字典防止空值报错</li>
+                <li>日志记录增加过滤多文件场景</li>
+                <li>修改缓存Set方法可能导致嵌套的问题</li>
+                <li>移除前端一些多余的依赖</li>
+                <li>防止安全扫描YUI出现的风险提示</li>
+                <li>修改node-sass为dart-sass</li>
+                <li>升级SpringBoot到最新版本2.1.18</li>
+                <li>升级poi到最新版本4.1.2</li>
+                <li>升级oshi到最新版本v5.3.6</li>
+                <li>升级bitwalker到最新版本1.21</li>
+                <li>升级axios到最新版本0.21.0</li>
+                <li>升级element-ui到最新版本2.14.1</li>
+                <li>升级vue到最新版本2.6.12</li>
+                <li>升级vuex到最新版本3.6.0</li>
+                <li>升级vue-cli到版本4.5.9</li>
+                <li>升级vue-router到最新版本3.4.9</li>
+                <li>升级vue-cli到最新版本4.4.6</li>
+                <li>升级vue-cropper到最新版本0.5.5</li>
+                <li>升级clipboard到最新版本2.0.6</li>
+                <li>升级core-js到最新版本3.8.1</li>
+                <li>升级echarts到最新版本4.9.0</li>
+                <li>升级file-saver到最新版本2.0.4</li>
+                <li>升级fuse.js到最新版本6.4.3</li>
+                <li>升级js-beautify到最新版本1.13.0</li>
+                <li>升级js-cookie到最新版本2.2.1</li>
+                <li>升级path-to-regexp到最新版本6.2.0</li>
+                <li>升级quill到最新版本1.3.7</li>
+                <li>升级screenfull到最新版本5.0.2</li>
+                <li>升级sortablejs到最新版本1.10.2</li>
+                <li>升级vuedraggable到最新版本2.24.3</li>
+                <li>升级chalk到最新版本4.1.0</li>
+                <li>升级eslint到最新版本7.15.0</li>
+                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
+                <li>升级lint-staged到最新版本10.5.3</li>
+                <li>升级runjs到最新版本4.4.2</li>
+                <li>升级sass-loader到最新版本10.1.0</li>
+                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
+                <li>升级svg-sprite-loader到最新版本5.1.1</li>
+                <li>升级vue-template-compiler到最新版本2.6.12</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.2.1 - 2020-11-18">
+              <ol>
+                <li>阻止任意文件下载漏洞</li>
+                <li>代码生成支持上传控件</li>
+                <li>新增图片上传组件</li>
+                <li>调整默认首页</li>
+                <li>升级druid到最新版本v1.2.2</li>
+                <li>mapperLocations配置支持分隔符</li>
+                <li>权限信息调整</li>
+                <li>调整sql默认时间</li>
+                <li>解决代码生成没有bit类型的问题</li>
+                <li>升级pagehelper到最新版1.3.0</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.2.0 - 2020-10-10">
+              <ol>
+                <li>升级springboot版本到2.1.17 提升安全性</li>
+                <li>升级oshi到最新版本v5.2.5</li>
+                <li>升级druid到最新版本v1.2.1</li>
+                <li>升级jjwt到版本0.9.1</li>
+                <li>升级fastjson到最新版1.2.74</li>
+                <li>修改sass为node-sass，避免el-icon图标乱码</li>
+                <li>代码生成支持同步数据库</li>
+                <li>代码生成支持富文本控件</li>
+                <li>代码生成页面时不忽略remark属性</li>
+                <li>代码生成添加select必填选项</li>
+                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
+                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
+                <li>Excel注解支持自动统计数据总和</li>
+                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
+                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
+                <li>允许用户分配到部门父节点</li>
+                <li>菜单新增是否缓存keep-alive</li>
+                <li>表格操作列间距调整</li>
+                <li>限制系统内置参数不允许删除</li>
+                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
+                <li>富文本工具栏样式对齐</li>
+                <li>导入excel整形值校验优化</li>
+                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
+                <li>表单构建布局型组件新增按钮</li>
+                <li>左侧菜单文字过长显示省略号</li>
+                <li>修正根节点为子部门时，树状结构显示问题</li>
+                <li>修正调用目标字符串最大长度</li>
+                <li>修正菜单提示信息错误</li>
+                <li>修正定时任务执行一次权限标识</li>
+                <li>修正数据库字符串类型nvarchar</li>
+                <li>优化递归子节点</li>
+                <li>优化数据权限判断</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v3.1.0 - 2020-08-13">
+              <ol>
+                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
+                <li>后端支持CORS跨域请求</li>
+                <li>代码生成支持选择上级菜单</li>
+                <li>代码生成支持自定义路径</li>
+                <li>代码生成支持复选框</li>
+                <li>Excel导出导入支持dictType字典类型</li>
+                <li>Excel支持分割字符串组内容</li>
+                <li>验证码类型支持（数组计算、字符验证）</li>
+                <li>升级vue-cli版本到4.4.4</li>
+                <li>修改 node-sass 为 dart-sass</li>
+                <li>表单类型为Integer/Long设置整形默认值</li>
+                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
+                <li>优化防重复提交拦截器</li>
+                <li>优化上级菜单不能选择自己</li>
+                <li>修复角色的权限分配后，未实时生效问题</li>
+                <li>修复在线用户日志记录类型</li>
+                <li>修复富文本空格和缩进保存后不生效问题</li>
+                <li>修复在线用户判断逻辑</li>
+                <li>唯一限制条件只返回单条数据</li>
+                <li>添加获取当前的环境配置方法</li>
+                <li>超时登录后页面跳转到首页</li>
+                <li>全局异常状态汉化拦截处理</li>
+                <li>HTML过滤器改为将html转义</li>
+                <li>检查字符支持小数点&降级改成异常提醒</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v3.0.0 - 2020-07-20">
+              <ol>
+                <li>单应用调整为多模块项目</li>
+                <li>升级element-ui版本到2.13.2</li>
+                <li>删除babel，提高编译速度。</li>
+                <li>新增菜单默认主类目</li>
+                <li>编码文件名修改为uuid方式</li>
+                <li>定时任务cron表达式验证</li>
+                <li>角色权限修改时已有权限未自动勾选异常修复</li>
+                <li>防止切换权限用户后登录出现404</li>
+                <li>Excel支持sort导出排序</li>
+                <li>创建用户不允许选择超级管理员角色</li>
+                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
+                <li>修复代码生成点击多次表修改数据不变化的问题</li>
+                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
+                <li>修复布局为small者mini用户表单显示错位问题</li>
+                <li>修复热部署导致的强换异常问题</li>
+                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
+                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
+                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
+                <li>定时任务调整label-width，防止部署出现错位</li>
+                <li>调整表头固定列默认样式</li>
+                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
+                <li>代码生成字典Integer/Long使用parseInt</li>
+                <li>
+                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
+                </li>
+                <li>修正岗位导出权限注解</li>
+                <li>禁止加密密文返回前端</li>
+                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
+                <li>修复首页搜索菜单外链无法点击跳转问题</li>
+                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
+                <li>用户管理部门分支节点不可检查&显示计数</li>
+                <li>数据范围过滤属性调整</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v2.3.0 - 2020-06-01">
+              <ol>
+                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
+                <li>dev启动默认打开浏览器</li>
+                <li>vue-cli使用默认source-map</li>
+                <li>slidebar eslint报错优化</li>
+                <li>当tags-view滚动关闭右键菜单</li>
+                <li>字典管理添加缓存读取</li>
+                <li>参数管理支持缓存操作</li>
+                <li>支持一级菜单（和主页同级）在main区域显示</li>
+                <li>限制外链地址必须以http(s)开头</li>
+                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
+                <li>修改数据源类型优先级，先根据方法，再根据类</li>
+                <li>支持是否需要设置token属性，自定义返回码消息。</li>
+                <li>swagger请求前缀加入配置。</li>
+                <li>登录地点设置内容过长则隐藏显示</li>
+                <li>修复定时任务执行一次按钮后不提示消息问题</li>
+                <li>修改上级部门（选择项排除本身和下级）</li>
+                <li>通用http发送方法增加参数 contentType 编码类型</li>
+                <li>更换IP地址查询接口</li>
+                <li>修复页签变量undefined</li>
+                <li>添加校验部门包含未停用的子部门</li>
+                <li>修改定时任务详情下次执行时间日期显示错误</li>
+                <li>角色管理查询设置默认排序字段</li>
+                <li>swagger添加enable参数控制是否启用</li>
+                <li>只对json类型请求构建可重复读取inputStream的request</li>
+                <li>修改代码生成字典字段int类型没有自动选中问题</li>
+                <li>vuex用户名取值修正</li>
+                <li>表格树模板去掉多余的)</li>
+                <li>代码生成序号修正</li>
+                <li>全屏情况下不调整上外边距</li>
+                <li>代码生成Date字段添加默认格式</li>
+                <li>用户管理角色选择权限控制</li>
+                <li>修复路由懒加载报错问题</li>
+                <li>模板sql.vm添加菜单状态</li>
+                <li>设置用户名称不能修改</li>
+                <li>dialog添加append-to-body属性，防止ie遮罩</li>
+                <li>菜单区分状态和显示隐藏功能</li>
+                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
+                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
+                <li>登录请求params更换为data，防止暴露url</li>
+                <li>日志返回时间格式处理</li>
+                <li>添加handle控制允许拖动的元素</li>
+                <li>布局设置点击扩大范围</li>
+                <li>代码生成列属性排序查询</li>
+                <li>代码生成列支持拖动排序</li>
+                <li>修复时间格式不支持ios问题</li>
+                <li>表单构建添加父级class，防止冲突</li>
+                <li>定时任务并发属性修正</li>
+                <li>角色禁用&菜单隐藏不查询权限</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v2.2.0 - 2020-03-18">
+              <ol>
+                <li>系统监控新增定时任务功能</li>
+                <li>添加一个打包Web工程bat</li>
+                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
+                <li>修复点击退出登录有时会无提示问题</li>
+                <li>修复防重复提交注解无效问题</li>
+                <li>修复通知公告批量删除异常问题</li>
+                <li>添加菜单时路由地址必填限制</li>
+                <li>代码生成字段描述可编辑</li>
+                <li>修复用户修改个人信息导致缓存不过期问题</li>
+                <li>个人信息创建时间获取正确属性值</li>
+                <li>操作日志详细显示正确类型</li>
+                <li>导入表单击行数据时选中对应的复选框</li>
+                <li>批量替换表前缀逻辑调整</li>
+                <li>固定重定向路径表达式</li>
+                <li>升级element-ui版本到2.13.0</li>
+                <li>操作日志排序调整</li>
+                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v2.1.0 - 2020-02-24">
+              <ol>
+                <li>新增表单构建</li>
+                <li>代码生成支持树表结构</li>
+                <li>新增用户导入</li>
+                <li>修复动态加载路由页面刷新问题</li>
+                <li>修复地址开关无效问题</li>
+                <li>汉化错误提示页面</li>
+                <li>代码生成已知问题修改</li>
+                <li>修复多数据源下配置关闭出现异常处理</li>
+                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
+                <li>修复上传头像控制台出现异常</li>
+                <li>修改用户管理分页不正确的问题</li>
+                <li>修复验证码记录提示错误</li>
+                <li>修复request.js缺少Message引用</li>
+                <li>修复表格时间为空出现的异常</li>
+                <li>添加Jackson日期反序列化时区配置</li>
+                <li>调整根据用户权限加载菜单数据树形结构</li>
+                <li>调整成功登陆不恢复按钮，防止多次点击</li>
+                <li>修改用户个人资料同步缓存信息</li>
+                <li>修复页面同时出现el-upload和Editor不显示处理</li>
+                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
+                <li>配置文件新增redis密码属性</li>
+                <li>设置mybatis全局的配置文件</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+
+            <el-collapse-item title="v2.0.0 - 2019-12-02">
+              <ol>
+                <li>新增代码生成</li>
+                <li>新增@RepeatSubmit注解，防止重复提交</li>
+                <li>新增菜单主目录添加/删除操作</li>
+                <li>日志记录过滤特殊对象，防止转换异常</li>
+                <li>修改代码生成路由脚本错误</li>
+                <li>用户上传头像实时同步缓存，无需重新登录</li>
+                <li>调整切换页签后不重新加载数据</li>
+                <li>添加jsencrypt实现参数的前端加密</li>
+                <li>系统退出删除用户缓存记录</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v1.1.0 - 2019-11-11">
+              <ol>
+                <li>新增在线用户管理</li>
+                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
+                <li>新增查询条件重置按钮</li>
+                <li>新增Swagger全局Token配置</li>
+                <li>新增后端参数校验</li>
+                <li>修复字典管理页面的日期查询异常</li>
+                <li>修改时间函数命名防止冲突</li>
+                <li>去除菜单上级校验，默认为顶级</li>
+                <li>修复用户密码无法修改问题</li>
+                <li>修复菜单类型为按钮时不显示权限标识</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v1.0.0 - 2019-10-08">
+              <ol>
+                <li>若依前后端分离系统正式发布</li>
+              </ol>
+            </el-collapse-item>
+          </el-collapse>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>捐赠支持</span>
+          </div>
+          <div class="body">
+            <img
+              src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
+              alt="donate"
+              width="100%"
+            />
+            <span style="display: inline-block; height: 30px; line-height: 30px"
+              >你可以请作者喝杯咖啡表示鼓励</span
+            >
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>-->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Index",
+  data() {
+    return {
+      // 版本号
+      version: "3.6.0",
+    };
+  },
+  methods: {
+    goTarget(href) {
+      window.open(href, "_blank");
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.home {
+  blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #eee;
+  }
+  hr {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border: 0;
+    border-top: 1px solid #eee;
+  }
+  .col-item {
+    margin-bottom: 20px;
+  }
+
+  ul {
+    padding: 0;
+    margin: 0;
+  }
+
+  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  color: #676a6c;
+  overflow-x: hidden;
+
+  ul {
+    list-style-type: none;
+  }
+
+  h4 {
+    margin-top: 0px;
+  }
+
+  h2 {
+    margin-top: 10px;
+    font-size: 26px;
+    font-weight: 100;
+  }
+
+  p {
+    margin-top: 10px;
+
+    b {
+      font-weight: 700;
+    }
+  }
+
+  .update-log {
+    ol {
+      display: block;
+      list-style-type: decimal;
+      margin-block-start: 1em;
+      margin-block-end: 1em;
+      margin-inline-start: 0;
+      margin-inline-end: 0;
+      padding-inline-start: 40px;
+    }
+  }
+}
+</style>
+
diff --git a/ruoyi-ui/src/views/index_v1.vue b/ruoyi-ui/src/views/index_v1.vue
new file mode 100644
index 0000000..d2d2ec6
--- /dev/null
+++ b/ruoyi-ui/src/views/index_v1.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="dashboard-editor-container">
+
+    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="lineChartData" />
+    </el-row>
+
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <raddar-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <bar-chart />
+        </div>
+      </el-col>
+    </el-row>
+
+    
+  </div>
+</template>
+
+<script>
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+
+export default {
+  name: 'Index',
+  components: {
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+      lineChartData: lineChartData.newVisitis
+    }
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
new file mode 100644
index 0000000..2428ee6
--- /dev/null
+++ b/ruoyi-ui/src/views/login.vue
@@ -0,0 +1,217 @@
+<template>
+  <div class="login">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <h3 class="title">赛格核销后台管理系统</h3>
+      <el-form-item prop="username">
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input
+          v-model="loginForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaOnOff">
+        <el-input
+          v-model="loginForm.code"
+          auto-complete="off"
+          placeholder="验证码"
+          style="width: 63%"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
+        <div class="login-code">
+          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+        </div>
+      </el-form-item>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-form-item style="width:100%;">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="handleLogin"
+        >
+          <span v-if="!loading">登 录</span>
+          <span v-else>登 录 中...</span>
+        </el-button>
+        <div style="float: right;" v-if="register">
+          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <div class="el-login-footer">
+      <span>Designed & Powerd by SegInfo. </span>
+      <span>Copyright © 2018-2021 SegInfo All Rights Reserved. </span>
+      <a href="http://beian.miit.gov.cn" target="_blank">冀ICP备2021025983号-1</a>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCodeImg } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+
+export default {
+  name: "Login",
+  data() {
+    return {
+      codeUrl: "",
+      cookiePassword: "",
+      loginForm: {
+        username: "admin",
+        password: "admin123",
+        rememberMe: false,
+        code: "",
+        uuid: ""
+      },
+      loginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "请输入您的账号" }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" }
+        ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+      },
+      loading: false,
+      // 验证码开关
+      captchaOnOff: true,
+      // 注册开关
+      register: false,
+      redirect: undefined
+    };
+  },
+  watch: {
+    $route: {
+      handler: function(route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true
+    }
+  },
+  created() {
+    this.getCode();
+    this.getCookie();
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then(res => {
+        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+        if (this.captchaOnOff) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        }
+      });
+    },
+    getCookie() {
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get('rememberMe')
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password: password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+      };
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+          } else {
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove('rememberMe');
+          }
+          this.$store.dispatch("Login", this.loginForm).then(() => {
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+          }).catch(() => {
+            this.loading = false;
+            if (this.captchaOnOff) {
+              this.getCode();
+            }
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-image: url("../assets/images/login-background.jpg");
+  background-size: cover;
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.login-form {
+  border-radius: 6px;
+  background: #ffffff;
+  width: 400px;
+  padding: 25px 25px 5px 25px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.login-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.login-code-img {
+  height: 38px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
new file mode 100644
index 0000000..df0cb1e
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header"><span>基本信息</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%">
+              <tbody>
+                <tr>
+                  <td><div class="cell">Redis版本</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>
+                  <td><div class="cell">运行模式</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>
+                  <td><div class="cell">端口</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
+                  <td><div class="cell">客户端数</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">运行时间(天)</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>
+                  <td><div class="cell">使用内存</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>
+                  <td><div class="cell">使用CPU</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
+                  <td><div class="cell">内存配置</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">AOF是否开启</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>
+                  <td><div class="cell">RDB是否成功</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>
+                  <td><div class="cell">Key数量</div></td>
+                  <td><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>
+                  <td><div class="cell">网络入口/出口</div></td>
+                  <td><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span>命令统计</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <div ref="commandstats" style="height: 420px" />
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span>内存信息</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <div ref="usedmemory" style="height: 420px" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getCache } from "@/api/monitor/cache";
+import echarts from "echarts";
+
+export default {
+  name: "Server",
+  data() {
+    return {
+      // 加载层信息
+      loading: [],
+      // 统计命令信息
+      commandstats: null,
+      // 使用内存
+      usedmemory: null,
+      // cache信息
+      cache: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.openLoading();
+  },
+  methods: {
+    /** 查缓存询信息 */
+    getList() {
+      getCache().then((response) => {
+        this.cache = response.data;
+        this.loading.close();
+
+        this.commandstats = echarts.init(this.$refs.commandstats, "macarons");
+        this.commandstats.setOption({
+          tooltip: {
+            trigger: "item",
+            formatter: "{a} <br/>{b} : {c} ({d}%)",
+          },
+          series: [
+            {
+              name: "命令",
+              type: "pie",
+              roseType: "radius",
+              radius: [15, 95],
+              center: ["50%", "38%"],
+              data: response.data.commandStats,
+              animationEasing: "cubicInOut",
+              animationDuration: 1000,
+            },
+          ],
+        });
+        this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
+        this.usedmemory.setOption({
+          tooltip: {
+            formatter: "{b} <br/>{a} : " + this.cache.info.used_memory_human,
+          },
+          series: [
+            {
+              name: "峰值",
+              type: "gauge",
+              min: 0,
+              max: 1000,
+              detail: {
+                formatter: this.cache.info.used_memory_human,
+              },
+              data: [
+                {
+                  value: parseFloat(this.cache.info.used_memory_human),
+                  name: "内存消耗",
+                },
+              ],
+            },
+          ],
+        });
+      });
+    },
+    // 打开加载层
+    openLoading() {
+      this.loading = this.$loading({
+        lock: true,
+        text: "拼命读取中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/monitor/druid/index.vue b/ruoyi-ui/src/views/monitor/druid/index.vue
new file mode 100644
index 0000000..c6ad585
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/druid/index.vue
@@ -0,0 +1,15 @@
+<template>
+  <i-frame :src="url" />
+</template>
+<script>
+import iFrame from "@/components/iFrame/index";
+export default {
+  name: "Druid",
+  components: { iFrame },
+  data() {
+    return {
+      url: process.env.VUE_APP_BASE_API + "/druid/login.html"
+    };
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
new file mode 100644
index 0000000..c907064
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -0,0 +1,523 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="任务名称" prop="jobName">
+        <el-input
+          v-model="queryParams.jobName"
+          placeholder="请输入任务名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务组名" prop="jobGroup">
+        <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable size="small">
+          <el-option
+            v-for="dict in jobGroupOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['monitor:job:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['monitor:job:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitor:job:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['monitor:job:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-s-operation"
+          size="mini"
+          @click="handleJobLog"
+          v-hasPermi="['monitor:job:query']"
+        >日志</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="任务编号" align="center" prop="jobId" />
+      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+      <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" />
+      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['monitor:job:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['monitor:job:remove']"
+          >删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
+                v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
+              <el-dropdown-item command="handleView" icon="el-icon-view"
+                v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
+              <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
+                v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改定时任务对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="任务名称" prop="jobName">
+              <el-input v-model="form.jobName" placeholder="请输入任务名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组" prop="jobGroup">
+              <el-select v-model="form.jobGroup" placeholder="请选择">
+                <el-option
+                  v-for="dict in jobGroupOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item prop="invokeTarget">
+              <span slot="label">
+                调用方法
+                <el-tooltip placement="top">
+                  <div slot="content">
+                    Bean调用示例：ryTask.ryParams('ry')
+                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
+                  </div>
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+              </span>
+              <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="cron表达式" prop="cronExpression">
+              <el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否并发" prop="concurrent">
+              <el-radio-group v-model="form.concurrent" size="small">
+                <el-radio-button label="0">允许</el-radio-button>
+                <el-radio-button label="1">禁止</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="错误策略" prop="misfirePolicy">
+              <el-radio-group v-model="form.misfirePolicy" size="small">
+                <el-radio-button label="1">立即执行</el-radio-button>
+                <el-radio-button label="2">执行一次</el-radio-button>
+                <el-radio-button label="3">放弃执行</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 任务日志详细 -->
+    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="120px" size="mini">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
+            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
+            <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务状态：">
+              <div v-if="form.status == 0">正常</div>
+              <div v-else-if="form.status == 1">失败</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否并发：">
+              <div v-if="form.concurrent == 0">允许</div>
+              <div v-else-if="form.concurrent == 1">禁止</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行策略：">
+              <div v-if="form.misfirePolicy == 0">默认策略</div>
+              <div v-else-if="form.misfirePolicy == 1">立即执行</div>
+              <div v-else-if="form.misfirePolicy == 2">执行一次</div>
+              <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openView = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
+
+export default {
+  name: "Job",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 定时任务表格数据
+      jobList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详细弹出层
+      openView: false,
+      // 任务组名字典
+      jobGroupOptions: [],
+      // 状态字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobName: undefined,
+        jobGroup: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        jobName: [
+          { required: true, message: "任务名称不能为空", trigger: "blur" }
+        ],
+        invokeTarget: [
+          { required: true, message: "调用目标字符串不能为空", trigger: "blur" }
+        ],
+        cronExpression: [
+          { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_job_group").then(response => {
+      this.jobGroupOptions = response.data;
+    });
+    this.getDicts("sys_job_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询定时任务列表 */
+    getList() {
+      this.loading = true;
+      listJob(this.queryParams).then(response => {
+        this.jobList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 任务组名字典翻译
+    jobGroupFormat(row, column) {
+      return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
+    },
+    // 状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        jobId: undefined,
+        jobName: undefined,
+        jobGroup: undefined,
+        invokeTarget: undefined,
+        cronExpression: undefined,
+        misfirePolicy: 1,
+        concurrent: 1,
+        status: "0"
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.jobId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleRun":
+          this.handleRun(row);
+          break;
+        case "handleView":
+          this.handleView(row);
+          break;
+        case "handleJobLog":
+          this.handleJobLog(row);
+          break;
+        default:
+          break;
+      }
+    },
+    // 任务状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.jobName + '"任务吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeJobStatus(row.jobId, row.status);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.status = row.status === "0" ? "1" : "0";
+        });
+    },
+    /* 立即执行一次 */
+    handleRun(row) {
+      this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return runJob(row.jobId, row.jobGroup);
+        }).then(() => {
+          this.msgSuccess("执行成功");
+        }).catch(() => {});
+    },
+    /** 任务详细信息 */
+    handleView(row) {
+      getJob(row.jobId).then(response => {
+        this.form = response.data;
+        this.openView = true;
+      });
+    },
+    /** 任务日志列表查询 */
+    handleJobLog(row) {
+      const jobId = row.jobId || 0;
+      this.$router.push({ path: '/monitor/job-log/index', query: { jobId: jobId } })
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const jobId = row.jobId || this.ids;
+      getJob(jobId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.jobId != undefined) {
+            updateJob(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addJob(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const jobIds = row.jobId || this.ids;
+      this.$confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delJob(jobIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有定时任务数据项?", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportJob(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
new file mode 100644
index 0000000..25db43f
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="任务名称" prop="jobName">
+        <el-input
+          v-model="queryParams.jobName"
+          placeholder="请输入任务名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务组名" prop="jobGroup">
+        <el-select
+          v-model="queryParams.jobGroup"
+          placeholder="请任务组名"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in jobGroupOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择执行状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitor:job:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleClean"
+          v-hasPermi="['monitor:job:remove']"
+        >清空</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['monitor:job:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
+      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+      <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
+      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
+      <el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['monitor:job:query']"
+          >详细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 调度日志详细 -->
+    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
+            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
+            <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="执行状态：">
+              <div v-if="form.status == 0">正常</div>
+              <div v-else-if="form.status == 1">失败</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getJob} from "@/api/monitor/job";
+import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+
+export default {
+  name: "JobLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 调度日志表格数据
+      jobLogList: [],
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 表单参数
+      form: {},
+      // 执行状态字典
+      statusOptions: [],
+      // 任务组名字典
+      jobGroupOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobName: undefined,
+        jobGroup: undefined,
+        status: undefined
+      }
+    };
+  },
+  created() {
+    const jobId = this.$route.query.jobId;
+    if (jobId !== undefined && jobId != 0) {
+      getJob(jobId).then(response => {
+        this.queryParams.jobName = response.data.jobName;
+        this.queryParams.jobGroup = response.data.jobGroup;
+        this.getList();
+      });
+    } else {
+      this.getList();
+    }
+    this.getDicts("sys_common_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_job_group").then(response => {
+      this.jobGroupOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询调度日志列表 */
+    getList() {
+      this.loading = true;
+      listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.jobLogList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 执行状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 任务组名字典翻译
+    jobGroupFormat(row, column) {
+      return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
+    },
+    // 返回按钮
+    handleClose() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/monitor/job" });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.jobLogId);
+      this.multiple = !selection.length;
+    },
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const jobLogIds = this.ids;
+      this.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delJobLog(jobLogIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 清空按钮操作 */
+    handleClean() {
+      this.$confirm("是否确认清空所有调度日志数据项?", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return cleanJobLog();
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("清空成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有调度日志数据项?", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportJobLog(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue
new file mode 100644
index 0000000..07937b4
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="登录地址" prop="ipaddr">
+        <el-input
+          v-model="queryParams.ipaddr"
+          placeholder="请输入登录地址"
+          clearable
+          style="width: 240px;"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          style="width: 240px;"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="登录状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登录时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitor:logininfor:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleClean"
+          v-hasPermi="['monitor:logininfor:remove']"
+        >清空</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['monitor:logininfor:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="访问编号" align="center" prop="infoId" />
+      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
+      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
+      <el-table-column label="操作系统" align="center" prop="os" />
+      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作信息" align="center" prop="msg" />
+      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { list, delLogininfor, cleanLogininfor, exportLogininfor } from "@/api/monitor/logininfor";
+
+export default {
+  name: "Logininfor",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 默认排序
+      defaultSort: {prop: 'loginTime', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ipaddr: undefined,
+        userName: undefined,
+        status: undefined
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_common_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询登录日志列表 */
+    getList() {
+      this.loading = true;
+      list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.list = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 登录状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.infoId)
+      this.multiple = !selection.length
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const infoIds = row.infoId || this.ids;
+      this.$confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLogininfor(infoIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 清空按钮操作 */
+    handleClean() {
+        this.$confirm('是否确认清空所有登录日志数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return cleanLogininfor();
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("清空成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有操作日志数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportLogininfor(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
+
diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue
new file mode 100644
index 0000000..64aa25c
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/online/index.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="登录地址" prop="ipaddr">
+        <el-input
+          v-model="queryParams.ipaddr"
+          placeholder="请输入登录地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+
+    </el-form>
+    <el-table
+      v-loading="loading"
+      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
+      style="width: 100%;"
+    >
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
+      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="部门名称" align="center" prop="deptName" />
+      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="浏览器" align="center" prop="browser" />
+      <el-table-column label="操作系统" align="center" prop="os" />
+      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleForceLogout(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+          >强退</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+  </div>
+</template>
+
+<script>
+import { list, forceLogout } from "@/api/monitor/online";
+
+export default {
+  name: "Online",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      pageNum: 1,
+      pageSize: 10,
+      // 查询参数
+      queryParams: {
+        ipaddr: undefined,
+        userName: undefined
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询登录日志列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 强退按钮操作 */
+    handleForceLogout(row) {
+      this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return forceLogout(row.tokenId);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("强退成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
+
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
new file mode 100644
index 0000000..ff6c798
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -0,0 +1,335 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="系统模块" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入系统模块"
+          clearable
+          style="width: 240px;"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作人员" prop="operName">
+        <el-input
+          v-model="queryParams.operName"
+          placeholder="请输入操作人员"
+          clearable
+          style="width: 240px;"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="businessType">
+        <el-select
+          v-model="queryParams.businessType"
+          placeholder="操作类型"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="操作状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['monitor:operlog:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleClean"
+          v-hasPermi="['monitor:operlog:remove']"
+        >清空</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['monitor:operlog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="日志编号" align="center" prop="operId" />
+      <el-table-column label="系统模块" align="center" prop="title" />
+      <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat" />
+      <el-table-column label="请求方式" align="center" prop="requestMethod" />
+      <el-table-column label="操作人员" align="center" prop="operName" width="100" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
+      <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作日期" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.operTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row,scope.index)"
+            v-hasPermi="['monitor:operlog:query']"
+          >详细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 操作日志详细 -->
+    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
+            <el-form-item
+              label="登录信息："
+            >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
+            <el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="操作状态：">
+              <div v-if="form.status === 0">正常</div>
+              <div v-else-if="form.status === 1">失败</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/monitor/operlog";
+
+export default {
+  name: "Operlog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      typeOptions: [],
+      // 类型数据字典
+      statusOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 默认排序
+      defaultSort: {prop: 'operTime', order: 'descending'},
+      // 表单参数
+      form: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: undefined,
+        operName: undefined,
+        businessType: undefined,
+        status: undefined
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_oper_type").then(response => {
+      this.typeOptions = response.data;
+    });
+    this.getDicts("sys_common_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询登录日志 */
+    getList() {
+      this.loading = true;
+      list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.list = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 操作日志状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 操作日志类型字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.businessType);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.operId)
+      this.multiple = !selection.length
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const operIds = row.operId || this.ids;
+      this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delOperlog(operIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 清空按钮操作 */
+    handleClean() {
+        this.$confirm('是否确认清空所有操作日志数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return cleanOperlog();
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("清空成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有操作日志数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportOperlog(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
+
diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue
new file mode 100644
index 0000000..8ba3082
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/server/index.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span>CPU</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="is-leaf"><div class="cell">属性</div></th>
+                  <th class="is-leaf"><div class="cell">值</div></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td><div class="cell">核心数</div></td>
+                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">用户使用率</div></td>
+                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">系统使用率</div></td>
+                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">当前空闲率</div></td>
+                  <td><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span>内存</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="is-leaf"><div class="cell">属性</div></th>
+                  <th class="is-leaf"><div class="cell">内存</div></th>
+                  <th class="is-leaf"><div class="cell">JVM</div></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td><div class="cell">总内存</div></td>
+                  <td><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">已用内存</div></td>
+                  <td><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">剩余内存</div></td>
+                  <td><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">使用率</div></td>
+                  <td><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
+                  <td><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span>服务器信息</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td><div class="cell">服务器名称</div></td>
+                  <td><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>
+                  <td><div class="cell">操作系统</div></td>
+                  <td><div class="cell" v-if="server.sys">{{ server.sys.osName }}</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">服务器IP</div></td>
+                  <td><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>
+                  <td><div class="cell">系统架构</div></td>
+                  <td><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span>Java虚拟机信息</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td><div class="cell">Java名称</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
+                  <td><div class="cell">Java版本</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
+                </tr>
+                <tr>
+                  <td><div class="cell">启动时间</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
+                  <td><div class="cell">运行时长</div></td>
+                  <td><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</div></td>
+                </tr>
+                <tr>
+                  <td colspan="1"><div class="cell">安装路径</div></td>
+                  <td colspan="3"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
+                </tr>
+                <tr>
+                  <td colspan="1"><div class="cell">项目路径</div></td>
+                  <td colspan="3"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span>磁盘状态</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="is-leaf"><div class="cell">盘符路径</div></th>
+                  <th class="is-leaf"><div class="cell">文件系统</div></th>
+                  <th class="is-leaf"><div class="cell">盘符类型</div></th>
+                  <th class="is-leaf"><div class="cell">总大小</div></th>
+                  <th class="is-leaf"><div class="cell">可用大小</div></th>
+                  <th class="is-leaf"><div class="cell">已用大小</div></th>
+                  <th class="is-leaf"><div class="cell">已用百分比</div></th>
+                </tr>
+              </thead>
+              <tbody v-if="server.sysFiles">
+                <tr v-for="sysFile in server.sysFiles">
+                  <td><div class="cell">{{ sysFile.dirName }}</div></td>
+                  <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>
+                  <td><div class="cell">{{ sysFile.typeName }}</div></td>
+                  <td><div class="cell">{{ sysFile.total }}</div></td>
+                  <td><div class="cell">{{ sysFile.free }}</div></td>
+                  <td><div class="cell">{{ sysFile.used }}</div></td>
+                  <td><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getServer } from "@/api/monitor/server";
+
+export default {
+  name: "Server",
+  data() {
+    return {
+      // 加载层信息
+      loading: [],
+      // 服务器信息
+      server: []
+    };
+  },
+  created() {
+    this.getList();
+    this.openLoading();
+  },
+  methods: {
+    /** 查询服务器信息 */
+    getList() {
+      getServer().then(response => {
+        this.server = response.data;
+        this.loading.close();
+      });
+    },
+    // 打开加载层
+    openLoading() {
+      this.loading = this.$loading({
+        lock: true,
+        text: "拼命读取中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/redirect.vue b/ruoyi-ui/src/views/redirect.vue
new file mode 100644
index 0000000..db4c1d6
--- /dev/null
+++ b/ruoyi-ui/src/views/redirect.vue
@@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
new file mode 100644
index 0000000..24d8522
--- /dev/null
+++ b/ruoyi-ui/src/views/register.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="register">
+    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
+      <h3 class="title">赛格核销后台管理系统</h3>
+      <el-form-item prop="username">
+        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input
+          v-model="registerForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter.native="handleRegister"
+        >
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="confirmPassword">
+        <el-input
+          v-model="registerForm.confirmPassword"
+          type="password"
+          auto-complete="off"
+          placeholder="确认密码"
+          @keyup.enter.native="handleRegister"
+        >
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaOnOff">
+        <el-input
+          v-model="registerForm.code"
+          auto-complete="off"
+          placeholder="验证码"
+          style="width: 63%"
+          @keyup.enter.native="handleRegister"
+        >
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
+        <div class="register-code">
+          <img :src="codeUrl" @click="getCode" class="register-code-img"/>
+        </div>
+      </el-form-item>
+      <el-form-item style="width:100%;">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="handleRegister"
+        >
+          <span v-if="!loading">注 册</span>
+          <span v-else>注 册 中...</span>
+        </el-button>
+        <div style="float: right;">
+          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <div class="el-register-footer">
+      <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCodeImg, register } from "@/api/login";
+
+export default {
+  name: "Register",
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.registerForm.password !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      codeUrl: "",
+      registerForm: {
+        username: "",
+        password: "",
+        confirmPassword: "",
+        code: "",
+        uuid: ""
+      },
+      registerRules: {
+        username: [
+          { required: true, trigger: "blur", message: "请输入您的账号" },
+          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        confirmPassword: [
+          { required: true, trigger: "blur", message: "请再次输入您的密码" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+      },
+      loading: false,
+      captchaOnOff: true
+    };
+  },
+  created() {
+    this.getCode();
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then(res => {
+        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+        if (this.captchaOnOff) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.registerForm.uuid = res.uuid;
+        }
+      });
+    },
+    handleRegister() {
+      this.$refs.registerForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          register(this.registerForm).then(res => {
+            const username = this.registerForm.username;
+            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+              dangerouslyUseHTMLString: true
+            }).then(() => {
+              this.$router.push("/login");
+            }).catch(() => {});
+          }).catch(() => {
+            this.loading = false;
+            if (this.captchaOnOff) {
+              this.getCode();
+            }
+          })
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.register {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-image: url("../assets/images/login-background.jpg");
+  background-size: cover;
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.register-form {
+  border-radius: 6px;
+  background: #ffffff;
+  width: 400px;
+  padding: 25px 25px 5px 25px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.register-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.register-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-register-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.register-code-img {
+  height: 38px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/segchk/segchk_carouse_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_carouse_mgt/index.vue
new file mode 100644
index 0000000..4202524
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_carouse_mgt/index.vue
@@ -0,0 +1,657 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="轮播图id" prop="carouseId">
+        <el-input
+          v-model="queryParams.carouseId"
+          placeholder="请输入轮播图id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id" prop="providerId">
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+<!--        <el-input-->
+<!--          v-model="queryParams.storeId"-->
+<!--          placeholder="请输入商家id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.storeId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in watch_provider(queryParams.providerId)"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="管理状态" prop="mgtState">
+        <el-select v-model="queryParams.mgtState" placeholder="服务状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.carouseStatus"
+            :key="parseInt(dict.dictValue)"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排序id" prop="sortId">
+        <el-input
+          v-model="queryParams.sortId"
+          placeholder="请输入排序id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_carouse_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_carouse_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_carouse_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_carouse_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="saveReSort"
+          @click="handleSortUpdate"
+          v-hasPermi="['segchk:segchk_carouse_mgt:edit']"
+        >保存排序</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="dragTable" v-loading="loading" :data="segchk_carouse_mgtList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="商家" align="center" prop="storeId" :formatter="tableProviderName" />
+      <el-table-column label="首页推荐轮播图" align="center" prop="storeCarousel" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeCarousel" :height="30" :width="75"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理状态" align="center" prop="mgtState" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.mgtState"
+            :active-value="0"
+            :inactive-value="-1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="展示顺序" align="center" prop="sortId"/>
+<!--      <el-table-column label="拖动" align="center" type="index" class-name="allowDrag"/>-->
+      <el-table-column label="修改时间" align="center" prop="modTime" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="轮播图" align="center" prop="carouseId"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_carouse_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_carouse_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg首页轮播图管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />-->
+          <el-tooltip content="全局唯一" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+<!--          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />-->
+          <el-tooltip content="全局唯一" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.storeId" placeholder="商家id" >
+            <el-option
+              v-for="dict in watch_provider(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家轮播图1路径">
+          <imageUpload v-model="form.storeCarousel" :limit=1 :file-size=1 />
+        </el-form-item>
+        <el-form-item label="管理状态" prop="mgtState">
+          <el-tooltip content="0有效，-1失效" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.mgtState" placeholder="管理状态" >
+            <el-option
+              v-for="dict in this.carouseStatus"
+              :key="parseInt(dict.dictValue)"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序id" prop="sortId">
+<!--          <el-input v-model="form.sortId" placeholder="请输入排序id" />-->
+
+          <el-input-number v-model="form.sortId" controls-position="right" :min="0" placeholder="展示序号"/>
+        </el-form-item>
+        <!--<el-form-item label="修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_carouse_mgt, getSegchk_carouse_mgt, delSegchk_carouse_mgt, addSegchk_carouse_mgt, updateSegchk_carouse_mgt, exportSegchk_carouse_mgt, updateSegchk_carouse_state, updateSegchk_carouse_sort } from "@/api/segchk/segchk_carouse_mgt";
+
+import {segchk_get_provider_list, segchk_get_chargecard_list, segchk_get_keyword_list, segchk_get_preference_lable_list, segchk_get_saler_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+
+import Sortable from 'sortablejs'
+import store from '@/store'
+
+export default {
+  name: "Segchk_carouse_mgt",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg首页轮播图管理表格数据
+      segchk_carouse_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'sortId', order: 'ascending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carouseId: null,
+        providerId: null,
+        storeId: null,
+        storeCarousel: null,
+        mgtState: null,
+        sortId: null,
+        modTime: null
+      },
+      segchk_providerList: [],
+      segchk_storeList: [],
+      carouseStatus: [],
+      baseUrl: '',
+      // baseUrl: process.env.VUE_APP_BASE_API,
+      // 显示搜索条件
+      saveReSort: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        carouseId: [
+          { required: true, message: "轮播图id不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，-1失效不能为空", trigger: "blur" }
+        ],
+        sortId: [
+          { required: true, message: "排序id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  mounted() {
+    // this.rowDrop();
+  },
+  computed: {
+    watch_provider() {
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+          .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          })
+        return arr
+      }
+    }
+  },
+  methods: {
+    rowDrop() {
+      const _this = this
+      const el = _this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+
+      const sortable = Sortable.create(el, {
+        animation: 300,
+        handle: ".allowDrag",
+        onEnd: evt => {
+          _this.saveReSort = false;
+          /*const targetRow = _this.segchk_carouse_mgtList.splice(evt.oldIndex, 1)[0];
+          _this.segchk_carouse_mgtList.splice(evt.newIndex, 0, targetRow);
+
+          for (let index in _this.segchk_carouse_mgtList) {
+            _this.segchk_carouse_mgtList[index].sortId = parseInt(index) + 1;
+          }*/
+
+          _this.segchk_carouse_mgtList.splice(evt.newIndex, 0, _this.segchk_carouse_mgtList.splice(evt.oldIndex, 1)[0]);
+          var newArray = _this.segchk_carouse_mgtList.slice(0);
+          _this.segchk_carouse_mgtList = [];
+          _this.$nextTick(function () {
+            _this.segchk_carouse_mgtList = newArray;
+          });
+          _this.segchk_carouse_mgtList.forEach(v => console.log(v.storeId + "-" + v.sortId + ":" + v.index))
+          console.log("-------------------")
+          this.segchk_carouse_mgtList.forEach(v => console.log(v.storeId + "-" + v.sortId + ":" + v.index))
+          // _this.computeSort(evt.oldIndex, evt.newIndex, _this.segchk_carouse_mgtList)
+
+        }
+      });
+    },
+    computeSort(oldIndex, newIndex,oldList){
+      // 新数据集合
+      const newList = []
+      // 第一种情况 oldIndex < newIndex比如下标为1->3
+      if (oldIndex < newIndex) {
+        for (let i = 0; i < oldList.length; i++) {
+          //如果没涉及到他们的数据直接赋值，比如0、4、5
+          if (i < oldIndex || i > newIndex) {
+            newList[i] = oldList[i]
+          }
+          else {
+            if (i < newIndex) {
+              // 小于新的下标的并且大于旧下标的都取当前下标的后一个，因为都往前移动了
+              newList[i] = oldList[i + 1]
+            } else {
+              //当i等于交换后的位置也就3时我们直接取oldIndex也就是下标1的数据
+              newList[i] = oldList[oldIndex]
+            }
+          }
+        }
+        // 第二种情况 oldIndex > newIndex  3->1
+      } else if (oldIndex > newIndex) {
+        for (let i = 0; i < oldList.length; i++) {
+          //如果没涉及到他们的数据直接赋值，比如0、4、5
+          if (i > oldIndex || i < newIndex) {
+            newList[i] = oldList[i]
+          } else {
+            // 当前下标等于新的下标时直接取老下标的值
+            if (i === newIndex) {
+              newList[i] = oldList[oldIndex]
+            } else if (i > newIndex) {
+              // 当前下标大于新下标时，取下标向前偏移1的数据，因为都往后移动了一位
+              newList[i] = oldList[i - 1]
+            }
+          }
+        }
+        // 第三种情况oldIndex = newIndex  1->1
+      } else {
+        for (let i = 0; i < oldList.length; i++) {
+          // 直接赋值
+          newList[i] = oldList[i]
+        }
+      }
+      return newList
+    },
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    handleStatusChange(row) {
+      let text = row.mgtState === 0 ? "生效" : "失效";
+      // console.log(typeof row.mgtState)
+      // return
+      var ret = this.segchk_storeList.find(value => {
+        return value.key == row.storeId
+      })
+      var storeName = ret == null ? "未知" : ret.value;
+      this.$confirm('确认要"' + text + '""' + storeName + '"吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_carouse_state(row.carouseId, row.mgtState);
+      }).then((response) => {
+        // console.log("handleStatusChange ---" + response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // console.log("updateSegchk_store_service_state res " + res)
+        row.mgtState = row.mgtState === 0 ? -1 : 0;
+      });
+    },
+
+    lableSort(row) {
+      var maxsortId = this.segchk_carouse_mgtList.reduce((v1, v2) => {
+        return v1.sortId > v2.sortId ? v1 : v2
+      }).sortId
+      if(row.mgtId == null)
+        return maxsortId + ""
+      else return row.sortId + ""
+    },
+
+    /** 查询seg首页轮播图管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      this.getDicts("segchk_carouse_status").then(response => {
+        this.carouseStatus = response.data;
+      });
+
+      listSegchk_carouse_mgt(this.queryParams).then(response => {
+        this.segchk_carouse_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      console.log(this.segchk_carouse_mgtList)
+    },
+    // 取消按钮
+    cancel() {
+      this.saveReSort = true;
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.saveReSort = true;
+      this.form = {
+        carouseId: null,
+        providerId: null,
+        storeId: null,
+        storeCarousel: null,
+        mgtState: null,
+        sortId: null,
+        modTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      // this.$refs.dragTable.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.carouseId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg首页轮播图管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const carouseId = row.carouseId || this.ids
+      getSegchk_carouse_mgt(carouseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg首页轮播图管理";
+      });
+    },
+    /** 修改显示顺序按钮操作 */
+    handleSortUpdate(row) {
+      this.rowDrop();
+      const sortInfo = this.segchk_carouse_mgtList.map(item => item.carouseId + ':' + item.sortId)
+      updateSegchk_carouse_sort(sortInfo).then(response => {
+        if(response.code == 200) {
+          this.msgSuccess("修改显示顺序成功");
+          this.saveReSort = true;
+        }
+        else {
+          this.msgError("修改显示顺序失败");
+          this.saveReSort = false;
+        }
+      });
+      // this.$refs.draggable.sort(this.defaultSort.prop, this.defaultSort.order)
+      // this.handleQuery();
+      // console.log(sortInfo)
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_carouse_mgtList.find(v => (v.providerId == this.form.providerId && v.storeId == this.form.storeId))
+          if (this.form.carouseId != null) {
+            if(exitItem != null && exitItem.carouseId != this.form.carouseId){
+              this.msgError("该商家已存在")
+              return
+            }
+            updateSegchk_carouse_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该商家已存在")
+              return
+            }
+            addSegchk_carouse_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const carouseIds = row.carouseId || this.ids;
+      this.$confirm('是否确认删除seg首页轮播图管理编号为"' + carouseIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_carouse_mgt(carouseIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg首页轮播图管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_carouse_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_charge_card/index.vue b/ruoyi-ui/src/views/segchk/segchk_charge_card/index.vue
new file mode 100644
index 0000000..e202fe5
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_charge_card/index.vue
@@ -0,0 +1,500 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商" prop="providerId">
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="卡类型" prop="cardTypeId">
+        <el-select v-model="queryParams.cardTypeId" placeholder="卡类型" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="parseInt(dict.value)"
+            :label="dict.lable"
+            :value="parseInt(dict.value)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!--<el-form-item label="卡类型名称" prop="cardTypeName">
+        <el-tooltip content="充值卡的显示名称" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.cardTypeName"
+          placeholder="请输入卡类型名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="卡面额" prop="cardTypeValue">
+        <el-tooltip content="充值卡的价值金额" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.cardTypeValue"
+          placeholder="请输入卡面额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效期时长" prop="effectiveTime">
+        <el-input
+          v-model="queryParams.effectiveTime"
+          placeholder="请输入有效期时长"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="可购买次数" prop="buyCount">
+        <el-input
+          v-model="queryParams.buyCount"
+          placeholder="请输入可购买次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总核消次数" prop="cardTypeChkcount">
+        <el-input
+          v-model="queryParams.cardTypeChkcount"
+          placeholder="请输入卡类型总核消次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_charge_card:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_charge_card:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_charge_card:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_charge_card:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_charge_cardList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"></el-table-column>
+      <el-table-column label="卡类型id" align="center" prop="cardTypeId"  sortable="custom" :sort-orders="['descending', 'ascending']"  :formatter="tableProviderName" :render-header="renderHeader" />
+<!--      <el-table-column label="卡类型名称" align="center" prop="cardTypeName" :render-header="renderHeader" />-->
+      <el-table-column label="卡面额" align="center" prop="cardTypeValue" :render-header="renderHeader" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="有效期时长" align="center" prop="effectiveTime" :render-header="renderHeader"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="可购买次数" align="center" prop="buyCount" :render-header="renderHeader" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="总核消次数" align="center" prop="cardTypeChkcount" :render-header="renderHeader"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :render-header="renderHeader">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_charge_card:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_charge_card:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg充值卡管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="cardTypeName">
+<!--          <el-input v-model="form.providerId" placeholder="运营商id" />-->
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+          <el-option
+            v-for="dict in segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item label="卡类型名称" prop="cardTypeName">
+          <el-tooltip content="充值卡的显示名称" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.cardTypeName" placeholder="请输入卡类型名称" />
+        </el-form-item>
+        <el-form-item label="卡面额" prop="cardTypeValue">
+          <el-input v-model="form.cardTypeValue" placeholder="请输入卡面额" />
+        </el-form-item>
+        <el-form-item label="有效期时长" prop="effectiveTime">
+<!--          <el-input v-model="form.effectiveTime" placeholder="请输入有效期时长" />-->
+          <el-input-number v-model="form.effectiveTime" controls-position="right" :min="1" placeholder="有效期时长"/>
+        </el-form-item>
+        <el-form-item label="可购买次数" prop="buyCount">
+<!--          <el-input v-model="form.buyCount" placeholder="请输入可购买次数" />-->
+          <el-input-number v-model="form.buyCount" controls-position="right" :min="1" placeholder="可购买次数"/>
+        </el-form-item>
+        <el-form-item label="卡类型总核消次数" prop="cardTypeChkcount">
+<!--          <el-input v-model="form.cardTypeChkcount" placeholder="请输入卡类型总核消次数" />-->
+          <el-input-number v-model="form.cardTypeChkcount" controls-position="right" :min="1" placeholder="卡类型总核消次数"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_charge_card, getSegchk_charge_card, delSegchk_charge_card, addSegchk_charge_card, updateSegchk_charge_card, exportSegchk_charge_card } from "@/api/segchk/segchk_charge_card";
+
+import {segchk_get_chargecard_list, segchk_get_provider_list} from "@/api/segchk/segchk_get_simple_list"
+import store from '@/store'
+
+export default {
+  name: "Segchk_charge_card",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg充值卡管理表格数据
+      segchk_charge_cardList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort: {prop: 'cardTypeId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        cardTypeId: null,
+        cardTypeName: null,
+        cardTypeValue: null,
+        effectiveTime: null,
+        buyCount: null,
+        cardTypeChkcount: null
+      },
+      segchk_providerList: [],
+      // 会员卡列表
+      segchk_chargeCardList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardTypeName: [
+          { required: true, message: "卡类型名称(9.9,99,199,299)不能为空", trigger: "blur" }
+        ],
+        cardTypeValue: [
+          { required: true, message: "卡面额不能为空", trigger: "blur" }
+        ],
+        effectiveTime: [
+          { required: true, message: "有效期时长不能为空", trigger: "blur" }
+        ],
+        buyCount: [
+          { required: true, message: "可购买次数不能为空", trigger: "blur" }
+        ],
+        cardTypeChkcount: [
+          { required: true, message: "卡类型总核消次数不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp() {
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_chargeCardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 优惠标签
+        }
+        this.formlableList = arr
+        return arr
+      }
+    }
+  },
+  methods: {
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+        case '卡类型id':
+          contentstr = '运营商下的会员卡名称';break;
+        case '卡面额':
+          contentstr = '用户购买时应支付的金额';break;
+        case '有效期时长':
+          contentstr = '用户购买后该种会员卡的有期天数';break;
+        case '可购买次数':
+          contentstr = '用户可购买多少次该种会员卡';break;
+        case '总核消次数':
+          contentstr = '用户可通过该种会员卡享受服务的次数';break;
+        case '操作':
+          contentstr = '如果删除会员卡时，同时将从首页标签，支持该卡的商家中的标签也会删除';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+    tableProviderName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'cardTypeId') {
+        var ret = this.segchk_chargeCardList.find((value) => {return parseInt(value.key) == row.cardTypeId && parseInt(value.providerId) == row.providerId })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg充值卡管理列表 */
+    getList() {
+      this.loading = true;
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_chargeCardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      listSegchk_charge_card(this.queryParams).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        cardTypeId: null,
+        cardTypeName: null,
+        cardTypeValue: null,
+        effectiveTime: null,
+        buyCount: null,
+        cardTypeChkcount: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg充值卡管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const cardTypeId = row.cardTypeId || this.ids
+      getSegchk_charge_card(cardTypeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg充值卡管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cardTypeId != null) {
+            updateSegchk_charge_card(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_charge_card(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cardTypeIds = row.cardTypeId || this.ids;
+      this.$confirm('是否确认删除seg充值卡管理编号为"' + cardTypeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_charge_card(cardTypeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg充值卡管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_charge_card(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_comment_acc/index.vue b/ruoyi-ui/src/views/segchk/segchk_comment_acc/index.vue
new file mode 100644
index 0000000..b1cdbda
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_comment_acc/index.vue
@@ -0,0 +1,422 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="更新id" prop="updateId">
+        <el-input
+          v-model="queryParams.updateId"
+          placeholder="请输入更新id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="评价次数" prop="starCount">
+        <el-input
+          v-model="queryParams.starCount"
+          placeholder="请输入评价次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="评价总分" prop="starLevel">
+        <el-input
+          v-model="queryParams.starLevel"
+          placeholder="请输入评价总分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_comment_acc:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_comment_acc:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_comment_acc:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_comment_acc:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_comment_accList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableStoreName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableStoreName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="更新id" align="center" prop="updateId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="评价次数" align="center" prop="starCount"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="评价总分" align="center" prop="starLevel"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_comment_acc:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_comment_acc:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商家累积评价对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="评价次数" prop="starCount">
+          <el-input v-model="form.starCount" placeholder="请输入评价次数" />
+        </el-form-item>
+        <el-form-item label="评价总分" prop="starLevel">
+          <el-input v-model="form.starLevel" placeholder="请输入评价总分" />
+        </el-form-item>
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_comment_acc, getSegchk_comment_acc, delSegchk_comment_acc, addSegchk_comment_acc, updateSegchk_comment_acc, exportSegchk_comment_acc } from "@/api/segchk/segchk_comment_acc";
+import {segchk_get_provider_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_comment_acc",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商家累积评价表格数据
+      segchk_comment_accList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'updateId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        updateId: null,
+        starCount: null,
+        starLevel: null,
+        storeId: null,
+        providerId: null,
+        modTime: null
+      },
+      segchk_storeList: [],
+      segchk_providerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        starCount: [
+          { required: true, message: "评价次数不能为空", trigger: "blur" }
+        ],
+        starLevel: [
+          { required: true, message: "评价总分不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableStoreName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'storeId') {
+        var ret = this.segchk_storeList.find((value) => {
+          return value.providerId == row.providerId && value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商家累积评价列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+      })
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      listSegchk_comment_acc(this.queryParams).then(response => {
+        this.segchk_comment_accList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        updateId: null,
+        starCount: null,
+        starLevel: null,
+        storeId: null,
+        providerId: null,
+        modTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.updateId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家累积评价";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const updateId = row.updateId || this.ids
+      getSegchk_comment_acc(updateId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家累积评价";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.updateId != null) {
+            updateSegchk_comment_acc(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_comment_acc(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const updateIds = row.updateId || this.ids;
+      this.$confirm('是否确认删除seg商家累积评价编号为"' + updateIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_comment_acc(updateIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家累积评价数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_comment_acc(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_district_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_district_info/index.vue
new file mode 100644
index 0000000..4760f7b
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_district_info/index.vue
@@ -0,0 +1,311 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="行政区代码" prop="districtId">
+        <el-input
+          v-model="queryParams.districtId"
+          placeholder="请输入行政区代码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="行政区名称" prop="districtName">
+        <el-input
+          v-model="queryParams.districtName"
+          placeholder="请输入行政区名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属行政区代码" prop="districtParent">
+        <el-input
+          v-model="queryParams.districtParent"
+          placeholder="请输入归属行政区代码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="行政区等级,0省直辖市，1地市，2县区" prop="districtLevel">
+        <el-input
+          v-model="queryParams.districtLevel"
+          placeholder="请输入行政区等级,0省直辖市，1地市，2县区"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_district_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_district_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_district_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_district_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_district_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="行政区代码" align="center" prop="districtId" />
+      <el-table-column label="行政区名称" align="center" prop="districtName" />
+      <el-table-column label="归属行政区代码" align="center" prop="districtParent" />
+      <el-table-column label="行政区等级,0省直辖市，1地市，2县区" align="center" prop="districtLevel" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_district_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_district_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg行政区域代码对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="行政区名称" prop="districtName">
+          <el-input v-model="form.districtName" placeholder="请输入行政区名称" />
+        </el-form-item>
+        <el-form-item label="归属行政区代码" prop="districtParent">
+          <el-input v-model="form.districtParent" placeholder="请输入归属行政区代码" />
+        </el-form-item>
+        <el-form-item label="行政区等级,0省直辖市，1地市，2县区" prop="districtLevel">
+          <el-input v-model="form.districtLevel" placeholder="请输入行政区等级,0省直辖市，1地市，2县区" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_district_info, getSegchk_district_info, delSegchk_district_info, addSegchk_district_info, updateSegchk_district_info, exportSegchk_district_info } from "@/api/segchk/segchk_district_info";
+
+export default {
+  name: "Segchk_district_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg行政区域代码表格数据
+      segchk_district_infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        districtId: null,
+        districtName: null,
+        districtParent: null,
+        districtLevel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        districtName: [
+          { required: true, message: "行政区名称不能为空", trigger: "blur" }
+        ],
+        districtParent: [
+          { required: true, message: "归属行政区代码不能为空", trigger: "blur" }
+        ],
+        districtLevel: [
+          { required: true, message: "行政区等级,0省直辖市，1地市，2县区不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg行政区域代码列表 */
+    getList() {
+      this.loading = true;
+      listSegchk_district_info(this.queryParams).then(response => {
+        this.segchk_district_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        districtId: null,
+        districtName: null,
+        districtParent: null,
+        districtLevel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.districtId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg行政区域代码";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const districtId = row.districtId || this.ids
+      getSegchk_district_info(districtId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg行政区域代码";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.districtId != null) {
+            updateSegchk_district_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_district_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const districtIds = row.districtId || this.ids;
+      this.$confirm('是否确认删除seg行政区域代码编号为"' + districtIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_district_info(districtIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg行政区域代码数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_district_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_keyword_lable/index.vue b/ruoyi-ui/src/views/segchk/segchk_keyword_lable/index.vue
new file mode 100644
index 0000000..25000c7
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_keyword_lable/index.vue
@@ -0,0 +1,472 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关键字" prop="keywordId">
+        <el-select v-model="queryParams.keywordId" placeholder="关键字" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(1, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!--<el-form-item label="关键字名称" prop="keywordName">
+        <el-tooltip content="商业标签，如：餐饮、美容、美发、汽修等" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.keywordName"
+          placeholder="请输入关键字名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_keyword_lable:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_keyword_lable:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_keyword_lable:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_keyword_lable:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_keyword_lableList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="关键字" align="center" prop="keywordId"  :formatter="tableProviderName" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="关键字名称" align="center" prop="keywordName" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="关键字图片地址" align="center" prop="keywordUrl" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.keywordUrl" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :render-header="renderHeader">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_keyword_lable:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_keyword_lable:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg关键字管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="运营商id" />-->
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字名称" prop="keywordName">
+          <el-tooltip content="商业标签，如：餐饮、美容、美发、汽修等" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.keywordName" placeholder="请输入关键字名称" />
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+        <el-form-item label="关键字图片地址">
+          <imageUpload v-model="form.keywordUrl" :limit=1 :file-size=1 />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_keyword_lable, getSegchk_keyword_lable, delSegchk_keyword_lable, addSegchk_keyword_lable, updateSegchk_keyword_lable, exportSegchk_keyword_lable } from "@/api/segchk/segchk_keyword_lable";
+
+import {segchk_get_provider_list} from "@/api/segchk/segchk_get_simple_list"
+import store from "@/store";
+
+export default {
+  name: "Segchk_keyword_lable",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg关键字管理表格数据
+      segchk_keyword_lableList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'keywordId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        keywordId: null,
+        keywordName: null,
+        modTime: null,
+        keywordUrl: null
+      },
+      segchk_providerList: [],
+      lableStatus: [],
+      baseUrl: '',
+      // baseUrl: process.env.VUE_APP_BASE_API,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        /*providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],*/
+        keywordName: [
+          { required: true, message: "关键字名称不能为空", trigger: "blur" }
+        ],
+        /*modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],*/
+        keywordUrl: [
+          { required: true, message: "关键字图片地址不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp() {
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_chargeCardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.keywordId), value: e.keywordName, pic: e.keywordUrl }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 优惠标签
+        }
+        this.formlableList = arr
+        return arr
+      }
+    }
+  },
+  methods: {
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+        case '卡类型名称':
+          contentstr = '运营商下的会员卡名称';break;
+        case '卡面额':
+          contentstr = '用户购买时应支付的金额';break;
+        case '有效期时长':
+          contentstr = '用户购买后该种会员卡的有期天数';break;
+        case '可购买次数':
+          contentstr = '用户可购买多少次该种会员卡';break;
+        case '总核消次数':
+          contentstr = '用户可通过该种会员卡享受服务的次数';break;
+        case '操作':
+          contentstr = '如果删除关键字时，同时将从首页标签，支持该标签的商家中的相应标签也会删除';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+    tableProviderName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'keywordId') {
+        var ret = this.segchk_keyword_lableList.find((value) => {return parseInt(value.keywordId) == row.keywordId && parseInt(value.providerId) == row.providerId })
+        var provName = ret == null ? "未知" : ret.keywordName;
+        return provName
+      }
+    },
+    /** 查询seg关键字管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      listSegchk_keyword_lable(this.queryParams).then(response => {
+        this.segchk_keyword_lableList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        keywordId: null,
+        keywordName: null,
+        modTime: null,
+        keywordUrl: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg关键字管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const keywordId = row.keywordId || this.ids
+      getSegchk_keyword_lable(keywordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg关键字管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.keywordId != null) {
+            updateSegchk_keyword_lable(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_keyword_lable(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const keywordIds = row.keywordId || this.ids;
+      this.$confirm('是否确认删除seg关键字管理编号为"' + keywordIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_keyword_lable(keywordIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg关键字管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_keyword_lable(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_lable_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_lable_mgt/index.vue
new file mode 100644
index 0000000..a519e08
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_lable_mgt/index.vue
@@ -0,0 +1,708 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+        <!--        <el-input-->
+        <!--          v-model="queryParams.providerId"-->
+        <!--          placeholder="请输入运营商id，全局唯一"-->
+        <!--          clearable-->
+        <!--          size="small"-->
+        <!--          @keyup.enter.native="handleQuery"-->
+        <!--        />-->
+      </el-form-item>
+
+      <el-form-item label="标签来源" prop="providerId">
+        <el-tooltip content="会员充值卡、关键字、优惠" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.lableFlag" placeholder="标签来源" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.typeSelectOptions"
+            :key="dict.typeId"
+            :label="dict.typeName"
+            :value="dict.typeId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="标签名称" prop="cardTypeName">
+        <el-tooltip content="会员充值卡、关键字、优惠中的一种具体名称" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <!--<el-input
+          v-model="queryParams.cardTypeName"
+          placeholder="请输入标签名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.cardTypeId" placeholder="标签名称" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="(dict,index) in getLabelComp(queryParams.lableFlag, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="管理状态" prop="mgtState">
+        <el-tooltip content="0有效，-1失效" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.mgtState" placeholder="服务状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.lableStatus"
+            :key="parseInt(dict.dictValue)"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          ></el-option>
+        </el-select>
+
+      </el-form-item>
+      <el-form-item label="修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="展示序号" prop="sortId">
+        <el-tooltip content="在首页中的展示顺序" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.sortId"
+          placeholder="请输入展示序号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_lable_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_lable_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_lable_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_lable_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_lable_mgtList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="管理" align="center" prop="mgtId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="标签来源" align="center" prop="lableFlag" :formatter="tableProviderName" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="标签名称" align="center" prop="cardTypeId" :formatter="tableProviderName" sortable="custom" :sort-orders="['descending', 'ascending']" />
+<!--      <el-table-column label="标签名称" align="center" prop="cardTypeName" />-->
+      <el-table-column label="管理状态" align="center" prop="mgtState"  sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.mgtState"
+            :active-value="0"
+            :inactive-value="-1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="展示序号" align="center" prop="sortId" />
+<!--      <el-table-column label="标签标识 0来自类型卡，1来自商家关键字" align="center" prop="lableFlag" />-->
+      <el-table-column label="标签图标路径" align="center" prop="iconUrl" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.iconUrl" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_lable_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_lable_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg首页标签管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <!--          <el-input v-model="form.providerId" placeholder="运营商id" />-->
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签来源" prop="lableFlag">
+          <el-tooltip content="会员充值卡、关键字、优惠" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.lableFlag" placeholder="标签来源" >
+            <el-option
+              v-for="dict in this.typeSelectOptions"
+              :key="parseInt(dict.typeId)"
+              :label="dict.typeName"
+              :value="parseInt(dict.typeId)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签名称" prop="cardTypeId">
+<!--          <el-input v-model="form.cardTypeId" placeholder="请输入卡类型名称(9.9,99,199,299)" />-->
+          <el-tooltip content="会员充值卡、关键字、优惠中的一种具体名称" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.cardTypeId" placeholder="标签名称" @change="changecardTypeName">
+            <el-option
+              v-for="(dict,index) in getLabelComp(form.lableFlag, form.providerId)"
+              :key="index"
+              :label="dict.lable"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="卡类型名称" prop="cardTypeName">-->
+<!--          <el-input v-model="form.cardTypeName"></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item label="管理状态" prop="mgtState">
+          <el-tooltip content="0有效，-1失效" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+<!--          <el-input v-model="form.mgtState" placeholder="请输入管理状态，0有效，-1失效" />-->
+          <el-select v-model="form.mgtState" placeholder="管理状态" >
+            <el-option
+              v-for="dict in lableStatus"
+              :key="parseInt(dict.dictValue)"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="展示序号" prop="sortId">
+          <el-tooltip content="0开始，越小展示越靠前" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+<!--          <el-input v-model="form.sortId" placeholder="请输入展示序号" />-->
+          <el-input-number v-model="form.sortId" controls-position="right" :min="0" placeholder="展示序号" :value="lableSort"/>
+        </el-form-item>
+        <el-form-item label="标签图标路径">
+          <ImageUpload v-model="form.iconUrl" :limit=1 :file-size=1 />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_lable_mgt, getSegchk_lable_mgt, delSegchk_lable_mgt, addSegchk_lable_mgt, updateSegchk_lable_mgt, exportSegchk_lable_mgt, updateSegchk_lable_mgt_state } from "@/api/segchk/segchk_lable_mgt";
+
+import {segchk_get_provider_list, segchk_get_chargecard_list, segchk_get_keyword_list, segchk_get_preference_lable_list, segchk_get_saler_list} from "@/api/segchk/segchk_get_simple_list";
+
+// import SingleUpload from '@/components/Upload/singleUpload'
+import Sortable from 'sortablejs'
+import store from "@/store";
+
+export default {
+  name: "Segchk_lable_mgt",
+  components: {Sortable},
+  data() {
+    return {
+      baseUrl: '',
+      // baseUrl: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg首页标签管理表格数据
+      segchk_lable_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'mgtId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cardTypeName: null,
+        mgtState: null,
+        modTime: null,
+        sortId: null,
+        iconUrl: null
+      },
+      // 会员卡列表
+      segchk_charge_cardList: [],
+      // 行业关键字列表
+      segchk_keyword_lableList: [],
+      // 优惠列表
+      segchk_preference_lableList: [],
+
+      segchk_providerList: [],
+      lableStatus: [],
+      typeSelectOptions:[
+        {
+          typeId: 0,
+          typeName:"会员充值卡"
+        },
+        {
+          typeId: 1,
+          typeName:"关键字"
+        },
+        {
+          typeId: 2,
+          typeName:"优惠标签"
+        }
+        ],
+      // 表单参数
+      form: {},
+      formlableList: [],
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "卡类型id不能为空", trigger: "blur" }
+        ],
+        cardTypeName: [
+          { required: true, message: "卡类型名称(9.9,99,199,299)不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，-1失效不能为空", trigger: "blur" }
+        ],
+        iconUrl: [
+          { required: true, message: "标签图标路径不能空", trigger: "blur" }
+        ],
+        sortId: [
+          { required: true, message: "展示序号不能为空", trigger: "blur" }
+        ],
+        lableFlag: [
+          { required: true, message: "标签标识 0来自类型卡，1来自商家关键字不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+
+  computed:{
+    lableSort(row) {
+      // console.log("lableSort --- " + row.providerId)
+      if(row.providerId == null){
+        return "0"
+      }
+      var maxsortId = this.segchk_lable_mgtList.filter(value => {
+        return value.providerId == row.providerId
+      }).reduce((v1, v2) => {
+        return v1.sortId > v2.sortId ? v1 : v2
+      }).sortId
+      if(row.mgtId == null)
+        return maxsortId + ""
+      else return row.sortId + ""
+    },
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 优惠标签
+        }
+        this.formlableList = arr
+        return arr
+      }
+    }
+  },
+
+  methods: {
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+        case '卡类型名称':
+          contentstr = '运营商下的会员卡名称';break;
+        case '卡面额':
+          contentstr = '用户购买时应支付的金额';break;
+        case '有效期时长':
+          contentstr = '用户购买后该种会员卡的有期天数';break;
+        case '可购买次数':
+          contentstr = '用户可购买多少次该种会员卡';break;
+        case '总核消次数':
+          contentstr = '用户可通过该种会员卡享受服务的次数';break;
+        case '操作':
+          contentstr = '如果删除优惠时，同时将从首页标签，支持该标签的商家中的相应标签也会删除';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+// 服务状态修改
+    handleStatusChange(row) {
+      let text = row.mgtState === 0 ? "生效" : "失效";
+      // console.log(typeof row.mgtState)
+      // return
+      this.$confirm('确认要"' + text + '""' + row.cardTypeName + '"吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_lable_mgt_state(row.mgtId, row.mgtState);
+      }).then((response) => {
+        // console.log("handleStatusChange ---" + response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // console.log("updateSegchk_store_service_state res " + res)
+        row.mgtState = row.mgtState === 0 ? -1 : 0;
+      });
+    },
+    changecardTypeName(vId) {
+      // console.log("changecardTypeName --- " + vId)
+      this.form.cardTypeName = this.formlableList.find(value => {return value.value == vId}).lable
+      this.form.iconUrl = this.formlableList.find(value => {return value.value == vId}).pic
+    },
+
+    tableProviderName(row, column) {
+      // console.log("tableProviderName --- " + row.property + "---" + column.property + "---" + column.index)
+
+      if (column.property == 'mgtState'){
+
+        var ret = this.lableStatus.find((value) => {return value.dictValue == row.mgtState})
+        var provName = ret == null ? "" : ret.dictLabel
+        console.log("tableProviderName --- " +  row.mgtState + "---"+ provName)
+        return provName
+      }
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'lableFlag'){
+        var ret = this.typeSelectOptions.find(value => {
+          return value.typeId == row.lableFlag
+        })
+        var provName = ret == null ? "未知" : ret.typeName;
+        return provName
+      }
+      if (column.property == 'cardTypeId'){
+        var ret = row.lableFlag == '0' ?
+          this.segchk_charge_cardList.find(value => {return value.providerId == row.providerId && value.key == row.cardTypeId}) :
+          (row.lableFlag == '1' ?
+            this.segchk_keyword_lableList.find(value => {return value.providerId == row.providerId && value.key == row.cardTypeId}) :
+            this.segchk_preference_lableList.find(value => {return value.providerId == row.providerId && value.key == row.cardTypeId}))
+
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg首页标签管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 关键字
+      segchk_get_keyword_list(this.queryParams.providerId).then(response => {
+        this.segchk_keyword_lableList = response.rows;
+        // this.keywordtotal = response.total;
+      });
+
+      // 优惠标签
+      segchk_get_preference_lable_list(this.queryParams.providerId).then(response => {
+        this.segchk_preference_lableList = response.rows;
+        // this.preferencetotal = response.total;
+      });
+
+
+      this.getDicts("segchk_index_lable_mgt").then(response => {
+        this.lableStatus = response.data;
+      });
+
+      listSegchk_lable_mgt(this.queryParams).then(response => {
+        this.segchk_lable_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        // console.log(this.segchk_lable_mgtList)
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        cardTypeId: null,
+        cardTypeName: null,
+        mgtState: null,
+        modTime: null,
+        sortId: null,
+        lableFlag: null,
+        iconUrl: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg首页标签管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const mgtId = row.mgtId || this.ids
+      getSegchk_lable_mgt(mgtId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg首页标签管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_lable_mgtList.find(v => (v.providerId == this.form.providerId && v.cardTypeId == this.form.cardTypeId && v.lableFlag == this.form.lableFlag))
+          if (this.form.mgtId != null) {
+            if(exitItem != null && exitItem.mgtId != this.form.mgtId){
+              this.msgError("此类型标签已存在")
+              return
+            }
+            updateSegchk_lable_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("此类型标签已存在")
+              return
+            }
+            addSegchk_lable_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const mgtIds = row.mgtId || this.ids;
+      this.$confirm('是否确认删除seg首页标签管理编号为"' + mgtIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_lable_mgt(mgtIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg首页标签管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_lable_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_logion_detail/index.vue b/ruoyi-ui/src/views/segchk/segchk_logion_detail/index.vue
new file mode 100644
index 0000000..5c45b27
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_logion_detail/index.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="登录时间">
+        <el-date-picker
+          v-model="daterangeLogionTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="用户等级，0运营商，1商家，2vip会员，3普通会员" prop="userLevel">
+        <el-input
+          v-model="queryParams.userLevel"
+          placeholder="请输入用户等级，0运营商，1商家，2vip会员，3普通会员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="登录id" prop="loginId">
+        <el-input
+          v-model="queryParams.loginId"
+          placeholder="请输入登录id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_logion_detail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_logion_detail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_logion_detail:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_logion_detail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_logion_detailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="登录时间" align="center" prop="logionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.logionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户等级，0运营商，1商家，2vip会员，3普通会员" align="center" prop="userLevel" />
+      <el-table-column label="登录id" align="center" prop="loginId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_logion_detail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_logion_detail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg登录记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="登录时间" prop="logionTime">
+          <el-date-picker clearable size="small"
+            v-model="form.logionTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择登录时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="用户等级，0运营商，1商家，2vip会员，3普通会员" prop="userLevel">
+          <el-input v-model="form.userLevel" placeholder="请输入用户等级，0运营商，1商家，2vip会员，3普通会员" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_logion_detail, getSegchk_logion_detail, delSegchk_logion_detail, addSegchk_logion_detail, updateSegchk_logion_detail, exportSegchk_logion_detail } from "@/api/segchk/segchk_logion_detail";
+
+export default {
+  name: "Segchk_logion_detail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg登录记录表格数据
+      segchk_logion_detailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 登录时间时间范围
+      daterangeLogionTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        logionTime: null,
+        userLevel: null,
+        loginId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userLevel: [
+          { required: true, message: "用户等级，0运营商，1商家，2vip会员，3普通会员不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg登录记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeLogionTime && '' != this.daterangeLogionTime) {
+        this.queryParams.params["beginLogionTime"] = this.daterangeLogionTime[0];
+        this.queryParams.params["endLogionTime"] = this.daterangeLogionTime[1];
+      }
+      listSegchk_logion_detail(this.queryParams).then(response => {
+        this.segchk_logion_detailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        logionTime: null,
+        userLevel: null,
+        loginId: null,
+        providerId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeLogionTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.loginId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg登录记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const loginId = row.loginId || this.ids
+      getSegchk_logion_detail(loginId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg登录记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.loginId != null) {
+            updateSegchk_logion_detail(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_logion_detail(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const loginIds = row.loginId || this.ids;
+      this.$confirm('是否确认删除seg登录记录编号为"' + loginIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_logion_detail(loginIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg登录记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_logion_detail(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_msg_detail/index.vue b/ruoyi-ui/src/views/segchk/segchk_msg_detail/index.vue
new file mode 100644
index 0000000..4806894
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_msg_detail/index.vue
@@ -0,0 +1,451 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="源id" prop="fromId">
+        <el-input
+          v-model="queryParams.fromId"
+          placeholder="请输入源id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="目标id" prop="toId">
+        <el-input
+          v-model="queryParams.toId"
+          placeholder="请输入目标id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息" prop="msgType">
+        <el-input
+          v-model="queryParams.msgType"
+          placeholder="请输入消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="消息标题" prop="msgTitle">
+        <el-input
+          v-model="queryParams.msgTitle"
+          placeholder="请输入消息标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发送时间">
+        <el-date-picker
+          v-model="daterangeFromTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="接收时间">
+        <el-date-picker
+          v-model="daterangeGetTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="消息状态，0未发送，1，未读，2已读，3删除" prop="msgFlag">
+        <el-input
+          v-model="queryParams.msgFlag"
+          placeholder="请输入消息状态，0未发送，1，未读，2已读，3删除"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接收人等级，0运营商，1商家，2会员" prop="recvLevel">
+        <el-input
+          v-model="queryParams.recvLevel"
+          placeholder="请输入接收人等级，0运营商，1商家，2会员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_msg_detail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_msg_detail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_msg_detail:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_msg_detail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_msg_detailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="源id" align="center" prop="fromId" />
+      <el-table-column label="目标id" align="center" prop="toId" />
+      <el-table-column label="消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息" align="center" prop="msgType" />
+      <el-table-column label="消息内容" align="center" prop="msgContent" />
+      <el-table-column label="消息标题" align="center" prop="msgTitle" />
+      <el-table-column label="发送时间" align="center" prop="fromTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fromTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收时间" align="center" prop="getTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.getTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="消息id" align="center" prop="msgId" />
+      <el-table-column label="消息状态，0未发送，1，未读，2已读，3删除" align="center" prop="msgFlag" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="接收人等级，0运营商，1商家，2会员" align="center" prop="recvLevel" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_msg_detail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_msg_detail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg消息记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="源id" prop="fromId">
+          <el-input v-model="form.fromId" placeholder="请输入源id" />
+        </el-form-item>
+        <el-form-item label="目标id" prop="toId">
+          <el-input v-model="form.toId" placeholder="请输入目标id" />
+        </el-form-item>
+        <el-form-item label="消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息" prop="msgType">
+          <el-input v-model="form.msgType" placeholder="请输入消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息" />
+        </el-form-item>
+        <el-form-item label="消息内容">
+          <editor v-model="form.msgContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="消息标题" prop="msgTitle">
+          <el-input v-model="form.msgTitle" placeholder="请输入消息标题" />
+        </el-form-item>
+        <el-form-item label="发送时间" prop="fromTime">
+          <el-date-picker clearable size="small"
+            v-model="form.fromTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择发送时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="接收时间" prop="getTime">
+          <el-date-picker clearable size="small"
+            v-model="form.getTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择接收时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="消息状态，0未发送，1，未读，2已读，3删除" prop="msgFlag">
+          <el-input v-model="form.msgFlag" placeholder="请输入消息状态，0未发送，1，未读，2已读，3删除" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="接收人等级，0运营商，1商家，2会员" prop="recvLevel">
+          <el-input v-model="form.recvLevel" placeholder="请输入接收人等级，0运营商，1商家，2会员" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_msg_detail, getSegchk_msg_detail, delSegchk_msg_detail, addSegchk_msg_detail, updateSegchk_msg_detail, exportSegchk_msg_detail } from "@/api/segchk/segchk_msg_detail";
+
+export default {
+  name: "Segchk_msg_detail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg消息记录表格数据
+      segchk_msg_detailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 发送时间时间范围
+      daterangeFromTime: [],
+      // 接收时间时间范围
+      daterangeGetTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fromId: null,
+        toId: null,
+        msgType: null,
+        msgContent: null,
+        msgTitle: null,
+        fromTime: null,
+        getTime: null,
+        msgFlag: null,
+        providerId: null,
+        recvLevel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fromId: [
+          { required: true, message: "源id不能为空", trigger: "blur" }
+        ],
+        toId: [
+          { required: true, message: "目标id不能为空", trigger: "blur" }
+        ],
+        msgType: [
+          { required: true, message: "消息类型，0系统消息，1交易消息，2提醒消息，3评价消息，4核消消息不能为空", trigger: "blur" }
+        ],
+        msgContent: [
+          { required: true, message: "消息内容不能为空", trigger: "blur" }
+        ],
+        msgTitle: [
+          { required: true, message: "消息标题不能为空", trigger: "blur" }
+        ],
+        msgFlag: [
+          { required: true, message: "消息状态，0未发送，1，未读，2已读，3删除不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        recvLevel: [
+          { required: true, message: "接收人等级，0运营商，1商家，2会员不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg消息记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeFromTime && '' != this.daterangeFromTime) {
+        this.queryParams.params["beginFromTime"] = this.daterangeFromTime[0];
+        this.queryParams.params["endFromTime"] = this.daterangeFromTime[1];
+      }
+      if (null != this.daterangeGetTime && '' != this.daterangeGetTime) {
+        this.queryParams.params["beginGetTime"] = this.daterangeGetTime[0];
+        this.queryParams.params["endGetTime"] = this.daterangeGetTime[1];
+      }
+      listSegchk_msg_detail(this.queryParams).then(response => {
+        this.segchk_msg_detailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fromId: null,
+        toId: null,
+        msgType: null,
+        msgContent: null,
+        msgTitle: null,
+        fromTime: null,
+        getTime: null,
+        msgId: null,
+        msgFlag: null,
+        providerId: null,
+        recvLevel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeFromTime = [];
+      this.daterangeGetTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.msgId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg消息记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const msgId = row.msgId || this.ids
+      getSegchk_msg_detail(msgId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg消息记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.msgId != null) {
+            updateSegchk_msg_detail(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_msg_detail(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const msgIds = row.msgId || this.ids;
+      this.$confirm('是否确认删除seg消息记录编号为"' + msgIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_msg_detail(msgIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg消息记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_msg_detail(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_preference_lable/index.vue b/ruoyi-ui/src/views/segchk/segchk_preference_lable/index.vue
new file mode 100644
index 0000000..d9a0b2a
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_preference_lable/index.vue
@@ -0,0 +1,481 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="优惠" prop="preferenceId">
+        <el-select v-model="queryParams.preferenceId" placeholder="优惠" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(2, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!--<el-form-item label="优惠名称" prop="preferenceName">
+        <el-tooltip content="如(团购，打折等)" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.preferenceName"
+          placeholder="请输入优惠名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_preference_lable:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_preference_lable:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_preference_lable:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_preference_lable:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_preference_lableList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="优惠id" align="center" prop="preferenceId"  :formatter="tableProviderName" sortable="custom" :sort-orders="['descending', 'ascending']" />
+<!--      <el-table-column label="优惠名称" align="center" prop="preferenceName" />-->
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠图片地址" align="center" prop="preferenceUrl" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.preferenceUrl" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :render-header="renderHeader">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_preference_lable:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_preference_lable:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg优惠管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="运营商id" />-->
+          <el-tooltip content="全局唯一" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.providerId" placeholder="运营商" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="优惠名称" prop="preferenceName">
+          <el-tooltip content="如：团购，打折等" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.preferenceName" placeholder="请输入优惠名称" />
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+        <el-form-item label="优惠图片地址">
+          <imageUpload v-model="form.preferenceUrl" :limit="1" :file-size=1 />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_preference_lable, getSegchk_preference_lable, delSegchk_preference_lable, addSegchk_preference_lable, updateSegchk_preference_lable, exportSegchk_preference_lable } from "@/api/segchk/segchk_preference_lable";
+
+import {segchk_get_preference_lable_list, segchk_get_provider_list} from "@/api/segchk/segchk_get_simple_list"
+import store from "@/store";
+
+export default {
+  name: "Segchk_preference_lable",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg优惠管理表格数据
+      segchk_preference_lableList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'preferenceId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        preferenceId: null,
+        preferenceName: null,
+        modTime: null,
+        preferenceUrl: null
+      },
+      segchk_providerList: [],
+      baseUrl: '',
+      // baseUrl: process.env.VUE_APP_BASE_API,
+      // 优惠列表
+      segchk_preferenceList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        /*providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],*/
+        preferenceName: [
+          { required: true, message: "优惠名称(团购，打折等)不能为空", trigger: "blur" }
+        ],
+        preferenceUrl: [
+          { required: true, message: "优惠图片地址不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp() {
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_chargeCardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value, pic: e.imgUrl }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.keywordId), value: e.keywordName, pic: e.keywordUrl }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.preferenceId), value: e.preferenceName, pic: e.preferenceUrl }
+            }) // 优惠标签
+        }
+        this.formlableList = arr
+        return arr
+      }
+    }
+  },
+  methods: {
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+        case '卡类型名称':
+          contentstr = '运营商下的会员卡名称';break;
+        case '卡面额':
+          contentstr = '用户购买时应支付的金额';break;
+        case '有效期时长':
+          contentstr = '用户购买后该种会员卡的有期天数';break;
+        case '可购买次数':
+          contentstr = '用户可购买多少次该种会员卡';break;
+        case '总核消次数':
+          contentstr = '用户可通过该种会员卡享受服务的次数';break;
+        case '操作':
+          contentstr = '如果删除优惠时，同时将从首页标签，支持该标签的商家中的相应标签也会删除';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'preferenceId'){
+
+        var ret = this.segchk_preferenceList.find(value => {
+          return parseInt(value.key) == row.preferenceId && parseInt(value.providerId) == row.providerId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg优惠管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      // 优惠标签
+      segchk_get_preference_lable_list(this.queryParams.providerId).then(response => {
+        this.segchk_preferenceList = response.rows;
+        // this.preferencetotal = response.total;
+      });
+      listSegchk_preference_lable(this.queryParams).then(response => {
+        this.segchk_preference_lableList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        preferenceId: null,
+        preferenceName: null,
+        modTime: null,
+        preferenceUrl: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg优惠管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const preferenceId = row.preferenceId || this.ids
+      getSegchk_preference_lable(preferenceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg优惠管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.preferenceId != null) {
+            updateSegchk_preference_lable(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_preference_lable(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const preferenceIds = row.preferenceId || this.ids;
+      this.$confirm('是否确认删除seg优惠管理编号为"' + preferenceIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_preference_lable(preferenceIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg优惠管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_preference_lable(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_provider_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_provider_mgt/index.vue
new file mode 100644
index 0000000..eba7028
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_provider_mgt/index.vue
@@ -0,0 +1,663 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--<el-form-item label="小程序的openid" prop="openid">
+        <el-input
+          v-model="queryParams.openid"
+          placeholder="请输入小程序的openid"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信的联合登录id" prop="unionId">
+        <el-input
+          v-model="queryParams.unionId"
+          placeholder="请输入微信的联合登录id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信号" prop="wechatId">
+        <el-input
+          v-model="queryParams.wechatId"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phoneNo">
+        <el-input
+          v-model="queryParams.phoneNo"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="flagId">
+        <el-select v-model="queryParams.flagId" placeholder="状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.providerStatus"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区县行政代码" prop="districtId">
+        <el-select v-model="queryParams.districtId" placeholder="行政区" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_distctList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除时间">
+        <el-date-picker
+          v-model="daterangeDelTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新时间">
+        <el-date-picker
+          v-model="daterangeUpdateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_provider_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_provider_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_provider_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_provider_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_provider_mgtList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column label="小程序的openid" align="center" prop="openid" />
+      <el-table-column label="微信的联合登录id" align="center" prop="unionId" />-->
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="昵称" align="center" prop="nickName" />
+      <el-table-column label="微信号" align="center" prop="wechatId" />
+      <el-table-column label="头像地址" align="center" prop="iconUrl" >
+        <template slot-scope="scope">
+          <!--              <el-input v-model="scope.row.card2" placeholder="请输入身份证反面照片路径" />-->
+          <img :src="scope.row.iconUrl"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号码" align="center" prop="phoneNo" />
+      <el-table-column label="状态" align="center" prop="flagId" >
+
+        <template slot-scope="scope">
+<!--          <el-switch-->
+<!--            v-model="scope.row.flagId"-->
+<!--            :active-value=0-->
+<!--            :inactive-value=1-->
+<!--            @change="handleMsgChange(scope.row)"-->
+<!--          ></el-switch>-->
+          <el-select v-model="scope.row.flagId" @change="handleStatusChange(scope.row)">
+            <el-option
+              v-for="dict in providerStatus"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="区县行政代码" align="center" prop="districtId"  :formatter="tableProviderName" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="删除时间" align="center" prop="delTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.delTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <!--<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_provider_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_provider_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg运营商管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="小程序的openid" prop="openid">-->
+<!--          <el-input v-model="form.openid" placeholder="请输入小程序的openid" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="微信的联合登录id" prop="unionId">-->
+<!--          <el-input v-model="form.unionId" placeholder="请输入微信的联合登录id" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="微信号" prop="wechatId">
+          <el-input v-model="form.wechatId" placeholder="请输入微信号" />
+        </el-form-item>
+        <el-form-item label="头像地址">
+          <imageUpload v-model="form.iconUrl"/>
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phoneNo">
+          <el-input v-model="form.phoneNo" placeholder="请输入手机号码" />
+        </el-form-item>
+        <el-form-item label="状态" prop="flagId">
+          <el-select v-model="form.flagId" >
+            <el-option
+              v-for="dict in providerStatus"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区县行政代码" prop="districtId">
+          <el-select v-model="form.districtId" >
+            <el-option
+              v-for="dict in this.segchk_distctList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+<!--        <el-divider content-position="center" v-show="false">seg首页标签管理信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkLableMgt">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkLableMgt">删除</el-button>
+          </el-col>
+        </el-row>-->
+        <el-table :data="segchkLableMgtList" :row-class-name="rowSegchkLableMgtIndex" @selection-change="handleSegchkLableMgtSelectionChange" ref="segchkLableMgt" v-show="false">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="卡类型名称(9.9,99,199,299)" prop="cardTypeName">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.cardTypeName" placeholder="请输入卡类型名称(9.9,99,199,299)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="管理状态，0有效，-1失效" prop="mgtState">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.mgtState" placeholder="请输入管理状态，0有效，-1失效" />
+            </template>
+          </el-table-column>
+          <el-table-column label="修改时间" prop="modTime">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.modTime" placeholder="请输入修改时间" />
+            </template>
+          </el-table-column>
+          <el-table-column label="展示序号" prop="sortId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sortId" placeholder="请输入展示序号" />
+            </template>
+          </el-table-column>
+          <el-table-column label="标签图标路径" prop="iconUrl">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.iconUrl" placeholder="请输入标签图标路径" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_provider_mgt, getSegchk_provider_mgt, delSegchk_provider_mgt, addSegchk_provider_mgt, updateSegchk_provider_mgt, exportSegchk_provider_mgt, updateSegchk_provider_service_state } from "@/api/segchk/segchk_provider_mgt";
+import {segchk_get_provider_list, segchk_get_distict_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_provider_mgt",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedSegchkLableMgt: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg运营商管理表格数据
+      segchk_provider_mgtList: [],
+      // seg首页标签管理表格数据
+      segchkLableMgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建时间时间范围
+      daterangeCreateTime: [],
+      // 删除时间时间范围
+      daterangeDelTime: [],
+      // 更新时间时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        openid: null,
+        unionId: null,
+        wechatId: null,
+        providerId: null,
+        nickName: null,
+        iconUrl: null,
+        phoneNo: null,
+        flagId: null,
+        districtId: null,
+        createTime: null,
+        delTime: null,
+        updateTime: null
+      },
+      providerStatus:[
+        {
+          key: 0,
+          value:"正常"
+        },
+        {
+          key: 1,
+          value:"失效"
+        },
+        {
+          key: 2,
+          value:"删除"
+        }
+      ],
+      oldstatus: undefined,
+      segchk_providerList: [],
+      segchk_distctList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        /*openid: [
+          { required: true, message: "小程序的openid不能为空", trigger: "blur" }
+        ],
+        unionId: [
+          { required: true, message: "微信的联合登录id不能为空", trigger: "blur" }
+        ],*/
+        providerId: [
+          { required: true, message: "运营商id不能为空", trigger: "blur" }
+        ],
+        nickName: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+        phoneNo: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" }
+        ],
+        flagId: [
+          { required: true, message: "状态，0正常，1失效，2删除不能为空", trigger: "blur" }
+        ],
+        districtId: [
+          { required: true, message: "区县行政代码不能为空", trigger: "blur" }
+        ]
+        /*createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        delTime: [
+          { required: true, message: "删除时间不能为空", trigger: "blur" }
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" }
+        ]*/
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  methods: {
+    recordStatus(row, index) {
+      this.oldstatus=row.flagId
+    },
+    // 修改状态
+    handleStatusChange(row, index) {
+      let text = row.flagId === 0 ? "上线" : row.flagId === 1 ? "下线" : "删除";
+      this.$confirm('确认要"' + text + '""' + row.nickName + '"运营商吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        // return
+        return updateSegchk_provider_service_state(row.providerId, row.flagId);
+      }).then((response) => {
+        console.log(response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // row.flagId = row.flagId === "0" ? "1" : "0";
+      });
+    },
+    tableProviderName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      else if(column.property == 'flagId') {
+        var ret = this.providerStatus.find((value) => {return parseInt(value.key) == row.flagId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      else if(column.property == 'districtId') {
+        var ret = this.segchk_distctList.find((value) => {return parseInt(value.key) == row.districtId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+
+    },
+    /** 查询seg运营商管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeDelTime && '' != this.daterangeDelTime) {
+        this.queryParams.params["beginDelTime"] = this.daterangeDelTime[0];
+        this.queryParams.params["endDelTime"] = this.daterangeDelTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listSegchk_provider_mgt(this.queryParams).then(response => {
+        this.segchk_provider_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      segchk_get_distict_list(this.queryParams.providerId).then(response => {
+        this.segchk_distctList = response.rows;
+        // this.cardtotal = response.total;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        openid: null,
+        unionId: null,
+        wechatId: null,
+        providerId: null,
+        nickName: null,
+        iconUrl: null,
+        phoneNo: null,
+        flagId: null,
+        districtId: null,
+        createTime: null,
+        delTime: null,
+        updateTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.segchkLableMgtList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.daterangeDelTime = [];
+      this.daterangeUpdateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg运营商管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const providerId = row.providerId || this.ids
+      getSegchk_provider_mgt(providerId).then(response => {
+        this.form = response.data;
+        // this.segchkLableMgtList = response.data.segchkLableMgtList;
+        this.open = true;
+        this.title = "修改seg运营商管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // this.form.segchkLableMgtList = this.segchkLableMgtList;
+          if (this.form.providerId != null) {
+            updateSegchk_provider_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_provider_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const providerIds = row.providerId || this.ids;
+      this.$confirm('是否确认删除seg运营商管理编号为"' + providerIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_provider_mgt(providerIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+	/** seg首页标签管理序号 */
+    rowSegchkLableMgtIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** seg首页标签管理添加按钮操作 */
+    handleAddSegchkLableMgt() {
+      let obj = {};
+      obj.cardTypeName = "";
+      obj.mgtState = "";
+      obj.modTime = "";
+      obj.sortId = "";
+      obj.iconUrl = "";
+      this.segchkLableMgtList.push(obj);
+    },
+    /** seg首页标签管理删除按钮操作 */
+    handleDeleteSegchkLableMgt() {
+      if (this.checkedSegchkLableMgt.length == 0) {
+        this.msgError("请先选择要删除的seg首页标签管理数据");
+      } else {
+        const segchkLableMgtList = this.segchkLableMgtList;
+        const checkedSegchkLableMgt = this.checkedSegchkLableMgt;
+        this.segchkLableMgtList = segchkLableMgtList.filter(function(item) {
+          return checkedSegchkLableMgt.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleSegchkLableMgtSelectionChange(selection) {
+      this.checkedSegchkLableMgt = selection.map(item => item.index)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg运营商管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_provider_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_recommender_store/index.vue b/ruoyi-ui/src/views/segchk/segchk_recommender_store/index.vue
new file mode 100644
index 0000000..ce7ed38
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_recommender_store/index.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <!--<el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <!--<el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_storeList"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="管理状态" prop="mgtState">
+        <el-tooltip content="0有效，-1失效" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.mgtState" placeholder="服务状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.recommenderStatus"
+            :key="parseInt(dict.dictValue)"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="展示序号" prop="sortId">
+        <el-tooltip content="只能是数字" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.sortId"
+          placeholder="请输入展示序号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="id" prop="recommenderId">
+        <el-input
+          v-model="queryParams.recommenderId"
+          placeholder="请输入id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_recommender_store:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_recommender_store:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_recommender_store:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_recommender_store:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_recommender_storeList" @selection-change="handleSelectionChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="商家id" align="center" prop="storeId"  :formatter="tableStoreName" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="管理状态" align="center" prop="mgtState" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.mgtState"
+            :active-value="0"
+            :inactive-value="-1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="展示序号" align="center" prop="sortId" />
+      <el-table-column label="id" align="center" prop="recommenderId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_recommender_store:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_recommender_store:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg首页推荐商户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />-->
+          <el-tooltip content="全局唯一" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+<!--          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />-->
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="管理状态" prop="mgtState">
+          <el-tooltip content="0有效，-1失效" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.mgtState" placeholder="管理状态" >
+            <el-option
+              v-for="dict in recommenderStatus"
+              :key="parseInt(dict.dictValue)"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+        <el-form-item label="展示序号" prop="sortId">
+<!--          <el-input v-model="form.sortId" placeholder="请输入展示序号" />-->
+          <el-input-number v-model="form.sortId" placeholder="展示序号" controls-position="right" :min="0" size="small"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_recommender_store, getSegchk_recommender_store, delSegchk_recommender_store, addSegchk_recommender_store, updateSegchk_recommender_store, exportSegchk_recommender_store, updateSegchk_recommender_state } from "@/api/segchk/segchk_recommender_store";
+
+import {segchk_get_provider_list, segchk_get_chargecard_list, segchk_get_keyword_list, segchk_get_preference_lable_list, segchk_get_saler_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+import {updateSegchk_lable_mgt_state} from "@/api/segchk/segchk_lable_mgt";
+import store from "@/store";
+
+export default {
+  name: "Segchk_recommender_store",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg首页推荐商户表格数据
+      segchk_recommender_storeList: [],
+      segchk_storeList: [],
+      segchk_providerList: [],
+      recommenderStatus: [],
+      baseUrl: process.env.VUE_APP_BASE_API,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'recommenderId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        storeId: null,
+        mgtState: null,
+        modTime: null,
+        sortId: null,
+        recommenderId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，-1失效不能为空", trigger: "blur" }
+        ],
+        sortId: [
+          { required: true, message: "展示序号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableStoreName(row, column) {
+      var ret = this.segchk_storeList.find((value) => {return value.providerId == row.providerId && value.key == row.storeId})
+      var provName = ret == null ? "未知" : ret.value;
+      return provName
+    },
+    handleStatusChange(row, column) {
+      let text = row.mgtState === 0 ? "生效" : "失效";
+      let storeName = this.tableStoreName(row, column)
+      this.$confirm('确认要"' + text + '""' + storeName + '"吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_recommender_state(row.recommenderId, row.mgtState);
+      }).then((response) => {
+        // console.log("handleStatusChange ---" + response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // console.log("updateSegchk_store_service_state res " + res)
+        row.mgtState = row.mgtState === 0 ? -1 : 0;
+      });
+    },
+
+    tableProviderName(row, column) {
+      if (column.property == 'mgtState'){
+
+        var ret = this.recommenderStatus.find((value) => {return value.dictValue == row.mgtState})
+        var provName = ret == null ? "" : ret.dictLabel
+        return provName
+      }
+      if (column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {
+          return value.key == row.providerId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg首页推荐商户列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+      })
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      this.getDicts("segchk_recommender_store_mgt").then(response => {
+        this.recommenderStatus = response.data;
+      });
+      listSegchk_recommender_store(this.queryParams).then(response => {
+        this.segchk_recommender_storeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        storeId: null,
+        mgtState: null,
+        modTime: null,
+        sortId: null,
+        recommenderId: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recommenderId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg首页推荐商户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recommenderId = row.recommenderId || this.ids
+      getSegchk_recommender_store(recommenderId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg首页推荐商户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_recommender_storeList.find(v => (v.providerId == this.form.providerId && v.storeId == this.form.storeId))
+          if (this.form.recommenderId != null) {
+            if(exitItem != null && exitItem.recommenderId != this.form.recommenderId){
+              this.msgError("该商家已存在")
+              return
+            }
+            updateSegchk_recommender_store(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该商家已存在")
+              return
+            }
+            addSegchk_recommender_store(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recommenderIds = row.recommenderId || this.ids;
+      this.$confirm('是否确认删除seg首页推荐商户编号为"' + recommenderIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_recommender_store(recommenderIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg首页推荐商户数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_recommender_store(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_saler_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_saler_info/index.vue
new file mode 100644
index 0000000..5a6b618
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_saler_info/index.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="销售人员id" prop="salerId">
+        <!--<el-input
+          v-model="queryParams.salerId"
+          placeholder="请输入销售人员id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.salerId" placeholder="销售人员id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_salerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="销售人员姓名" prop="salerName">
+        <el-input
+          v-model="queryParams.salerName"
+          placeholder="请输入销售人员姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售人员电话" prop="salerPhone">
+        <el-input
+          v-model="queryParams.salerPhone"
+          placeholder="请输入销售人员电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售人员身份证号" prop="salerCard">
+        <el-input
+          v-model="queryParams.salerCard"
+          placeholder="请输入销售人员身份证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售人员状态" prop="salerState">
+        <el-tooltip content="0工作，1非工作状态，2删除" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.salerState" placeholder="状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.salerStatus"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_saler_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_saler_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_saler_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_saler_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_saler_infoList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="销售人员姓名" align="center" prop="salerName" />
+      <el-table-column label="销售人员电话" align="center" prop="salerPhone" />
+      <el-table-column label="销售人员身份证号" align="center" prop="salerCard" />
+      <el-table-column filter-placement="top" label="销售人员状态" align="center" prop="salerState" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.salerState" @change="handleStatusChange(scope.row)">
+            <el-option
+              v-for="dict in salerStatus"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="销售人员id" align="center" prop="salerId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_saler_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_saler_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg销售人员信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />-->
+          <el-tooltip content="全局唯一" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="dict.key"
+              :label="dict.value"
+              :value="dict.key"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="销售人员姓名" prop="salerName">
+          <el-input v-model="form.salerName" placeholder="请输入销售人员姓名" />
+        </el-form-item>
+        <el-form-item label="销售人员电话" prop="salerPhone">
+          <el-input v-model="form.salerPhone" placeholder="请输入销售人员电话" />
+        </el-form-item>
+        <el-form-item label="销售人员身份证号" prop="salerCard">
+          <el-input v-model="form.salerCard" placeholder="请输入销售人员身份证号" />
+        </el-form-item>
+        <el-form-item label="销售人员状态" prop="salerState">
+          <el-tooltip content="0工作，1非工作状态，2删除" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.salerState" >
+            <el-option
+              v-for="dict in salerStatus"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_saler_info, getSegchk_saler_info, delSegchk_saler_info, addSegchk_saler_info, updateSegchk_saler_info, exportSegchk_saler_info, updateSegchk_saler_status } from "@/api/segchk/segchk_saler_info";
+
+import {segchk_get_provider_list, segchk_get_saler_list} from "@/api/segchk/segchk_get_simple_list"
+import store from "@/store";
+
+export default {
+  name: "Segchk_saler_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg销售人员信息表格数据
+      segchk_saler_infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'salerId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        modTime: null,
+        salerId: null,
+        salerName: null,
+        salerPhone: null,
+        salerCard: null,
+        salerState: null
+      },
+      salerStatus:[
+        {
+          key: 0,
+          value:"正常"
+        },
+        {
+          key: 1,
+          value:"失效"
+        },
+        {
+          key: 2,
+          value:"删除"
+        }
+      ],
+      segchk_providerList: [],
+      //销售人员列表
+      segchk_salerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        salerName: [
+          { required: true, message: "销售人员姓名不能为空", trigger: "blur" }
+        ],
+        salerPhone: [
+          { required: true, message: "销售人员电话不能为空", trigger: "blur" }
+        ],
+        salerCard: [
+          { required: true, message: "销售人员身份证号不能为空", trigger: "blur" }
+        ],
+        salerState: [
+          { required: true, message: "销售人员状态，0工作，1非工作状态，2删除不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  methods: {
+    // 修改状态
+    handleStatusChange(row, index) {
+      let text = row.flagId === 0 ? "上线" : row.flagId === 1 ? "下线" : "删除";
+      this.$confirm('确认要"' + text + '" 销售"' + row.salerName + '?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        // return
+        return updateSegchk_saler_status(row.providerId, row.salerId, row.salerState);
+      }).then((response) => {
+        console.log(response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+      });
+    },
+    salerselect(providerId) {
+      var providerId = providerId
+      var segchk_salerList = this.segchk_salerList
+        .map(value => {
+          var ckp = {
+            providerId: value.providerId,
+            salerId: value.key,
+            salerName: value.value}
+          return ckp
+        })
+      let ret = segchk_salerList.filter(function (ssi) {
+        return ssi.providerId == providerId
+      })
+      return ret
+    },
+    tableProviderName(row, column) {
+      var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+      var provName = ret == null ? "未知" : ret.value;
+      return provName
+    },
+    /** 查询seg销售人员信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+
+      segchk_get_saler_list(this.queryParams.providerId).then(response => {
+        this.segchk_salerList = response.rows;
+        // this.salertotal = response.total;
+      });
+
+      listSegchk_saler_info(this.queryParams).then(response => {
+        this.segchk_saler_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        modTime: null,
+        salerId: null,
+        salerName: null,
+        salerPhone: null,
+        salerCard: null,
+        salerState: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.salerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg销售人员信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const salerId = row.salerId || this.ids
+      getSegchk_saler_info(salerId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg销售人员信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.salerId != null) {
+            updateSegchk_saler_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_saler_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const salerIds = row.salerId || this.ids;
+      this.$confirm('是否确认删除seg销售人员信息编号为"' + salerIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_saler_info(salerIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg销售人员信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_saler_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_self_service_chk/index.vue b/ruoyi-ui/src/views/segchk/segchk_self_service_chk/index.vue
new file mode 100644
index 0000000..b833099
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_self_service_chk/index.vue
@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id，全局惟一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="核消id，全表唯一" prop="chkServiceId">
+        <el-input
+          v-model="queryParams.chkServiceId"
+          placeholder="请输入核消id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_self_service_chk:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_self_service_chk:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_self_service_chk:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_self_service_chk:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_self_service_chkList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="会员卡号id，全局惟一" align="center" prop="cardId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="核消id，全表唯一" align="center" prop="chkServiceId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_self_service_chk:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_self_service_chk:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg自定义卡核消记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入会员卡号id，全局惟一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_self_service_chk, getSegchk_self_service_chk, delSegchk_self_service_chk, addSegchk_self_service_chk, updateSegchk_self_service_chk, exportSegchk_self_service_chk } from "@/api/segchk/segchk_self_service_chk";
+
+export default {
+  name: "Segchk_self_service_chk",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg自定义卡核消记录表格数据
+      segchk_self_service_chkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        cardId: null,
+        storeId: null,
+        userId: null,
+        modTime: null,
+        chkServiceId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg自定义卡核消记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_self_service_chk(this.queryParams).then(response => {
+        this.segchk_self_service_chkList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        cardId: null,
+        storeId: null,
+        userId: null,
+        modTime: null,
+        chkServiceId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.chkServiceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg自定义卡核消记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const chkServiceId = row.chkServiceId || this.ids
+      getSegchk_self_service_chk(chkServiceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg自定义卡核消记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.chkServiceId != null) {
+            updateSegchk_self_service_chk(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_self_service_chk(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const chkServiceIds = row.chkServiceId || this.ids;
+      this.$confirm('是否确认删除seg自定义卡核消记录编号为"' + chkServiceIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_self_service_chk(chkServiceIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg自定义卡核消记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_self_service_chk(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_service_chk/index.vue b/ruoyi-ui/src/views/segchk/segchk_service_chk/index.vue
new file mode 100644
index 0000000..f564178
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_service_chk/index.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id，全局惟一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+        <el-input
+          v-model="queryParams.cardTypeId"
+          placeholder="请输入会员卡类型，0--9块9，1---99"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="核消id，全表唯一" prop="chkServiceId">
+        <el-input
+          v-model="queryParams.chkServiceId"
+          placeholder="请输入核消id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="评价id" prop="commentId">
+        <el-input
+          v-model="queryParams.commentId"
+          placeholder="请输入评价id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_service_chk:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_service_chk:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_service_chk:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_service_chk:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_service_chkList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="会员卡号id，全局惟一" align="center" prop="cardId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="会员卡类型，0--9块9，1---99" align="center" prop="cardTypeId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="核消id，全表唯一" align="center" prop="chkServiceId" />
+      <el-table-column label="评价id" align="center" prop="commentId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_service_chk:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_service_chk:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg核消记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入会员卡号id，全局惟一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+          <el-input v-model="form.cardTypeId" placeholder="请输入会员卡类型，0--9块9，1---99" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="评价id" prop="commentId">
+          <el-input v-model="form.commentId" placeholder="请输入评价id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_service_chk, getSegchk_service_chk, delSegchk_service_chk, addSegchk_service_chk, updateSegchk_service_chk, exportSegchk_service_chk } from "@/api/segchk/segchk_service_chk";
+
+export default {
+  name: "Segchk_service_chk",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg核消记录表格数据
+      segchk_service_chkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        cardId: null,
+        storeId: null,
+        cardTypeId: null,
+        userId: null,
+        modTime: null,
+        chkServiceId: null,
+        commentId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "会员卡类型，0--9块9，1---99不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        commentId: [
+          { required: true, message: "评价id不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg核消记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_service_chk(this.queryParams).then(response => {
+        this.segchk_service_chkList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        cardId: null,
+        storeId: null,
+        cardTypeId: null,
+        userId: null,
+        modTime: null,
+        chkServiceId: null,
+        commentId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.chkServiceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg核消记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const chkServiceId = row.chkServiceId || this.ids
+      getSegchk_service_chk(chkServiceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg核消记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.chkServiceId != null) {
+            updateSegchk_service_chk(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_service_chk(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const chkServiceIds = row.chkServiceId || this.ids;
+      this.$confirm('是否确认删除seg核消记录编号为"' + chkServiceIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_service_chk(chkServiceIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg核消记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_service_chk(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_service_comment/index.vue b/ruoyi-ui/src/views/segchk/segchk_service_comment/index.vue
new file mode 100644
index 0000000..add0c4c
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_service_comment/index.vue
@@ -0,0 +1,358 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="评价id" prop="commentId">
+        <el-input
+          v-model="queryParams.commentId"
+          placeholder="请输入评价id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="星级评价" prop="starLevel">
+        <el-input
+          v-model="queryParams.starLevel"
+          placeholder="请输入星级评价"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_service_comment:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_service_comment:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_service_comment:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_service_comment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_service_commentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="评价id" align="center" prop="commentId" />
+      <el-table-column label="星级评价" align="center" prop="starLevel" />
+      <el-table-column label="评价内容" align="center" prop="contentText" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_service_comment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_service_comment:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg评价记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="星级评价" prop="starLevel">
+          <el-input v-model="form.starLevel" placeholder="请输入星级评价" />
+        </el-form-item>
+        <el-form-item label="评价内容" prop="contentText">
+          <el-input v-model="form.contentText" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_service_comment, getSegchk_service_comment, delSegchk_service_comment, addSegchk_service_comment, updateSegchk_service_comment, exportSegchk_service_comment } from "@/api/segchk/segchk_service_comment";
+
+export default {
+  name: "Segchk_service_comment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg评价记录表格数据
+      segchk_service_commentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        commentId: null,
+        starLevel: null,
+        contentText: null,
+        modTime: null,
+        providerId: null,
+        storeId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        starLevel: [
+          { required: true, message: "星级评价不能为空", trigger: "blur" }
+        ],
+        contentText: [
+          { required: true, message: "评价内容不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg评价记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_service_comment(this.queryParams).then(response => {
+        this.segchk_service_commentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        commentId: null,
+        starLevel: null,
+        contentText: null,
+        modTime: null,
+        providerId: null,
+        storeId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.commentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg评价记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const commentId = row.commentId || this.ids
+      getSegchk_service_comment(commentId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg评价记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.commentId != null) {
+            updateSegchk_service_comment(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_service_comment(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const commentIds = row.commentId || this.ids;
+      this.$confirm('是否确认删除seg评价记录编号为"' + commentIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_service_comment(commentIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg评价记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_service_comment(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_sms_detail/index.vue b/ruoyi-ui/src/views/segchk/segchk_sms_detail/index.vue
new file mode 100644
index 0000000..cef7d08
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_sms_detail/index.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="手机号" prop="phoneNo">
+        <el-input
+          v-model="queryParams.phoneNo"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="验证码" prop="validateCode">
+        <el-input
+          v-model="queryParams.validateCode"
+          placeholder="请输入验证码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标识，0已发送，1已验证" prop="flag">
+        <el-input
+          v-model="queryParams.flag"
+          placeholder="请输入标识，0已发送，1已验证"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="短信码id" prop="shortMsgId">
+        <el-input
+          v-model="queryParams.shortMsgId"
+          placeholder="请输入短信码id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_sms_detail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_sms_detail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_sms_detail:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_sms_detail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_sms_detailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="手机号" align="center" prop="phoneNo" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="验证码" align="center" prop="validateCode" />
+      <el-table-column label="标识，0已发送，1已验证" align="center" prop="flag" />
+      <el-table-column label="短信码id" align="center" prop="shortMsgId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_sms_detail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_sms_detail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg短信记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="手机号" prop="phoneNo">
+          <el-input v-model="form.phoneNo" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="验证码" prop="validateCode">
+          <el-input v-model="form.validateCode" placeholder="请输入验证码" />
+        </el-form-item>
+        <el-form-item label="标识，0已发送，1已验证" prop="flag">
+          <el-input v-model="form.flag" placeholder="请输入标识，0已发送，1已验证" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_sms_detail, getSegchk_sms_detail, delSegchk_sms_detail, addSegchk_sms_detail, updateSegchk_sms_detail, exportSegchk_sms_detail } from "@/api/segchk/segchk_sms_detail";
+
+export default {
+  name: "Segchk_sms_detail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg短信记录表格数据
+      segchk_sms_detailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建时间时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        phoneNo: null,
+        createTime: null,
+        validateCode: null,
+        flag: null,
+        shortMsgId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        phoneNo: [
+          { required: true, message: "手机号不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        validateCode: [
+          { required: true, message: "验证码不能为空", trigger: "blur" }
+        ],
+        flag: [
+          { required: true, message: "标识，0已发送，1已验证不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg短信记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listSegchk_sms_detail(this.queryParams).then(response => {
+        this.segchk_sms_detailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        phoneNo: null,
+        createTime: null,
+        validateCode: null,
+        flag: null,
+        shortMsgId: null,
+        providerId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.shortMsgId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg短信记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const shortMsgId = row.shortMsgId || this.ids
+      getSegchk_sms_detail(shortMsgId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg短信记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.shortMsgId != null) {
+            updateSegchk_sms_detail(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_sms_detail(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const shortMsgIds = row.shortMsgId || this.ids;
+      this.$confirm('是否确认删除seg短信记录编号为"' + shortMsgIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_sms_detail(shortMsgIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg短信记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_sms_detail(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_account/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_account/index.vue
new file mode 100644
index 0000000..b2daf70
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_account/index.vue
@@ -0,0 +1,462 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(queryParams.providerId)"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="余额" prop="account">
+        <el-input
+          v-model="queryParams.account"
+          placeholder="请输入余额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="余额类型" prop="accountType">
+        <el-select v-model="queryParams.accountType" placeholder="请选择余额类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label="余额id" prop="accountId">
+        <el-input
+          v-model="queryParams.accountId"
+          placeholder="请输入余额id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励id" prop="rewardId">
+        <el-input
+          v-model="queryParams.rewardId"
+          placeholder="请输入奖励id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值id" prop="chargeId">
+        <el-input
+          v-model="queryParams.chargeId"
+          placeholder="请输入充值id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值id" prop="cashId">
+        <el-input
+          v-model="queryParams.cashId"
+          placeholder="请输入充值id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_account:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_account:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_account:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_account:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_accountList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableStoreName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableStoreName" />
+      <el-table-column label="余额" align="center" prop="account" />
+      <!--<el-table-column label="余额类型" align="center" prop="accountType" />-->
+      <el-table-column label="余额id" align="center" prop="accountId" />
+      <el-table-column label="奖励id" align="center" prop="rewardId" />
+      <el-table-column label="充值id" align="center" prop="chargeId" />
+      <el-table-column label="充值id" align="center" prop="cashId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_account:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_account:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商户余额信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="余额" prop="account">
+          <el-input v-model="form.account" placeholder="请输入余额" />
+        </el-form-item>
+        <!--<el-form-item label="余额类型" prop="accountType">
+          <el-select v-model="form.accountType" placeholder="请选择余额类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>-->
+        <el-form-item label="奖励id" prop="rewardId">
+          <el-input v-model="form.rewardId" placeholder="请输入奖励id" />
+        </el-form-item>
+        <el-form-item label="充值id" prop="chargeId">
+          <el-input v-model="form.chargeId" placeholder="请输入充值id" />
+        </el-form-item>
+        <el-form-item label="充值id" prop="cashId">
+          <el-input v-model="form.cashId" placeholder="请输入充值id" />
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_account, getSegchk_store_account, delSegchk_store_account, addSegchk_store_account, updateSegchk_store_account, exportSegchk_store_account } from "@/api/segchk/segchk_store_account";
+import {segchk_get_provider_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_account",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商户余额信息表格数据
+      segchk_store_accountList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        account: null,
+        accountType: null,
+        accountId: null,
+        rewardId: null,
+        chargeId: null,
+        cashId: null,
+        modTime: null,
+        providerId: null
+      },
+      segchk_storeList: [],
+      segchk_providerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        account: [
+          { required: true, message: "余额不能为空", trigger: "blur" }
+        ],
+
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableStoreName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'storeId') {
+        var ret = this.segchk_storeList.find((value) => {
+          return value.providerId == row.providerId && value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商户余额信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+      })
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      listSegchk_store_account(this.queryParams).then(response => {
+        this.segchk_store_accountList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        account: null,
+        accountType: null,
+        accountId: null,
+        rewardId: null,
+        chargeId: null,
+        cashId: null,
+        modTime: null,
+        providerId: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.accountId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商户余额信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const accountId = row.accountId || this.ids
+      getSegchk_store_account(accountId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商户余额信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.accountId != null) {
+            updateSegchk_store_account(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_account(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const accountIds = row.accountId || this.ids;
+      this.$confirm('是否确认删除seg商户余额信息编号为"' + accountIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_account(accountIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商户余额信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_account(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_basic_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_basic_info/index.vue
new file mode 100644
index 0000000..37a7f8c
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_basic_info/index.vue
@@ -0,0 +1,1538 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+<!--        <el-input-->
+<!--          v-model="queryParams.providerId"-->
+<!--          placeholder="请输入运营商id，全局唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+      </el-form-item>
+      <el-form-item label="商家名称" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家名称" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(-1, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家电话" prop="storePhone">
+        <el-input
+          v-model="queryParams.storePhone"
+          placeholder="请输入商家电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="wechat openid" prop="openid">
+        <el-tooltip content="微信唯一识别号" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.openid"
+          placeholder="请输入微信唯一识别号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="union_id" prop="unionId">
+        <el-tooltip content="请输入微信的联合登录" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.unionId"
+          placeholder="请输入微信的联合登录id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家微信昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入商家微信昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="服务状态" prop="serviceState">
+        <el-tooltip content="0在线，1下线" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-select v-model="queryParams.serviceState" placeholder="服务状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.storeStatus"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="销售" prop="salerId">
+        <el-select v-model="queryParams.salerId" placeholder="销售" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_saler_infoList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="合同日期">
+        <el-date-picker
+          v-model="daterangeEffectiveDate"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="商家执照编号" prop="storeCorporation">
+        <el-input
+          v-model="queryParams.storeCorporation"
+          placeholder="请输入商家执照编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家地址" prop="storeAddr">
+        <el-input
+          v-model="queryParams.storeAddr"
+          placeholder="请输入商家地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家法人身份证" prop="storeCard">
+        <el-input
+          v-model="queryParams.storeCard"
+          placeholder="请输入商家法人身份证"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="是否发送通知消息" prop="withMsg">
+        <el-tooltip content="0发送，1不发送" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.withMsg"
+          placeholder="请输入是否发送通知消息，0发送，1不发送"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="提现额门限" prop="cashThreshold">
+        <el-input
+          v-model="queryParams.cashThreshold"
+          placeholder="请输入提现额门限"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现到账天数" prop="cashDay">
+        <el-tooltip content="提现到账天数，商户发起提现后到商户账号天数" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input v-model="queryParams.cashDay" placeholder="请输入提现到账日期" controls-position="right" @keyup.enter.native="handleQuery"/>
+<!--        <el-input-->
+<!--          v-model="queryParams.cashDay"-->
+<!--          placeholder="请输入提现到账日期，0当天到账，n&#45;&#45;N个工作日后到账"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+      </el-form-item>
+      <el-form-item label="下线平均星评门限" prop="serviceDownThreshold">
+        <el-tooltip content="取值0-5，步长0.5" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.serviceDownThreshold"
+          placeholder="请输入下线平均星评门限"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="是否人工干预" prop="stateFlag">
+        <el-tooltip content="0自动，1人工" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.stateFlag"
+          placeholder="请输入是否人工干预，0自动，1人工"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <!--<el-form-item label="商家经度" prop="storeLon">
+        <el-input
+          v-model="queryParams.storeLon"
+          placeholder="请输入商家经度"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家纬度" prop="storeLat">
+        <el-input
+          v-model="queryParams.storeLat"
+          placeholder="请输入商家纬度"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_basic_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_basic_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_basic_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_basic_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table empty-text="loading" v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_store_basic_infoList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="商家" align="center" prop="storeId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="商家名称" align="center" prop="storeName"  show-overflow-tooltip/>
+      <el-table-column label="商家电话" align="center" prop="storePhone" />
+      <!--<el-table-column label="微信唯一识别号" align="center" prop="openid" />
+      <el-table-column label="微信的联合登录id" align="center" prop="unionId" />
+      <el-table-column label="商家微信昵称" align="center" prop="nickName" />
+      <el-table-column label="商家微信头像" align="center" prop="iconUrl" >
+        <template slot-scope="scope">
+          <img src="scope.row.iconUrl"/>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="服务状态" align="center" prop="serviceState"  :formatter="tableProviderName" :render-header="renderHeader" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.serviceState"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="销售" align="center" prop="salerId"  :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" width="100"/>
+
+      <el-table-column label="合同日期" align="center" prop="effectiveDate" sortable="custom" :sort-orders="['descending', 'ascending']"  width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.effectiveDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="商家执照编号" align="center" prop="storeCorporation" />-->
+      <el-table-column label="商家地址" align="center" prop="storeAddr"  show-overflow-tooltip/>
+<!--      <el-table-column label="商家法人身份证" align="center" prop="storeCard" />-->
+      <el-table-column label="提现额门限" align="center" prop="cashThreshold"  sortable="custom" :sort-orders="['descending', 'ascending']" :render-header="renderHeader"/>
+      <el-table-column label="提现到账日期" align="center" prop="cashDay" />
+      <el-table-column label="是否发送通知消息" align="center" prop="withMsg"  :formatter="tableProviderName">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.withMsg"
+            active-value="0"
+            inactive-value="1"
+            @change="handleMsgChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="下线平均星评门限" align="center" prop="serviceDownThreshold" />
+      <el-table-column label="是否人工干预，0自动，1人工" align="center" prop="stateFlag" />
+      <el-table-column label="商家经度" align="center" prop="storeLon" />
+      <el-table-column label="商家纬度" align="center" prop="storeLat" />-->
+      <el-table-column label="商家营业时间" align="center" prop="onService"  show-overflow-tooltip/>
+      <el-table-column label="商家描述详情" align="center" prop="detail" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div @click="show_details(scope.row)">{{scope.row.detail}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime"  sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_basic_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_basic_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog :title="title" :visible.sync="detailopen" width="1000px" append-to-body>
+      <editor v-model="showdetail.detail" :min-height="192"/>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDetails">修 改</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改seg商家基础信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="请输入运营商id" />-->
+          <el-select v-model="form.providerId" placeholder="运营商" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家名称" prop="storeName">
+          <el-input v-model="form.storeName" placeholder="请输入商家名称" />
+        </el-form-item>
+        <el-form-item label="商家电话" prop="storePhone">
+          <el-input v-model="form.storePhone" placeholder="请输入商家电话" />
+        </el-form-item>
+        <!--<el-form-item label="微信唯一识别号" prop="openid">
+          <el-input v-model="form.openid" placeholder="请输入微信唯一识别号，用于转账等" />
+        </el-form-item>
+        <el-form-item label="微信的联合登录id" prop="unionId">
+          <el-input v-model="form.unionId" placeholder="请输入微信的联合登录id" />
+        </el-form-item>
+        <el-form-item label="商家微信昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入商家微信昵称" />
+        </el-form-item>
+        <el-form-item label="商家微信头像">
+          <imageUpload v-model="form.iconUrl"/>
+        </el-form-item>-->
+        <el-form-item label="服务状态" prop="serviceState">
+          <el-tooltip content="在线：商家可以在小程序端展示，下线：商家不会在小程序端以任务形式被展示" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.serviceState" placeholder="服务状态" >
+            <el-option
+              v-for="dict in this.storeStatus"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="销售id" prop="salerId">
+<!--          <el-input v-model="form.salerId" placeholder="请输入销售id" />-->
+          <el-select v-model="form.salerId" placeholder="请输入销售id" >
+            <el-option
+              v-for="dict in salerselect(form.providerId)"
+              :key="parseInt(dict.salerId)"
+              :label="dict.salerName"
+              :value="parseInt(dict.salerId)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="合同日期" prop="effectiveDate">
+          <el-tooltip content="默认即刻生效上线" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-date-picker clearable size="small"
+            v-model="form.effectiveDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择合同日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="商家执照编号" prop="storeCorporation">
+          <el-input v-model="form.storeCorporation" placeholder="请输入商家执照编号" />
+        </el-form-item>
+        <el-form-item label="商家地址" prop="storeAddr">
+          <el-input v-model="form.storeAddr" placeholder="请输入商家地址" />
+        </el-form-item>
+        <el-form-item label="商家法人身份证" prop="storeCard">
+          <el-input v-model="form.storeCard" placeholder="请输入商家法人身份证" />
+        </el-form-item>
+        <!--<el-form-item label="是否发送通知消息" prop="withMsg">
+          <el-input v-model="form.withMsg" placeholder="请输入是否发送通知消息，0发送，1不发送" />
+        </el-form-item>-->
+        <el-form-item label="提现额门限" prop="cashThreshold">
+          <el-input v-model="form.cashThreshold" placeholder="请输入提现额门限" />
+        </el-form-item>
+        <el-form-item label="提现到账天数" prop="cashDay">
+<!--          <el-input v-model="form.cashDay" placeholder="请输入提现到账日期，0当天到账，n&#45;&#45;N个工作日后到账" />-->
+          <el-input-number v-model="form.cashDay" controls-position="right" :min="0"/>
+        </el-form-item>
+        <el-form-item label="下线平均星评门限" prop="serviceDownThreshold">
+          <el-tooltip content="当商家的累积平均星评低于门限值时，该商家会被系统自动下线，要求商家改进后运营商手动上线" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.serviceDownThreshold" placeholder="请输入下线平均星评门限" />
+        </el-form-item>
+        <el-form-item label="商家经度" prop="storeLon">
+          <el-input v-model="form.storeLon" placeholder="请输入商家经度" />
+        </el-form-item>
+        <el-form-item label="商家纬度" prop="storeLat">
+          <el-input v-model="form.storeLat" placeholder="请输入商家纬度" />
+        </el-form-item>
+        <el-form-item label="商家营业时间" prop="onService">
+          <el-input v-model="form.onService" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="商家描述详情" prop="detail">
+          <editor v-model="form.detail" :min-height="192"/>
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+
+<!--        子表信息-->
+        <el-divider content-position="center">商家图片信息信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkStoreImage">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkStoreImage">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="segchkStoreImageList" :row-class-name="rowSegchkStoreImageIndex" @selection-change="handleSegchkStoreImageSelectionChange" ref="segchkStoreImage">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="商家营业执照图1路径" prop="storeCertificate1" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCertificate1" aria-placeholder="请输入商家营业执照图1路径" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商家营业执照图2路径" prop="storeCertificate2" width="200">
+            <template slot-scope="scope">
+              <imageUpload v-model="scope.row.storeCertificate2" aria-placeholder="请输入商家营业执照图2路径" :limit="1"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家图标路径" prop="storeIcon" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeIcon" aria-placeholder="请输入商家图标路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家大图标路径" prop="storeGificon" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeGificon" aria-placeholder="请输入商家大图标路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图1路径" prop="storeCarousel1" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel1" aria-placeholder="请输入商家轮播图1路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图2路径" prop="storeCarousel2" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel2" aria-placeholder="请输入商家轮播图2路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图3路径" prop="storeCarousel3" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeCarousel3" placeholder="请输入商家轮播图3路径" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel3" aria-placeholder="请输入商家轮播图3路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图4路径" prop="storeCarousel4" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeCarousel4" placeholder="请输入商家轮播图4路径" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel4" aria-placeholder="请输入商家轮播图4路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图5路径" prop="storeCarousel5" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeCarousel5" placeholder="请输入商家轮播图5路径" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel5" aria-placeholder="请输入商家轮播图5路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家轮播图6路径" prop="storeCarousel6" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeCarousel6" placeholder="请输入商家轮播图6路径" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeCarousel6" aria-placeholder="请输入商家轮播图6路径"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家环境图1" prop="storeEnv1" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeEnv1" placeholder="请输入商家环境图1" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeEnv1" aria-placeholder="请输入商家环境图1"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家环境图2" prop="storeEnv2" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeEnv2" placeholder="请输入商家环境图2" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeEnv2" aria-placeholder="请输入商家环境图2"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家环境图3" prop="storeEnv3" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.storeEnv3" placeholder="请输入商家环境图3" />-->
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeEnv3" aria-placeholder="请输入商家环境图3"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="商家环境图4" prop="storeEnv4" width="200">
+            <template slot-scope="scope">
+              <imageUpload :file-size=1 :limit=1 v-model="scope.row.storeEnv4" aria-placeholder="请输入商家环境图4"/>
+            </template>
+          </el-table-column>
+          <!--<el-table-column label="创建或修改时间" prop="modTime" width="150">
+            <template slot-scope="scope">
+&lt;!&ndash;              <el-input v-model="scope.row.modTime" placeholder="请输入创建或修改时间" />&ndash;&gt;
+              <el-date-picker clearable size="small"
+                              v-model="scope.row.modTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择创建或修改时间">
+              </el-date-picker>
+            </template>
+          </el-table-column>-->
+        </el-table>
+
+        <el-divider content-position="center">商家核消管理信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkStoreChkMgt">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkStoreChkMgt">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="segchkStoreChkMgtList" :row-class-name="rowSegchkStoreChkMgtIndex" @selection-change="handleSegchkStoreChkMgtSelectionChange" ref="segchkStoreImage">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+<!--          <el-table-column label="商家核消信息管理id" prop="mgtId" />-->
+          <!--<el-table-column label="运营商id" prop="providerId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.providerId" placeholder="请输入运营商id" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商家id" prop="storeId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.storeId" placeholder="请输入运营商id" />
+            </template>
+          </el-table-column>-->
+          <el-table-column label="卡类型id" prop="cardTypeId">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.cardTypeId" placeholder="卡类型id" />-->
+              <el-select v-model="scope.row.cardTypeId" placeholder="请选择卡类型">
+                <el-option
+                  v-for="dict in provsegchk_charge_cardList(form.providerId)"
+                  :key="dict.key"
+                  :label="dict.value"
+                  :value="dict.key"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="可核消次数" prop="chkCount" :render-header="renderHeader">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.chkCount" placeholder="请输入支持可核消次数" />
+            </template>
+          </el-table-column>
+          <el-table-column label="月可售卡量" prop="saleCount" :render-header="renderHeader">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.saleCount" placeholder="请输入月可售卡量" />
+            </template>
+          </el-table-column>
+          <el-table-column label="售卡奖励" prop="cardCommission" :render-header="renderHeader">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.cardCommission" placeholder="请输入售卡奖励" />
+            </template>
+          </el-table-column>
+          <el-table-column label="销售人员奖励" prop="salerCommission" :render-header="renderHeader">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.salerCommission" placeholder="请输入销售人员奖励" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-divider content-position="center">商家标签管理信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkStoreLableMgt">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkStoreLableMgt">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="segchkStoreLableMgtList" :row-class-name="rowsegchkStoreLableMgtIndex" @selection-change="handleSegchkStoreLableMgtSelectionChange" ref="segchkStoreLableMgt">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="商家标签管理id" prop="mgtId" />
+          <!--<el-table-column label="运营商id" prop="providerId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.providerId" placeholder="请输入运营商id" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商家id" prop="storeId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.storeId" placeholder="商家id" />
+            </template>
+          </el-table-column>-->
+          <el-table-column label="标签来源" prop="typeId" :render-header="renderHeader">
+            <template slot-scope="scope">
+              <!--              <el-input v-model="scope.row.typeId" placeholder="标签来源id" />-->
+              <el-select v-model="scope.row.typeId" placeholder="标签来源" @change="scope.row.lableId = null">
+                <el-option
+                  v-for="dict in typeSelectOptions"
+                  :key="dict.typeId"
+                  :label="dict.typeName"
+                  :value="dict.typeId"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="标签" prop="lableId">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.lableId" placeholder="标签id" />-->
+              <el-select v-model="scope.row.lableId" placeholder="标签">
+                <el-option
+                  v-for="(dict,index) in getLabelComp(scope.row.typeId, form.providerId)"
+                  :key="index"
+                  :label="dict.lable"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="显示顺序" prop="sortId" :render-header="renderHeader">
+            <!--<template slot-scope="scope">
+              <el-input v-model="scope.row.sortId" placeholder="显示顺序id" />
+            </template>-->
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.sortId" size="small" placeholder="显示顺序id" controls-position="right" :min="0"/>
+            </template>
+          </el-table-column>
+
+          <!--<el-table-column label="管理状态" prop="mgtState">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.mgtState" placeholder="管理状态" />
+            </template>
+          </el-table-column>
+          <el-table-column label="创建或修改时间" prop="modTime">
+            <template slot-scope="scope">
+            <el-date-picker clearable size="small"
+                            v-model="scope.row.modTime"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="创建或修改时间">
+            </el-date-picker>
+            </template>
+          </el-table-column>-->
+        </el-table>
+
+        <el-divider content-position="center" v-show="false">商家密码管理信息</el-divider>
+        <el-row :gutter="10" class="mb8" v-show="false">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkStoreSecurity">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkStoreSecurity">删除</el-button>
+          </el-col>
+        </el-row>
+
+
+        <el-table v-show="false" :data="segchkStoreSecurityList" :row-class-name="rowsegchkStoreSecurityIndex" @selection-change="handleSegchkStoreSecuritySelectionChange" ref="segchkStoreSecurity">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="密码" prop="passwd">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.passwd" placeholder="密码" />-->
+              <el-input
+                v-model="scope.row.passwd"
+                type="password"
+                auto-complete="off"
+                placeholder="密码"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column label="创建或修改时间" prop="modTime">
+            <template slot-scope="scope">
+            <el-date-picker clearable size="small"
+                            v-model="scope.row.modTime"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择合同日期">
+            </el-date-picker>
+            </template>
+          </el-table-column>
+        </el-table>
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_basic_info, getSegchk_store_basic_info, delSegchk_store_basic_info, addSegchk_store_basic_info, updateSegchk_store_basic_info, exportSegchk_store_basic_info, updateSegchk_store_service_state, update_store_detail } from "@/api/segchk/segchk_store_basic_info";
+import {listSegchk_charge_card} from "@/api/segchk/segchk_charge_card";
+import {listSegchk_keyword_lable} from "@/api/segchk/segchk_keyword_lable";
+import {listSegchk_preference_lable} from "@/api/segchk/segchk_preference_lable";
+import {listSegchk_saler_info} from "@/api/segchk/segchk_saler_info";
+import {
+  segchk_get_provider_list,
+  segchk_get_chargecard_list,
+  segchk_get_keyword_list,
+  segchk_get_preference_lable_list,
+  segchk_get_saler_list,
+  segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+// import {changeRoleStatus} from "@/api/system/role";
+
+import store from '@/store'
+
+export default {
+  name: "Segchk_store_basic_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedSegchkStoreImage: [],
+      // 子表选中数据
+      checkedSegchkStoreChkMgt: [],
+      // 子表选中数据
+      checkedSegchkStoreLableMgt: [],
+      // 子表选中数据
+      checkedSegchkStoreSecurity: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商家基础信息表格数据
+      segchk_store_basic_infoList: [],
+      // seg商家图片信息表格数据
+      segchkStoreImageList: [],
+      // seg商家图片信息表格数据
+      segchkStoreChkMgtList: [],
+      // seg商家图片信息表格数据
+      segchkStoreLableMgtList: [],
+      // seg商家图片信息表格数据
+      segchkStoreSecurityList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+
+      detailopen: false,
+      showdetail: {
+        storeId: null,
+        storeName: null,
+        detail: null
+      },
+      // 合同日期时间范围
+      daterangeEffectiveDate: [],
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'storeId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        storeName: null,
+        storePhone: null,
+        openid: null,
+        unionId: null,
+        nickName: null,
+        iconUrl: null,
+        serviceState: null,
+        salerId: null,
+        effectiveDate: null,
+        storeCorporation: null,
+        storeAddr: null,
+        storeCard: null,
+        withMsg: null,
+        cashThreshold: null,
+        cashDay: null,
+        serviceDownThreshold: null,
+        stateFlag: null,
+        storeLon: null,
+        storeLat: null,
+        onService: null,
+        detail: null,
+        modTime: null
+      },
+
+      // 会员卡列表
+      segchk_charge_cardList: [],
+      // 行业关键字列表
+      segchk_keyword_lableList: [],
+      // 优惠列表
+      segchk_preference_lableList: [],
+      //销售人员列表
+      segchk_saler_infoList: [],
+      segchk_storeList: [],
+      // 运营商列表
+      segchk_providerList: [],
+      preferencetotal: 0,
+      keywordtotal: 0,
+      cardtotal: 0,
+      salertotal: 0,
+      typewatchId: 0,
+      lableList: [],
+      labelListOptions:[],
+      typeSelectOptions:[
+        {
+          typeId: 0,
+          typeName:"会员充值卡"
+        },
+          {
+            typeId: 1,
+            typeName:"关键字"
+          },
+          {
+            typeId: 2,
+            typeName:"优惠标签"
+          }
+      ],
+      storeStatus: [],
+      sendMsgs: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeName: [
+          { required: true, message: "商家名称不能为空", trigger: "blur" }
+        ],
+        storePhone: [
+          { required: true, message: "商家电话不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        nickName: [
+          { required: true, message: "商家微信昵称不能为空", trigger: "blur" }
+        ],
+        serviceState: [
+          { required: true, message: "服务状态，0在线，1下线不能为空", trigger: "blur" }
+        ],
+        salerId: [
+          { required: true, message: "销售id不能为空", trigger: "blur" }
+        ],
+        withMsg: [
+          { required: true, message: "是否发送通知消息，0发送，1不发送不能为空", trigger: "blur" }
+        ],
+        cashDay: [
+          { required: true, message: "提现到账日期，0当天到账，n--N个工作日后到账不能为空", trigger: "blur" }
+        ],
+        serviceDownThreshold: [
+          { required: true, message: "下线平均星评门限不能为空", trigger: "blur" }
+        ],
+        stateFlag: [
+          { required: true, message: "是否人工干预，0自动，1人工不能为空", trigger: "blur" }
+        ],
+        storeLon: [
+          { required: true, message: "商家经度不能为空", trigger: "blur" }
+        ],
+        storeLat: [
+          { required: true, message: "商家纬度不能为空", trigger: "blur" }
+        ],
+        onService: [
+          { required: true, message: "商家运营时间不能为空", trigger: "blur" }
+        ],
+        detail: [
+          { required: true, message: "商家描述详情不能为空", trigger: "blur" }
+        ]
+        /*,modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]*/
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.tmpList()
+  },
+  computed:{
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+            return { value: parseInt(e.key), lable: e.value }
+          }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+            return { value: parseInt(e.key), lable: e.value }
+          }) // 关键字
+        }
+        else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+            return { value: parseInt(e.key), lable: e.value }
+          }) // 优惠标签
+        }
+        else if(fromLableId == -1){
+          arr = this.segchk_storeList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          }) // 商家列表
+        }
+        return arr
+      }
+    },
+    provsegchk_charge_cardList() {
+      return function (providerId) {
+        if(providerId == undefined) {
+          console.log("prov is "+providerId)
+          alert("请先填写运营商id")
+          return [];
+        }
+        var providerId = providerId
+        var segchk_charge_cardList = this.segchk_charge_cardList
+        let ret = segchk_charge_cardList
+          .filter(scc=> scc.providerId == providerId)
+          .map(e => {
+            return { key: parseInt(e.key) , value: e.value}
+          })
+        // console.log(ret)
+        return ret
+      }
+    },
+    lableSort() {
+      return  function(row){
+        let maxsortId = this.segchkStoreLableMgtList.reduce((v1, v2) => {
+          return v1.sortId > v2.sortId ? v1 : v2
+        }).sortId
+        if(row.mgtId == null)
+          return maxsortId
+        else return row.sortId
+      }
+
+    },
+  },
+  methods: {
+    submitDetails() {
+      update_store_detail(this.showdetail).then(response => {
+        if(response.code != 200){
+          this.msgError(response.msg)
+          return
+        }
+        this.msgSuccess("修改成功");
+        this.detailopen = false;
+        this.getList();
+      });
+    },
+    show_details(row) {
+      this.showdetail.detail = row.detail
+      this.showdetail.storeId = row.storeId
+      this.showdetail.storeName = row.storeName
+      this.title = "修改" + this.showdetail.storeName + "商家描述详情";
+      this.detailopen = true
+    },
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '提现额门限':
+          contentstr = '当商家的累积平均星评低于门限值时，该商家会被系统自动下线，要求商家改进后运营商手动上线';break;
+        case '服务状态':
+          contentstr = '在线：商家可以在小程序端展示，下线：商家不会在小程序端以任务形式被展示，如果将商家下线，商家会被从首页推荐商户及首页轮播图中删除';break;
+        case '可核消次数':
+          contentstr = '该商家针对具体的某种类型会员卡，单卡可提供服务的次数';break;
+        case '月可售卡量':
+          contentstr = '该商家针对具体的某种类型会员卡，在单月内可售卡数量，超过后无法再售卖';break;
+        case '售卡奖励':
+          contentstr = '该商家针对具体的某种类型会员卡，每张卡的提成';break;
+        case '销售人员奖励':
+          contentstr = '该商家针对具体的某种类型会员卡，对应的销售人员每张卡的提成';break;
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+    tableProviderName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      else if(column.property == 'salerId') {
+        var ret = this.segchk_saler_infoList.find((value) => {return parseInt(value.key) == row.salerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      else if(column.property == 'serviceState') {
+        var ret = this.storeStatus.find((value) => {return parseInt(value.dictValue) == row.serviceState})
+        var provName = ret == null ? "未知" : ret.dictLabel;
+        return provName
+      }
+      else if(column.property == 'withMsg') {
+        var ret = this.sendMsgs.find((value) => {return parseInt(value.dictValue) == row.withMsg})
+        var provName = ret == null ? "未知" : ret.dictLabel;
+        return provName
+      }
+    },
+    // 服务状态修改
+    handleStatusChange(row, index) {
+      let text = row.serviceState === "0" ? "上线" : "下线并不在首页推荐";
+      this.$confirm('确认要"' + text + '""' + row.storeName + '"商家吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_store_service_state(row.providerId, row.storeId, row.serviceState, null);
+      }).then((response) => {
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // console.log("updateSegchk_store_service_state res " + res)
+        row.serviceState = row.serviceState === "0" ? "1" : "0";
+      });
+    },
+    // 是否发送短信修改
+    handleMsgChange(row, index) {
+      let text = row.withMsg === "0" ? "发送消息" : "禁发消息";
+
+      this.$confirm('确认要"' + text + '""' + row.storeName + '"商家吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_store_service_state(row.providerId, row.storeId, null, row.withMsg);
+      }).then((response) => {
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        row.withMsg = row.withMsg === "0" ? "1" : "0";
+      });
+    },
+
+    salerselect(providerId) {
+      var providerId = providerId
+      var segchk_saler_infoList = this.segchk_saler_infoList
+        .map(value => {
+        var ckp = {
+          providerId: value.providerId,
+          salerId: value.key,
+          salerName: value.value}
+        return ckp
+      })
+      let ret = segchk_saler_infoList.filter(function (ssi) {
+        return ssi.providerId == providerId
+      })
+      return ret
+    },
+
+
+    // 查询会员卡列表
+    getcharge_card() {
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 运营商列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 关键字
+      segchk_get_keyword_list(this.queryParams.providerId).then(response => {
+        this.segchk_keyword_lableList = response.rows;
+        // this.keywordtotal = response.total;
+      });
+
+      // 优惠标签
+      segchk_get_preference_lable_list(this.queryParams.providerId).then(response => {
+        this.segchk_preference_lableList = response.rows;
+        // this.preferencetotal = response.total;
+      });
+
+      segchk_get_saler_list(this.queryParams.providerId).then(response => {
+        this.segchk_saler_infoList = response.rows;
+        // this.salertotal = response.total;
+      });
+
+      this.getDicts("segchk_store_state").then(response => {
+        this.storeStatus = response.data;
+      });
+
+      this.getDicts("segchk_store_msg").then(response => {
+        this.sendMsgs = response.data;
+      });
+    },
+
+    /** 查询seg商家基础信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeEffectiveDate && '' != this.daterangeEffectiveDate) {
+        this.queryParams.params["beginEffectiveDate"] = this.daterangeEffectiveDate[0];
+        this.queryParams.params["endEffectiveDate"] = this.daterangeEffectiveDate[1];
+      }
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      this.getcharge_card()
+      listSegchk_store_basic_info(this.queryParams).then(response => {
+        this.segchk_store_basic_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    async tmpList() {
+      await this.getcharge_card();
+      await this.getList();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailopen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        storeId: null,
+        storeName: null,
+        storePhone: null,
+        openid: null,
+        unionId: null,
+        nickName: null,
+        iconUrl: null,
+        serviceState: null,
+        salerId: null,
+        effectiveDate: null,
+        storeCorporation: null,
+        storeAddr: null,
+        storeCard: null,
+        withMsg: null,
+        cashThreshold: null,
+        cashDay: null,
+        serviceDownThreshold: null,
+        stateFlag: null,
+        storeLon: null,
+        storeLat: null,
+        onService: null,
+        detail: null,
+        modTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.segchkStoreImageList = [];
+      this.segchkStoreChkMgtList = [];
+      this.segchkStoreLableMgtList = [];
+      this.segchkStoreSecurityList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeEffectiveDate = [];
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.storeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.segchk_charge_cardList.length == 0){
+        this.msgError("请先添加会员卡")
+        return
+      }
+      if(this.segchk_keyword_lableList.length == 0){
+        this.msgError("请先添加行业关键字")
+        return
+      }
+      if(this.segchk_saler_infoList.length == 0){
+        this.msgError("请先添加销售人员")
+        return
+      }
+      this.reset();
+      this.open = true;
+      this.detailopen = false;
+      this.title = "添加商家基础信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const storeId = row.storeId || this.ids
+      getSegchk_store_basic_info(storeId).then(response => {
+        this.form = response.data;
+        this.segchkStoreImageList = response.data.segchkStoreImageList;
+        this.segchkStoreChkMgtList = response.data.segchkStoreChkMgtList;
+        this.segchkStoreLableMgtList = response.data.segchkStoreLableMgtList;
+        this.segchkStoreSecurityList = response.data.segchkStoreSecurityList;
+        this.open = true;
+        this.title = "修改商家基础信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.segchkStoreImageList = this.segchkStoreImageList;
+          this.form.segchkStoreChkMgtList = this.segchkStoreChkMgtList;
+          this.form.segchkStoreLableMgtList = this.segchkStoreLableMgtList;
+          this.form.segchkStoreSecurityList = this.segchkStoreSecurityList;
+          // console.log(this.form)
+          if (this.form.storeId != null) {
+            updateSegchk_store_basic_info(this.form).then(response => {
+              if(response.code == 500){
+                this.msgError(response.msg)
+                return
+              }
+
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_basic_info(this.form).then(response => {
+              if(response.code == 500){
+                this.msgError(response.msg)
+                return
+              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const storeIds = row.storeId || this.ids;
+      this.$confirm('是否确认删除seg商家基础信息编号为"' + storeIds + '"的数据项? 如果该商家为首页推荐商家，将一同删除！', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_basic_info(storeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+	/** seg商家图片信息序号 */
+    rowSegchkStoreImageIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+	/** seg商家核消管理信息序号 */
+    rowSegchkStoreChkMgtIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+	/** seg商家核消管理信息序号 */
+  rowsegchkStoreLableMgtIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+	/** seg商家核消管理信息序号 */
+  rowsegchkStoreSecurityIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** seg商家图片信息添加按钮操作 */
+    handleAddSegchkStoreImage() {
+      let obj = {};
+      obj.providerId = "";
+      obj.storeCertificate1 = "";
+      obj.storeCertificate2 = "";
+      obj.storeIcon = "";
+      obj.storeGificon = "";
+      obj.storeCarousel1 = "";
+      obj.storeCarousel2 = "";
+      obj.storeCarousel3 = "";
+      obj.storeCarousel4 = "";
+      obj.storeCarousel5 = "";
+      obj.storeCarousel6 = "";
+      obj.storeEnv1 = "";
+      obj.storeEnv2 = "";
+      obj.storeEnv3 = "";
+      obj.storeEnv4 = "";
+      obj.modTime = "";
+      this.segchkStoreImageList.push(obj);
+    },
+    /** seg商家核消管理信息添加按钮操作 */
+    handleAddSegchkStoreChkMgt() {
+      let obj = {};
+      obj.providerId = "";
+      obj.storeId = "";
+      obj.cardTypeId = "";
+      obj.chkCount = "";
+      obj.saleCount = "";
+      obj.cardCommission = "";
+      obj.salerCommission = "";
+      obj.mgtId = "";
+      this.segchkStoreChkMgtList.push(obj);
+    },
+    /** seg商家标签管理信息添加按钮操作 */
+    handleAddSegchkStoreLableMgt() {
+
+      let obj = {};
+      obj.providerId = "";
+      obj.storeId = "";
+      obj.lableId = "";
+      obj.sortId = "";
+      obj.typeId = "";
+      obj.mgtState = "0";
+      obj.modTime = "";
+      obj.mgtId = "";
+      this.segchkStoreLableMgtList.push(obj);
+    },
+    /** seg商家密码管理信息添加按钮操作 */
+    handleAddSegchkStoreSecurity() {
+      let obj = {};
+      obj.providerId = "";
+      obj.storeId = "";
+      obj.passwd = "";
+      obj.modTime = "";
+      obj.pwdId = "";
+      this.segchkStoreSecurityList.push(obj);
+    },
+    /** seg商家图片信息删除按钮操作 */
+    handleDeleteSegchkStoreImage() {
+      if (this.checkedSegchkStoreImage.length == 0) {
+        this.msgError("请先选择要删除的seg商家图片信息数据");
+      } else {
+        const segchkStoreImageList = this.segchkStoreImageList;
+        const checkedSegchkStoreImage = this.checkedSegchkStoreImage;
+        this.segchkStoreImageList = segchkStoreImageList.filter(function(item) {
+          return checkedSegchkStoreImage.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** seg商家核消管理信息删除按钮操作 */
+    handleDeleteSegchkStoreChkMgt() {
+      if (this.checkedSegchkStoreChkMgt.length == 0) {
+        this.msgError("请先选择要删除的seg商家图片信息数据");
+      } else {
+        const segchkStoreChkMgtList = this.segchkStoreChkMgtList;
+        const checkedSegchkStoreChkMgt = this.checkedSegchkStoreChkMgt;
+        this.segchkStoreChkMgtList = segchkStoreChkMgtList.filter(function(item) {
+          return checkedSegchkStoreChkMgt.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** seg商家核消管理信息删除按钮操作 */
+    handleDeleteSegchkStoreLableMgt() {
+      // console.log("handleDeleteSegchkStoreLableMgt --->" + this.checkedSegchkStoreLableMgt)
+      if (this.checkedSegchkStoreLableMgt.length == 0) {
+        this.msgError("请先选择要删除的seg商家图片信息数据");
+      } else {
+        const segchkStoreLableMgtList = this.segchkStoreLableMgtList;
+        const checkedSegchkStoreLableMgt = this.checkedSegchkStoreLableMgt;
+        this.segchkStoreLableMgtList = segchkStoreLableMgtList.filter(function(item) {
+          return checkedSegchkStoreLableMgt.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** seg商家密码管理信息删除按钮操作 */
+    handleDeleteSegchkStoreSecurity() {
+      if (this.checkedSegchkStoreSecurity.length == 0) {
+        this.msgError("请先选择要删除的seg商家图片信息数据");
+      } else {
+        const segchkStoreSecurityList = this.segchkStoreSecurityList;
+        const checkedSegchkStoreSecurity = this.checkedSegchkStoreSecurity;
+        this.segchkStoreSecurityList = segchkStoreSecurityList.filter(function(item) {
+          return checkedSegchkStoreSecurity.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleSegchkStoreImageSelectionChange(selection) {
+      this.checkedSegchkStoreImage = selection.map(item => item.index)
+    },
+    /** 复选框选中数据 */
+    handleSegchkStoreChkMgtSelectionChange(selection) {
+      this.checkedSegchkStoreChkMgt = selection.map(item => item.index)
+    },
+    /** 复选框选中数据 */
+    handleSegchkStoreLableMgtSelectionChange(selection) {
+      this.checkedSegchkStoreLableMgt = selection.map(item => item.index)
+    },
+    /** 复选框选中数据 */
+    handleSegchkStoreSecuritySelectionChange(selection) {
+      this.checkedSegchkStoreLableMgt = selection.map(item => item.index)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家基础信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_basic_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  },
+
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_cash/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_cash/index.vue
new file mode 100644
index 0000000..e3a81ee
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_cash/index.vue
@@ -0,0 +1,470 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="提现额" prop="cash">
+        <el-input
+          v-model="queryParams.cash"
+          placeholder="请输入提现额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="提现类型" prop="cashType">
+        <el-select v-model="queryParams.cashType" placeholder="请选择提现类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label="提现id" prop="cashId">
+        <el-input
+          v-model="queryParams.cashId"
+          placeholder="请输入提现id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="提现结果" prop="retFlag">
+        <el-select v-model="queryParams.retFlag" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.cashRet"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_cash:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_cash:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_cash:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_cash:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_store_cashList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableStoreName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableStoreName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="提现额" align="center" prop="cash"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="提现结果" align="center" prop="retFlag" :formatter="tableStoreName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <!--<el-table-column label="提现类型" align="center" prop="cashType" />-->
+      <el-table-column label="提现id" align="center" prop="cashId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime"  sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_cash:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_cash:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商户户提现记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提现额" prop="cash">
+          <el-input v-model="form.cash" placeholder="请输入提现额" />
+        </el-form-item>
+        <!--<el-form-item label="提现类型" prop="cashType">
+          <el-select v-model="form.cashType" placeholder="请选择提现类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+        <el-form-item label="提现结果" prop="retFlag">
+          <el-select v-model="form.retFlag" >
+            <el-option
+              v-for="dict in cashRet"
+              :key="dict.key"
+              :label="dict.value"
+              :value="dict.key"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_cash, getSegchk_store_cash, delSegchk_store_cash, addSegchk_store_cash, updateSegchk_store_cash, exportSegchk_store_cash } from "@/api/segchk/segchk_store_cash";
+import {segchk_get_provider_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_cash",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商户户提现记录表格数据
+      segchk_store_cashList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'storeId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        cash: null,
+        cashType: null,
+        cashId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      },
+
+      cashRet:[
+        {
+          key: '0',
+          value:"未完成"
+        },
+        {
+          key: '1',
+          value:"成功"
+        },
+        {
+          key: '2',
+          value:"失败"
+        }
+      ],
+      segchk_storeList: [],
+      segchk_providerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cash: [
+          { required: true, message: "提现额不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        retFlag: [
+          { required: true, message: "提现结果，0未完成，1成功，2失败不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableStoreName(row, column) {
+      if(column.property == 'providerId') {
+        var ret = this.segchk_providerList.find((value) => {return parseInt(value.key) == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'storeId') {
+        var ret = this.segchk_storeList.find((value) => {
+          return value.providerId == row.providerId && value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if(column.property == 'retFlag') {
+        var ret = this.cashRet.find((value) => {
+          return value.key == row.retFlag
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商户户提现记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+      })
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+      })
+      listSegchk_store_cash(this.queryParams).then(response => {
+        this.segchk_store_cashList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        cash: null,
+        cashType: null,
+        cashId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cashId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商户户提现记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const cashId = row.cashId || this.ids
+      getSegchk_store_cash(cashId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商户户提现记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cashId != null) {
+            updateSegchk_store_cash(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_cash(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cashIds = row.cashId || this.ids;
+      this.$confirm('是否确认删除seg商户户提现记录编号为"' + cashIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_cash(cashIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商户户提现记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_cash(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_charge/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_charge/index.vue
new file mode 100644
index 0000000..9f28872
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_charge/index.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值额" prop="charge">
+        <el-input
+          v-model="queryParams.charge"
+          placeholder="请输入充值额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值类型" prop="chargeType">
+        <el-select v-model="queryParams.chargeType" placeholder="请选择充值类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="充值id，全表唯一" prop="chargeId">
+        <el-input
+          v-model="queryParams.chargeId"
+          placeholder="请输入充值id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="结果，0未完成，1成功，2失败" prop="retFlag">
+        <el-input
+          v-model="queryParams.retFlag"
+          placeholder="请输入结果，0未完成，1成功，2失败"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_charge:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_charge:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_charge:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_charge:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_chargeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="充值额" align="center" prop="charge" />
+      <el-table-column label="充值类型" align="center" prop="chargeType" />
+      <el-table-column label="充值id，全表唯一" align="center" prop="chargeId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结果，0未完成，1成功，2失败" align="center" prop="retFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_charge:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_charge:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商户充值记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="充值额" prop="charge">
+          <el-input v-model="form.charge" placeholder="请输入充值额" />
+        </el-form-item>
+        <el-form-item label="充值类型" prop="chargeType">
+          <el-select v-model="form.chargeType" placeholder="请选择充值类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结果，0未完成，1成功，2失败" prop="retFlag">
+          <el-input v-model="form.retFlag" placeholder="请输入结果，0未完成，1成功，2失败" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_charge, getSegchk_store_charge, delSegchk_store_charge, addSegchk_store_charge, updateSegchk_store_charge, exportSegchk_store_charge } from "@/api/segchk/segchk_store_charge";
+
+export default {
+  name: "Segchk_store_charge",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg商户充值记录表格数据
+      segchk_store_chargeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        charge: null,
+        chargeType: null,
+        chargeId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        charge: [
+          { required: true, message: "充值额不能为空", trigger: "blur" }
+        ],
+        chargeType: [
+          { required: true, message: "充值类型不能为空", trigger: "change" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        retFlag: [
+          { required: true, message: "结果，0未完成，1成功，2失败不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg商户充值记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_store_charge(this.queryParams).then(response => {
+        this.segchk_store_chargeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        charge: null,
+        chargeType: null,
+        chargeId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.chargeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商户充值记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const chargeId = row.chargeId || this.ids
+      getSegchk_store_charge(chargeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商户充值记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.chargeId != null) {
+            updateSegchk_store_charge(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_charge(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const chargeIds = row.chargeId || this.ids;
+      this.$confirm('是否确认删除seg商户充值记录编号为"' + chargeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_charge(chargeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商户充值记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_charge(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_chk_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_chk_mgt/index.vue
new file mode 100644
index 0000000..e9d1961
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_chk_mgt/index.vue
@@ -0,0 +1,491 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in watch_provider(queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="卡类型id" prop="cardTypeId">
+        <el-select v-model="queryParams.cardTypeId" placeholder="卡类型id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="该商家针对该类型卡可核消次数" prop="chkCount">
+        <el-input
+          v-model="queryParams.chkCount"
+          placeholder="请输入该商家针对该类型卡可核消次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="该商家针对该类型卡每月可售卡量" prop="saleCount">
+        <el-input
+          v-model="queryParams.saleCount"
+          placeholder="请输入该商家针对该类型卡每月可售卡量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="售卡奖励" prop="cardCommission">
+        <el-input
+          v-model="queryParams.cardCommission"
+          placeholder="请输入售卡奖励"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="对应销售人员奖励" prop="salerCommission">
+        <el-input
+          v-model="queryParams.salerCommission"
+          placeholder="请输入对应销售人员奖励"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家核消信息管理id" prop="mgtId">
+        <el-input
+          v-model="queryParams.mgtId"
+          placeholder="请输入商家核消信息管理id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_chk_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_chk_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_chk_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_chk_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_chk_mgtList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="商家id" align="center" prop="storeId"  :formatter="tableProviderName" />
+      <el-table-column label="卡类型id" align="center" prop="cardTypeId"  :formatter="tableProviderName" />
+      <el-table-column label="该商家针对该类型卡可核消次数" align="center" prop="chkCount" />
+      <el-table-column label="该商家针对该类型卡每月可售卡量" align="center" prop="saleCount" />
+      <el-table-column label="售卡奖励" align="center" prop="cardCommission" />
+      <el-table-column label="对应销售人员奖励" align="center" prop="salerCommission" />
+      <el-table-column label="商家核消信息管理id" align="center" prop="mgtId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_chk_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_chk_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商家核消卡管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="商家id" >
+            <el-option
+              v-for="dict in watch_provider(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="卡类型id" prop="cardTypeId">
+          <el-select v-model="form.cardTypeId" placeholder="卡类型id" >
+            <el-option
+              v-for="dict in getLabelComp(0, form.providerId)"
+              :key="parseInt(dict.value)"
+              :label="dict.lable"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="该商家针对该类型卡可核消次数" prop="chkCount">
+          <el-input v-model="form.chkCount" placeholder="请输入该商家针对该类型卡可核消次数" />
+        </el-form-item>
+        <el-form-item label="该商家针对该类型卡每月可售卡量" prop="saleCount">
+          <el-input v-model="form.saleCount" placeholder="请输入该商家针对该类型卡每月可售卡量" />
+        </el-form-item>
+        <el-form-item label="售卡奖励" prop="cardCommission">
+          <el-input v-model="form.cardCommission" placeholder="请输入售卡奖励" />
+        </el-form-item>
+        <el-form-item label="对应销售人员奖励" prop="salerCommission">
+          <el-input v-model="form.salerCommission" placeholder="请输入对应销售人员奖励" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_chk_mgt, getSegchk_store_chk_mgt, delSegchk_store_chk_mgt, addSegchk_store_chk_mgt, updateSegchk_store_chk_mgt, exportSegchk_store_chk_mgt } from "@/api/segchk/segchk_store_chk_mgt";
+import {
+  segchk_get_chargecard_list,
+  segchk_get_provider_list,
+  segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_chk_mgt",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商家核消卡管理表格数据
+      segchk_store_chk_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        storeId: null,
+        cardTypeId: null,
+        chkCount: null,
+        saleCount: null,
+        cardCommission: null,
+        salerCommission: null,
+        mgtId: null
+      },
+      segchk_providerList: [],
+      segchk_charge_cardList: [],
+      segchk_storeList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "卡类型id不能为空", trigger: "blur" }
+        ],
+        chkCount: [
+          { required: true, message: "该商家针对该类型卡可核消次数不能为空", trigger: "blur" }
+        ],
+        saleCount: [
+          { required: true, message: "该商家针对该类型卡每月可售卡量不能为空", trigger: "blur" }
+        ],
+        cardCommission: [
+          { required: true, message: "售卡奖励不能为空", trigger: "blur" }
+        ],
+        salerCommission: [
+          { required: true, message: "对应销售人员奖励不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp() {
+      return function (fromLableId, providerId) {
+        let arr = []
+        if (fromLableId == 0) {
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e => {
+              return {value: parseInt(e.key), lable: e.value}
+            }) // 会员卡
+        }
+        return arr
+      }
+    },
+    watch_provider() {
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+          .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          })
+        return arr
+      }
+    }
+  },
+  methods: {
+
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'cardTypeId'){
+        var ret = this.segchk_charge_cardList.find(value => {
+          return value.providerId == row.providerId && value.key == row.cardTypeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商家核消卡管理列表 */
+    getList() {
+      this.loading = true;
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      listSegchk_store_chk_mgt(this.queryParams).then(response => {
+        this.segchk_store_chk_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        storeId: null,
+        cardTypeId: null,
+        chkCount: null,
+        saleCount: null,
+        cardCommission: null,
+        salerCommission: null,
+        mgtId: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.mgtId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家核消卡管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const mgtId = row.mgtId || this.ids
+      getSegchk_store_chk_mgt(mgtId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家核消卡管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_store_chk_mgtList.find(v => (v.providerId == this.form.providerId && v.cardTypeId == this.form.cardTypeId && v.storeId == this.form.storeId))
+          if (this.form.mgtId != null) {
+            if(exitItem != null && exitItem.mgtId != this.form.mgtId){
+              this.msgError("该商家已存在此类型")
+              return
+            }
+            updateSegchk_store_chk_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该商家已存在此类型")
+              return
+            }
+            addSegchk_store_chk_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const mgtIds = row.mgtId || this.ids;
+      this.$confirm('是否确认删除seg商家核消卡管理编号为"' + mgtIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_chk_mgt(mgtIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家核消卡管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_chk_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_image/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_image/index.vue
new file mode 100644
index 0000000..4fee85b
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_image/index.vue
@@ -0,0 +1,523 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in watch_provider(queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_image:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_image:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_image:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_image:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_imageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableProviderName" />
+      <el-table-column label="商家营业执照图1路径" align="center" prop="storeCertificate1" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeCertificate1" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家营业执照图2路径" align="center" prop="storeCertificate2" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeCertificate2" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家图标路径" align="center" prop="storeIcon" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeIcon" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家大图标路径" align="center" prop="storeGificon" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeGificon" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家轮播图1路径" align="center" prop="storeCarousel1" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeCarousel1" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="商家轮播图2路径" align="center" prop="storeCarousel2" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeCarousel2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家轮播图3路径" align="center" prop="storeCarousel3" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeCarousel3"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家轮播图4路径" align="center" prop="storeCarousel4" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeCarousel4"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家轮播图5路径" align="center" prop="storeCarousel5" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeCarousel5"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家轮播图6路径" align="center" prop="storeCarousel6" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeCarousel6"/>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="商家环境图1" align="center" prop="storeEnv1" >
+        <template slot-scope="scope">
+          <img :src="baseUrl + scope.row.storeEnv1" :height="50" :width="50"/>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="商家环境图2" align="center" prop="storeEnv2" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeEnv2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家环境图3" align="center" prop="storeEnv3" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeEnv3"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家环境图4" align="center" prop="storeEnv4" >
+        <template slot-scope="scope">
+          <img :src="scope.row.storeEnv4"/>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_image:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_image:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商家图片信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="商家id" >
+            <el-option
+              v-for="dict in watch_provider(form.providerId)"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家营业执照图1路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCertificate1"/>
+        </el-form-item>
+        <el-form-item label="商家营业执照图2路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCertificate2"/>
+        </el-form-item>
+        <el-form-item label="商家图标路径，用于在商家列表中显示">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeIcon"/>
+        </el-form-item>
+        <el-form-item label="商家大图标路径，用于在商家列表中显示">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeGificon"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图1路径，默认用于首页推荐轮播图">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel1"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图2路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel2"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图3路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel3"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图4路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel4"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图5路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel5"/>
+        </el-form-item>
+        <el-form-item label="商家轮播图6路径">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeCarousel6"/>
+        </el-form-item>
+        <el-form-item label="商家环境图1">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeEnv1"/>
+        </el-form-item>
+        <el-form-item label="商家环境图2">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeEnv2"/>
+        </el-form-item>
+        <el-form-item label="商家环境图3">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeEnv3"/>
+        </el-form-item>
+        <el-form-item label="商家环境图4">
+          <imageUpload :file-size=1 :limit=1 v-model="form.storeEnv4"/>
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">s
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_image, getSegchk_store_image, delSegchk_store_image, addSegchk_store_image, updateSegchk_store_image, exportSegchk_store_image } from "@/api/segchk/segchk_store_image";
+import {segchk_get_provider_list, segchk_get_store_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_image",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商家图片信息表格数据
+      segchk_store_imageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        storeId: null,
+        storeCertificate1: null,
+        storeCertificate2: null,
+        storeIcon: null,
+        storeGificon: null,
+        storeCarousel1: null,
+        storeCarousel2: null,
+        storeCarousel3: null,
+        storeCarousel4: null,
+        storeCarousel5: null,
+        storeCarousel6: null,
+        storeEnv1: null,
+        storeEnv2: null,
+        storeEnv3: null,
+        storeEnv4: null,
+        modTime: null
+      },
+      segchk_providerList: [],
+      segchk_storeList: [],
+      baseUrl: '',
+      // baseUrl: process.env.VUE_APP_BASE_API,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ]
+
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    watch_provider() {
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+          .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          })
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商家图片信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      listSegchk_store_image(this.queryParams).then(response => {
+        this.segchk_store_imageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        storeId: null,
+        storeCertificate1: null,
+        storeCertificate2: null,
+        storeIcon: null,
+        storeGificon: null,
+        storeCarousel1: null,
+        storeCarousel2: null,
+        storeCarousel3: null,
+        storeCarousel4: null,
+        storeCarousel5: null,
+        storeCarousel6: null,
+        storeEnv1: null,
+        storeEnv2: null,
+        storeEnv3: null,
+        storeEnv4: null,
+        modTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.storeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家图片信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const storeId = row.storeId || this.ids
+      getSegchk_store_image(storeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家图片信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_store_imageList.find(v => (v.providerId == this.form.providerId && v.storeId == this.form.storeId))
+          if (this.form.storeId != null) {
+            updateSegchk_store_image(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该商家已存在")
+              return
+            }
+            addSegchk_store_image(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const storeIds = row.storeId || this.ids;
+      this.$confirm('是否确认删除seg商家图片信息编号为"' + storeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_image(storeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家图片信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_image(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_lable_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_lable_mgt/index.vue
new file mode 100644
index 0000000..984f20e
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_lable_mgt/index.vue
@@ -0,0 +1,645 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in watch_provider(queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="标签来源" prop="typeId">
+        <el-select v-model="queryParams.typeId" placeholder="标签来源" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in typeIds"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="标签id" prop="lableId">
+        <el-select v-model="queryParams.lableId" placeholder="标签id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(queryParams.typeId, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="显示顺序id" prop="sortId">
+        <el-input
+          v-model="queryParams.sortId"
+          placeholder="请输入显示顺序id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管理状态" prop="mgtState">
+        <el-select v-model="queryParams.mgtState" placeholder="管理状态" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in mgtStates"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="商家核消信息管理id" prop="mgtId">
+        <el-input
+          v-model="queryParams.mgtId"
+          placeholder="请输入商家核消信息管理id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_lable_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_lable_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_lable_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_lable_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_store_lable_mgtList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="标签来源" align="center" prop="typeId" :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="标签" align="center" prop="lableId" :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="显示顺序" align="center" prop="sortId" />
+      <el-table-column label="管理状态" align="center" prop="mgtState" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.mgtState"
+            :active-value=0
+            :inactive-value=-1
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理id" align="center" prop="mgtId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_lable_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_lable_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商家标签管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(-1, form.providerId)"
+              :key="parseInt(dict.value)"
+              :label="dict.lable"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签来源" prop="typeId">
+          <el-select v-model="form.typeId" placeholder="标签来源" >
+            <el-option
+              v-for="dict in typeIds"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签id" prop="lableId">
+          <el-select v-model="form.lableId" placeholder="标签id" >
+            <el-option
+              v-for="dict in getLabelComp(form.typeId, form.providerId)"
+              :key="dict.value"
+              :label="dict.lable"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="显示顺序id" prop="sortId">
+          <el-input v-model="form.sortId" placeholder="请输入显示顺序id" />
+        </el-form-item>
+        <el-form-item label="管理状态" prop="mgtState">
+          <el-select v-model="form.mgtState" placeholder="管理状态" >
+            <el-option
+              v-for="dict in mgtStates"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_lable_mgt, getSegchk_store_lable_mgt, delSegchk_store_lable_mgt, addSegchk_store_lable_mgt, updateSegchk_store_lable_mgt, updateSegchk_store_lable_status, exportSegchk_store_lable_mgt } from "@/api/segchk/segchk_store_lable_mgt";
+import {
+  segchk_get_chargecard_list,
+  segchk_get_keyword_list, segchk_get_preference_lable_list,
+  segchk_get_provider_list, segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_lable_mgt",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商家标签管理表格数据
+      segchk_store_lable_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'mgtId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        providerId: null,
+        lableId: null,
+        sortId: null,
+        typeId: null,
+        mgtState: null,
+        modTime: null,
+        mgtId: null
+      },
+      // 会员卡列表
+      segchk_charge_cardList: [],
+      // 行业关键字列表
+      segchk_keyword_lableList: [],
+      // 优惠列表
+      segchk_preference_lableList: [],
+      segchk_storeList: [],
+      baseUrl: process.env.VUE_APP_BASE_API,
+      // 运营商列表
+      segchk_providerList: [],
+      mgtStates: [
+        {
+          key: 0,
+          value: "有效"
+        },
+        {
+          key: -1,
+          value: "失效"
+        }
+      ],
+      typeIds:[
+        {
+          key: 0,
+          value:"会员卡"
+        },
+        {
+          key: 1,
+          value:"关键字"
+        },
+        {
+          key: 2,
+          value:"优惠券"
+        }
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        lableId: [
+          { required: true, message: "标签id不能为空", trigger: "blur" }
+        ],
+        /*sortId: [
+          { required: true, message: "显示顺序id不能为空", trigger: "blur" }
+        ],*/
+        typeId: [
+          { required: true, message: "标签来源id，0关键字，1优惠标签不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，-1失效不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 优惠标签
+        }else if(fromLableId == -1){
+          arr = this.segchk_storeList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 优惠标签
+        }
+        return arr
+      }
+    },
+    watch_provider() {
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+          .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          })
+        return arr
+      }
+    }
+  },
+  methods: {
+    handleStatusChange(row) {
+      let text = row.mgtState === 0 ? "生效" : "失效";
+      // console.log(typeof row.mgtState)
+      // return
+      var ret = this.segchk_storeList.find(value => {
+        return value.key == row.storeId
+      })
+      var storeName = ret == null ? "未知" : ret.value;
+      this.$confirm('确认要"' + text + '"商家"' + storeName + '"的标签吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return updateSegchk_store_lable_status(row.mgtId, row.mgtState);
+      }).then((response) => {
+        // console.log("handleStatusChange ---" + response)
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        // console.log("updateSegchk_store_service_state res " + res)
+        row.mgtState = row.mgtState === 0 ? -1 : 0;
+      });
+    },
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'typeId'){
+        var ret = this.typeIds.find(value => {
+          return value.key == row.typeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'mgtState'){
+        var ret = this.mgtStates.find(value => {
+          return value.key == row.mgtState
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'lableId'){
+        let tmplist = []
+        switch (row.typeId) {
+          case 0: tmplist = this.segchk_charge_cardList;break;
+          case 1: tmplist = this.segchk_keyword_lableList;break;
+          case 2: tmplist = this.segchk_preference_lableList;break;
+        }
+        var ret = tmplist.find(value => {
+          return value.key == row.lableId && value.providerId == row.providerId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商家标签管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 关键字
+      segchk_get_keyword_list(this.queryParams.providerId).then(response => {
+        this.segchk_keyword_lableList = response.rows;
+        // this.keywordtotal = response.total;
+      });
+
+      // 优惠标签
+      segchk_get_preference_lable_list(this.queryParams.providerId).then(response => {
+        this.segchk_preference_lableList = response.rows;
+        // this.preferencetotal = response.total;
+      });
+
+      listSegchk_store_lable_mgt(this.queryParams).then(response => {
+        this.segchk_store_lable_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        providerId: null,
+        lableId: null,
+        sortId: null,
+        typeId: null,
+        mgtState: null,
+        modTime: null,
+        mgtId: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.mgtId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家标签管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const mgtId = row.mgtId || this.ids
+      getSegchk_store_lable_mgt(mgtId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家标签管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_store_lable_mgtList.find(v => (v.providerId == this.form.providerId && v.lableId == this.form.lableId && v.storeId == this.form.storeId && v.typeId == this.form.typeId))
+          if (this.form.mgtId != null) {
+            if(exitItem != null && exitItem.mgtId != this.form.mgtId){
+              this.msgError("该商家已存在此类型标签")
+              return
+            }
+            updateSegchk_store_lable_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该商家已存在此类型")
+              return
+            }
+            addSegchk_store_lable_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const mgtIds = row.mgtId || this.ids;
+      this.$confirm('是否确认删除seg商家标签管理编号为"' + mgtIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_lable_mgt(mgtIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家标签管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_lable_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_reward/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_reward/index.vue
new file mode 100644
index 0000000..39ed4dd
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_reward/index.vue
@@ -0,0 +1,542 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家id" prop="storeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(-1, queryParams.providerId)"
+            :key="parseInt(dict.value)"
+            :label="dict.lable"
+            :value="parseInt(dict.value)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="奖励额" prop="reward">
+        <el-input
+          v-model="queryParams.reward"
+          placeholder="请输入奖励额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="奖励类型" prop="rewardType">
+        <el-input
+          v-model="queryParams.rewardType"
+          placeholder="请输入奖励类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="奖励卡号" prop="rewardCardId">
+        <el-input
+          v-model="queryParams.rewardCardId"
+          placeholder="请输入奖励卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励卡类型" prop="rewardCardTypeId">
+        <el-select v-model="queryParams.storeId" placeholder="商家id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="奖励id号，全表唯一" prop="rewardId">
+        <el-input
+          v-model="queryParams.rewardId"
+          placeholder="请输入奖励id号，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_reward:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_reward:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_reward:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_reward:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_store_rewardList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName" />
+      <el-table-column label="商家id" align="center" prop="storeId" :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="奖励额" align="center" prop="reward"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="奖励类型" align="center" prop="rewardType" />
+      <el-table-column label="奖励卡号" align="center" prop="rewardCardId" />
+      <el-table-column label="奖励卡类型" align="center" prop="rewardCardTypeId" :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="奖励id号" align="center" prop="rewardId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_reward:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_reward:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商户奖励对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商家id" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(-1, form.providerId)"
+              :key="parseInt(dict.value)"
+              :label="dict.lable"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="奖励额" prop="reward">
+          <el-input v-model="form.reward" placeholder="请输入奖励额" />
+        </el-form-item>
+        <!--<el-form-item label="奖励类型" prop="rewardType">
+          <el-input v-model="form.rewardType" placeholder="请输入奖励类型" />
+        </el-form-item>-->
+        <el-form-item label="奖励卡号" prop="rewardCardId">
+          <el-input v-model="form.rewardCardId" placeholder="请输入奖励卡号" />
+        </el-form-item>
+        <el-form-item label="奖励卡类型" prop="rewardCardTypeId">
+          <el-select v-model="form.rewardCardTypeId" placeholder="请输入商家id" >
+            <el-option
+              v-for="dict in getLabelComp(0, form.providerId)"
+              :key="parseInt(dict.value)"
+              :label="dict.lable"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_reward, getSegchk_store_reward, delSegchk_store_reward, addSegchk_store_reward, updateSegchk_store_reward, exportSegchk_store_reward } from "@/api/segchk/segchk_store_reward";
+import {
+  segchk_get_chargecard_list,
+  segchk_get_provider_list,
+  segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_store_reward",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg商户奖励表格数据
+      segchk_store_rewardList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'rewardId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        reward: null,
+        rewardType: null,
+        rewardCardId: null,
+        rewardCardTypeId: null,
+        modTime: null,
+        rewardId: null,
+        providerId: null
+      },
+      // 会员卡列表
+      segchk_charge_cardList: [],
+      segchk_storeList: [],
+      // 运营商列表
+      segchk_providerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        reward: [
+          { required: true, message: "奖励额不能为空", trigger: "blur" }
+        ],
+        rewardCardId: [
+          { required: true, message: "奖励卡号不能为空", trigger: "blur" }
+        ],
+        rewardCardTypeId: [
+          { required: true, message: "奖励卡类型，0--9块9卡，1--99卡不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 会员卡
+        }else if(fromLableId == 1){
+          arr = this.segchk_keyword_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 关键字
+        }else if(fromLableId == 2){
+          arr = this.segchk_preference_lableList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 优惠标签
+        }else if(fromLableId == -1){
+          arr = this.segchk_storeList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 优惠标签
+        }
+        return arr
+      }
+    },
+    watch_provider() {
+      return function (providerId) {
+        let arr = []
+        arr = this.segchk_storeList
+          .filter(value => value.providerId == providerId)
+          .map(e=>  {
+            return { key: parseInt(e.key), value: e.value }
+          })
+        return arr
+      }
+    }
+  },
+  methods: {
+    tableProviderName(row, column) {
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'typeId'){
+        var ret = this.typeIds.find(value => {
+          return value.key == row.typeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'mgtState'){
+        var ret = this.mgtStates.find(value => {
+          return value.key == row.mgtState
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'rewardCardTypeId'){
+        let tmplist = []
+        switch (0) {
+          case 0: tmplist = this.segchk_charge_cardList;break;
+          case 1: tmplist = this.segchk_keyword_lableList;break;
+          case 2: tmplist = this.segchk_preference_lableList;break;
+        }
+        var ret = tmplist.find(value => {
+          return value.key == row.rewardCardTypeId && value.providerId == row.providerId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商户奖励列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      listSegchk_store_reward(this.queryParams).then(response => {
+        this.segchk_store_rewardList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        reward: null,
+        rewardType: null,
+        rewardCardId: null,
+        rewardCardTypeId: null,
+        modTime: null,
+        rewardId: null,
+        providerId: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.rewardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商户奖励";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const rewardId = row.rewardId || this.ids
+      getSegchk_store_reward(rewardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商户奖励";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.rewardId != null) {
+            updateSegchk_store_reward(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_reward(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const rewardIds = row.rewardId || this.ids;
+      this.$confirm('是否确认删除seg商户奖励编号为"' + rewardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_reward(rewardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商户奖励数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_reward(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_security/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_security/index.vue
new file mode 100644
index 0000000..2ac3198
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_security/index.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="密码" prop="passwd">
+        <el-input
+          v-model="queryParams.passwd"
+          placeholder="请输入密码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="密码id，全表唯一" prop="pwdId">
+        <el-input
+          v-model="queryParams.pwdId"
+          placeholder="请输入密码id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_security:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_security:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_security:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_security:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_securityList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="密码" align="center" prop="passwd" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="密码id，全表唯一" align="center" prop="pwdId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_security:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_security:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商户密码对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="密码" prop="passwd">
+          <el-input v-model="form.passwd" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_security, getSegchk_store_security, delSegchk_store_security, addSegchk_store_security, updateSegchk_store_security, exportSegchk_store_security } from "@/api/segchk/segchk_store_security";
+
+export default {
+  name: "Segchk_store_security",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg商户密码表格数据
+      segchk_store_securityList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeId: null,
+        passwd: null,
+        modTime: null,
+        pwdId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        passwd: [
+          { required: true, message: "密码不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg商户密码列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_store_security(this.queryParams).then(response => {
+        this.segchk_store_securityList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        storeId: null,
+        passwd: null,
+        modTime: null,
+        pwdId: null,
+        providerId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.pwdId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商户密码";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const pwdId = row.pwdId || this.ids
+      getSegchk_store_security(pwdId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商户密码";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.pwdId != null) {
+            updateSegchk_store_security(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_security(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const pwdIds = row.pwdId || this.ids;
+      this.$confirm('是否确认删除seg商户密码编号为"' + pwdIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_security(pwdIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商户密码数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_security(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_store_self_mgt/index.vue b/ruoyi-ui/src/views/segchk/segchk_store_self_mgt/index.vue
new file mode 100644
index 0000000..5e50ba8
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_store_self_mgt/index.vue
@@ -0,0 +1,484 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="赠卡id" prop="freeCardId">
+        <el-input
+          v-model="queryParams.freeCardId"
+          placeholder="请输入赠卡id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id，全局惟一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标签id，只在优惠标签时有效" prop="lableId">
+        <el-input
+          v-model="queryParams.lableId"
+          placeholder="请输入标签id，只在优惠标签时有效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标签来源id，0自定义卡，2优惠标签" prop="typeId">
+        <el-input
+          v-model="queryParams.typeId"
+          placeholder="请输入标签来源id，0自定义卡，2优惠标签"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="权益次数" prop="freeCount">
+        <el-input
+          v-model="queryParams.freeCount"
+          placeholder="请输入权益次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="权益卡名称" prop="freeName">
+        <el-input
+          v-model="queryParams.freeName"
+          placeholder="请输入权益卡名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="剩余权益次数" prop="leftCount">
+        <el-input
+          v-model="queryParams.leftCount"
+          placeholder="请输入剩余权益次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态，0正常，1过期" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          placeholder="请输入状态，0正常，1过期"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_store_self_mgt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_store_self_mgt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_store_self_mgt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_store_self_mgt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_self_mgtList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="赠卡id" align="center" prop="freeCardId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="会员卡号id，全局惟一" align="center" prop="cardId" />
+      <el-table-column label="标签id，只在优惠标签时有效" align="center" prop="lableId" />
+      <el-table-column label="标签来源id，0自定义卡，2优惠标签" align="center" prop="typeId" />
+      <el-table-column label="权益次数" align="center" prop="freeCount" />
+      <el-table-column label="权益卡名称" align="center" prop="freeName" />
+      <el-table-column label="权益内容" align="center" prop="freeContent" />
+      <el-table-column label="剩余权益次数" align="center" prop="leftCount" />
+      <el-table-column label="状态，0正常，1过期" align="center" prop="status" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_store_self_mgt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_store_self_mgt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg商家自定义卡管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入会员卡号id，全局惟一" />
+        </el-form-item>
+        <el-form-item label="标签id，只在优惠标签时有效" prop="lableId">
+          <el-input v-model="form.lableId" placeholder="请输入标签id，只在优惠标签时有效" />
+        </el-form-item>
+        <el-form-item label="标签来源id，0自定义卡，2优惠标签" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入标签来源id，0自定义卡，2优惠标签" />
+        </el-form-item>
+        <el-form-item label="权益次数" prop="freeCount">
+          <el-input v-model="form.freeCount" placeholder="请输入权益次数" />
+        </el-form-item>
+        <el-form-item label="权益卡名称" prop="freeName">
+          <el-input v-model="form.freeName" placeholder="请输入权益卡名称" />
+        </el-form-item>
+        <el-form-item label="权益内容">
+          <editor v-model="form.freeContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="剩余权益次数" prop="leftCount">
+          <el-input v-model="form.leftCount" placeholder="请输入剩余权益次数" />
+        </el-form-item>
+        <el-form-item label="状态，0正常，1过期" prop="status">
+          <el-input v-model="form.status" placeholder="请输入状态，0正常，1过期" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_store_self_mgt, getSegchk_store_self_mgt, delSegchk_store_self_mgt, addSegchk_store_self_mgt, updateSegchk_store_self_mgt, exportSegchk_store_self_mgt } from "@/api/segchk/segchk_store_self_mgt";
+
+export default {
+  name: "Segchk_store_self_mgt",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg商家自定义卡管理表格数据
+      segchk_store_self_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        freeCardId: null,
+        modTime: null,
+        storeId: null,
+        providerId: null,
+        userId: null,
+        cardId: null,
+        lableId: null,
+        typeId: null,
+        freeCount: null,
+        freeName: null,
+        freeContent: null,
+        leftCount: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        lableId: [
+          { required: true, message: "标签id，只在优惠标签时有效不能为空", trigger: "blur" }
+        ],
+        typeId: [
+          { required: true, message: "标签来源id，0自定义卡，2优惠标签不能为空", trigger: "blur" }
+        ],
+        freeCount: [
+          { required: true, message: "权益次数不能为空", trigger: "blur" }
+        ],
+        freeName: [
+          { required: true, message: "权益卡名称不能为空", trigger: "blur" }
+        ],
+        freeContent: [
+          { required: true, message: "权益内容不能为空", trigger: "blur" }
+        ],
+        leftCount: [
+          { required: true, message: "剩余权益次数不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态，0正常，1过期不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg商家自定义卡管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_store_self_mgt(this.queryParams).then(response => {
+        this.segchk_store_self_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        freeCardId: null,
+        modTime: null,
+        storeId: null,
+        providerId: null,
+        userId: null,
+        cardId: null,
+        lableId: null,
+        typeId: null,
+        freeCount: null,
+        freeName: null,
+        freeContent: null,
+        leftCount: null,
+        status: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.freeCardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家自定义卡管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const freeCardId = row.freeCardId || this.ids
+      getSegchk_store_self_mgt(freeCardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家自定义卡管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.freeCardId != null) {
+            updateSegchk_store_self_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_self_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const freeCardIds = row.freeCardId || this.ids;
+      this.$confirm('是否确认删除seg商家自定义卡管理编号为"' + freeCardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_self_mgt(freeCardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家自定义卡管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_store_self_mgt(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_system_setting/basicSetting.vue b/ruoyi-ui/src/views/segchk/segchk_system_setting/basicSetting.vue
new file mode 100644
index 0000000..9016add
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_system_setting/basicSetting.vue
@@ -0,0 +1,200 @@
+<template> 
+    <el-card class="form-container" shadow="never">
+        <el-form :model="sysSystemSetting" :rules="rules" ref="SysSystemSettingFrom" label-width="150px">
+
+
+
+
+                    <el-form-item prop="siteUrl">
+                            <span slot="label">商城前台网址</span>
+                            <el-input v-model="sysSystemSetting.siteUrl" maxlength="256">
+
+                            </el-input>
+                          </el-form-item>
+
+
+                    <el-form-item
+                            label="网站名称"
+                            prop="siteName">
+                        <el-input v-model="sysSystemSetting.siteName" style="width: 370px;"/>
+                    </el-form-item>
+
+
+                   <el-form-item label="浏览器标签图标：" prop="labelLog">
+                                <single-upload v-model="sysSystemSetting.labelLog"></single-upload>
+                              </el-form-item>
+                               <el-form-item label="商城LOGO：" prop="logo">
+                                      <single-upload v-model="sysSystemSetting.logo"></single-upload>
+                                    </el-form-item>
+                                     <el-form-item label="管理端登录LOGO：" prop="adminLogo">
+                                            <single-upload v-model="sysSystemSetting.adminLogo"></single-upload>
+                                          </el-form-item>
+                                           <el-form-item label="管理端LOGO：" prop="adminIndexLogo">
+                                                  <single-upload v-model="sysSystemSetting.adminIndexLogo"></single-upload>
+                                                </el-form-item>
+                                                 <el-form-item label="商城登录页面图片：" prop="siteLoginPic">
+                                                        <single-upload v-model="sysSystemSetting.siteLoginPic"></single-upload>
+                                                      </el-form-item>
+                          <el-form-item label="商家登录页面图片：" prop="storeLoginPic">
+                                                             <single-upload v-model="sysSystemSetting.storeLoginPic"></single-upload>
+                                                           </el-form-item>
+
+
+
+                        <el-form-item label="商家开店协议">
+                          <tinymce v-model="sysSystemSetting.storeOpenProtocol" :height="300"/>
+                        </el-form-item>
+                        <el-form-item label="商城用户注册协议">
+                          <tinymce v-model="sysSystemSetting.siteRegisterProtocol" :height="300"/>
+                        </el-form-item>
+                        <el-form-item label="众筹支持者协议">
+                          <tinymce v-model="sysSystemSetting.crowdFundingProtocol" :height="300"/>
+                        </el-form-item>
+
+
+
+
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('SysSystemSettingFrom')">提交</el-button>
+                <el-button v-if="!isEdit" @click="resetForm('SysSystemSettingFrom')">重置</el-button>
+            </el-form-item>
+        </el-form>
+    </el-card>
+</template>
+<script>
+
+  import { listSegchk_system_setting, getSegchk_system_setting, delSegchk_system_setting, addSegchk_system_setting, updateSegchk_system_setting, exportSegchk_system_setting } from "@/api/segchk/segchk_system_setting";
+
+      import {
+         queryBaseInfoSet,
+         updateBaseInfoSet,
+       } from '@/api/segchk/basicinfo';
+    import SingleUpload from '@/components/Upload/singleUpload'
+    import Tinymce from '@/components/Tinymce/index';
+    const defaultSysSystemSetting = {
+        name: ''
+    };
+    export default {
+
+        name: 'SysSystemSettingDetail',
+        components: {SingleUpload,Tinymce},
+        props: {
+            isEdit: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+            sysSystemSetting:
+            Object.assign({},
+        defaultSysSystemSetting),
+            rules: {
+                name: [
+                    {required: true, message: '请输入品牌名称', trigger: 'blur'},
+                    {min: 2, max: 140, message: '长度在 2 到 140 个字符', trigger: 'blur'}
+                ],
+                    logo
+            :
+                [
+                    {required: true, message: '请输入品牌logo', trigger: 'blur'}
+                ],
+                    sort
+            :
+                [
+                    {type: 'number', message: '排序必须为数字'}
+                ],
+            }
+        }
+        },
+        created() {
+
+          queryBaseInfoSet().then(response => {
+                    this.sysSystemSetting = response.data;
+            })
+                ;
+
+        },
+        methods: {
+            onSubmit(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if(valid) {
+                        this.$confirm('是否提交数据', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            if(this.isEdit
+                    )
+                        {
+                            updateBaseInfoSet(this.sysSystemSetting).then(response => {
+
+                                this.$refs[formName].resetFields();
+                                this.$message({
+                                    message: '修改成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.$router.back();
+
+
+
+                        })
+                            ;
+                        }
+                    else
+                        {
+                            updateBaseInfoSet(1,this.sysSystemSetting).then(response => {
+                                if(response.code == 200
+                        )
+                            {
+                                this.$refs[formName].resetFields();
+                                this.sysSystemSetting = Object.assign({},
+                            defaultSysSystemSetting)
+                                ;
+                                this.$message({
+                                    message: '提交成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.$router.back();
+                            }
+                        else
+                            {
+                                this.$message({
+                                    message: response.msg,
+                                    type: 'error',
+                                    duration: 1000
+                                });
+                            }
+
+                        })
+                            ;
+                        }
+                    })
+                        ;
+
+                    } else {
+                        this.$message({
+                            message: '验证失败',
+                            type: 'error',
+                            duration: 1000
+                        });
+                return false;
+            }
+            })
+                ;
+            },
+            resetForm(formName) {
+                this.$refs[formName].resetFields();
+                this.sysSystemSetting = Object.assign({},
+            defaultSysSystemSetting)
+                ;
+            }
+        }
+    }
+</script>
+<style>
+</style>
+
+
diff --git a/ruoyi-ui/src/views/segchk/segchk_system_setting/basicinfo.vue b/ruoyi-ui/src/views/segchk/segchk_system_setting/basicinfo.vue
new file mode 100644
index 0000000..4cbde49
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_system_setting/basicinfo.vue
@@ -0,0 +1,223 @@
+<template>
+<el-card class="form-container" shadow="never">
+
+    <el-alert title="注意！ 基本信息设置，若修改不当，会影响相关网站地址和logo，会造成页面显示和跳转出错。" type="warning" :closable="false"
+              show-icon></el-alert>
+    <el-form label-position="right" :model="form" :rules="rules" ref="form" label-width="150px"
+             style="margin-top: 20px">
+      <el-form-item prop="partSiteUrl">
+        <span slot="label">商城前台网址</span>
+        <el-input v-model="form.partSiteUrl" maxlength="256">
+          <el-select v-model="httpSelect" slot="prepend" style="width: 100px">
+            <el-option label="http://" value="1"></el-option>
+            <el-option label="https://" value="2"></el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="siteName">
+        <span slot="label">商城名称</span>
+        <el-input v-model="form.siteName" maxlength="256"/>
+      </el-form-item>
+       <el-form-item label="浏览器标签图标：" prop="labelLog">
+              <single-upload v-model="form.labelLog"></single-upload>
+            </el-form-item>
+             <el-form-item label="商城LOGO：" prop="logo">
+                    <single-upload v-model="form.logo"></single-upload>
+                  </el-form-item>
+                   <el-form-item label="管理端登录LOGO：" prop="adminLogo">
+                          <single-upload v-model="form.adminLogo"></single-upload>
+                        </el-form-item>
+                         <el-form-item label="管理端LOGO：" prop="adminIndexLogo">
+                                <single-upload v-model="form.adminIndexLogo"></single-upload>
+                              </el-form-item>
+                               <el-form-item label="商城登录页面图片：" prop="siteLoginPic">
+                                      <single-upload v-model="form.siteLoginPic"></single-upload>
+                                    </el-form-item>
+        <el-form-item label="商家登录页面图片：" prop="storeLoginPic">
+                                           <single-upload v-model="form.storeLoginPic"></single-upload>
+                                         </el-form-item>
+
+
+
+      <el-form-item label="商家开店协议">
+        <tinymce v-model="form.storeOpenProtocol" :height="300"/>
+      </el-form-item>
+      <el-form-item label="商城用户注册协议">
+        <tinymce v-model="form.siteRegisterProtocol" :height="300"/>
+      </el-form-item>
+      <el-form-item label="众筹支持者协议">
+        <tinymce v-model="form.crowdFundingProtocol" :height="300"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="updateBaseInfoSet">保存设置</el-button>
+      </el-form-item>
+    </el-form>
+
+    </el-card>
+</template>
+
+<script>
+  import { listSegchk_system_setting, getSegchk_system_setting, delSegchk_system_setting, addSegchk_system_setting, updateSegchk_system_setting, exportSegchk_system_setting } from "@/api/segchk/segchk_system_setting";
+  import Tinymce from '@/components/Tinymce/index';
+
+ import {
+    queryBaseInfoSet,
+    updateBaseInfoSet,
+  } from '@/api/segchk/basicinfo';
+import { getToken,get } from '@/utils/auth'
+  import SingleUpload from '@/components/Upload/singleUpload'
+  export default {
+    components: {Tinymce},
+    data() {
+      return {
+        isProcess: false, // 接口是否处理中
+        httpSelect: '1', // 商城前台网址前缀 1 http 2 https
+        uploadApi: process.env.VUE_APP_BASE_API+'/aliyun/oss/uploadToAliOss',// 上传文件路由
+        headers: { // 设置上传的请求头部
+          Authorization: 'Bearer ' + getToken()
+        },
+        form: { // 提交form表单
+          partSiteUrl: '', // 商城前台网址（没有前缀http和https)
+          siteName: '', // 商城名称
+          phone: '', // 商城联系电话
+          labelLog: '', // 标签页图标
+          logo: '', // 网站LOGO
+          adminLogo: '', // 后台登陆LOGO
+          adminIndexLogo: '', // 后台首页LOGO
+          siteLoginPic: '', // 前台登录页面图片
+          storeLoginPic: '', // 商家登录页面图片
+          copyrightInfo: '', // 后台版权信息
+          storeOpenProtocol: '', // 商家开店协议
+          siteRegisterProtocol: '', // 商城用户注册协议
+          crowdFundingProtocol: '', // 众筹支持者协议
+        },
+        rules: { // 校验规则
+          partSiteUrl: [
+            {
+              required: true,
+              message: '请输入商城前台网址',
+              trigger: 'blur'
+            }
+          ],
+          siteName: [
+            {
+              required: true,
+              message: '请输入商城名称',
+              trigger: 'blur'
+            }
+          ]
+        },
+      }
+    },
+    created() {
+      this.queryBaseInfoSet()
+    },
+    methods: {
+      // 查询基本信息设置
+      queryBaseInfoSet() {
+        queryBaseInfoSet(201).then(res => {
+
+          // 推荐给form表单根据属性，对照返回数据对象属性 挨个赋值
+          let baseinfo = res.data
+          this.form = {
+            partSiteUrl: baseinfo.siteUrl.split('://')[1], // 商城前台网址（没有前缀http和https)
+            siteName: baseinfo.siteName, // 商城名称
+            phone: baseinfo.phone, // 商城联系电话
+            labelLog: baseinfo.labelLog, // 标签页图标
+            logo: baseinfo.logo, // 网站LOGO
+            adminLogo: baseinfo.adminLogo, // 后台登陆LOGO
+            adminIndexLogo: baseinfo.adminIndexLogo, // 后台首页LOGO
+            siteLoginPic: baseinfo.siteLoginPic, // 前台登录页面图片
+            storeLoginPic: baseinfo.storeLoginPic, // 商家登录页面图片
+            copyrightInfo: baseinfo.copyrightInfo, // 后台版权信息
+            storeOpenProtocol: baseinfo.storeOpenProtocol, // 商家开店协议
+            siteRegisterProtocol: baseinfo.siteRegisterProtocol, // 商城用户注册协议
+            crowdFundingProtocol: baseinfo.crowdFundingProtocol, // 众筹支持者协议
+          };
+
+          this.httpSelect = baseinfo.siteUrl.split('://')[0] == 'http' ? '1' : '2';
+          if (this.$refs["form"]) {
+            this.$refs["form"].resetFields();
+          }
+        })
+      },
+      // 修改基本信息设置
+      updateBaseInfoSet() {
+        this.$refs['form'].validate(valid => {
+          if (valid && this.validateLength() && !this.isProcess) {
+            // 如果商城前台网址不是以斜杠"/"结尾，自动补全斜杠"/"
+            if (!this.form.partSiteUrl.endsWith("/")) {
+              this.form.partSiteUrl = this.form.partSiteUrl + '/';
+            }
+            this.form.siteUrl = (this.httpSelect == '1' ? 'http://' : 'https://') + this.form.partSiteUrl;
+            this.isProcess = true;
+            updateBaseInfoSet(1,this.form).then(res => {
+              this.isProcess = false;
+              if (res == 1) {
+                this.queryBaseInfoSet();
+                this.$message({
+                  message: '修改成功',
+                  type: 'success'
+                })
+              } else {
+                this.$message({
+                  message: '修改失败',
+                  type: 'error'
+                })
+              }
+            })
+          }
+        });
+      },
+      // 上传标签页图标回调
+      uploadLabelLogSuccess(res) {
+        this.form.labelLog = res;
+      },
+      // 上传网站LOGO回调
+      uploadLogoSuccess(res) {
+        this.form.logo = res;
+      },
+      // 上传后台登陆LOGO回调
+      uploadAdminLogoSuccess(res) {
+        this.form.adminLogo = res;
+      },
+      // 上传后台首页LOGO回调
+      uploadAdminIndexLogoSuccess(res) {
+        this.form.adminIndexLogo = res;
+      },
+      // 上传前台登录页面图片回调
+      uploadSiteLoginPicSuccess(res) {
+        this.form.siteLoginPic = res;
+      },
+      // 上传商家登录页面图片回调
+      uploadStoreLoginPicSuccess(res) {
+        this.form.storeLoginPic = res;
+      },
+      // 验证协议长度
+      validateLength() {
+        if (this.form.storeOpenProtocol.length > 65535) {
+          this.$message({
+            message: '商家开店协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.siteRegisterProtocol.length > 65535) {
+          this.$message({
+            message: '商城用户注册协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.crowdFundingProtocol.length > 65535) {
+          this.$message({
+            message: '众筹支持者协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        return true;
+      },
+    }
+  }
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_system_setting/index.vue b/ruoyi-ui/src/views/segchk/segchk_system_setting/index.vue
new file mode 100644
index 0000000..cc944d8
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_system_setting/index.vue
@@ -0,0 +1,256 @@
+<template>
+<el-card class="form-container" shadow="never">
+
+    <el-alert :closable="false" show-icon title="注意！ 基本信息设置，若修改不当，会影响相关网站地址和logo，会造成页面显示和跳转出错。"
+              type="warning"></el-alert>
+    <el-form :model="form" :rules="rules" label-position="right" label-width="150px" ref="form"
+             style="margin-top: 20px">
+      <el-form-item prop="partSiteUrl">
+        <span slot="label">商城前台网址</span>
+        <el-input maxlength="256" v-model="form.partSiteUrl">
+          <el-select slot="prepend" style="width: 100px" v-model="httpSelect">
+            <el-option label="http://" value="1"></el-option>
+            <el-option label="https://" value="2"></el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="siteName">
+        <span slot="label">商城名称</span>
+        <el-input maxlength="256" v-model="form.siteName"/>
+      </el-form-item>
+       <el-form-item label="浏览器标签图标：" prop="labelLog">
+<!--              <single-upload v-model="form.labelLog" />-->
+         {{this.form.labelLog}}
+         <image-upload v-model="form.labelLog" :file-size=1 :limit=1 />
+       </el-form-item>
+             <el-form-item label="商城LOGO：" prop="logo">
+<!--                    <single-upload v-model="form.logo"/>-->
+               <image-upload v-model="form.logo" :file-size=1 :limit=1 />
+                  </el-form-item>
+                   <el-form-item label="管理端登录LOGO：" prop="adminLogo">
+<!--                          <single-upload v-model="form.adminLogo"></single-upload>-->
+                     <image-upload v-model="form.adminLogo" :file-size=1 :limit=1 />
+                        </el-form-item>
+                         <el-form-item label="管理端LOGO：" prop="adminIndexLogo">
+<!--                                <single-upload v-model="form.adminIndexLogo"></single-upload>-->
+                           <image-upload v-model="form.adminIndexLogo" :file-size=1 :limit=1 />
+                              </el-form-item>
+                               <el-form-item label="商城登录页面图片：" prop="siteLoginPic">
+<!--                                      <single-upload v-model="form.siteLoginPic"></single-upload>-->
+                                 <image-upload v-model="form.siteLoginPic" :file-size=1 :limit=1 />
+                                    </el-form-item>
+        <el-form-item label="商家登录页面图片：" prop="storeLoginPic">
+<!--                                           <single-upload v-model="form.storeLoginPic"></single-upload>-->
+          <image-upload v-model="form.storeLoginPic" :file-size=1 :limit=1 />
+                                         </el-form-item>
+
+
+
+      <el-form-item label="商家开店协议">
+        <tinymce :height="300" v-model="form.storeOpenProtocol"/>
+      </el-form-item>
+      <el-form-item label="商城用户注册协议">
+        <tinymce :height="300" v-model="form.siteRegisterProtocol"/>
+      </el-form-item>
+      <el-form-item label="商城用户隐私协议">
+        <tinymce :height="300" v-model="form.userPrivacyAgreement"/>
+      </el-form-item>
+      <el-form-item label="商城vip会员服务协议">
+        <tinymce :height="300" v-model="form.vipServiceAgreement"/>
+      </el-form-item>
+      <el-form-item label="众筹支持者协议">
+        <tinymce :height="300" v-model="form.crowdFundingProtocol"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="updateBaseInfoSet" type="primary">保存设置</el-button>
+      </el-form-item>
+    </el-form>
+
+    </el-card>
+</template>
+
+<script>
+  import { listSegchk_system_setting, getSegchk_system_setting, delSegchk_system_setting, addSegchk_system_setting, updateSegchk_system_setting, exportSegchk_system_setting } from "@/api/segchk/segchk_system_setting";
+  import Tinymce from '@/components/Tinymce/index';
+
+ import {
+    queryBaseInfoSet,
+    updateBaseInfoSet,
+  } from '@/api/segchk/basicinfo';
+import { getToken,get } from '@/utils/auth'
+  import SingleUpload from '@/components/Upload/singleUpload'
+  export default {
+    components: {SingleUpload, Tinymce},
+    data() {
+      return {
+        isProcess: false, // 接口是否处理中
+        httpSelect: '1', // 商城前台网址前缀 1 http 2 https
+        uploadApi: process.env.VUE_APP_BASE_API+'/aliyun/oss/uploadToAliOss',// 上传文件路由
+        headers: { // 设置上传的请求头部
+          Authorization: 'Bearer ' + getToken()
+        },
+        form: { // 提交form表单
+          partSiteUrl: '', // 商城前台网址（没有前缀http和https)
+          siteName: '', // 商城名称
+          phone: '', // 商城联系电话
+          labelLog: '', // 标签页图标
+          logo: '', // 网站LOGO
+          adminLogo: '', // 后台登陆LOGO
+          adminIndexLogo: '', // 后台首页LOGO
+          siteLoginPic: '', // 前台登录页面图片
+          storeLoginPic: '', // 商家登录页面图片
+          copyrightInfo: '', // 后台版权信息
+          storeOpenProtocol: '', // 商家开店协议
+          siteRegisterProtocol: '', // 商城用户注册协议
+          userPrivacyAgreement: '', // 商城用户隐私协议
+          vipServiceAgreement: '', // 商城vip会员服务协议
+          crowdFundingProtocol: '', // 众筹支持者协议
+        },
+        rules: { // 校验规则
+          partSiteUrl: [
+            {
+              required: true,
+              message: '请输入商城前台网址',
+              trigger: 'blur'
+            }
+          ],
+          siteName: [
+            {
+              required: true,
+              message: '请输入商城名称',
+              trigger: 'blur'
+            }
+          ]
+        },
+      }
+    },
+    created() {
+      this.queryBaseInfoSet()
+    },
+    methods: {
+      // 查询基本信息设置
+      queryBaseInfoSet() {
+        queryBaseInfoSet(201).then(res => {
+
+          // 推荐给form表单根据属性，对照返回数据对象属性 挨个赋值
+          let baseinfo = res.data
+          this.form = {
+            partSiteUrl: baseinfo.siteUrl.split('://')[1], // 商城前台网址（没有前缀http和https)
+            siteName: baseinfo.siteName, // 商城名称
+            phone: baseinfo.phone, // 商城联系电话
+            labelLog: baseinfo.labelLog, // 标签页图标
+            logo: baseinfo.logo, // 网站LOGO
+            adminLogo: baseinfo.adminLogo, // 后台登陆LOGO
+            adminIndexLogo: baseinfo.adminIndexLogo, // 后台首页LOGO
+            siteLoginPic: baseinfo.siteLoginPic, // 前台登录页面图片
+            storeLoginPic: baseinfo.storeLoginPic, // 商家登录页面图片
+            copyrightInfo: baseinfo.copyrightInfo, // 后台版权信息
+            storeOpenProtocol: baseinfo.storeOpenProtocol, // 商家开店协议
+            siteRegisterProtocol: baseinfo.siteRegisterProtocol, // 商城用户注册协议
+            userPrivacyAgreement: baseinfo.userPrivacyAgreement, // 商城用户注册协议
+            vipServiceAgreement: baseinfo.vipServiceAgreement, // 商城用户注册协议
+
+            crowdFundingProtocol: baseinfo.crowdFundingProtocol, // 众筹支持者协议
+          };
+
+          this.httpSelect = baseinfo.siteUrl.split('://')[0] == 'http' ? '1' : '2';
+          console.log(this.form)
+          if (this.$refs["form"]) {
+            this.$refs["form"].resetFields();
+          }
+        })
+      },
+      // 修改基本信息设置
+      updateBaseInfoSet() {
+        this.$refs['form'].validate(valid => {
+          if (valid && this.validateLength() && !this.isProcess) {
+            // 如果商城前台网址不是以斜杠"/"结尾，自动补全斜杠"/"
+            if (!this.form.partSiteUrl.endsWith("/")) {
+              this.form.partSiteUrl = this.form.partSiteUrl + '/';
+            }
+            this.form.siteUrl = (this.httpSelect == '1' ? 'http://' : 'https://') + this.form.partSiteUrl;
+            this.isProcess = true;
+            updateBaseInfoSet(this.form).then(res => {
+              this.isProcess = false;
+              if (res.code == 200) {
+                this.queryBaseInfoSet();
+                this.$message({
+                  message: '修改成功',
+                  type: 'success'
+                })
+              } else {
+                this.$message({
+                  message: '修改失败',
+                  type: 'error'
+                })
+              }
+            })
+          }
+        });
+      },
+      // 上传标签页图标回调
+      uploadLabelLogSuccess(res) {
+        this.form.labelLog = res;
+      },
+      // 上传网站LOGO回调
+      uploadLogoSuccess(res) {
+        this.form.logo = res;
+      },
+      // 上传后台登陆LOGO回调
+      uploadAdminLogoSuccess(res) {
+        this.form.adminLogo = res;
+      },
+      // 上传后台首页LOGO回调
+      uploadAdminIndexLogoSuccess(res) {
+        this.form.adminIndexLogo = res;
+      },
+      // 上传前台登录页面图片回调
+      uploadSiteLoginPicSuccess(res) {
+        this.form.siteLoginPic = res;
+      },
+      // 上传商家登录页面图片回调
+      uploadStoreLoginPicSuccess(res) {
+        this.form.storeLoginPic = res;
+      },
+      // 验证协议长度
+      validateLength() {
+        if (this.form.storeOpenProtocol.length > 65535) {
+          this.$message({
+            message: '商家开店协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.siteRegisterProtocol.length > 65535) {
+          this.$message({
+            message: '商城用户注册协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.userPrivacyAgreement.length > 65535) {
+          this.$message({
+            message: '商城用户隐私协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.vipServiceAgreement.length > 65535) {
+          this.$message({
+            message: '商城vip会员协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (this.form.crowdFundingProtocol.length > 65535) {
+          this.$message({
+            message: '众筹支持者协议长度不能超过65535',
+            type: 'warning'
+          });
+          return false;
+        }
+        return true;
+      },
+    }
+  }
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_system_setting/index_1.vue b/ruoyi-ui/src/views/segchk/segchk_system_setting/index_1.vue
new file mode 100644
index 0000000..1fd479b
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_system_setting/index_1.vue
@@ -0,0 +1,511 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="前端地址" prop="siteUrl">
+        <el-input
+          v-model="queryParams.siteUrl"
+          placeholder="请输入前端地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="网站名称" prop="siteName">
+        <el-input
+          v-model="queryParams.siteName"
+          placeholder="请输入网站名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="版权信息" prop="copyrightInfo">
+        <el-input
+          v-model="queryParams.copyrightInfo"
+          placeholder="请输入版权信息"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否开启验证码   0 开启 1 不开启 默认0 " prop="captchaOpen">
+        <el-select v-model="queryParams.captchaOpen" placeholder="请选择是否开启验证码   0 开启 1 不开启 默认0 " clearable size="small">
+          <el-option
+            v-for="dict in captchaOpenOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="店铺商品审核开关  0 需要审核 1 不需要 默认0 " prop="storeSpuAudit">
+        <el-select v-model="queryParams.storeSpuAudit" placeholder="请选择店铺商品审核开关  0 需要审核 1 不需要 默认0 " clearable size="small">
+          <el-option
+            v-for="dict in storeSpuAuditOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会员价开关状态 0开启 1不开启 默认0" prop="memberPriceStatus">
+        <el-select v-model="queryParams.memberPriceStatus" placeholder="请选择会员价开关状态 0开启 1不开启 默认0" clearable size="small">
+          <el-option
+            v-for="dict in memberPriceStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="h5域名" prop="h5CallBackDomain">
+        <el-input
+          v-model="queryParams.h5CallBackDomain"
+          placeholder="请输入h5域名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="pc域名" prop="pcCallBackDomain">
+        <el-input
+          v-model="queryParams.pcCallBackDomain"
+          placeholder="请输入pc域名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_system_setting:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_system_setting:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_system_setting:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_system_setting:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_system_settingList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="前端地址" align="center" prop="siteUrl" />
+      <el-table-column label="网站名称" align="center" prop="siteName" />
+      <el-table-column label="网站LOGO(前端搜索页旁边和店铺登陆页)" align="center" prop="logo" />
+      <el-table-column label="pc端，admin端，store端标签图片" align="center" prop="labelLog" />
+      <el-table-column label="pc端登录背景图片" align="center" prop="siteLogin" />
+      <el-table-column label="pc端注册背景图片" align="center" prop="siteRegister" />
+      <el-table-column label="店铺端登录图片" align="center" prop="storeLogin" />
+      <el-table-column label="店铺端注册图片" align="center" prop="storeRegister" />
+      <el-table-column label="版权信息" align="center" prop="copyrightInfo" />
+      <el-table-column label="注册协议" align="center" prop="registerProtocol" />
+
+      <el-table-column label="店铺端注册协议" align="center" prop="storeRegisterProtocol" />
+      <el-table-column label="店铺端开店协议" align="center" prop="storeOpenProtocol" />
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="admin端登录logo" align="center" prop="adminLogo" />
+      <el-table-column label="admin端首页logo" align="center" prop="adminIndexLogo" />
+      <el-table-column label="是否开启验证码   0 开启 1 不开启 默认0 " align="center" prop="captchaOpen" :formatter="captchaOpenFormat" />
+      <el-table-column label="店铺商品审核开关  0 需要审核 1 不需要 默认0 " align="center" prop="storeSpuAudit" :formatter="storeSpuAuditFormat" />
+      <el-table-column label="会员价开关状态 0开启 1不开启 默认0" align="center" prop="memberPriceStatus" :formatter="memberPriceStatusFormat" />
+      <el-table-column label="众筹协议" align="center" prop="crowdfundingProtocol" />
+      <el-table-column label="h5域名" align="center" prop="h5CallBackDomain" />
+      <el-table-column label="pc域名" align="center" prop="pcCallBackDomain" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_system_setting:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_system_setting:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改系统设置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="前端地址" prop="siteUrl">
+          <el-input v-model="form.siteUrl" placeholder="请输入前端地址" />
+        </el-form-item>
+        <el-form-item label="网站名称" prop="siteName">
+          <el-input v-model="form.siteName" placeholder="请输入网站名称" />
+        </el-form-item>
+        <el-form-item label="网站LOGO(前端搜索页旁边和店铺登陆页)">
+          <imageUpload v-model="form.logo"/>
+        </el-form-item>
+        <el-form-item label="pc端，admin端，store端标签图片">
+          <imageUpload v-model="form.labelLog"/>
+        </el-form-item>
+        <el-form-item label="pc端登录背景图片">
+          <imageUpload v-model="form.siteLogin"/>
+        </el-form-item>
+        <el-form-item label="pc端注册背景图片">
+          <imageUpload v-model="form.siteRegister"/>
+        </el-form-item>
+        <el-form-item label="店铺端登录图片">
+          <imageUpload v-model="form.storeLogin"/>
+        </el-form-item>
+        <el-form-item label="店铺端注册图片">
+          <imageUpload v-model="form.storeRegister"/>
+        </el-form-item>
+        <el-form-item label="版权信息" prop="copyrightInfo">
+          <el-input v-model="form.copyrightInfo" placeholder="请输入版权信息" />
+        </el-form-item>
+        <el-form-item label="注册协议">
+          <editor v-model="form.registerProtocol" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="店铺端注册协议">
+          <editor v-model="form.storeRegisterProtocol" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="店铺端开店协议">
+          <editor v-model="form.storeOpenProtocol" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="admin端登录logo">
+          <imageUpload v-model="form.adminLogo"/>
+        </el-form-item>
+        <el-form-item label="admin端首页logo">
+          <imageUpload v-model="form.adminIndexLogo"/>
+        </el-form-item>
+        <el-form-item label="是否开启验证码   0 开启 1 不开启 默认0 " prop="captchaOpen">
+          <el-select v-model="form.captchaOpen" placeholder="请选择是否开启验证码   0 开启 1 不开启 默认0 ">
+            <el-option
+              v-for="dict in captchaOpenOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺商品审核开关  0 需要审核 1 不需要 默认0 " prop="storeSpuAudit">
+          <el-select v-model="form.storeSpuAudit" placeholder="请选择店铺商品审核开关  0 需要审核 1 不需要 默认0 ">
+            <el-option
+              v-for="dict in storeSpuAuditOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="会员价开关状态 0开启 1不开启 默认0">
+          <el-radio-group v-model="form.memberPriceStatus">
+            <el-radio
+              v-for="dict in memberPriceStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="众筹协议">
+          <editor v-model="form.crowdfundingProtocol" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="h5域名" prop="h5CallBackDomain">
+          <el-input v-model="form.h5CallBackDomain" placeholder="请输入h5域名" />
+        </el-form-item>
+        <el-form-item label="pc域名" prop="pcCallBackDomain">
+          <el-input v-model="form.pcCallBackDomain" placeholder="请输入pc域名" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_system_setting, getSegchk_system_setting, delSegchk_system_setting, addSegchk_system_setting, updateSegchk_system_setting, exportSegchk_system_setting } from "@/api/segchk/segchk_system_setting";
+
+export default {
+  name: "Segchk_system_setting",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 系统设置表格数据
+      segchk_system_settingList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否开启验证码   0 开启 1 不开启 默认0 字典
+      captchaOpenOptions: [],
+      // 店铺商品审核开关  0 需要审核 1 不需要 默认0 字典
+      storeSpuAuditOptions: [],
+      // 会员价开关状态 0开启 1不开启 默认0字典
+      memberPriceStatusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        siteUrl: null,
+        siteName: null,
+        logo: null,
+        labelLog: null,
+        siteLogin: null,
+        siteRegister: null,
+        storeLogin: null,
+        storeRegister: null,
+        copyrightInfo: null,
+        registerProtocol: null,
+        storeRegisterProtocol: null,
+        storeOpenProtocol: null,
+        phone: null,
+        adminLogo: null,
+        adminIndexLogo: null,
+        captchaOpen: null,
+        storeSpuAudit: null,
+        memberPriceStatus: null,
+        crowdfundingProtocol: null,
+        h5CallBackDomain: null,
+        pcCallBackDomain: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        siteUrl: [
+          { required: true, message: "前端地址不能为空", trigger: "blur" }
+        ],
+        siteName: [
+          { required: true, message: "网站名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.captchaOpenOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.storeSpuAuditOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.memberPriceStatusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询系统设置列表 */
+    getList() {
+      this.loading = true;
+      listSegchk_system_setting(this.queryParams).then(response => {
+        this.segchk_system_settingList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 是否开启验证码   0 开启 1 不开启 默认0 字典翻译
+    captchaOpenFormat(row, column) {
+      return this.selectDictLabel(this.captchaOpenOptions, row.captchaOpen);
+    },
+    // 店铺商品审核开关  0 需要审核 1 不需要 默认0 字典翻译
+    storeSpuAuditFormat(row, column) {
+      return this.selectDictLabel(this.storeSpuAuditOptions, row.storeSpuAudit);
+    },
+    // 会员价开关状态 0开启 1不开启 默认0字典翻译
+    memberPriceStatusFormat(row, column) {
+      return this.selectDictLabel(this.memberPriceStatusOptions, row.memberPriceStatus);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        siteUrl: null,
+        siteName: null,
+        logo: null,
+        labelLog: null,
+        siteLogin: null,
+        siteRegister: null,
+        storeLogin: null,
+        storeRegister: null,
+        copyrightInfo: null,
+        registerProtocol: null,
+        storeRegisterProtocol: null,
+        storeOpenProtocol: null,
+        phone: null,
+        adminLogo: null,
+        adminIndexLogo: null,
+        captchaOpen: null,
+        storeSpuAudit: null,
+        memberPriceStatus: "0",
+        crowdfundingProtocol: null,
+        h5CallBackDomain: null,
+        pcCallBackDomain: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加系统设置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSegchk_system_setting(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改系统设置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSegchk_system_setting(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_system_setting(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除系统设置编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_system_setting(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有系统设置数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_system_setting(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_account/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_account/index.vue
new file mode 100644
index 0000000..d71425a
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_account/index.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="余额" prop="account">
+        <el-input
+          v-model="queryParams.account"
+          placeholder="请输入余额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="余额类型" prop="accountType">
+        <el-input
+          v-model="queryParams.accountType"
+          placeholder="请输入余额类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="余额id" prop="accountId">
+        <el-input
+          v-model="queryParams.accountId"
+          placeholder="请输入余额id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励id号" prop="rewardId">
+        <el-input
+          v-model="queryParams.rewardId"
+          placeholder="请输入奖励id号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值id" prop="chargeId">
+        <el-input
+          v-model="queryParams.chargeId"
+          placeholder="请输入充值id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现id" prop="cashId">
+        <el-input
+          v-model="queryParams.cashId"
+          placeholder="请输入提现id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_account:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_account:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_account:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_account:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_accountList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="余额" align="center" prop="account" />
+      <el-table-column label="余额类型" align="center" prop="accountType" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="余额id" align="center" prop="accountId" />
+      <el-table-column label="奖励id号" align="center" prop="rewardId" />
+      <el-table-column label="充值id" align="center" prop="chargeId" />
+      <el-table-column label="提现id" align="center" prop="cashId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_account:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_account:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户余额信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="余额" prop="account">
+          <el-input v-model="form.account" placeholder="请输入余额" />
+        </el-form-item>
+        <el-form-item label="余额类型" prop="accountType">
+          <el-input v-model="form.accountType" placeholder="请输入余额类型" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="奖励id号" prop="rewardId">
+          <el-input v-model="form.rewardId" placeholder="请输入奖励id号" />
+        </el-form-item>
+        <el-form-item label="充值id" prop="chargeId">
+          <el-input v-model="form.chargeId" placeholder="请输入充值id" />
+        </el-form-item>
+        <el-form-item label="提现id" prop="cashId">
+          <el-input v-model="form.cashId" placeholder="请输入提现id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_account, getSegchk_user_account, delSegchk_user_account, addSegchk_user_account, updateSegchk_user_account, exportSegchk_user_account } from "@/api/segchk/segchk_user_account";
+
+export default {
+  name: "Segchk_user_account",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户余额信息表格数据
+      segchk_user_accountList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        account: null,
+        accountType: null,
+        providerId: null,
+        accountId: null,
+        rewardId: null,
+        chargeId: null,
+        cashId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        account: [
+          { required: true, message: "余额不能为空", trigger: "blur" }
+        ],
+        accountType: [
+          { required: true, message: "余额类型不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        rewardId: [
+          { required: true, message: "奖励id号不能为空", trigger: "blur" }
+        ],
+        chargeId: [
+          { required: true, message: "充值id不能为空", trigger: "blur" }
+        ],
+        cashId: [
+          { required: true, message: "提现id不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户余额信息列表 */
+    getList() {
+      this.loading = true;
+      listSegchk_user_account(this.queryParams).then(response => {
+        this.segchk_user_accountList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        account: null,
+        accountType: null,
+        providerId: null,
+        accountId: null,
+        rewardId: null,
+        chargeId: null,
+        cashId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.accountId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户余额信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const accountId = row.accountId || this.ids
+      getSegchk_user_account(accountId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户余额信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.accountId != null) {
+            updateSegchk_user_account(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_account(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const accountIds = row.accountId || this.ids;
+      this.$confirm('是否确认删除seg用户余额信息编号为"' + accountIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_account(accountIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户余额信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_account(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_basic_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_basic_info/index.vue
new file mode 100644
index 0000000..956648c
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_basic_info/index.vue
@@ -0,0 +1,448 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id" prop="userId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户手机号" prop="phoneNo">
+        <el-input
+          v-model="queryParams.phoneNo"
+          placeholder="请输入用户手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否绑定微信" prop="hasWechat">
+        <el-input
+          v-model="queryParams.hasWechat"
+          placeholder="请输入是否绑定微信"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="卡类型id" prop="cardTypeId">
+        <el-tooltip content="NULL普通用户，其他，不同vip卡" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.cardTypeId"
+          placeholder="请输入卡类型id,NULL普通用户，其他，不同vip卡"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id" prop="providerId">
+        <el-tooltip content="全局唯一" placement="top">
+          <i class="el-icon-question"></i>
+        </el-tooltip>
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_basic_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_basic_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_basic_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_basic_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_basic_infoList" @selection-change="handleSelectionChange">
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户手机号" align="center" prop="phoneNo" />
+      <el-table-column label="用户头像，与微信头像一致" align="center" prop="userIcon" >
+        <template slot-scope="scope">
+          <!--              <el-input v-model="scope.row.card2" placeholder="请输入身份证反面照片路径" />-->
+          <img :src="scope.row.userIcon"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否绑定微信" align="center" prop="hasWechat" />
+      <el-table-column label="卡类型id,NULL普通用户，其他，不同vip卡" align="center" prop="cardTypeId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_basic_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_basic_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户基本信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户手机号" prop="phoneNo">
+          <el-input v-model="form.phoneNo" placeholder="请输入用户手机号" />
+        </el-form-item>
+        <el-form-item label="用户头像">
+<!--          <span slot="label">-->
+<!--            用户头像-->
+            <el-tooltip content="与微信头像一致" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+<!--          </span>-->
+          <imageUpload v-model="form.userIcon"/>
+        </el-form-item>
+        <el-form-item label="是否绑定微信" prop="hasWechat">
+          <el-input v-model="form.hasWechat" placeholder="请输入是否绑定微信" />
+        </el-form-item>
+        <el-form-item label="卡类型id" prop="cardTypeId">
+          <el-tooltip content="NULL普通用户，其他，不同vip卡" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.cardTypeId" placeholder="请输入卡类型id,NULL普通用户，其他，不同vip卡" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-divider content-position="center">seg用户实名认证信息信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddSegchkUserCertificationInfo">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteSegchkUserCertificationInfo">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="segchkUserCertificationInfoList" :row-class-name="rowSegchkUserCertificationInfoIndex" @selection-change="handleSegchkUserCertificationInfoSelectionChange" ref="segchkUserCertificationInfo">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="用户真实姓名" prop="userName">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.userName" placeholder="请输入用户真实姓名" />
+            </template>
+          </el-table-column>
+          <el-table-column label="运营商id，全局唯一" prop="providerId">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.providerId" placeholder="请输入运营商id，全局唯一" />
+            </template>
+          </el-table-column>
+          <el-table-column label="身份证号" prop="idcard">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.idcard" placeholder="请输入身份证号" />
+            </template>
+          </el-table-column>
+          <el-table-column label="身份证正面照片路径" prop="card1" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.card1" placeholder="请输入身份证正面照片路径" />-->
+              <imageUpload v-model="scope.row.card1"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="身份证反面照片路径" prop="card2" width="200">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.card2" placeholder="请输入身份证反面照片路径" />-->
+              <imageUpload v-model="scope.row.card2"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建或修改时间" prop="modTime" width="150">
+            <template slot-scope="scope">
+<!--              <el-input v-model="scope.row.modTime" placeholder="请输入创建或修改时间" />-->
+              <el-date-picker clearable size="small"
+                              v-model="scope.row.modTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择创建或修改时间">
+              </el-date-picker>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_basic_info, getSegchk_user_basic_info, delSegchk_user_basic_info, addSegchk_user_basic_info, updateSegchk_user_basic_info, exportSegchk_user_basic_info } from "@/api/segchk/segchk_user_basic_info";
+
+export default {
+  name: "Segchk_user_basic_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedSegchkUserCertificationInfo: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg用户基本信息表格数据
+      segchk_user_basic_infoList: [],
+      // seg用户实名认证信息表格数据
+      segchkUserCertificationInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        phoneNo: null,
+        userIcon: null,
+        hasWechat: null,
+        cardTypeId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        phoneNo: [
+          { required: true, message: "用户手机号不能为空", trigger: "blur" }
+        ],
+        hasWechat: [
+          { required: true, message: "是否绑定微信不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "卡类型id,NULL普通用户，其他，不同vip卡不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户基本信息列表 */
+    getList() {
+      this.loading = true;
+      listSegchk_user_basic_info(this.queryParams).then(response => {
+        this.segchk_user_basic_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        phoneNo: null,
+        userIcon: null,
+        hasWechat: null,
+        cardTypeId: null,
+        providerId: null
+      };
+      this.segchkUserCertificationInfoList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户基本信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getSegchk_user_basic_info(userId).then(response => {
+        this.form = response.data;
+        this.segchkUserCertificationInfoList = response.data.segchkUserCertificationInfoList;
+        this.open = true;
+        this.title = "修改seg用户基本信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.segchkUserCertificationInfoList = this.segchkUserCertificationInfoList;
+          if (this.form.userId != null) {
+            updateSegchk_user_basic_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_basic_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除seg用户基本信息编号为"' + userIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_basic_info(userIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+	/** seg用户实名认证信息序号 */
+    rowSegchkUserCertificationInfoIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** seg用户实名认证信息添加按钮操作 */
+    handleAddSegchkUserCertificationInfo() {
+      let obj = {};
+      obj.userName = "";
+      obj.providerId = "";
+      obj.idcard = "";
+      obj.card1 = "";
+      obj.card2 = "";
+      obj.modTime = "";
+      this.segchkUserCertificationInfoList.push(obj);
+    },
+    /** seg用户实名认证信息删除按钮操作 */
+    handleDeleteSegchkUserCertificationInfo() {
+      if (this.checkedSegchkUserCertificationInfo.length == 0) {
+        this.msgError("请先选择要删除的seg用户实名认证信息数据");
+      } else {
+        const segchkUserCertificationInfoList = this.segchkUserCertificationInfoList;
+        const checkedSegchkUserCertificationInfo = this.checkedSegchkUserCertificationInfo;
+        this.segchkUserCertificationInfoList = segchkUserCertificationInfoList.filter(function(item) {
+          return checkedSegchkUserCertificationInfo.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleSegchkUserCertificationInfoSelectionChange(selection) {
+      this.checkedSegchkUserCertificationInfo = selection.map(item => item.index)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户基本信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_basic_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_cash/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_cash/index.vue
new file mode 100644
index 0000000..bef3f6f
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_cash/index.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现额" prop="cash">
+        <el-input
+          v-model="queryParams.cash"
+          placeholder="请输入提现额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现类型" prop="cashType">
+        <el-input
+          v-model="queryParams.cashType"
+          placeholder="请输入提现类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现id，全表唯一" prop="cashId">
+        <el-input
+          v-model="queryParams.cashId"
+          placeholder="请输入提现id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="结果，0未完成，1成功，2失败" prop="retFlag">
+        <el-input
+          v-model="queryParams.retFlag"
+          placeholder="请输入结果，0未完成，1成功，2失败"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_cash:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_cash:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_cash:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_cash:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_cashList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="提现额" align="center" prop="cash" />
+      <el-table-column label="提现类型" align="center" prop="cashType" />
+      <el-table-column label="提现id，全表唯一" align="center" prop="cashId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结果，0未完成，1成功，2失败" align="center" prop="retFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_cash:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_cash:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户提现记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="提现额" prop="cash">
+          <el-input v-model="form.cash" placeholder="请输入提现额" />
+        </el-form-item>
+        <el-form-item label="提现类型" prop="cashType">
+          <el-input v-model="form.cashType" placeholder="请输入提现类型" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结果，0未完成，1成功，2失败" prop="retFlag">
+          <el-input v-model="form.retFlag" placeholder="请输入结果，0未完成，1成功，2失败" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_cash, getSegchk_user_cash, delSegchk_user_cash, addSegchk_user_cash, updateSegchk_user_cash, exportSegchk_user_cash } from "@/api/segchk/segchk_user_cash";
+
+export default {
+  name: "Segchk_user_cash",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户提现记录表格数据
+      segchk_user_cashList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        cash: null,
+        cashType: null,
+        cashId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cash: [
+          { required: true, message: "提现额不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        retFlag: [
+          { required: true, message: "结果，0未完成，1成功，2失败不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户提现记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_cash(this.queryParams).then(response => {
+        this.segchk_user_cashList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        cash: null,
+        cashType: null,
+        cashId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cashId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户提现记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const cashId = row.cashId || this.ids
+      getSegchk_user_cash(cashId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户提现记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cashId != null) {
+            updateSegchk_user_cash(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_cash(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cashIds = row.cashId || this.ids;
+      this.$confirm('是否确认删除seg用户提现记录编号为"' + cashIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_cash(cashIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户提现记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_cash(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_certification_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_certification_info/index.vue
new file mode 100644
index 0000000..f3b4ee3
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_certification_info/index.vue
@@ -0,0 +1,393 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="身份证信息id，全表唯一" prop="usercardId">
+        <el-input
+          v-model="queryParams.usercardId"
+          placeholder="请输入身份证信息id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户真实姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户真实姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idcard">
+        <el-input
+          v-model="queryParams.idcard"
+          placeholder="请输入身份证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_certification_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_certification_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_certification_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_certification_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_certification_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="身份证信息id，全表唯一" align="center" prop="usercardId" />
+      <el-table-column label="用户真实姓名" align="center" prop="userName" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="身份证号" align="center" prop="idcard" />
+      <el-table-column label="身份证正面照片路径" align="center" prop="card1" >
+        <template slot-scope="scope">
+          <img :src="scope.row.card1"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="身份证反面照片路径" align="center" prop="card2" >
+        <template slot-scope="scope">
+          <img :src="scope.row.card2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_certification_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_certification_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户实名认证信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户真实姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户真实姓名" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="idcard">
+          <el-input v-model="form.idcard" placeholder="请输入身份证号" />
+        </el-form-item>
+        <el-form-item label="身份证正面照片路径">
+          <imageUpload v-model="form.card1"/>
+        </el-form-item>
+        <el-form-item label="身份证反面照片路径">
+          <imageUpload v-model="form.card2"/>
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_certification_info, getSegchk_user_certification_info, delSegchk_user_certification_info, addSegchk_user_certification_info, updateSegchk_user_certification_info, exportSegchk_user_certification_info } from "@/api/segchk/segchk_user_certification_info";
+
+export default {
+  name: "Segchk_user_certification_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户实名认证信息表格数据
+      segchk_user_certification_infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        usercardId: null,
+        userName: null,
+        userId: null,
+        providerId: null,
+        idcard: null,
+        card1: null,
+        card2: null,
+        modTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户真实姓名不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        idcard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" }
+        ],
+        card1: [
+          { required: true, message: "身份证正面照片路径不能为空", trigger: "blur" }
+        ],
+        card2: [
+          { required: true, message: "身份证反面照片路径不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户实名认证信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_certification_info(this.queryParams).then(response => {
+        this.segchk_user_certification_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        usercardId: null,
+        userName: null,
+        userId: null,
+        providerId: null,
+        idcard: null,
+        card1: null,
+        card2: null,
+        modTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.usercardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户实名认证信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const usercardId = row.usercardId || this.ids
+      getSegchk_user_certification_info(usercardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户实名认证信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.usercardId != null) {
+            updateSegchk_user_certification_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_certification_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const usercardIds = row.usercardId || this.ids;
+      this.$confirm('是否确认删除seg用户实名认证信息编号为"' + usercardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_certification_info(usercardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户实名认证信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_certification_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_charge/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_charge/index.vue
new file mode 100644
index 0000000..72f0eb6
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_charge/index.vue
@@ -0,0 +1,455 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值额" prop="charge">
+        <el-input
+          v-model="queryParams.charge"
+          placeholder="请输入充值额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="使用的余额部分" prop="accountUsed">
+        <el-input
+          v-model="queryParams.accountUsed"
+          placeholder="请输入使用的余额部分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id，全局惟一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+        <el-input
+          v-model="queryParams.cardTypeId"
+          placeholder="请输入会员卡类型，0--9块9，1---99"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值类型" prop="chargeType">
+        <el-select v-model="queryParams.chargeType" placeholder="请选择充值类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="充值id，全表唯一" prop="chargeId">
+        <el-input
+          v-model="queryParams.chargeId"
+          placeholder="请输入充值id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="结果，0未完成，1成功，-1失败,2返利" prop="retFlag">
+        <el-input
+          v-model="queryParams.retFlag"
+          placeholder="请输入结果，0未完成，1成功，-1失败，2返利"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_charge:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_charge:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_charge:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_charge:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_chargeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="充值额" align="center" prop="charge" />
+      <el-table-column label="使用的余额部分" align="center" prop="accountUsed" />
+      <el-table-column label="会员卡号id，全局惟一" align="center" prop="cardId" />
+      <el-table-column label="会员卡类型，0--9块9，1---99" align="center" prop="cardTypeId" />
+      <el-table-column label="充值类型" align="center" prop="chargeType" />
+      <el-table-column label="充值id，全表唯一" align="center" prop="chargeId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结果，0未完成，1成功，1失败，2返利" align="center" prop="retFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_charge:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_charge:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户充值记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="充值额" prop="charge">
+          <el-input v-model="form.charge" placeholder="请输入充值额" />
+        </el-form-item>
+        <el-form-item label="使用的余额部分" prop="accountUsed">
+          <el-input v-model="form.accountUsed" placeholder="请输入使用的余额部分" />
+        </el-form-item>
+        <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入会员卡号id，全局惟一" />
+        </el-form-item>
+        <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+          <el-input v-model="form.cardTypeId" placeholder="请输入会员卡类型，0--9块9，1---99" />
+        </el-form-item>
+        <el-form-item label="充值类型" prop="chargeType">
+          <el-select v-model="form.chargeType" placeholder="请选择充值类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结果，0未完成，1成功，-1失败，2返利" prop="retFlag">
+          <el-input v-model="form.retFlag" placeholder="请输入结果，0未完成，1成功，2失败" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_charge, getSegchk_user_charge, delSegchk_user_charge, addSegchk_user_charge, updateSegchk_user_charge, exportSegchk_user_charge } from "@/api/segchk/segchk_user_charge";
+
+export default {
+  name: "Segchk_user_charge",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户充值记录表格数据
+      segchk_user_chargeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        storeId: null,
+        charge: null,
+        accountUsed: null,
+        cardId: null,
+        cardTypeId: null,
+        chargeType: null,
+        chargeId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        charge: [
+          { required: true, message: "充值额不能为空", trigger: "blur" }
+        ],
+        accountUsed: [
+          { required: true, message: "使用的余额部分不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "会员卡类型，0--9块9，1---99不能为空", trigger: "blur" }
+        ],
+        chargeType: [
+          { required: true, message: "充值类型不能为空", trigger: "change" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        retFlag: [
+          { required: true, message: "结果，0未完成，1成功，2失败不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户充值记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_charge(this.queryParams).then(response => {
+        this.segchk_user_chargeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        storeId: null,
+        charge: null,
+        accountUsed: null,
+        cardId: null,
+        cardTypeId: null,
+        chargeType: null,
+        chargeId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.chargeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户充值记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const chargeId = row.chargeId || this.ids
+      getSegchk_user_charge(chargeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户充值记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.chargeId != null) {
+            updateSegchk_user_charge(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_charge(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const chargeIds = row.chargeId || this.ids;
+      this.$confirm('是否确认删除seg用户充值记录编号为"' + chargeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_charge(chargeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户充值记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_charge(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_collect/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_collect/index.vue
new file mode 100644
index 0000000..58482d5
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_collect/index.vue
@@ -0,0 +1,385 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="收藏id" prop="collectId">
+        <el-input
+          v-model="queryParams.collectId"
+          placeholder="请输入收藏id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收藏类型，0商家，1商品" prop="collectType">
+        <el-input
+          v-model="queryParams.collectType"
+          placeholder="请输入收藏类型，0商家，1商品"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="管理状态，0有效，1失效" prop="mgtState">
+        <el-input
+          v-model="queryParams.mgtState"
+          placeholder="请输入管理状态，0有效，1失效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_collect:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_collect:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_collect:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_collect:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_collectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="收藏id" align="center" prop="collectId" />
+      <el-table-column label="收藏类型，0商家，1商品" align="center" prop="collectType" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理状态，0有效，1失效" align="center" prop="mgtState" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_collect:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_collect:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户收藏记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="收藏类型，0商家，1商品" prop="collectType">
+          <el-input v-model="form.collectType" placeholder="请输入收藏类型，0商家，1商品" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="管理状态，0有效，1失效" prop="mgtState">
+          <el-input v-model="form.mgtState" placeholder="请输入管理状态，0有效，1失效" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_collect, getSegchk_user_collect, delSegchk_user_collect, addSegchk_user_collect, updateSegchk_user_collect, exportSegchk_user_collect } from "@/api/segchk/segchk_user_collect";
+
+export default {
+  name: "Segchk_user_collect",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户收藏记录表格数据
+      segchk_user_collectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        collectId: null,
+        collectType: null,
+        providerId: null,
+        userId: null,
+        storeId: null,
+        modTime: null,
+        mgtState: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        collectType: [
+          { required: true, message: "收藏类型，0商家，1商品不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，1失效不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户收藏记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_collect(this.queryParams).then(response => {
+        this.segchk_user_collectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        collectId: null,
+        collectType: null,
+        providerId: null,
+        userId: null,
+        storeId: null,
+        modTime: null,
+        mgtState: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.collectId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户收藏记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const collectId = row.collectId || this.ids
+      getSegchk_user_collect(collectId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户收藏记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.collectId != null) {
+            updateSegchk_user_collect(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_collect(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const collectIds = row.collectId || this.ids;
+      this.$confirm('是否确认删除seg用户收藏记录编号为"' + collectIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_collect(collectIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户收藏记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_collect(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_ext_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_ext_info/index.vue
new file mode 100644
index 0000000..39eb1ec
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_ext_info/index.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐人id" prop="userRecommenders">
+        <el-input
+          v-model="queryParams.userRecommenders"
+          placeholder="请输入推荐人id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推荐人等级，0运营商，1商家，2vip会员，3普通会员" prop="recommendersLevel">
+        <el-input
+          v-model="queryParams.recommendersLevel"
+          placeholder="请输入推荐人等级，0运营商，1商家，2vip会员，3普通会员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_ext_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_ext_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_ext_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_ext_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_ext_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="推荐人id" align="center" prop="userRecommenders" />
+      <el-table-column label="推荐人等级，0运营商，1商家，2vip会员，3普通会员" align="center" prop="recommendersLevel" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_ext_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_ext_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户扩展信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="推荐人id" prop="userRecommenders">
+          <el-input v-model="form.userRecommenders" placeholder="请输入推荐人id" />
+        </el-form-item>
+        <el-form-item label="推荐人等级，0运营商，1商家，2vip会员，3普通会员" prop="recommendersLevel">
+          <el-input v-model="form.recommendersLevel" placeholder="请输入推荐人等级，0运营商，1商家，2vip会员，3普通会员" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_ext_info, getSegchk_user_ext_info, delSegchk_user_ext_info, addSegchk_user_ext_info, updateSegchk_user_ext_info, exportSegchk_user_ext_info } from "@/api/segchk/segchk_user_ext_info";
+
+export default {
+  name: "Segchk_user_ext_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户扩展信息表格数据
+      segchk_user_ext_infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        userRecommenders: null,
+        recommendersLevel: null,
+        providerId: null,
+        modTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userRecommenders: [
+          { required: true, message: "推荐人id不能为空", trigger: "blur" }
+        ],
+        recommendersLevel: [
+          { required: true, message: "推荐人等级，0运营商，1商家，2vip会员，3普通会员不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户扩展信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_ext_info(this.queryParams).then(response => {
+        this.segchk_user_ext_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        userRecommenders: null,
+        recommendersLevel: null,
+        providerId: null,
+        modTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户扩展信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getSegchk_user_ext_info(userId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户扩展信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != null) {
+            updateSegchk_user_ext_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_ext_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除seg用户扩展信息编号为"' + userIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_ext_info(userIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户扩展信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_ext_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_likego/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_likego/index.vue
new file mode 100644
index 0000000..6667189
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_likego/index.vue
@@ -0,0 +1,413 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="想去id" prop="likegoId">
+        <el-input
+          v-model="queryParams.likegoId"
+          placeholder="请输入想去id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家id，全局唯一" prop="storeId">
+        <el-input
+          v-model="queryParams.storeId"
+          placeholder="请输入商家id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户计划使用的卡号" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入用户计划使用的卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="卡类型id，0充值卡，1商家赠卡，2优惠券卡" prop="cardType">
+        <el-input
+          v-model="queryParams.cardType"
+          placeholder="请输入卡类型id，0充值卡，1商家赠卡，2优惠券卡"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="管理状态，0有效，1失效，2已使用" prop="mgtState">
+        <el-input
+          v-model="queryParams.mgtState"
+          placeholder="请输入管理状态，0有效，1失效，2已使用"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_likego:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_likego:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_likego:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_likego:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_likegoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="想去id" align="center" prop="likegoId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="商家id，全局唯一" align="center" prop="storeId" />
+      <el-table-column label="用户计划使用的卡号" align="center" prop="cardId" />
+      <el-table-column label="卡类型id，0充值卡，1商家赠卡，2优惠券卡" align="center" prop="cardType" />
+      <el-table-column label="预约二维码" align="center" prop="qrCode" >
+        <template slot-scope="scope">
+          <img :src="scope.row.qrCode"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理状态，0有效，1失效，2已使用" align="center" prop="mgtState" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_likego:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_likego:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户想去记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="商家id，全局唯一" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="用户计划使用的卡号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入用户计划使用的卡号" />
+        </el-form-item>
+        <el-form-item label="卡类型id，0充值卡，1商家赠卡，2优惠券卡" prop="cardType">
+          <el-input v-model="form.cardType" placeholder="请输入卡类型id，0充值卡，1商家赠卡，2优惠券卡" />
+        </el-form-item>
+        <el-form-item label="预约二维码">
+          <imageUpload v-model="form.qrCode"/>
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="管理状态，0有效，1失效，2已使用" prop="mgtState">
+          <el-input v-model="form.mgtState" placeholder="请输入管理状态，0有效，1失效，2已使用" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_likego, getSegchk_user_likego, delSegchk_user_likego, addSegchk_user_likego, updateSegchk_user_likego, exportSegchk_user_likego } from "@/api/segchk/segchk_user_likego";
+
+export default {
+  name: "Segchk_user_likego",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户想去记录表格数据
+      segchk_user_likegoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        likegoId: null,
+        providerId: null,
+        userId: null,
+        storeId: null,
+        cardId: null,
+        cardType: null,
+        qrCode: null,
+        modTime: null,
+        mgtState: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "用户计划使用的卡号不能为空", trigger: "blur" }
+        ],
+        cardType: [
+          { required: true, message: "卡类型id，0充值卡，1商家赠卡，2优惠券卡不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，1失效，2已使用不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户想去记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_likego(this.queryParams).then(response => {
+        this.segchk_user_likegoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        likegoId: null,
+        providerId: null,
+        userId: null,
+        storeId: null,
+        cardId: null,
+        cardType: null,
+        qrCode: null,
+        modTime: null,
+        mgtState: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.likegoId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户想去记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const likegoId = row.likegoId || this.ids
+      getSegchk_user_likego(likegoId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户想去记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.likegoId != null) {
+            updateSegchk_user_likego(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_likego(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const likegoIds = row.likegoId || this.ids;
+      this.$confirm('是否确认删除seg用户想去记录编号为"' + likegoIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_likego(likegoIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户想去记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_likego(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_reward/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_reward/index.vue
new file mode 100644
index 0000000..34f105d
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_reward/index.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励额" prop="reward">
+        <el-input
+          v-model="queryParams.reward"
+          placeholder="请输入奖励额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励类型" prop="rewardType">
+        <el-input
+          v-model="queryParams.rewardType"
+          placeholder="请输入奖励类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励卡号" prop="rewardCardId">
+        <el-input
+          v-model="queryParams.rewardCardId"
+          placeholder="请输入奖励卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="奖励卡类型id" prop="rewardCardTypeId">
+        <el-input
+          v-model="queryParams.rewardCardTypeId"
+          placeholder="请输入奖励卡类型id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="奖励id号，全表唯一" prop="rewardId">
+        <el-input
+          v-model="queryParams.rewardId"
+          placeholder="请输入奖励id号，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_reward:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_reward:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_reward:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_reward:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_rewardList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="奖励额" align="center" prop="reward" />
+      <el-table-column label="奖励类型" align="center" prop="rewardType" />
+      <el-table-column label="奖励卡号" align="center" prop="rewardCardId" />
+      <el-table-column label="奖励卡类型id" align="center" prop="rewardCardTypeId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="奖励id号，全表唯一" align="center" prop="rewardId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_reward:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_reward:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户奖励对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="奖励额" prop="reward">
+          <el-input v-model="form.reward" placeholder="请输入奖励额" />
+        </el-form-item>
+        <el-form-item label="奖励类型" prop="rewardType">
+          <el-input v-model="form.rewardType" placeholder="请输入奖励类型" />
+        </el-form-item>
+        <el-form-item label="奖励卡号" prop="rewardCardId">
+          <el-input v-model="form.rewardCardId" placeholder="请输入奖励卡号" />
+        </el-form-item>
+        <el-form-item label="奖励卡类型id" prop="rewardCardTypeId">
+          <el-input v-model="form.rewardCardTypeId" placeholder="请输入奖励卡类型id" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_reward, getSegchk_user_reward, delSegchk_user_reward, addSegchk_user_reward, updateSegchk_user_reward, exportSegchk_user_reward } from "@/api/segchk/segchk_user_reward";
+
+export default {
+  name: "Segchk_user_reward",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户奖励表格数据
+      segchk_user_rewardList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        reward: null,
+        rewardType: null,
+        rewardCardId: null,
+        rewardCardTypeId: null,
+        modTime: null,
+        rewardId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        reward: [
+          { required: true, message: "奖励额不能为空", trigger: "blur" }
+        ],
+        rewardType: [
+          { required: true, message: "奖励类型不能为空", trigger: "blur" }
+        ],
+        rewardCardId: [
+          { required: true, message: "奖励卡号不能为空", trigger: "blur" }
+        ],
+        rewardCardTypeId: [
+          { required: true, message: "奖励卡类型id不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户奖励列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_reward(this.queryParams).then(response => {
+        this.segchk_user_rewardList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        reward: null,
+        rewardType: null,
+        rewardCardId: null,
+        rewardCardTypeId: null,
+        modTime: null,
+        rewardId: null,
+        providerId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.rewardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户奖励";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const rewardId = row.rewardId || this.ids
+      getSegchk_user_reward(rewardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户奖励";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.rewardId != null) {
+            updateSegchk_user_reward(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_reward(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const rewardIds = row.rewardId || this.ids;
+      this.$confirm('是否确认删除seg用户奖励编号为"' + rewardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_reward(rewardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户奖励数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_reward(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_reward_ctl/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_reward_ctl/index.vue
new file mode 100644
index 0000000..6f2d5f3
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_reward_ctl/index.vue
@@ -0,0 +1,547 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="控制id" prop="rewardCtlId">
+        <el-input
+          v-model="queryParams.rewardCtlId"
+          placeholder="请输入控制id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id" prop="providerId">
+        <el-select v-model="queryParams.providerId" placeholder="运营商id" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+        <!--<el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+      </el-form-item>
+      <el-form-item label="推荐人卡类型" prop="fromId">
+        <!--<el-input
+          v-model="queryParams.fromId"
+          placeholder="请输入卡类型id，-1,普通用户，其他会员卡类型id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.fromId" placeholder="推荐人卡类型" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="奖励额" prop="reward">
+        <el-input
+          v-model="queryParams.reward"
+          placeholder="请输入奖励额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="卡类型id" prop="toId">
+        <!--<el-input
+          v-model="queryParams.toId"
+          placeholder="请输入卡类型id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />-->
+        <el-select v-model="queryParams.toId" placeholder="购买卡类型" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="dict.value"
+            :label="dict.lable"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_reward_ctl:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_reward_ctl:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_reward_ctl:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_reward_ctl:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_user_reward_ctlList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="推荐人卡类型" align="center" prop="fromId" :formatter="tableProviderName" :render-header="renderHeader"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="奖励额" align="center" prop="reward"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="购买卡类型" align="center" prop="toId" :formatter="tableProviderName" :render-header="renderHeader"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="修改时间" align="center" prop="modTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="控制id" align="center" prop="rewardCtlId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_reward_ctl:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_reward_ctl:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg会员推荐控制对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="providerId">
+<!--          <el-input v-model="form.providerId" placeholder="请输入运营商id" />-->
+          <el-select v-model="form.providerId" placeholder="运营商id" >
+            <el-option
+              v-for="dict in segchk_providerList"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="推荐人卡类型" prop="fromId">
+<!--          <el-input v-model="form.fromId" placeholder="请输入卡类型id，-1,普通用户，其他会员卡类型id" />-->
+          <el-tooltip content="推荐人持有的会员充值卡类型" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.fromId" placeholder="推荐会员卡" @change="changecardTypeName">
+            <el-option
+              v-for="(dict,index) in getLabelComp(0, form.providerId)"
+              :key="index"
+              :label="dict.lable"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="奖励额" prop="reward">
+          <el-input v-model="form.reward" placeholder="请输入奖励额" />
+        </el-form-item>
+        <el-form-item label="购买卡类型" prop="toId">
+<!--          <el-input v-model="form.toId" placeholder="请输入卡类型id" />-->
+          <el-tooltip content="被推荐人购买的会员充值卡类型" placement="top">
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-select v-model="form.toId" placeholder="推荐会员卡" @change="changecardTypeName">
+            <el-option
+              v-for="(dict,index) in getLabelComp(0, form.providerId)"
+              :key="index"
+              :label="dict.lable"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择修改时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_reward_ctl, getSegchk_user_reward_ctl, delSegchk_user_reward_ctl, addSegchk_user_reward_ctl, updateSegchk_user_reward_ctl, exportSegchk_user_reward_ctl } from "@/api/segchk/segchk_user_reward_ctl";
+import {segchk_get_chargecard_list, segchk_get_provider_list} from "@/api/segchk/segchk_get_simple_list";
+import store from "@/store";
+
+export default {
+  name: "Segchk_user_reward_ctl",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // seg会员推荐控制表格数据
+      segchk_user_reward_ctlList: [],
+
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 修改时间时间范围
+      daterangeModTime: [],
+      defaultSort: {prop: 'rewardCtlId', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        rewardCtlId: null,
+        providerId: null,
+        fromId: null,
+        reward: null,
+        toId: null,
+        modTime: null
+      },
+      // 会员卡列表
+      segchk_charge_cardList: [],
+      segchk_providerList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id不能为空", trigger: "blur" }
+        ],
+        fromId: [
+          { required: true, message: "卡类型id，-1,普通用户，其他会员卡类型id不能为空", trigger: "blur" }
+        ],
+        reward: [
+          { required: true, message: "奖励额不能为空", trigger: "blur" }
+        ],
+        toId: [
+          { required: true, message: "卡类型id不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "修改时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.getList();
+  },
+  computed: {
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId || value.key == -1)
+            .map(e=>  {
+              return { value: parseInt(e.key), lable: e.value }
+            }) // 会员卡
+        }
+        // arr.push({value: -1, lable: '普通用户'})
+        // this.formlableList = arr
+        return arr
+      }
+    }
+  },
+  methods: {
+    renderHeader(h, { column }) {
+      let contentstr = undefined
+      switch (column.label) {
+        case '标签来源':
+          contentstr = '充值会员卡，关键字（行业，范围），优惠券三选一';break;
+        case '显示顺序':
+          contentstr = '标签在商家相关页面下的显示顺序';break;
+        case '卡类型名称':
+          contentstr = '运营商下的会员卡名称';break;
+        case '卡面额':
+          contentstr = '用户购买时应支付的金额';break;
+        case '有效期时长':
+          contentstr = '用户购买后该种会员卡的有期天数';break;
+        case '可购买次数':
+          contentstr = '用户可购买多少次该种会员卡';break;
+        case '总核消次数':
+          contentstr = '用户可通过该种会员卡享受服务的次数';break;
+        case '推荐人卡类型':
+          contentstr = '推荐人，已持有的有效会员卡类型';break;
+        case '购买卡类型':
+          contentstr = '被推荐人购买的会员卡类型';break;
+        case '操作':
+          contentstr = '如果删除优惠时，同时将从首页标签，支持该标签的商家中的相应标签也会删除';break;
+      }
+      return [
+        column.label,
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: `${contentstr}`,
+              placement: 'top'
+            }
+          },
+          [
+            h(
+              'span',{
+                class: {
+                  'el-icon-question': true
+                }
+              })
+          ]
+        )
+      ]
+    },
+    tableProviderName(row, column) {
+      // console.log("tableProviderName --- " + row.property + "---" + column.property + "---" + column.index)
+
+      if (column.property == 'providerId'){
+        var ret = this.segchk_providerList.find((value) => {return value.key == row.providerId})
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+      if (column.property == 'fromId'){
+        var ret = this.segchk_charge_cardList.find((value) => {return value.key == row.fromId || value.key == -1})
+        var provName = ret == null ? "普通用户" : ret.value;
+        return provName
+      }
+      if (column.property == 'toId'){
+        var ret = this.segchk_charge_cardList.find(value => {
+          return value.key == row.toId || value.key == -1
+        })
+        var provName = ret == null ? "普通用户" : ret.value;
+        return provName
+      }
+
+    },
+    /** 查询seg会员推荐控制列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        this.segchk_charge_cardList.push({providerId: this.queryParams.providerId, key: -1, value: '普通用户'})
+        // this.cardtotal = response.total;
+      });
+
+      listSegchk_user_reward_ctl(this.queryParams).then(response => {
+        this.segchk_user_reward_ctlList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        rewardCtlId: null,
+        providerId: null,
+        fromId: null,
+        reward: null,
+        toId: null,
+        modTime: null
+      };
+      this.form.providerId = store.getters.providerId || null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.rewardCtlId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg会员推荐控制";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const rewardCtlId = row.rewardCtlId || this.ids
+      getSegchk_user_reward_ctl(rewardCtlId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg会员推荐控制";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if(this.form.toId == -1){
+        this.msgError("被推荐人不能设置为普通用户（即非会员）")
+        return
+      }
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let exitItem = this.segchk_user_reward_ctlList.find(v => (v.providerId == this.form.providerId && v.fromId == this.form.fromId && v.toId == this.form.toId))
+          if (this.form.rewardCtlId != null) {
+            if(exitItem != null && exitItem.rewardCtlId != this.form.rewardCtlId){
+              this.msgError("该推荐关系已设置")
+              return
+            }
+            updateSegchk_user_reward_ctl(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(exitItem != null){
+              this.msgError("该推荐关系已设置")
+              return
+            }
+            addSegchk_user_reward_ctl(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 排序触发事件 */
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const rewardCtlIds = row.rewardCtlId || this.ids;
+      this.$confirm('是否确认删除seg会员推荐控制编号为"' + rewardCtlIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_reward_ctl(rewardCtlIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg会员推荐控制数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_reward_ctl(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_security/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_security/index.vue
new file mode 100644
index 0000000..554953a
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_security/index.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="密码" prop="passwd">
+        <el-input
+          v-model="queryParams.passwd"
+          placeholder="请输入密码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="密码id，全表唯一" prop="pwdId">
+        <el-input
+          v-model="queryParams.pwdId"
+          placeholder="请输入密码id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_security:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_security:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_security:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_security:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_securityList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="密码" align="center" prop="passwd" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="密码id，全表唯一" align="center" prop="pwdId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_security:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_security:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户密码对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="密码" prop="passwd">
+          <el-input v-model="form.passwd" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_security, getSegchk_user_security, delSegchk_user_security, addSegchk_user_security, updateSegchk_user_security, exportSegchk_user_security } from "@/api/segchk/segchk_user_security";
+
+export default {
+  name: "Segchk_user_security",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户密码表格数据
+      segchk_user_securityList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        passwd: null,
+        modTime: null,
+        pwdId: null,
+        providerId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户密码列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_security(this.queryParams).then(response => {
+        this.segchk_user_securityList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        passwd: null,
+        modTime: null,
+        pwdId: null,
+        providerId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.pwdId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户密码";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const pwdId = row.pwdId || this.ids
+      getSegchk_user_security(pwdId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户密码";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.pwdId != null) {
+            updateSegchk_user_security(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_security(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const pwdIds = row.pwdId || this.ids;
+      this.$confirm('是否确认删除seg用户密码编号为"' + pwdIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_security(pwdIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户密码数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_security(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_vip/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_vip/index.vue
new file mode 100644
index 0000000..61cd193
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_vip/index.vue
@@ -0,0 +1,440 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="会员卡号id，全局惟一" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id，全局惟一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+        <el-input
+          v-model="queryParams.cardTypeId"
+          placeholder="请输入会员卡类型，0--9块9，1---99"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效期">
+        <el-date-picker
+          v-model="daterangeEffectiveTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="使用次数" prop="useCount">
+        <el-input
+          v-model="queryParams.useCount"
+          placeholder="请输入使用次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="剩余次数" prop="leftCount">
+        <el-input
+          v-model="queryParams.leftCount"
+          placeholder="请输入剩余次数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态，0正常，1过期" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          placeholder="请输入状态，0正常，1过期"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_vip:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_vip:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_vip:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_vip:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_vipList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="会员卡号id，全局惟一" align="center" prop="cardId" />
+      <el-table-column label="会员卡类型，0--9块9，1---99" align="center" prop="cardTypeId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期" align="center" prop="effectiveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.effectiveTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="使用次数" align="center" prop="useCount" />
+      <el-table-column label="剩余次数" align="center" prop="leftCount" />
+      <el-table-column label="状态，0正常，1过期" align="center" prop="status" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_vip:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_vip:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg会员卡对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="会员卡类型，0--9块9，1---99" prop="cardTypeId">
+          <el-input v-model="form.cardTypeId" placeholder="请输入会员卡类型，0--9块9，1---99" />
+        </el-form-item>
+        <el-form-item label="用户id，全局唯一" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="有效期" prop="effectiveTime">
+          <el-date-picker clearable size="small"
+            v-model="form.effectiveTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择有效期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用次数" prop="useCount">
+          <el-input v-model="form.useCount" placeholder="请输入使用次数" />
+        </el-form-item>
+        <el-form-item label="剩余次数" prop="leftCount">
+          <el-input v-model="form.leftCount" placeholder="请输入剩余次数" />
+        </el-form-item>
+        <el-form-item label="状态，0正常，1过期" prop="status">
+          <el-input v-model="form.status" placeholder="请输入状态，0正常，1过期" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_vip, getSegchk_user_vip, delSegchk_user_vip, addSegchk_user_vip, updateSegchk_user_vip, exportSegchk_user_vip } from "@/api/segchk/segchk_user_vip";
+
+export default {
+  name: "Segchk_user_vip",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg会员卡表格数据
+      segchk_user_vipList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 有效期时间范围
+      daterangeEffectiveTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cardId: null,
+        cardTypeId: null,
+        userId: null,
+        providerId: null,
+        modTime: null,
+        effectiveTime: null,
+        useCount: null,
+        leftCount: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        cardTypeId: [
+          { required: true, message: "会员卡类型，0--9块9，1---99不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        effectiveTime: [
+          { required: true, message: "有效期不能为空", trigger: "blur" }
+        ],
+        useCount: [
+          { required: true, message: "使用次数不能为空", trigger: "blur" }
+        ],
+        leftCount: [
+          { required: true, message: "剩余次数不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态，0正常，1过期不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg会员卡列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      if (null != this.daterangeEffectiveTime && '' != this.daterangeEffectiveTime) {
+        this.queryParams.params["beginEffectiveTime"] = this.daterangeEffectiveTime[0];
+        this.queryParams.params["endEffectiveTime"] = this.daterangeEffectiveTime[1];
+      }
+      listSegchk_user_vip(this.queryParams).then(response => {
+        this.segchk_user_vipList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cardId: null,
+        cardTypeId: null,
+        userId: null,
+        providerId: null,
+        modTime: null,
+        effectiveTime: null,
+        useCount: null,
+        leftCount: null,
+        status: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.daterangeEffectiveTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg会员卡";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const cardId = row.cardId || this.ids
+      getSegchk_user_vip(cardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg会员卡";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cardId != null) {
+            updateSegchk_user_vip(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_vip(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cardIds = row.cardId || this.ids;
+      this.$confirm('是否确认删除seg会员卡编号为"' + cardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_vip(cardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg会员卡数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_vip(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_user_wechat/index.vue b/ruoyi-ui/src/views/segchk/segchk_user_wechat/index.vue
new file mode 100644
index 0000000..e17659e
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_user_wechat/index.vue
@@ -0,0 +1,377 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户id，全局唯一" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信唯一识别号，用于转账等" prop="openid">
+        <el-input
+          v-model="queryParams.openid"
+          placeholder="请输入微信唯一识别号，用于转账等"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信的联合登录id" prop="unionId">
+        <el-input
+          v-model="queryParams.unionId"
+          placeholder="请输入微信的联合登录id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入微信昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_user_wechat:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_user_wechat:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_user_wechat:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_user_wechat:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_user_wechatList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="用户id，全局唯一" align="center" prop="userId" />
+      <el-table-column label="微信唯一识别号，用于转账等" align="center" prop="openid" />
+      <el-table-column label="微信的联合登录id" align="center" prop="unionId" />
+      <el-table-column label="微信昵称" align="center" prop="nickName" />
+      <el-table-column label="微信头像" align="center" prop="iconUrl" >
+        <template slot-scope="scope">
+          <img :src="scope.row.iconUrl"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_user_wechat:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_user_wechat:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg用户微信信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="微信唯一识别号，用于转账等" prop="openid">
+          <el-input v-model="form.openid" placeholder="请输入微信唯一识别号，用于转账等" />
+        </el-form-item>
+        <el-form-item label="微信的联合登录id" prop="unionId">
+          <el-input v-model="form.unionId" placeholder="请输入微信的联合登录id" />
+        </el-form-item>
+        <el-form-item label="微信昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入微信昵称" />
+        </el-form-item>
+        <el-form-item label="微信头像">
+          <imageUpload v-model="form.iconUrl"/>
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_user_wechat, getSegchk_user_wechat, delSegchk_user_wechat, addSegchk_user_wechat, updateSegchk_user_wechat, exportSegchk_user_wechat } from "@/api/segchk/segchk_user_wechat";
+
+export default {
+  name: "Segchk_user_wechat",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户微信信息表格数据
+      segchk_user_wechatList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        userId: null,
+        openid: null,
+        unionId: null,
+        nickName: null,
+        iconUrl: null,
+        modTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        openid: [
+          { required: true, message: "微信唯一识别号，用于转账等不能为空", trigger: "blur" }
+        ],
+        nickName: [
+          { required: true, message: "微信昵称不能为空", trigger: "blur" }
+        ],
+        iconUrl: [
+          { required: true, message: "微信头像不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg用户微信信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_user_wechat(this.queryParams).then(response => {
+        this.segchk_user_wechatList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        userId: null,
+        openid: null,
+        unionId: null,
+        nickName: null,
+        iconUrl: null,
+        modTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户微信信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getSegchk_user_wechat(userId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户微信信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != null) {
+            updateSegchk_user_wechat(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_wechat(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除seg用户微信信息编号为"' + userIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_wechat(userIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户微信信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_user_wechat(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/segchk/segchk_vip_set_info/index.vue b/ruoyi-ui/src/views/segchk/segchk_vip_set_info/index.vue
new file mode 100644
index 0000000..1008378
--- /dev/null
+++ b/ruoyi-ui/src/views/segchk/segchk_vip_set_info/index.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="提现额门限" prop="cashThrehold">
+        <el-input
+          v-model="queryParams.cashThrehold"
+          placeholder="请输入提现额门限"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现到账日期，0当天到账，n--N个工作日后到账" prop="cashDay">
+        <el-input
+          v-model="queryParams.cashDay"
+          placeholder="请输入提现到账日期，0当天到账，n--N个工作日后到账"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否允许自助续费,0允许，1禁止" prop="selfCharge">
+        <el-input
+          v-model="queryParams.selfCharge"
+          placeholder="请输入是否允许自助续费,0允许，1禁止"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效期提醒时间，天" prop="effectiveRemind">
+        <el-input
+          v-model="queryParams.effectiveRemind"
+          placeholder="请输入有效期提醒时间，天"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="模板id，全表唯一" prop="modeId">
+        <el-input
+          v-model="queryParams.modeId"
+          placeholder="请输入模板id，全表唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态" prop="activeFlag">
+        <el-input
+          v-model="queryParams.activeFlag"
+          placeholder="请输入激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_vip_set_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_vip_set_info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_vip_set_info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_vip_set_info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_vip_set_infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="提现额门限" align="center" prop="cashThrehold" />
+      <el-table-column label="提现到账日期，0当天到账，n--N个工作日后到账" align="center" prop="cashDay" />
+      <el-table-column label="是否允许自助续费,0允许，1禁止" align="center" prop="selfCharge" />
+      <el-table-column label="有效期提醒时间，天" align="center" prop="effectiveRemind" />
+      <el-table-column label="模板id，全表唯一" align="center" prop="modeId" />
+      <el-table-column label="激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态" align="center" prop="activeFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_vip_set_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_vip_set_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改seg会员卡设置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="提现额门限" prop="cashThrehold">
+          <el-input v-model="form.cashThrehold" placeholder="请输入提现额门限" />
+        </el-form-item>
+        <el-form-item label="提现到账日期，0当天到账，n--N个工作日后到账" prop="cashDay">
+          <el-input v-model="form.cashDay" placeholder="请输入提现到账日期，0当天到账，n--N个工作日后到账" />
+        </el-form-item>
+        <el-form-item label="是否允许自助续费,0允许，1禁止" prop="selfCharge">
+          <el-input v-model="form.selfCharge" placeholder="请输入是否允许自助续费,0允许，1禁止" />
+        </el-form-item>
+        <el-form-item label="有效期提醒时间，天" prop="effectiveRemind">
+          <el-input v-model="form.effectiveRemind" placeholder="请输入有效期提醒时间，天" />
+        </el-form-item>
+        <el-form-item label="激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态" prop="activeFlag">
+          <el-input v-model="form.activeFlag" placeholder="请输入激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_vip_set_info, getSegchk_vip_set_info, delSegchk_vip_set_info, addSegchk_vip_set_info, updateSegchk_vip_set_info, exportSegchk_vip_set_info } from "@/api/segchk/segchk_vip_set_info";
+
+export default {
+  name: "Segchk_vip_set_info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg会员卡设置表格数据
+      segchk_vip_set_infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        modTime: null,
+        cashThrehold: null,
+        cashDay: null,
+        selfCharge: null,
+        effectiveRemind: null,
+        modeId: null,
+        activeFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        cashThrehold: [
+          { required: true, message: "提现额门限不能为空", trigger: "blur" }
+        ],
+        cashDay: [
+          { required: true, message: "提现到账日期，0当天到账，n--N个工作日后到账不能为空", trigger: "blur" }
+        ],
+        selfCharge: [
+          { required: true, message: "是否允许自助续费,0允许，1禁止不能为空", trigger: "blur" }
+        ],
+        effectiveRemind: [
+          { required: true, message: "有效期提醒时间，天不能为空", trigger: "blur" }
+        ],
+        activeFlag: [
+          { required: true, message: "激活标识，0激活，1去激活，根据每个运营商一个模板id为激活状态不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询seg会员卡设置列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      listSegchk_vip_set_info(this.queryParams).then(response => {
+        this.segchk_vip_set_infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        modTime: null,
+        cashThrehold: null,
+        cashDay: null,
+        selfCharge: null,
+        effectiveRemind: null,
+        modeId: null,
+        activeFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.modeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加seg会员卡设置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const modeId = row.modeId || this.ids
+      getSegchk_vip_set_info(modeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg会员卡设置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.modeId != null) {
+            updateSegchk_vip_set_info(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_vip_set_info(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const modeIds = row.modeId || this.ids;
+      this.$confirm('是否确认删除seg会员卡设置编号为"' + modeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_vip_set_info(modeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg会员卡设置数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_vip_set_info(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
new file mode 100644
index 0000000..06bfb2a
--- /dev/null
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="参数名称" prop="configName">
+        <el-input
+          v-model="queryParams.configName"
+          placeholder="请输入参数名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数键名" prop="configKey">
+        <el-input
+          v-model="queryParams.configKey"
+          placeholder="请输入参数键名"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="系统内置" prop="configType">
+        <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small">
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:config:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:config:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:config:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:config:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleRefreshCache"
+          v-hasPermi="['system:config:remove']"
+        >刷新缓存</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="参数主键" align="center" prop="configId" />
+      <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键值" align="center" prop="configValue" />
+      <el-table-column label="系统内置" align="center" prop="configType" :formatter="typeFormat" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:config:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:config:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="参数名称" prop="configName">
+          <el-input v-model="form.configName" placeholder="请输入参数名称" />
+        </el-form-item>
+        <el-form-item label="参数键名" prop="configKey">
+          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
+        </el-form-item>
+        <el-form-item label="参数键值" prop="configValue">
+          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
+        </el-form-item>
+        <el-form-item label="系统内置" prop="configType">
+          <el-radio-group v-model="form.configType">
+            <el-radio
+              v-for="dict in typeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, refreshCache } from "@/api/system/config";
+
+export default {
+  name: "Config",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 参数表格数据
+      configList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      typeOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        configName: undefined,
+        configKey: undefined,
+        configType: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        configName: [
+          { required: true, message: "参数名称不能为空", trigger: "blur" }
+        ],
+        configKey: [
+          { required: true, message: "参数键名不能为空", trigger: "blur" }
+        ],
+        configValue: [
+          { required: true, message: "参数键值不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_yes_no").then(response => {
+      this.typeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true;
+      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.configList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 参数系统内置字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.configType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        configId: undefined,
+        configName: undefined,
+        configKey: undefined,
+        configValue: undefined,
+        configType: "Y",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加参数";
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.configId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const configId = row.configId || this.ids
+      getConfig(configId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改参数";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.configId != undefined) {
+            updateConfig(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addConfig(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const configIds = row.configId || this.ids;
+      this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delConfig(configIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有参数数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportConfig(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.msgSuccess("刷新成功");
+      });
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
new file mode 100644
index 0000000..a377235
--- /dev/null
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -0,0 +1,317 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:dept:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="deptList"
+      row-key="deptId"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button 
+            size="mini" 
+            type="text" 
+            icon="el-icon-edit" 
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+          >修改</el-button>
+          <el-button 
+            size="mini" 
+            type="text" 
+            icon="el-icon-plus" 
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+          >新增</el-button>
+          <el-button
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改部门对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leader">
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Dept",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 表格树数据
+      deptList: [],
+      // 部门树选项
+      deptOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        deptName: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentId: [
+          { required: true, message: "上级部门不能为空", trigger: "blur" }
+        ],
+        deptName: [
+          { required: true, message: "部门名称不能为空", trigger: "blur" }
+        ],
+        orderNum: [
+          { required: true, message: "显示排序不能为空", trigger: "blur" }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询部门列表 */
+    getList() {
+      this.loading = true;
+      listDept(this.queryParams).then(response => {
+        this.deptList = this.handleTree(response.data, "deptId");
+        this.loading = false;
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children
+      };
+    },
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deptId: undefined,
+        parentId: undefined,
+        deptName: undefined,
+        orderNum: undefined,
+        leader: undefined,
+        phone: undefined,
+        email: undefined,
+        status: "0"
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      if (row != undefined) {
+        this.form.parentId = row.deptId;
+      }
+      this.open = true;
+      this.title = "添加部门";
+      listDept().then(response => {
+	        this.deptOptions = this.handleTree(response.data, "deptId");
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getDept(row.deptId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改部门";
+      });
+      listDeptExcludeChild(row.deptId).then(response => {
+	        this.deptOptions = this.handleTree(response.data, "deptId");
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deptId != undefined) {
+            updateDept(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDept(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDept(row.deptId);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
new file mode 100644
index 0000000..cbaf967
--- /dev/null
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -0,0 +1,406 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="字典名称" prop="dictType">
+        <el-select v-model="queryParams.dictType" size="small">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.dictId"
+            :label="item.dictName"
+            :value="item.dictType"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="字典标签" prop="dictLabel">
+        <el-input
+          v-model="queryParams.dictLabel"
+          placeholder="请输入字典标签"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:dict:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:dict:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:dict:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:dict:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="字典编码" align="center" prop="dictCode" />
+      <el-table-column label="字典标签" align="center" prop="dictLabel">
+        <template slot-scope="scope">
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="字典键值" align="center" prop="dictValue" />
+      <el-table-column label="字典排序" align="center" prop="dictSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典类型">
+          <el-input v-model="form.dictType" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="数据标签" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+        </el-form-item>
+        <el-form-item label="数据键值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+        </el-form-item>
+        <el-form-item label="显示排序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="回显样式" prop="listClass">
+          <el-select v-model="form.listClass">
+            <el-option
+              v-for="item in listClassOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data";
+import { listType, getType } from "@/api/system/dict/type";
+
+export default {
+  name: "Data",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      dataList: [],
+      // 默认字典类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据标签回显样式
+      listClassOptions: [
+        {
+          value: "default",
+          label: "默认"
+        },
+        {
+          value: "primary",
+          label: "主要"
+        },
+        {
+          value: "success",
+          label: "成功"
+        },
+        {
+          value: "info",
+          label: "信息"
+        },
+        {
+          value: "warning",
+          label: "警告"
+        },
+        {
+          value: "danger",
+          label: "危险"
+        }
+      ],
+      // 状态数据字典
+      statusOptions: [],
+      // 类型数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" }
+        ],
+        dictValue: [
+          { required: true, message: "数据键值不能为空", trigger: "blur" }
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    const dictId = this.$route.params && this.$route.params.dictId;
+    this.getType(dictId);
+    this.getTypeList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询字典类型详细 */
+    getType(dictId) {
+      getType(dictId).then(response => {
+        this.queryParams.dictType = response.data.dictType;
+        this.defaultDictType = response.data.dictType;
+        this.getList();
+      });
+    },
+    /** 查询字典类型列表 */
+    getTypeList() {
+      listType().then(response => {
+        this.typeOptions = response.rows;
+      });
+    },
+    /** 查询字典数据列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictCode: undefined,
+        dictLabel: undefined,
+        dictValue: undefined,
+        cssClass: undefined,
+        listClass: 'default',
+        dictSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.dictType = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典数据";
+      this.form.dictType = this.queryParams.dictType;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictCode)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictCode = row.dictCode || this.ids
+      getData(dictCode).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.dictCode != undefined) {
+            updateData(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addData(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.dictCode || this.ids;
+      this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delData(dictCodes);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportData(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
new file mode 100644
index 0000000..073b8a3
--- /dev/null
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="字典名称" prop="dictName">
+        <el-input
+          v-model="queryParams.dictName"
+          placeholder="请输入字典名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="字典类型" prop="dictType">
+        <el-input
+          v-model="queryParams.dictType"
+          placeholder="请输入字典类型"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="字典状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:dict:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:dict:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:dict:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:dict:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleRefreshCache"
+          v-hasPermi="['system:dict:remove']"
+        >刷新缓存</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="字典编号" align="center" prop="dictId" />
+      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+            <span>{{ scope.row.dictType }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+        </el-form-item>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listType, getType, delType, addType, updateType, exportType, refreshCache } from "@/api/system/dict/type";
+
+export default {
+  name: "Dict",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictName: [
+          { required: true, message: "字典名称不能为空", trigger: "blur" }
+        ],
+        dictType: [
+          { required: true, message: "字典类型不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictId: undefined,
+        dictName: undefined,
+        dictType: undefined,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典类型";
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictId = row.dictId || this.ids
+      getType(dictId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.dictId != undefined) {
+            updateType(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictIds = row.dictId || this.ids;
+      this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delType(dictIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有类型数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportType(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.msgSuccess("刷新成功");
+      });
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
new file mode 100644
index 0000000..41ec634
--- /dev/null
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -0,0 +1,442 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="菜单名称" prop="menuName">
+        <el-input
+          v-model="queryParams.menuName"
+          placeholder="请输入菜单名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="menuList"
+      row-key="menuId"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column prop="icon" label="图标" align="center" width="100">
+        <template slot-scope="scope">
+          <svg-icon :icon-class="scope.row.icon" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" 
+            type="text" 
+            icon="el-icon-edit" 
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
+          >修改</el-button>
+          <el-button 
+            size="mini" 
+            type="text" 
+            icon="el-icon-plus" 
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:menu:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改菜单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="上级菜单">
+              <treeselect
+                v-model="form.parentId"
+                :options="menuOptions"
+                :normalizer="normalizer"
+                :show-count="true"
+                placeholder="选择上级菜单"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="菜单类型" prop="menuType">
+              <el-radio-group v-model="form.menuType">
+                <el-radio label="M">目录</el-radio>
+                <el-radio label="C">菜单</el-radio>
+                <el-radio label="F">按钮</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item v-if="form.menuType != 'F'" label="菜单图标">
+              <el-popover
+                placement="bottom-start"
+                width="460"
+                trigger="click"
+                @show="$refs['iconSelect'].reset()"
+              >
+                <IconSelect ref="iconSelect" @selected="selected" />
+                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
+                  <svg-icon
+                    v-if="form.icon"
+                    slot="prefix"
+                    :icon-class="form.icon"
+                    class="el-input__icon"
+                    style="height: 32px;width: 16px;"
+                  />
+                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+                </el-input>
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="菜单名称" prop="menuName">
+              <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'F'">
+              <span slot="label">
+                <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                是否外链
+              </span>
+              <el-radio-group v-model="form.isFrame">
+                <el-radio label="0">是</el-radio>
+                <el-radio label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'F'" prop="path">
+              <span slot="label">
+                <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                路由地址
+              </span>
+              <el-input v-model="form.path" placeholder="请输入路由地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType == 'C'">
+            <el-form-item prop="component">
+              <span slot="label">
+                <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                组件路径
+              </span>
+              <el-input v-model="form.component" placeholder="请输入组件路径" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'M'">
+              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
+              <span slot="label">
+                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                权限字符
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'F'">
+              <span slot="label">
+                <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                显示状态
+              </span>
+              <el-radio-group v-model="form.visible">
+                <el-radio
+                  v-for="dict in visibleOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'F'">
+              <span slot="label">
+                <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                菜单状态
+              </span>
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType == 'C'">
+              <span slot="label">
+                <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                是否缓存
+              </span>
+              <el-radio-group v-model="form.isCache">
+                <el-radio label="0">缓存</el-radio>
+                <el-radio label="1">不缓存</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import IconSelect from "@/components/IconSelect";
+
+export default {
+  name: "Menu",
+  components: { Treeselect, IconSelect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 菜单表格树数据
+      menuList: [],
+      // 菜单树选项
+      menuOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 显示状态数据字典
+      visibleOptions: [],
+      // 菜单状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        menuName: undefined,
+        visible: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        menuName: [
+          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+        ],
+        orderNum: [
+          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+        ],
+        path: [
+          { required: true, message: "路由地址不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_show_hide").then(response => {
+      this.visibleOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    // 选择图标
+    selected(name) {
+      this.form.icon = name;
+    },
+    /** 查询菜单列表 */
+    getList() {
+      this.loading = true;
+      listMenu(this.queryParams).then(response => {
+        this.menuList = this.handleTree(response.data, "menuId");
+        this.loading = false;
+      });
+    },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
+    /** 查询菜单下拉树结构 */
+    getTreeselect() {
+      listMenu().then(response => {
+        this.menuOptions = [];
+        const menu = { menuId: 0, menuName: '主类目', children: [] };
+        menu.children = this.handleTree(response.data, "menuId");
+        this.menuOptions.push(menu);
+      });
+    },
+    // 显示状态字典翻译
+    visibleFormat(row, column) {
+      if (row.menuType == "F") {
+        return "";
+      }
+      return this.selectDictLabel(this.visibleOptions, row.visible);
+    },
+    // 菜单状态字典翻译
+    statusFormat(row, column) {
+      if (row.menuType == "F") {
+        return "";
+      }
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        menuId: undefined,
+        parentId: 0,
+        menuName: undefined,
+        icon: undefined,
+        menuType: "M",
+        orderNum: undefined,
+        isFrame: "1",
+        isCache: "0",
+        visible: "0",
+        status: "0"
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.menuId) {
+        this.form.parentId = row.menuId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加菜单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      getMenu(row.menuId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改菜单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.menuId != undefined) {
+            updateMenu(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMenu(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm('是否确认删除名称为"' + row.menuName + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delMenu(row.menuId);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
new file mode 100644
index 0000000..0095b37
--- /dev/null
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -0,0 +1,339 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公告标题" prop="noticeTitle">
+        <el-input
+          v-model="queryParams.noticeTitle"
+          placeholder="请输入公告标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作人员" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入操作人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="noticeType">
+        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:notice:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:notice:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:notice:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column
+        label="公告标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="公告类型"
+        align="center"
+        prop="noticeType"
+        :formatter="typeFormat"
+        width="100"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :formatter="statusFormat"
+        width="100"
+      />
+      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:notice:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:notice:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公告标题" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公告类型" prop="noticeType">
+              <el-select v-model="form.noticeType" placeholder="请选择">
+                <el-option
+                  v-for="dict in typeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="内容">
+              <editor v-model="form.noticeContent" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
+
+export default {
+  name: "Notice",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告表格数据
+      noticeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      statusOptions: [],
+      // 状态数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        noticeTitle: undefined,
+        createBy: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeTitle: [
+          { required: true, message: "公告标题不能为空", trigger: "blur" }
+        ],
+        noticeType: [
+          { required: true, message: "公告类型不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_notice_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_notice_type").then(response => {
+      this.typeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      listNotice(this.queryParams).then(response => {
+        this.noticeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 公告状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 公告状态字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.noticeType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        noticeId: undefined,
+        noticeTitle: undefined,
+        noticeType: undefined,
+        noticeContent: undefined,
+        status: "0"
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.noticeId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公告";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const noticeId = row.noticeId || this.ids
+      getNotice(noticeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公告";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.noticeId != undefined) {
+            updateNotice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNotice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const noticeIds = row.noticeId || this.ids
+      this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delNotice(noticeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue
new file mode 100644
index 0000000..21dc452
--- /dev/null
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -0,0 +1,331 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="岗位编码" prop="postCode">
+        <el-input
+          v-model="queryParams.postCode"
+          placeholder="请输入岗位编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="postName">
+        <el-input
+          v-model="queryParams.postName"
+          placeholder="请输入岗位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:post:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:post:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:post:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:post:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="岗位编号" align="center" prop="postId" />
+      <el-table-column label="岗位编码" align="center" prop="postCode" />
+      <el-table-column label="岗位名称" align="center" prop="postName" />
+      <el-table-column label="岗位排序" align="center" prop="postSort" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:post:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:post:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改岗位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="岗位名称" prop="postName">
+          <el-input v-model="form.postName" placeholder="请输入岗位名称" />
+        </el-form-item>
+        <el-form-item label="岗位编码" prop="postCode">
+          <el-input v-model="form.postCode" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="岗位顺序" prop="postSort">
+          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="岗位状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+
+export default {
+  name: "Post",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 岗位表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        postCode: undefined,
+        postName: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        postName: [
+          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+        ],
+        postCode: [
+          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+        ],
+        postSort: [
+          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询岗位列表 */
+    getList() {
+      this.loading = true;
+      listPost(this.queryParams).then(response => {
+        this.postList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 岗位状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        postId: undefined,
+        postCode: undefined,
+        postName: undefined,
+        postSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.postId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加岗位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const postId = row.postId || this.ids
+      getPost(postId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改岗位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.postId != undefined) {
+            updatePost(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPost(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const postIds = row.postId || this.ids;
+      this.$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delPost(postIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有岗位数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportPost(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue
new file mode 100644
index 0000000..dd500f1
--- /dev/null
+++ b/ruoyi-ui/src/views/system/role/authUser.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input
+          v-model="queryParams.phonenumber"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="openSelectUser"
+          v-hasPermi="['system:role:add']"
+        >添加用户</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-circle-close"
+          size="mini"
+          :disabled="multiple"
+          @click="cancelAuthUserAll"
+          v-hasPermi="['system:role:remove']"
+        >批量取消授权</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+      <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-close"
+            @click="cancelAuthUser(scope.row)"
+            v-hasPermi="['system:role:remove']"
+          >取消授权</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <select-user ref="select" :roleId="queryParams.roleId" @ok="handleQuery" />
+  </div>
+</template>
+
+<script>
+import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+import selectUser from "./selectUser";
+
+export default {
+  name: "AuthUser",
+  components: { selectUser },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中用户组
+      userIds: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleId: undefined,
+        userName: undefined,
+        phonenumber: undefined
+      }
+    };
+  },
+  created() {
+    const roleId = this.$route.params && this.$route.params.roleId;
+    if (roleId) {
+      this.queryParams.roleId = roleId;
+      this.getList();
+      this.getDicts("sys_normal_disable").then(response => {
+        this.statusOptions = response.data;
+      });
+    }
+  },
+  methods: {
+    /** 查询授权用户列表 */
+    getList() {
+      this.loading = true;
+      allocatedUserList(this.queryParams).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 返回按钮
+    handleClose() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/system/role" });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userIds = selection.map(item => item.userId)
+      this.multiple = !selection.length
+    },
+    /** 打开授权用户表弹窗 */
+    openSelectUser() {
+      this.$refs.select.show();
+    },
+    /** 取消授权按钮操作 */
+    cancelAuthUser(row) {
+      const roleId = this.queryParams.roleId;
+      this.$confirm('确认要取消该用户"' + row.userName + '"角色吗？', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return authUserCancel({ userId: row.userId, roleId: roleId });
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("取消授权成功");
+      }).catch(() => {});
+    },
+    /** 批量取消授权按钮操作 */
+    cancelAuthUserAll(row) {
+      const roleId = this.queryParams.roleId;
+      const userIds = this.userIds.join(",");
+      this.$confirm('是否取消选中用户授权数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+      }).then(() => {
+          return authUserCancelAll({ roleId: roleId, userIds: userIds });
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("取消授权成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
new file mode 100644
index 0000000..c44628d
--- /dev/null
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -0,0 +1,643 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input
+          v-model="queryParams.roleKey"
+          placeholder="请输入权限字符"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="角色状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:role:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="状态" align="center" width="100">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:role:remove']"
+          >删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
+                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
+              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
+                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改角色配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+        </el-form-item>
+        <el-form-item prop="roleKey">
+          <span slot="label">
+            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+            权限字符
+          </span>
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+        </el-form-item>
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menu"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍后"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 分配角色数据权限对话框 -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="角色名称">
+          <el-input v-model="form.roleName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限字符">
+          <el-input v-model="form.roleKey" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限范围">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据权限" v-show="form.dataScope == 2">
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="deptOptions"
+            show-checkbox
+            default-expand-all
+            ref="dept"
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍后"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">确 定</el-button>
+        <el-button @click="cancelDataScope">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
+
+export default {
+  name: "Role",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 角色表格数据
+      roleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示弹出层（数据权限）
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 日期范围
+      dateRange: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 数据范围选项
+      dataScopeOptions: [
+        {
+          value: "1",
+          label: "全部数据权限"
+        },
+        {
+          value: "2",
+          label: "自定数据权限"
+        },
+        {
+          value: "3",
+          label: "本部门数据权限"
+        },
+        {
+          value: "4",
+          label: "本部门及以下数据权限"
+        },
+        {
+          value: "5",
+          label: "仅本人数据权限"
+        }
+      ],
+      // 菜单列表
+      menuOptions: [],
+      // 部门列表
+      deptOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleName: undefined,
+        roleKey: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 表单校验
+      rules: {
+        roleName: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" }
+        ],
+        roleKey: [
+          { required: true, message: "权限字符不能为空", trigger: "blur" }
+        ],
+        roleSort: [
+          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询角色列表 */
+    getList() {
+      this.loading = true;
+      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+        response => {
+          this.roleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询菜单树结构 */
+    getMenuTreeselect() {
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data;
+      });
+    },
+    /** 查询部门树结构 */
+    getDeptTreeselect() {
+      deptTreeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 所有菜单节点数据
+    getMenuAllCheckedKeys() {
+      // 目前被选中的菜单节点
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
+      // 半选中的菜单节点
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    // 所有部门节点数据
+    getDeptAllCheckedKeys() {
+      // 目前被选中的部门节点
+      let checkedKeys = this.$refs.dept.getCheckedKeys();
+      // 半选中的部门节点
+      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    /** 根据角色ID查询菜单树结构 */
+    getRoleMenuTreeselect(roleId) {
+      return roleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.menus;
+        return response;
+      });
+    },
+    /** 根据角色ID查询部门树结构 */
+    getRoleDeptTreeselect(roleId) {
+      return roleDeptTreeselect(roleId).then(response => {
+        this.deptOptions = response.depts;
+        return response;
+      });
+    },
+    // 角色状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeRoleStatus(row.roleId, row.status);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.status = row.status === "0" ? "1" : "0";
+        });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮（数据权限）
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+      this.menuNodeAll = false,
+      this.deptExpand = true,
+      this.deptNodeAll = false,
+      this.form = {
+        roleId: undefined,
+        roleName: undefined,
+        roleKey: undefined,
+        roleSort: 0,
+        status: "0",
+        menuIds: [],
+        deptIds: [],
+        menuCheckStrictly: true,
+        deptCheckStrictly: true,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.roleId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDataScope":
+          this.handleDataScope(row);
+          break;
+        case "handleAuthUser":
+          this.handleAuthUser(row);
+          break;
+        default:
+          break;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type == 'menu') {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type == 'dept') {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type == 'menu') {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+      } else if (type == 'dept') {
+        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+      }
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type == 'menu') {
+        this.form.menuCheckStrictly = value ? true: false;
+      } else if (type == 'dept') {
+        this.form.deptCheckStrictly = value ? true: false;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getMenuTreeselect();
+      this.open = true;
+      this.title = "添加角色";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const roleId = row.roleId || this.ids
+      const roleMenu = this.getRoleMenuTreeselect(roleId);
+      getRole(roleId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.$nextTick(() => {
+          roleMenu.then(res => {
+            let checkedKeys = res.checkedKeys
+            checkedKeys.forEach((v) => {
+                this.$nextTick(()=>{
+                    this.$refs.menu.setChecked(v, true ,false);
+                })
+            })
+          });
+        });
+        this.title = "修改角色";
+      });
+    },
+    /** 选择角色权限范围触发 */
+    dataScopeSelectChange(value) {
+      if(value !== '2') {
+        this.$refs.dept.setCheckedKeys([]);
+      }
+    },
+    /** 分配数据权限操作 */
+    handleDataScope(row) {
+      this.reset();
+      const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
+      getRole(row.roleId).then(response => {
+        this.form = response.data;
+        this.openDataScope = true;
+        this.$nextTick(() => {
+          roleDeptTreeselect.then(res => {
+            this.$refs.dept.setCheckedKeys(res.checkedKeys);
+          });
+        });
+        this.title = "分配数据权限";
+      });
+    },
+    /** 分配用户操作 */
+    handleAuthUser: function(row) {
+      const roleId = row.roleId;
+      this.$router.push("/system/role-auth/user/" + roleId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.roleId != undefined) {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            updateRole(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            addRole(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 提交按钮（数据权限） */
+    submitDataScope: function() {
+      if (this.form.roleId != undefined) {
+        this.form.deptIds = this.getDeptAllCheckedKeys();
+        dataScope(this.form).then(response => {
+          this.msgSuccess("修改成功");
+          this.openDataScope = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const roleIds = row.roleId || this.ids;
+      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delRole(roleIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有角色数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportRole(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
new file mode 100644
index 0000000..a3aa0dd
--- /dev/null
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -0,0 +1,142 @@
+<template>
+  <!-- 授权用户 -->
+  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input
+          v-model="queryParams.phonenumber"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+      <el-button @click="visible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
+export default {
+  props: {
+    // 角色编号
+    roleId: {
+      type: [Number, String]
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      visible: false,
+      // 选中数组值
+      userIds: [],
+      // 总条数
+      total: 0,
+      // 未授权用户数据
+      userList: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleId: undefined,
+        userName: undefined,
+        phonenumber: undefined
+      }
+    };
+  },
+  created() {
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    // 显示弹框
+    show() {
+      this.queryParams.roleId = this.roleId;
+      this.getList();
+      this.visible = true;
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userIds = selection.map(item => item.userId);
+    },
+    // 查询表数据
+    getList() {
+      unallocatedUserList(this.queryParams).then(res => {
+        this.userList = res.rows;
+        this.total = res.total;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 选择授权用户操作 */
+    handleSelectUser() {
+      const roleId = this.queryParams.roleId;
+      const userIds = this.userIds.join(",");
+      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
+        this.msgSuccess(res.msg);
+        if (res.code === 200) {
+          this.visible = false;
+          this.$emit("ok");
+        }
+      });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue
new file mode 100644
index 0000000..9c6998a
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/authRole.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="app-container">
+    <h4 class="form-header h4">基本信息</h4>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input v-model="form.nickName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="登录账号" prop="phonenumber">
+            <el-input  v-model="form.userName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h4 class="form-header h4">角色信息</h4>
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色名称" align="center" prop="roleName" />
+      <el-table-column label="权限字符" align="center" prop="roleKey" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAuthRole, updateAuthRole } from "@/api/system/user";
+
+export default {
+  name: "AuthRole",
+  data() {
+    return {
+       // 遮罩层
+      loading: true,
+      // 分页信息
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      // 选中角色编号
+      roleIds:[],
+      // 角色信息
+      roles: [],
+      // 用户信息
+      form: {}
+    };
+  },
+  created() {
+    const userId = this.$route.params && this.$route.params.userId;
+    if (userId) {
+      this.loading = true;
+      getAuthRole(userId).then((response) => {
+        this.form = response.user;
+        this.roles = response.roles;
+        this.total = this.roles.length;
+        this.$nextTick(() => {
+          this.roles.forEach((row) => {
+            if (row.flag) {
+              this.$refs.table.toggleRowSelection(row);
+            }
+          });
+        });
+        this.loading = false;
+      });
+    }
+  },
+  methods: {
+    /** 单击选中行数据 */
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.roleIds = selection.map((item) => item.roleId);
+    },
+    // 保存选中的数据编号
+    getRowKey(row) {
+      return row.roleId;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const userId = this.form.userId;
+      const roleIds = this.roleIds.join(",");
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+        this.msgSuccess("授权成功");
+        this.close();
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/system/user" });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
new file mode 100644
index 0000000..bd048bb
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -0,0 +1,721 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              size="small"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :loading="exportLoading"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="运营商行政代码" align="center" key="distictId" prop="distictId" v-if="columns[7].visible" width="120" />
+          <el-table-column label="运营商代码" align="center" key="providerId" prop="providerId" v-if="columns[8].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+              >删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="行政代码" prop="distictId">
+              <el-input v-model="form.distictId" placeholder="请输入运营商行政地区代码" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择">
+                <el-option
+                  v-for="dict in sexOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "User",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 性别状态字典
+      sexOptions: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined,
+        distictId: undefined,
+        providerId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { key: 2, label: `用户昵称`, visible: true },
+        { key: 3, label: `部门`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 7, label: `行政代码`, visible: true },
+        { key: 8, label: `运营商代码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_user_sex").then(response => {
+      this.sexOptions = response.data;
+    });
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.getList();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeUserStatus(row.userId, row.status);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.status = row.status === "0" ? "1" : "0";
+        });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: [],
+        distictId: undefined,
+        providerId: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getTreeselect();
+      getUser().then(response => {
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.open = true;
+        this.title = "添加用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.form.postIds = response.postIds;
+        this.form.roleIds = response.roleIds;
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+      }).then(({ value }) => {
+          resetUserPwd(row.userId, value).then(response => {
+            this.msgSuccess("修改成功，新密码是：" + value);
+          });
+        }).catch(() => {});
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function(row) {
+      const userId = row.userId;
+      this.$router.push("/system/user-auth/role/" + userId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delUser(userIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有用户数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportUser(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
new file mode 100644
index 0000000..8993cab
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>个人信息</span>
+          </div>
+          <div>
+            <div class="text-center">
+              <userAvatar :user="user" />
+            </div>
+            <ul class="list-group list-group-striped">
+              <li class="list-group-item">
+                <svg-icon icon-class="user" />用户名称
+                <div class="pull-right">{{ user.userName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="phone" />手机号码
+                <div class="pull-right">{{ user.phonenumber }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="email" />用户邮箱
+                <div class="pull-right">{{ user.email }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属部门
+                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="peoples" />所属角色
+                <div class="pull-right">{{ roleGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="date" />创建日期
+                <div class="pull-right">{{ user.createTime }}</div>
+              </li>
+            </ul>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基本资料</span>
+          </div>
+          <el-tabs v-model="activeTab">
+            <el-tab-pane label="基本资料" name="userinfo">
+              <userInfo :user="user" />
+            </el-tab-pane>
+            <el-tab-pane label="修改密码" name="resetPwd">
+              <resetPwd :user="user" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import userAvatar from "./userAvatar";
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import { getUserProfile } from "@/api/system/user";
+
+export default {
+  name: "Profile",
+  components: { userAvatar, userInfo, resetPwd },
+  data() {
+    return {
+      user: {},
+      roleGroup: {},
+      postGroup: {},
+      activeTab: "userinfo"
+    };
+  },
+  created() {
+    this.getUser();
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.roleGroup = response.roleGroup;
+        this.postGroup = response.postGroup;
+      });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
new file mode 100644
index 0000000..d567d6d
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -0,0 +1,72 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user";
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      test: "1test",
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
+            response => {
+              this.msgSuccess("修改成功");
+            }
+          );
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
new file mode 100644
index 0000000..d6ea0fc
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog()">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div class="avatar-upload-preview">
+            <img :src="previews.url" :style="previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :md="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :md="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+
+export default {
+  components: { VueCropper },
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: store.getters.avatar, //裁剪图片的地址
+        autoCrop: true, // 是否默认生成截图框
+        autoCropWidth: 200, // 默认生成截图框宽度
+        autoCropHeight: 200, // 默认生成截图框高度
+        fixedBox: true // 固定截图框大小 不允许改变
+      },
+      previews: {}
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.options.img = store.getters.avatar
+	  this.visible = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
new file mode 100644
index 0000000..fd7965b
--- /dev/null
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="user.nickName" maxlength="30" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="user.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="user.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="user.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/system/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
+            this.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue
new file mode 100644
index 0000000..941ec36
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue
@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <el-dialog
+      v-bind="$attrs"
+      width="500px"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      v-on="$listeners"
+      @open="onOpen"
+      @close="onClose"
+    >
+      <el-row :gutter="15">
+        <el-form
+          ref="elForm"
+          :model="formData"
+          :rules="rules"
+          size="medium"
+          label-width="100px"
+        >
+          <el-col :span="24">
+            <el-form-item label="生成类型" prop="type">
+              <el-radio-group v-model="formData.type">
+                <el-radio-button
+                  v-for="(item, index) in typeOptions"
+                  :key="index"
+                  :label="item.value"
+                  :disabled="item.disabled"
+                >
+                  {{ item.label }}
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="showFileName" label="文件名" prop="fileName">
+              <el-input v-model="formData.fileName" placeholder="请输入文件名" clearable />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+
+      <div slot="footer">
+        <el-button @click="close">
+          取消
+        </el-button>
+        <el-button type="primary" @click="handelConfirm">
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  inheritAttrs: false,
+  props: ['showFileName'],
+  data() {
+    return {
+      formData: {
+        fileName: undefined,
+        type: 'file'
+      },
+      rules: {
+        fileName: [{
+          required: true,
+          message: '请输入文件名',
+          trigger: 'blur'
+        }],
+        type: [{
+          required: true,
+          message: '生成类型不能为空',
+          trigger: 'change'
+        }]
+      },
+      typeOptions: [{
+        label: '页面',
+        value: 'file'
+      }, {
+        label: '弹窗',
+        value: 'dialog'
+      }]
+    }
+  },
+  computed: {
+  },
+  watch: {},
+  mounted() {},
+  methods: {
+    onOpen() {
+      if (this.showFileName) {
+        this.formData.fileName = `${+new Date()}.vue`
+      }
+    },
+    onClose() {
+    },
+    close(e) {
+      this.$emit('update:visible', false)
+    },
+    handelConfirm() {
+      this.$refs.elForm.validate(valid => {
+        if (!valid) return
+        this.$emit('confirm', { ...this.formData })
+        this.close()
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/ruoyi-ui/src/views/tool/build/DraggableItem.vue
new file mode 100644
index 0000000..e881778
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/DraggableItem.vue
@@ -0,0 +1,100 @@
+<script>
+import draggable from 'vuedraggable'
+import render from '@/utils/generator/render'
+
+const components = {
+  itemBtns(h, element, index, parent) {
+    const { copyItem, deleteItem } = this.$listeners
+    return [
+      <span class="drawing-item-copy" title="复制" onClick={event => {
+        copyItem(element, parent); event.stopPropagation()
+      }}>
+        <i class="el-icon-copy-document" />
+      </span>,
+      <span class="drawing-item-delete" title="删除" onClick={event => {
+        deleteItem(index, parent); event.stopPropagation()
+      }}>
+        <i class="el-icon-delete" />
+      </span>
+    ]
+  }
+}
+const layouts = {
+  colFormItem(h, element, index, parent) {
+    const { activeItem } = this.$listeners
+    let className = this.activeId === element.formId ? 'drawing-item active-from-item' : 'drawing-item'
+    if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
+    return (
+      <el-col span={element.span} class={className}
+        nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
+        <el-form-item label-width={element.labelWidth ? `${element.labelWidth}px` : null}
+          label={element.label} required={element.required}>
+          <render key={element.renderKey} conf={element} onInput={ event => {
+            this.$set(element, 'defaultValue', event)
+          }} />
+        </el-form-item>
+        {components.itemBtns.apply(this, arguments)}
+      </el-col>
+    )
+  },
+  rowFormItem(h, element, index, parent) {
+    const { activeItem } = this.$listeners
+    const className = this.activeId === element.formId ? 'drawing-row-item active-from-item' : 'drawing-row-item'
+    let child = renderChildren.apply(this, arguments)
+    if (element.type === 'flex') {
+      child = <el-row type={element.type} justify={element.justify} align={element.align}>
+              {child}
+            </el-row>
+    }
+    return (
+      <el-col span={element.span}>
+        <el-row gutter={element.gutter} class={className}
+          nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
+          <span class="component-name">{element.componentName}</span>
+          <draggable list={element.children} animation={340} group="componentsGroup" class="drag-wrapper">
+            {child}
+          </draggable>
+          {components.itemBtns.apply(this, arguments)}
+        </el-row>
+      </el-col>
+    )
+  }
+}
+
+function renderChildren(h, element, index, parent) {
+  if (!Array.isArray(element.children)) return null
+  return element.children.map((el, i) => {
+    const layout = layouts[el.layout]
+    if (layout) {
+      return layout.call(this, h, el, i, element.children)
+    }
+    return layoutIsNotFound()
+  })
+}
+
+function layoutIsNotFound() {
+  throw new Error(`没有与${this.element.layout}匹配的layout`)
+}
+
+export default {
+  components: {
+    render,
+    draggable
+  },
+  props: [
+    'element',
+    'index',
+    'drawingList',
+    'activeId',
+    'formConf'
+  ],
+  render(h) {
+    const layout = layouts[this.element.layout]
+
+    if (layout) {
+      return layout.call(this, h, this.element, this.index, this.drawingList)
+    }
+    return layoutIsNotFound()
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
new file mode 100644
index 0000000..958be50
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="icon-dialog">
+    <el-dialog
+      v-bind="$attrs"
+      width="980px"
+      :modal-append-to-body="false"
+      v-on="$listeners"
+      @open="onOpen"
+      @close="onClose"
+    >
+      <div slot="title">
+        选择图标
+        <el-input
+          v-model="key"
+          size="mini"
+          :style="{width: '260px'}"
+          placeholder="请输入图标名称"
+          prefix-icon="el-icon-search"
+          clearable
+        />
+      </div>
+      <ul class="icon-ul">
+        <li
+          v-for="icon in iconList"
+          :key="icon"
+          :class="active===icon?'active-item':''"
+          @click="onSelect(icon)"
+        >
+          <i :class="icon" />
+          <div>{{ icon }}</div>
+        </li>
+      </ul>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import iconList from '@/utils/generator/icon.json'
+
+const originList = iconList.map(name => `el-icon-${name}`)
+
+export default {
+  inheritAttrs: false,
+  props: ['current'],
+  data() {
+    return {
+      iconList: originList,
+      active: null,
+      key: ''
+    }
+  },
+  watch: {
+    key(val) {
+      if (val) {
+        this.iconList = originList.filter(name => name.indexOf(val) > -1)
+      } else {
+        this.iconList = originList
+      }
+    }
+  },
+  methods: {
+    onOpen() {
+      this.active = this.current
+      this.key = ''
+    },
+    onClose() {},
+    onSelect(icon) {
+      this.active = icon
+      this.$emit('select', icon)
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.icon-ul {
+  margin: 0;
+  padding: 0;
+  font-size: 0;
+  li {
+    list-style-type: none;
+    text-align: center;
+    font-size: 14px;
+    display: inline-block;
+    width: 16.66%;
+    box-sizing: border-box;
+    height: 108px;
+    padding: 15px 6px 6px 6px;
+    cursor: pointer;
+    overflow: hidden;
+    &:hover {
+      background: #f2f2f2;
+    }
+    &.active-item{
+      background: #e1f3fb;
+      color: #7a6df0
+    }
+    > i {
+      font-size: 30px;
+      line-height: 50px;
+    }
+  }
+}
+.icon-dialog {
+  ::v-deep .el-dialog {
+    border-radius: 8px;
+    margin-bottom: 0;
+    margin-top: 4vh !important;
+    display: flex;
+    flex-direction: column;
+    max-height: 92vh;
+    overflow: hidden;
+    box-sizing: border-box;
+    .el-dialog__header {
+      padding-top: 14px;
+    }
+    .el-dialog__body {
+      margin: 0 20px 20px 20px;
+      padding: 0;
+      overflow: auto;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/ruoyi-ui/src/views/tool/build/RightPanel.vue
new file mode 100644
index 0000000..7e67936
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/RightPanel.vue
@@ -0,0 +1,946 @@
+<template>
+  <div class="right-board">
+    <el-tabs v-model="currentTab" class="center-tabs">
+      <el-tab-pane label="组件属性" name="field" />
+      <el-tab-pane label="表单属性" name="form" />
+    </el-tabs>
+    <div class="field-box">
+      <a class="document-link" target="_blank" :href="documentLink" title="查看组件文档">
+        <i class="el-icon-link" />
+      </a>
+      <el-scrollbar class="right-scrollbar">
+        <!-- 组件属性 -->
+        <el-form v-show="currentTab==='field' && showField" size="small" label-width="90px">
+          <el-form-item v-if="activeData.changeTag" label="组件类型">
+            <el-select
+              v-model="activeData.tagIcon"
+              placeholder="请选择组件类型"
+              :style="{width: '100%'}"
+              @change="tagChange"
+            >
+              <el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
+                <el-option
+                  v-for="item in group.options"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.tagIcon"
+                >
+                  <svg-icon class="node-icon" :icon-class="item.tagIcon" />
+                  <span> {{ item.label }}</span>
+                </el-option>
+              </el-option-group>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.vModel!==undefined" label="字段名">
+            <el-input v-model="activeData.vModel" placeholder="请输入字段名（v-model）" />
+          </el-form-item>
+          <el-form-item v-if="activeData.componentName!==undefined" label="组件名">
+            {{ activeData.componentName }}
+          </el-form-item>
+          <el-form-item v-if="activeData.label!==undefined" label="标题">
+            <el-input v-model="activeData.label" placeholder="请输入标题" />
+          </el-form-item>
+          <el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
+            <el-input v-model="activeData.placeholder" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
+            <el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
+            <el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData.span!==undefined" label="表单栅格">
+            <el-slider v-model="activeData.span" :max="24" :min="1" :marks="{12:''}" @change="spanChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData.layout==='rowFormItem'" label="栅格间隔">
+            <el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔" />
+          </el-form-item>
+          <el-form-item v-if="activeData.layout==='rowFormItem'" label="布局模式">
+            <el-radio-group v-model="activeData.type">
+              <el-radio-button label="default" />
+              <el-radio-button label="flex" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
+            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}">
+              <el-option
+                v-for="(item, index) in justifyOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
+            <el-radio-group v-model="activeData.align">
+              <el-radio-button label="top" />
+              <el-radio-button label="middle" />
+              <el-radio-button label="bottom" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.labelWidth!==undefined" label="标签宽度">
+            <el-input v-model.number="activeData.labelWidth" type="number" placeholder="请输入标签宽度" />
+          </el-form-item>
+          <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
+            <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable />
+          </el-form-item>
+          <el-form-item v-if="activeData.vModel!==undefined" label="默认值">
+            <el-input
+              :value="setDefaultValue(activeData.defaultValue)"
+              placeholder="请输入默认值"
+              @input="onDefaultValueInput"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="至少应选">
+            <el-input-number
+              :value="activeData.min"
+              :min="0"
+              placeholder="至少应选"
+              @input="$set(activeData, 'min', $event?$event:undefined)"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="最多可选">
+            <el-input-number
+              :value="activeData.max"
+              :min="0"
+              placeholder="最多可选"
+              @input="$set(activeData, 'max', $event?$event:undefined)"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.prepend!==undefined" label="前缀">
+            <el-input v-model="activeData.prepend" placeholder="请输入前缀" />
+          </el-form-item>
+          <el-form-item v-if="activeData.append!==undefined" label="后缀">
+            <el-input v-model="activeData.append" placeholder="请输入后缀" />
+          </el-form-item>
+          <el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
+            <el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
+              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
+            <el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
+              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="选项分隔符">
+            <el-input v-model="activeData.separator" placeholder="请输入选项分隔符" />
+          </el-form-item>
+          <el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
+            <el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
+            <el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.min !== undefined" label="最小值">
+            <el-input-number v-model="activeData.min" placeholder="最小值" />
+          </el-form-item>
+          <el-form-item v-if="activeData.max !== undefined" label="最大值">
+            <el-input-number v-model="activeData.max" placeholder="最大值" />
+          </el-form-item>
+          <el-form-item v-if="activeData.step !== undefined" label="步长">
+            <el-input-number v-model="activeData.step" placeholder="步数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="精度">
+            <el-input-number v-model="activeData.precision" :min="0" placeholder="精度" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="按钮位置">
+            <el-radio-group v-model="activeData['controls-position']">
+              <el-radio-button label="">
+                默认
+              </el-radio-button>
+              <el-radio-button label="right">
+                右侧
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
+            <el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
+              <template slot="append">
+                个字符
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
+            <el-input v-model="activeData['active-text']" placeholder="请输入开启提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
+            <el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
+            <el-input
+              :value="setDefaultValue(activeData['active-value'])"
+              placeholder="请输入开启值"
+              @input="onSwitchValueInput($event, 'active-value')"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
+            <el-input
+              :value="setDefaultValue(activeData['inactive-value'])"
+              placeholder="请输入关闭值"
+              @input="onSwitchValueInput($event, 'inactive-value')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.type !== undefined && 'el-date-picker' === activeData.tag"
+            label="时间类型"
+          >
+            <el-select
+              v-model="activeData.type"
+              placeholder="请选择时间类型"
+              :style="{ width: '100%' }"
+              @change="dateTypeChange"
+            >
+              <el-option
+                v-for="(item, index) in dateOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">
+            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />
+          </el-form-item>
+          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
+            <el-select
+              v-model="activeData.accept"
+              placeholder="请选择文件类型"
+              :style="{ width: '100%' }"
+              clearable
+            >
+              <el-option label="图片" value="image/*" />
+              <el-option label="视频" value="video/*" />
+              <el-option label="音频" value="audio/*" />
+              <el-option label="excel" value=".xls,.xlsx" />
+              <el-option label="word" value=".doc,.docx" />
+              <el-option label="pdf" value=".pdf" />
+              <el-option label="txt" value=".txt" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
+            <el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
+              <el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
+                <el-option label="KB" value="KB" />
+                <el-option label="MB" value="MB" />
+                <el-option label="GB" value="GB" />
+              </el-select>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData.action !== undefined" label="上传地址">
+            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />
+          </el-form-item>
+          <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
+            <el-radio-group v-model="activeData['list-type']" size="small">
+              <el-radio-button label="text">
+                text
+              </el-radio-button>
+              <el-radio-button label="picture">
+                picture
+              </el-radio-button>
+              <el-radio-button label="picture-card">
+                picture-card
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.buttonText !== undefined"
+            v-show="'picture-card' !== activeData['list-type']"
+            label="按钮文字"
+          >
+            <el-input v-model="activeData.buttonText" placeholder="请输入按钮文字" />
+          </el-form-item>
+          <el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
+            <el-input v-model="activeData['range-separator']" placeholder="请输入分隔符" />
+          </el-form-item>
+          <el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
+            <el-input
+              v-model="activeData['picker-options'].selectableRange"
+              placeholder="请输入时间段"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
+            <el-input
+              :value="activeData.format"
+              placeholder="请输入时间格式"
+              @input="setTimeValue($event)"
+            />
+          </el-form-item>
+          <template v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.tag) > -1">
+            <el-divider>选项</el-divider>
+            <draggable
+              :list="activeData.options"
+              :animation="340"
+              group="selectItem"
+              handle=".option-drag"
+            >
+              <div v-for="(item, index) in activeData.options" :key="index" class="select-item">
+                <div class="select-line-icon option-drag">
+                  <i class="el-icon-s-operation" />
+                </div>
+                <el-input v-model="item.label" placeholder="选项名" size="small" />
+                <el-input
+                  placeholder="选项值"
+                  size="small"
+                  :value="item.value"
+                  @input="setOptionValue(item, $event)"
+                />
+                <div class="close-btn select-line-icon" @click="activeData.options.splice(index, 1)">
+                  <i class="el-icon-remove-outline" />
+                </div>
+              </div>
+            </draggable>
+            <div style="margin-left: 20px;">
+              <el-button
+                style="padding-bottom: 0"
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addSelectItem"
+              >
+                添加选项
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+
+          <template v-if="['el-cascader'].indexOf(activeData.tag) > -1">
+            <el-divider>选项</el-divider>
+            <el-form-item label="数据类型">
+              <el-radio-group v-model="activeData.dataType" size="small">
+                <el-radio-button label="dynamic">
+                  动态数据
+                </el-radio-button>
+                <el-radio-button label="static">
+                  静态数据
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+
+            <template v-if="activeData.dataType === 'dynamic'">
+              <el-form-item label="标签键名">
+                <el-input v-model="activeData.labelKey" placeholder="请输入标签键名" />
+              </el-form-item>
+              <el-form-item label="值键名">
+                <el-input v-model="activeData.valueKey" placeholder="请输入值键名" />
+              </el-form-item>
+              <el-form-item label="子级键名">
+                <el-input v-model="activeData.childrenKey" placeholder="请输入子级键名" />
+              </el-form-item>
+            </template>
+
+            <el-tree
+              v-if="activeData.dataType === 'static'"
+              draggable
+              :data="activeData.options"
+              node-key="id"
+              :expand-on-click-node="false"
+              :render-content="renderContent"
+            />
+            <div v-if="activeData.dataType === 'static'" style="margin-left: 20px">
+              <el-button
+                style="padding-bottom: 0"
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addTreeItem"
+              >
+                添加父级
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+
+          <el-form-item v-if="activeData.optionType !== undefined" label="选项样式">
+            <el-radio-group v-model="activeData.optionType">
+              <el-radio-button label="default">
+                默认
+              </el-radio-button>
+              <el-radio-button label="button">
+                按钮
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
+            <el-color-picker v-model="activeData['active-color']" />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
+            <el-color-picker v-model="activeData['inactive-color']" />
+          </el-form-item>
+
+          <el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
+            <el-switch v-model="activeData['allow-half']" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
+            <el-switch v-model="activeData['show-text']" @change="rateTextChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
+            <el-switch v-model="activeData['show-score']" @change="rateScoreChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
+            <el-switch v-model="activeData['show-stops']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
+            <el-switch v-model="activeData.range" @change="rangeChange" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.border !== undefined && activeData.optionType === 'default'"
+            label="是否带边框"
+          >
+            <el-switch v-model="activeData.border" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-color-picker'" label="颜色格式">
+            <el-select
+              v-model="activeData['color-format']"
+              placeholder="请选择颜色格式"
+              :style="{ width: '100%' }"
+              @change="colorFormatChange"
+            >
+              <el-option
+                v-for="(item, index) in colorFormatOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.size !== undefined &&
+              (activeData.optionType === 'button' ||
+                activeData.border ||
+                activeData.tag === 'el-color-picker')"
+            label="选项尺寸"
+          >
+            <el-radio-group v-model="activeData.size">
+              <el-radio-button label="medium">
+                中等
+              </el-radio-button>
+              <el-radio-button label="small">
+                较小
+              </el-radio-button>
+              <el-radio-button label="mini">
+                迷你
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
+            <el-switch v-model="activeData['show-word-limit']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="严格步数">
+            <el-switch v-model="activeData['step-strictly']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="是否多选">
+            <el-switch v-model="activeData.props.props.multiple" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="展示全路径">
+            <el-switch v-model="activeData['show-all-levels']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
+            <el-switch v-model="activeData.clearable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
+            <el-switch v-model="activeData.showTip" />
+          </el-form-item>
+          <el-form-item v-if="activeData.multiple !== undefined" label="多选文件">
+            <el-switch v-model="activeData.multiple" />
+          </el-form-item>
+          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">
+            <el-switch v-model="activeData['auto-upload']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
+            <el-switch v-model="activeData.readonly" />
+          </el-form-item>
+          <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
+            <el-switch v-model="activeData.disabled" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-select'" label="是否多选">
+            <el-switch v-model="activeData.multiple" @change="multipleChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData.required !== undefined" label="是否必填">
+            <el-switch v-model="activeData.required" />
+          </el-form-item>
+
+          <template v-if="activeData.layoutTree">
+            <el-divider>布局结构树</el-divider>
+            <el-tree
+              :data="[activeData]"
+              :props="layoutTreeProps"
+              node-key="renderKey"
+              default-expand-all
+              draggable
+            >
+              <span slot-scope="{ node, data }">
+                <span class="node-label">
+                  <svg-icon class="node-icon" :icon-class="data.tagIcon" />
+                  {{ node.label }}
+                </span>
+              </span>
+            </el-tree>
+          </template>
+
+          <template v-if="activeData.layout === 'colFormItem'">
+            <el-divider>正则校验</el-divider>
+            <div
+              v-for="(item, index) in activeData.regList"
+              :key="index"
+              class="reg-item"
+            >
+              <span class="close-btn" @click="activeData.regList.splice(index, 1)">
+                <i class="el-icon-close" />
+              </span>
+              <el-form-item label="表达式">
+                <el-input v-model="item.pattern" placeholder="请输入正则" />
+              </el-form-item>
+              <el-form-item label="错误提示" style="margin-bottom:0">
+                <el-input v-model="item.message" placeholder="请输入错误提示" />
+              </el-form-item>
+            </div>
+            <div style="margin-left: 20px">
+              <el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
+                添加规则
+              </el-button>
+            </div>
+          </template>
+        </el-form>
+        <!-- 表单属性 -->
+        <el-form v-show="currentTab === 'form'" size="small" label-width="90px">
+          <el-form-item label="表单名">
+            <el-input v-model="formConf.formRef" placeholder="请输入表单名（ref）" />
+          </el-form-item>
+          <el-form-item label="表单模型">
+            <el-input v-model="formConf.formModel" placeholder="请输入数据模型" />
+          </el-form-item>
+          <el-form-item label="校验模型">
+            <el-input v-model="formConf.formRules" placeholder="请输入校验模型" />
+          </el-form-item>
+          <el-form-item label="表单尺寸">
+            <el-radio-group v-model="formConf.size">
+              <el-radio-button label="medium">
+                中等
+              </el-radio-button>
+              <el-radio-button label="small">
+                较小
+              </el-radio-button>
+              <el-radio-button label="mini">
+                迷你
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签对齐">
+            <el-radio-group v-model="formConf.labelPosition">
+              <el-radio-button label="left">
+                左对齐
+              </el-radio-button>
+              <el-radio-button label="right">
+                右对齐
+              </el-radio-button>
+              <el-radio-button label="top">
+                顶部对齐
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签宽度">
+            <el-input-number v-model="formConf.labelWidth" placeholder="标签宽度" />
+          </el-form-item>
+          <el-form-item label="栅格间隔">
+            <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
+          </el-form-item>
+          <el-form-item label="禁用表单">
+            <el-switch v-model="formConf.disabled" />
+          </el-form-item>
+          <el-form-item label="表单按钮">
+            <el-switch v-model="formConf.formBtns" />
+          </el-form-item>
+          <el-form-item label="显示未选中组件边框">
+            <el-switch v-model="formConf.unFocusedComponentBorder" />
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+    </div>
+
+    <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
+    <icons-dialog :visible.sync="iconsVisible" :current="activeData[currentIconModel]" @select="setIcon" />
+  </div>
+</template>
+
+<script>
+import { isArray } from 'util'
+import draggable from 'vuedraggable'
+import TreeNodeDialog from './TreeNodeDialog'
+import { isNumberStr } from '@/utils/index'
+import IconsDialog from './IconsDialog'
+import {
+  inputComponents,
+  selectComponents,
+  layoutComponents
+} from '@/utils/generator/config'
+
+const dateTimeFormat = {
+  date: 'yyyy-MM-dd',
+  week: 'yyyy 第 WW 周',
+  month: 'yyyy-MM',
+  year: 'yyyy',
+  datetime: 'yyyy-MM-dd HH:mm:ss',
+  daterange: 'yyyy-MM-dd',
+  monthrange: 'yyyy-MM',
+  datetimerange: 'yyyy-MM-dd HH:mm:ss'
+}
+
+export default {
+  components: {
+    draggable,
+    TreeNodeDialog,
+    IconsDialog
+  },
+  props: ['showField', 'activeData', 'formConf'],
+  data() {
+    return {
+      currentTab: 'field',
+      currentNode: null,
+      dialogVisible: false,
+      iconsVisible: false,
+      currentIconModel: null,
+      dateTypeOptions: [
+        {
+          label: '日(date)',
+          value: 'date'
+        },
+        {
+          label: '周(week)',
+          value: 'week'
+        },
+        {
+          label: '月(month)',
+          value: 'month'
+        },
+        {
+          label: '年(year)',
+          value: 'year'
+        },
+        {
+          label: '日期时间(datetime)',
+          value: 'datetime'
+        }
+      ],
+      dateRangeTypeOptions: [
+        {
+          label: '日期范围(daterange)',
+          value: 'daterange'
+        },
+        {
+          label: '月范围(monthrange)',
+          value: 'monthrange'
+        },
+        {
+          label: '日期时间范围(datetimerange)',
+          value: 'datetimerange'
+        }
+      ],
+      colorFormatOptions: [
+        {
+          label: 'hex',
+          value: 'hex'
+        },
+        {
+          label: 'rgb',
+          value: 'rgb'
+        },
+        {
+          label: 'rgba',
+          value: 'rgba'
+        },
+        {
+          label: 'hsv',
+          value: 'hsv'
+        },
+        {
+          label: 'hsl',
+          value: 'hsl'
+        }
+      ],
+      justifyOptions: [
+        {
+          label: 'start',
+          value: 'start'
+        },
+        {
+          label: 'end',
+          value: 'end'
+        },
+        {
+          label: 'center',
+          value: 'center'
+        },
+        {
+          label: 'space-around',
+          value: 'space-around'
+        },
+        {
+          label: 'space-between',
+          value: 'space-between'
+        }
+      ],
+      layoutTreeProps: {
+        label(data, node) {
+          return data.componentName || `${data.label}: ${data.vModel}`
+        }
+      }
+    }
+  },
+  computed: {
+    documentLink() {
+      return (
+        this.activeData.document
+        || 'https://element.eleme.cn/#/zh-CN/component/installation'
+      )
+    },
+    dateOptions() {
+      if (
+        this.activeData.type !== undefined
+        && this.activeData.tag === 'el-date-picker'
+      ) {
+        if (this.activeData['start-placeholder'] === undefined) {
+          return this.dateTypeOptions
+        }
+        return this.dateRangeTypeOptions
+      }
+      return []
+    },
+    tagList() {
+      return [
+        {
+          label: '输入型组件',
+          options: inputComponents
+        },
+        {
+          label: '选择型组件',
+          options: selectComponents
+        }
+      ]
+    }
+  },
+  methods: {
+    addReg() {
+      this.activeData.regList.push({
+        pattern: '',
+        message: ''
+      })
+    },
+    addSelectItem() {
+      this.activeData.options.push({
+        label: '',
+        value: ''
+      })
+    },
+    addTreeItem() {
+      ++this.idGlobal
+      this.dialogVisible = true
+      this.currentNode = this.activeData.options
+    },
+    renderContent(h, { node, data, store }) {
+      return (
+        <div class="custom-tree-node">
+          <span>{node.label}</span>
+          <span class="node-operation">
+            <i on-click={() => this.append(data)}
+              class="el-icon-plus"
+              title="添加"
+            ></i>
+            <i on-click={() => this.remove(node, data)}
+              class="el-icon-delete"
+              title="删除"
+            ></i>
+          </span>
+        </div>
+      )
+    },
+    append(data) {
+      if (!data.children) {
+        this.$set(data, 'children', [])
+      }
+      this.dialogVisible = true
+      this.currentNode = data.children
+    },
+    remove(node, data) {
+      const { parent } = node
+      const children = parent.data.children || parent.data
+      const index = children.findIndex(d => d.id === data.id)
+      children.splice(index, 1)
+    },
+    addNode(data) {
+      this.currentNode.push(data)
+    },
+    setOptionValue(item, val) {
+      item.value = isNumberStr(val) ? +val : val
+    },
+    setDefaultValue(val) {
+      if (Array.isArray(val)) {
+        return val.join(',')
+      }
+      if (['string', 'number'].indexOf(val) > -1) {
+        return val
+      }
+      if (typeof val === 'boolean') {
+        return `${val}`
+      }
+      return val
+    },
+    onDefaultValueInput(str) {
+      if (isArray(this.activeData.defaultValue)) {
+        // 数组
+        this.$set(
+          this.activeData,
+          'defaultValue',
+          str.split(',').map(val => (isNumberStr(val) ? +val : val))
+        )
+      } else if (['true', 'false'].indexOf(str) > -1) {
+        // 布尔
+        this.$set(this.activeData, 'defaultValue', JSON.parse(str))
+      } else {
+        // 字符串和数字
+        this.$set(
+          this.activeData,
+          'defaultValue',
+          isNumberStr(str) ? +str : str
+        )
+      }
+    },
+    onSwitchValueInput(val, name) {
+      if (['true', 'false'].indexOf(val) > -1) {
+        this.$set(this.activeData, name, JSON.parse(val))
+      } else {
+        this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
+      }
+    },
+    setTimeValue(val, type) {
+      const valueFormat = type === 'week' ? dateTimeFormat.date : val
+      this.$set(this.activeData, 'defaultValue', null)
+      this.$set(this.activeData, 'value-format', valueFormat)
+      this.$set(this.activeData, 'format', val)
+    },
+    spanChange(val) {
+      this.formConf.span = val
+    },
+    multipleChange(val) {
+      this.$set(this.activeData, 'defaultValue', val ? [] : '')
+    },
+    dateTypeChange(val) {
+      this.setTimeValue(dateTimeFormat[val], val)
+    },
+    rangeChange(val) {
+      this.$set(
+        this.activeData,
+        'defaultValue',
+        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
+      )
+    },
+    rateTextChange(val) {
+      if (val) this.activeData['show-score'] = false
+    },
+    rateScoreChange(val) {
+      if (val) this.activeData['show-text'] = false
+    },
+    colorFormatChange(val) {
+      this.activeData.defaultValue = null
+      this.activeData['show-alpha'] = val.indexOf('a') > -1
+      this.activeData.renderKey = +new Date() // 更新renderKey,重新渲染该组件
+    },
+    openIconsDialog(model) {
+      this.iconsVisible = true
+      this.currentIconModel = model
+    },
+    setIcon(val) {
+      this.activeData[this.currentIconModel] = val
+    },
+    tagChange(tagIcon) {
+      let target = inputComponents.find(item => item.tagIcon === tagIcon)
+      if (!target) target = selectComponents.find(item => item.tagIcon === tagIcon)
+      this.$emit('tag-change', target)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.right-board {
+  width: 350px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  padding-top: 3px;
+  .field-box {
+    position: relative;
+    height: calc(100vh - 42px);
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+  .el-scrollbar {
+    height: 100%;
+  }
+}
+.select-item {
+  display: flex;
+  border: 1px dashed #fff;
+  box-sizing: border-box;
+  & .close-btn {
+    cursor: pointer;
+    color: #f56c6c;
+  }
+  & .el-input + .el-input {
+    margin-left: 4px;
+  }
+}
+.select-item + .select-item {
+  margin-top: 4px;
+}
+.select-item.sortable-chosen {
+  border: 1px dashed #409eff;
+}
+.select-line-icon {
+  line-height: 32px;
+  font-size: 22px;
+  padding: 0 4px;
+  color: #777;
+}
+.option-drag {
+  cursor: move;
+}
+.time-range {
+  .el-date-editor {
+    width: 227px;
+  }
+  ::v-deep .el-icon-time {
+    display: none;
+  }
+}
+.document-link {
+  position: absolute;
+  display: block;
+  width: 26px;
+  height: 26px;
+  top: 0;
+  left: 0;
+  cursor: pointer;
+  background: #409eff;
+  z-index: 1;
+  border-radius: 0 0 6px 0;
+  text-align: center;
+  line-height: 26px;
+  color: #fff;
+  font-size: 18px;
+}
+.node-label{
+  font-size: 14px;
+}
+.node-icon{
+  color: #bebfc3;
+}
+</style>
diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
new file mode 100644
index 0000000..c225c4c
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <el-dialog
+      v-bind="$attrs"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      v-on="$listeners"
+      @open="onOpen"
+      @close="onClose"
+    >
+      <el-row :gutter="0">
+        <el-form
+          ref="elForm"
+          :model="formData"
+          :rules="rules"
+          size="small"
+          label-width="100px"
+        >
+          <el-col :span="24">
+            <el-form-item
+              label="选项名"
+              prop="label"
+            >
+              <el-input
+                v-model="formData.label"
+                placeholder="请输入选项名"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="选项值"
+              prop="value"
+            >
+              <el-input
+                v-model="formData.value"
+                placeholder="请输入选项值"
+                clearable
+              >
+                <el-select
+                  slot="append"
+                  v-model="dataType"
+                  :style="{width: '100px'}"
+                >
+                  <el-option
+                    v-for="(item, index) in dataTypeOptions"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                    :disabled="item.disabled"
+                  />
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer">
+        <el-button
+          type="primary"
+          @click="handelConfirm"
+        >
+          确定
+        </el-button>
+        <el-button @click="close">
+          取消
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { isNumberStr } from '@/utils/index'
+
+export default {
+  components: {},
+  inheritAttrs: false,
+  props: [],
+  data() {
+    return {
+      id: 100,
+      formData: {
+        label: undefined,
+        value: undefined
+      },
+      rules: {
+        label: [
+          {
+            required: true,
+            message: '请输入选项名',
+            trigger: 'blur'
+          }
+        ],
+        value: [
+          {
+            required: true,
+            message: '请输入选项值',
+            trigger: 'blur'
+          }
+        ]
+      },
+      dataType: 'string',
+      dataTypeOptions: [
+        {
+          label: '字符串',
+          value: 'string'
+        },
+        {
+          label: '数字',
+          value: 'number'
+        }
+      ]
+    }
+  },
+  computed: {},
+  watch: {
+    // eslint-disable-next-line func-names
+    'formData.value': function (val) {
+      this.dataType = isNumberStr(val) ? 'number' : 'string'
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    onOpen() {
+      this.formData = {
+        label: undefined,
+        value: undefined
+      }
+    },
+    onClose() {},
+    close() {
+      this.$emit('update:visible', false)
+    },
+    handelConfirm() {
+      this.$refs.elForm.validate(valid => {
+        if (!valid) return
+        if (this.dataType === 'number') {
+          this.formData.value = parseFloat(this.formData.value)
+        }
+        this.formData.id = this.id++
+        this.$emit('commit', this.formData)
+        this.close()
+      })
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
new file mode 100644
index 0000000..1f8b361
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -0,0 +1,794 @@
+<template>
+  <div class="container">
+    <div class="left-board">
+      <div class="logo-wrapper">
+        <div class="logo">
+          <img :src="logo" alt="logo"> Form Generator
+        </div>
+      </div>
+      <el-scrollbar class="left-scrollbar">
+        <div class="components-list">
+          <div class="components-title">
+            <svg-icon icon-class="component" />输入型组件
+          </div>
+          <draggable
+            class="components-draggable"
+            :list="inputComponents"
+            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
+            :clone="cloneComponent"
+            draggable=".components-item"
+            :sort="false"
+            @end="onEnd"
+          >
+            <div
+              v-for="(element, index) in inputComponents" :key="index" class="components-item"
+              @click="addComponent(element)"
+            >
+              <div class="components-body">
+                <svg-icon :icon-class="element.tagIcon" />
+                {{ element.label }}
+              </div>
+            </div>
+          </draggable>
+          <div class="components-title">
+            <svg-icon icon-class="component" />选择型组件
+          </div>
+          <draggable
+            class="components-draggable"
+            :list="selectComponents"
+            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
+            :clone="cloneComponent"
+            draggable=".components-item"
+            :sort="false"
+            @end="onEnd"
+          >
+            <div
+              v-for="(element, index) in selectComponents"
+              :key="index"
+              class="components-item"
+              @click="addComponent(element)"
+            >
+              <div class="components-body">
+                <svg-icon :icon-class="element.tagIcon" />
+                {{ element.label }}
+              </div>
+            </div>
+          </draggable>
+          <div class="components-title">
+            <svg-icon icon-class="component" /> 布局型组件
+          </div>
+          <draggable
+            class="components-draggable" :list="layoutComponents"
+            :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
+            draggable=".components-item" :sort="false" @end="onEnd"
+          >
+            <div
+              v-for="(element, index) in layoutComponents" :key="index" class="components-item"
+              @click="addComponent(element)"
+            >
+              <div class="components-body">
+                <svg-icon :icon-class="element.tagIcon" />
+                {{ element.label }}
+              </div>
+            </div>
+          </draggable>
+        </div>
+      </el-scrollbar>
+    </div>
+
+    <div class="center-board">
+      <div class="action-bar">
+        <el-button icon="el-icon-download" type="text" @click="download">
+          导出vue文件
+        </el-button>
+        <el-button class="copy-btn-main" icon="el-icon-document-copy" type="text" @click="copy">
+          复制代码
+        </el-button>
+        <el-button class="delete-btn" icon="el-icon-delete" type="text" @click="empty">
+          清空
+        </el-button>
+      </div>
+      <el-scrollbar class="center-scrollbar">
+        <el-row class="center-board-row" :gutter="formConf.gutter">
+          <el-form
+            :size="formConf.size"
+            :label-position="formConf.labelPosition"
+            :disabled="formConf.disabled"
+            :label-width="formConf.labelWidth + 'px'"
+          >
+            <draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
+              <draggable-item
+                v-for="(element, index) in drawingList"
+                :key="element.renderKey"
+                :drawing-list="drawingList"
+                :element="element"
+                :index="index"
+                :active-id="activeId"
+                :form-conf="formConf"
+                @activeItem="activeFormItem"
+                @copyItem="drawingItemCopy"
+                @deleteItem="drawingItemDelete"
+              />
+            </draggable>
+            <div v-show="!drawingList.length" class="empty-info">
+              从左侧拖入或点选组件进行表单设计
+            </div>
+          </el-form>
+        </el-row>
+      </el-scrollbar>
+    </div>
+
+    <right-panel
+      :active-data="activeData"
+      :form-conf="formConf"
+      :show-field="!!drawingList.length"
+      @tag-change="tagChange"
+    />
+
+    <code-type-dialog
+      :visible.sync="dialogVisible"
+      title="选择生成类型"
+      :show-file-name="showFileName"
+      @confirm="generate"
+    />
+    <input id="copyNode" type="hidden">
+  </div>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+import { saveAs } from 'file-saver'
+import beautifier from 'js-beautify'
+import ClipboardJS from 'clipboard'
+import render from '@/utils/generator/render'
+import RightPanel from './RightPanel'
+import {
+  inputComponents,
+  selectComponents,
+  layoutComponents,
+  formConf
+} from '@/utils/generator/config'
+import {
+  exportDefault, beautifierConf, isNumberStr, titleCase
+} from '@/utils/index'
+import {
+  makeUpHtml, vueTemplate, vueScript, cssStyle
+} from '@/utils/generator/html'
+import { makeUpJs } from '@/utils/generator/js'
+import { makeUpCss } from '@/utils/generator/css'
+import drawingDefalut from '@/utils/generator/drawingDefalut'
+import logo from '@/assets/logo/logo.png'
+import CodeTypeDialog from './CodeTypeDialog'
+import DraggableItem from './DraggableItem'
+
+const emptyActiveData = { style: {}, autosize: {} }
+let oldActiveId
+let tempActiveData
+
+export default {
+  components: {
+    draggable,
+    render,
+    RightPanel,
+    CodeTypeDialog,
+    DraggableItem
+  },
+  data() {
+    return {
+      logo,
+      idGlobal: 100,
+      formConf,
+      inputComponents,
+      selectComponents,
+      layoutComponents,
+      labelWidth: 100,
+      drawingList: drawingDefalut,
+      drawingData: {},
+      activeId: drawingDefalut[0].formId,
+      drawerVisible: false,
+      formData: {},
+      dialogVisible: false,
+      generateConf: null,
+      showFileName: false,
+      activeData: drawingDefalut[0]
+    }
+  },
+  created() {
+    // 防止 firefox 下 拖拽 会新打卡一个选项卡
+    document.body.ondrop = event => {
+      event.preventDefault()
+      event.stopPropagation()
+    }
+  },
+  watch: {
+    // eslint-disable-next-line func-names
+    'activeData.label': function (val, oldVal) {
+      if (
+        this.activeData.placeholder === undefined
+        || !this.activeData.tag
+        || oldActiveId !== this.activeId
+      ) {
+        return
+      }
+      this.activeData.placeholder = this.activeData.placeholder.replace(oldVal, '') + val
+    },
+    activeId: {
+      handler(val) {
+        oldActiveId = val
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    const clipboard = new ClipboardJS('#copyNode', {
+      text: trigger => {
+        const codeStr = this.generateCode()
+        this.$notify({
+          title: '成功',
+          message: '代码已复制到剪切板，可粘贴。',
+          type: 'success'
+        })
+        return codeStr
+      }
+    })
+    clipboard.on('error', e => {
+      this.$message.error('代码复制失败')
+    })
+  },
+  methods: {
+    activeFormItem(element) {
+      this.activeData = element
+      this.activeId = element.formId
+    },
+    onEnd(obj, a) {
+      if (obj.from !== obj.to) {
+        this.activeData = tempActiveData
+        this.activeId = this.idGlobal
+      }
+    },
+    addComponent(item) {
+      const clone = this.cloneComponent(item)
+      this.drawingList.push(clone)
+      this.activeFormItem(clone)
+    },
+    cloneComponent(origin) {
+      const clone = JSON.parse(JSON.stringify(origin))
+      clone.formId = ++this.idGlobal
+      clone.span = formConf.span
+      clone.renderKey = +new Date() // 改变renderKey后可以实现强制更新组件
+      if (!clone.layout) clone.layout = 'colFormItem'
+      if (clone.layout === 'colFormItem') {
+        clone.vModel = `field${this.idGlobal}`
+        clone.placeholder !== undefined && (clone.placeholder += clone.label)
+        tempActiveData = clone
+      } else if (clone.layout === 'rowFormItem') {
+        delete clone.label
+        clone.componentName = `row${this.idGlobal}`
+        clone.gutter = this.formConf.gutter
+        tempActiveData = clone
+      }
+      return tempActiveData
+    },
+    AssembleFormData() {
+      this.formData = {
+        fields: JSON.parse(JSON.stringify(this.drawingList)),
+        ...this.formConf
+      }
+    },
+    generate(data) {
+      const func = this[`exec${titleCase(this.operationType)}`]
+      this.generateConf = data
+      func && func(data)
+    },
+    execRun(data) {
+      this.AssembleFormData()
+      this.drawerVisible = true
+    },
+    execDownload(data) {
+      const codeStr = this.generateCode()
+      const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
+      saveAs(blob, data.fileName)
+    },
+    execCopy(data) {
+      document.getElementById('copyNode').click()
+    },
+    empty() {
+      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
+        () => {
+          this.drawingList = []
+        }
+      )
+    },
+    drawingItemCopy(item, parent) {
+      let clone = JSON.parse(JSON.stringify(item))
+      clone = this.createIdAndKey(clone)
+      parent.push(clone)
+      this.activeFormItem(clone)
+    },
+    createIdAndKey(item) {
+      item.formId = ++this.idGlobal
+      item.renderKey = +new Date()
+      if (item.layout === 'colFormItem') {
+        item.vModel = `field${this.idGlobal}`
+      } else if (item.layout === 'rowFormItem') {
+        item.componentName = `row${this.idGlobal}`
+      }
+      if (Array.isArray(item.children)) {
+        item.children = item.children.map(childItem => this.createIdAndKey(childItem))
+      }
+      return item
+    },
+    drawingItemDelete(index, parent) {
+      parent.splice(index, 1)
+      this.$nextTick(() => {
+        const len = this.drawingList.length
+        if (len) {
+          this.activeFormItem(this.drawingList[len - 1])
+        }
+      })
+    },
+    generateCode() {
+      const { type } = this.generateConf
+      this.AssembleFormData()
+      const script = vueScript(makeUpJs(this.formData, type))
+      const html = vueTemplate(makeUpHtml(this.formData, type))
+      const css = cssStyle(makeUpCss(this.formData))
+      return beautifier.html(html + script + css, beautifierConf.html)
+    },
+    download() {
+      this.dialogVisible = true
+      this.showFileName = true
+      this.operationType = 'download'
+    },
+    run() {
+      this.dialogVisible = true
+      this.showFileName = false
+      this.operationType = 'run'
+    },
+    copy() {
+      this.dialogVisible = true
+      this.showFileName = false
+      this.operationType = 'copy'
+    },
+    tagChange(newTag) {
+      newTag = this.cloneComponent(newTag)
+      newTag.vModel = this.activeData.vModel
+      newTag.formId = this.activeId
+      newTag.span = this.activeData.span
+      delete this.activeData.tag
+      delete this.activeData.tagIcon
+      delete this.activeData.document
+      Object.keys(newTag).forEach(key => {
+        if (this.activeData[key] !== undefined
+          && typeof this.activeData[key] === typeof newTag[key]) {
+          newTag[key] = this.activeData[key]
+        }
+      })
+      this.activeData = newTag
+      this.updateDrawingList(newTag, this.drawingList)
+    },
+    updateDrawingList(newTag, list) {
+      const index = list.findIndex(item => item.formId === this.activeId)
+      if (index > -1) {
+        list.splice(index, 1, newTag)
+      } else {
+        list.forEach(item => {
+          if (Array.isArray(item.children)) this.updateDrawingList(newTag, item.children)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss'>
+body, html{
+  margin: 0;
+  padding: 0;
+  background: #fff;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
+}
+
+input, textarea{
+  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
+}
+
+.editor-tabs{
+  background: #121315;
+  .el-tabs__header{
+    margin: 0;
+    border-bottom-color: #121315;
+    .el-tabs__nav{
+      border-color: #121315;
+    }
+  }
+  .el-tabs__item{
+    height: 32px;
+    line-height: 32px;
+    color: #888a8e;
+    border-left: 1px solid #121315 !important;
+    background: #363636;
+    margin-right: 5px;
+    user-select: none;
+  }
+  .el-tabs__item.is-active{
+    background: #1e1e1e;
+    border-bottom-color: #1e1e1e!important;
+    color: #fff;
+  }
+  .el-icon-edit{
+    color: #f1fa8c;
+  }
+  .el-icon-document{
+    color: #a95812;
+  }
+}
+
+// home
+.right-scrollbar {
+  .el-scrollbar__view {
+    padding: 12px 18px 15px 15px;
+  }
+}
+.left-scrollbar .el-scrollbar__wrap {
+  box-sizing: border-box;
+  overflow-x: hidden !important;
+  margin-bottom: 0 !important;
+}
+.center-tabs{
+  .el-tabs__header{
+    margin-bottom: 0!important;
+  }
+  .el-tabs__item{
+    width: 50%;
+    text-align: center;
+  }
+  .el-tabs__nav{
+    width: 100%;
+  }
+}
+.reg-item{
+  padding: 12px 6px;
+  background: #f8f8f8;
+  position: relative;
+  border-radius: 4px;
+  .close-btn{
+    position: absolute;
+    right: -6px;
+    top: -6px;
+    display: block;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    background: rgba(0, 0, 0, 0.2);
+    border-radius: 50%;
+    color: #fff;
+    text-align: center;
+    z-index: 1;
+    cursor: pointer;
+    font-size: 12px;
+    &:hover{
+      background: rgba(210, 23, 23, 0.5)
+    }
+  }
+  & + .reg-item{
+    margin-top: 18px;
+  }
+}
+.action-bar{
+  & .el-button+.el-button {
+    margin-left: 15px;
+  }
+  & i {
+    font-size: 20px;
+    vertical-align: middle;
+    position: relative;
+    top: -1px;
+  }
+}
+
+.custom-tree-node{
+  width: 100%;
+  font-size: 14px;
+  .node-operation{
+    float: right;
+  }
+  i[class*="el-icon"] + i[class*="el-icon"]{
+    margin-left: 6px;
+  }
+  .el-icon-plus{
+    color: #409EFF;
+  }
+  .el-icon-delete{
+    color: #157a0c;
+  }
+}
+
+.left-scrollbar .el-scrollbar__view{
+  overflow-x: hidden;
+}
+
+.el-rate{
+  display: inline-block;
+  vertical-align: text-top;
+}
+.el-upload__tip{
+  line-height: 1.2;
+}
+
+$selectedColor: #f6f7ff;
+$lighterBlue: #409EFF;
+
+.container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.components-list {
+  padding: 8px;
+  box-sizing: border-box;
+  height: 100%;
+  .components-item {
+    display: inline-block;
+    width: 48%;
+    margin: 1%;
+    transition: transform 0ms !important;
+  }
+}
+.components-draggable{
+  padding-bottom: 20px;
+}
+.components-title{
+  font-size: 14px;
+  color: #222;
+  margin: 6px 2px;
+  .svg-icon{
+    color: #666;
+    font-size: 18px;
+  }
+}
+
+.components-body {
+  padding: 8px 10px;
+  background: $selectedColor;
+  font-size: 12px;
+  cursor: move;
+  border: 1px dashed $selectedColor;
+  border-radius: 3px;
+  .svg-icon{
+    color: #777;
+    font-size: 15px;
+  }
+  &:hover {
+    border: 1px dashed #787be8;
+    color: #787be8;
+    .svg-icon {
+      color: #787be8;
+    }
+  }
+}
+
+.left-board {
+  width: 260px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 100vh;
+}
+.left-scrollbar{
+  height: calc(100vh - 42px);
+  overflow: hidden;
+}
+.center-scrollbar {
+  height: calc(100vh - 42px);
+  overflow: hidden;
+  border-left: 1px solid #f1e8e8;
+  border-right: 1px solid #f1e8e8;
+  box-sizing: border-box;
+}
+.center-board {
+  height: 100vh;
+  width: auto;
+  margin: 0 350px 0 260px;
+  box-sizing: border-box;
+}
+.empty-info{
+  position: absolute;
+  top: 46%;
+  left: 0;
+  right: 0;
+  text-align: center;
+  font-size: 18px;
+  color: #ccb1ea;
+  letter-spacing: 4px;
+}
+.action-bar{
+  position: relative;
+  height: 42px;
+  text-align: right;
+  padding: 0 15px;
+  box-sizing: border-box;;
+  border: 1px solid #f1e8e8;
+  border-top: none;
+  border-left: none;
+  .delete-btn{
+    color: #F56C6C;
+  }
+}
+.logo-wrapper{
+  position: relative;
+  height: 42px;
+  background: #fff;
+  border-bottom: 1px solid #f1e8e8;
+  box-sizing: border-box;
+}
+.logo{
+  position: absolute;
+  left: 12px;
+  top: 6px;
+  line-height: 30px;
+  color: #00afff;
+  font-weight: 600;
+  font-size: 17px;
+  white-space: nowrap;
+  > img{
+    width: 30px;
+    height: 30px;
+    vertical-align: top;
+  }
+  .github{
+    display: inline-block;
+    vertical-align: sub;
+    margin-left: 15px;
+    > img{
+      height: 22px;
+    }
+  }
+}
+
+.center-board-row {
+  padding: 12px 12px 15px 12px;
+  box-sizing: border-box;
+  & > .el-form {
+    // 69 = 12+15+42
+    height: calc(100vh - 69px);
+  }
+}
+.drawing-board {
+  height: 100%;
+  position: relative;
+  .components-body {
+    padding: 0;
+    margin: 0;
+    font-size: 0;
+  }
+  .sortable-ghost {
+    position: relative;
+    display: block;
+    overflow: hidden;
+    &::before {
+      content: " ";
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      height: 3px;
+      background: rgb(89, 89, 223);
+      z-index: 2;
+    }
+  }
+  .components-item.sortable-ghost {
+    width: 100%;
+    height: 60px;
+    background-color: $selectedColor;
+  }
+  .active-from-item {
+    & > .el-form-item{
+      background: $selectedColor;
+      border-radius: 6px;
+    }
+    & > .drawing-item-copy, & > .drawing-item-delete{
+      display: initial;
+    }
+    & > .component-name{
+      color: $lighterBlue;
+    }
+  }
+  .el-form-item{
+    margin-bottom: 15px;
+  }
+}
+.drawing-item{
+  position: relative;
+  cursor: move;
+  &.unfocus-bordered:not(.activeFromItem) > div:first-child  {
+    border: 1px dashed #ccc;
+  }
+  .el-form-item{
+    padding: 12px 10px;
+  }
+}
+.drawing-row-item{
+  position: relative;
+  cursor: move;
+  box-sizing: border-box;
+  border: 1px dashed #ccc;
+  border-radius: 3px;
+  padding: 0 2px;
+  margin-bottom: 15px;
+  .drawing-row-item {
+    margin-bottom: 2px;
+  }
+  .el-col{
+    margin-top: 22px;
+  }
+  .el-form-item{
+    margin-bottom: 0;
+  }
+  .drag-wrapper{
+    min-height: 80px;
+  }
+  &.active-from-item{
+    border: 1px dashed $lighterBlue;
+  }
+  .component-name{
+    position: absolute;
+    top: 0;
+    left: 0;
+    font-size: 12px;
+    color: #bbb;
+    display: inline-block;
+    padding: 0 6px;
+  }
+}
+.drawing-item, .drawing-row-item{
+  &:hover {
+    & > .el-form-item{
+      background: $selectedColor;
+      border-radius: 6px;
+    }
+    & > .drawing-item-copy, & > .drawing-item-delete{
+      display: initial;
+    }
+  }
+  & > .drawing-item-copy, & > .drawing-item-delete{
+    display: none;
+    position: absolute;
+    top: -10px;
+    width: 22px;
+    height: 22px;
+    line-height: 22px;
+    text-align: center;
+    border-radius: 50%;
+    font-size: 12px;
+    border: 1px solid;
+    cursor: pointer;
+    z-index: 1;
+  }
+  & > .drawing-item-copy{
+    right: 56px;
+    border-color: $lighterBlue;
+    color: $lighterBlue;
+    background: #fff;
+    &:hover{
+      background: $lighterBlue;
+      color: #fff;
+    }
+  }
+  & > .drawing-item-delete{
+    right: 24px;
+    border-color: #F56C6C;
+    color: #F56C6C;
+    background: #fff;
+    &:hover{
+      background: #F56C6C;
+      color: #fff;
+    }
+  }
+}
+
+</style>
diff --git a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue b/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
new file mode 100644
index 0000000..757962c
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="表名称" prop="tableName">
+          <el-input placeholder="请输入仓库名称" v-model="info.tableName" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="表描述" prop="tableComment">
+          <el-input placeholder="请输入" v-model="info.tableComment" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="实体类名称" prop="className">
+          <el-input placeholder="请输入" v-model="info.className" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="作者" prop="functionAuthor">
+          <el-input placeholder="请输入" v-model="info.functionAuthor" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" :rows="3" v-model="info.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+export default {
+  name: "BasicInfoForm",
+  props: {
+    info: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      rules: {
+        tableName: [
+          { required: true, message: "请输入表名称", trigger: "blur" }
+        ],
+        tableComment: [
+          { required: true, message: "请输入表描述", trigger: "blur" }
+        ],
+        className: [
+          { required: true, message: "请输入实体类名称", trigger: "blur" }
+        ],
+        functionAuthor: [
+          { required: true, message: "请输入作者", trigger: "blur" }
+        ]
+      }
+    };
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
new file mode 100644
index 0000000..94d0ef3
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -0,0 +1,232 @@
+<template>
+  <el-card>
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="基本信息" name="basic">
+        <basic-info-form ref="basicInfo" :info="info" />
+      </el-tab-pane>
+      <el-tab-pane label="字段信息" name="cloum">
+        <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
+          <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
+          <el-table-column
+            label="字段列名"
+            prop="columnName"
+            min-width="10%"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="字段描述" min-width="10%">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.columnComment"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="物理类型"
+            prop="columnType"
+            min-width="10%"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="Java类型" min-width="11%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.javaType">
+                <el-option label="Long" value="Long" />
+                <el-option label="String" value="String" />
+                <el-option label="Integer" value="Integer" />
+                <el-option label="Double" value="Double" />
+                <el-option label="BigDecimal" value="BigDecimal" />
+                <el-option label="Date" value="Date" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="java属性" min-width="10%">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.javaField"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="插入" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="编辑" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="列表" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="查询" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="查询方式" min-width="10%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.queryType">
+                <el-option label="=" value="EQ" />
+                <el-option label="!=" value="NE" />
+                <el-option label=">" value="GT" />
+                <el-option label=">=" value="GTE" />
+                <el-option label="<" value="LT" />
+                <el-option label="<=" value="LTE" />
+                <el-option label="LIKE" value="LIKE" />
+                <el-option label="BETWEEN" value="BETWEEN" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="必填" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="显示类型" min-width="12%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.htmlType">
+                <el-option label="文本框" value="input" />
+                <el-option label="文本域" value="textarea" />
+                <el-option label="下拉框" value="select" />
+                <el-option label="单选框" value="radio" />
+                <el-option label="复选框" value="checkbox" />
+                <el-option label="日期控件" value="datetime" />
+                <el-option label="图片上传" value="imageUpload" />
+                <el-option label="文件上传" value="fileUpload" />
+                <el-option label="富文本控件" value="editor" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="字典类型" min-width="12%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
+                <el-option
+                  v-for="dict in dictOptions"
+                  :key="dict.dictType"
+                  :label="dict.dictName"
+                  :value="dict.dictType">
+                  <span style="float: left">{{ dict.dictName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
+              </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="生成信息" name="genInfo">
+        <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
+      </el-tab-pane>
+    </el-tabs>
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+<script>
+import { getGenTable, updateGenTable } from "@/api/tool/gen";
+import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
+import { listMenu as getMenuTreeselect } from "@/api/system/menu";
+import basicInfoForm from "./basicInfoForm";
+import genInfoForm from "./genInfoForm";
+import Sortable from 'sortablejs'
+
+export default {
+  name: "GenEdit",
+  components: {
+    basicInfoForm,
+    genInfoForm
+  },
+  data() {
+    return {
+      // 选中选项卡的 name
+      activeName: "cloum",
+      // 表格的高度
+      tableHeight: document.documentElement.scrollHeight - 245 + "px",
+      // 表信息
+      tables: [],
+      // 表列信息
+      cloumns: [],
+      // 字典信息
+      dictOptions: [],
+      // 菜单信息
+      menus: [],
+      // 表详细信息
+      info: {}
+    };
+  },
+  created() {
+    const tableId = this.$route.params && this.$route.params.tableId;
+    if (tableId) {
+      // 获取表详细信息
+      getGenTable(tableId).then(res => {
+        this.cloumns = res.data.rows;
+        this.info = res.data.info;
+        this.tables = res.data.tables;
+      });
+      /** 查询字典下拉列表 */
+      getDictOptionselect().then(response => {
+        this.dictOptions = response.data;
+      });
+      /** 查询菜单下拉列表 */
+      getMenuTreeselect().then(response => {
+        this.menus = this.handleTree(response.data, "menuId");
+      });
+    }
+  },
+  methods: {
+    /** 提交按钮 */
+    submitForm() {
+      const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
+      const genForm = this.$refs.genInfo.$refs.genInfoForm;
+      Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
+        const validateResult = res.every(item => !!item);
+        if (validateResult) {
+          const genTable = Object.assign({}, basicForm.model, genForm.model);
+          genTable.columns = this.cloumns;
+          genTable.params = {
+            treeCode: genTable.treeCode,
+            treeName: genTable.treeName,
+            treeParentCode: genTable.treeParentCode,
+            parentMenuId: genTable.parentMenuId
+          };
+          updateGenTable(genTable).then(res => {
+            this.msgSuccess(res.msg);
+            if (res.code === 200) {
+              this.close();
+            }
+          });
+        } else {
+          this.msgError("表单校验未通过，请重新检查提交内容");
+        }
+      });
+    },
+    getFormPromise(form) {
+      return new Promise(resolve => {
+        form.validate(res => {
+          resolve(res);
+        });
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
+    }
+  },
+  mounted() {
+    const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+    const sortable = Sortable.create(el, {
+      handle: ".allowDrag",
+      onEnd: evt => {
+        const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
+        this.cloumns.splice(evt.newIndex, 0, targetRow);
+        for (let index in this.cloumns) {
+          this.cloumns[index].sort = parseInt(index) + 1;
+        }
+      }
+    });
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
new file mode 100644
index 0000000..27d6a22
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -0,0 +1,300 @@
+<template>
+  <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item prop="tplCategory">
+          <span slot="label">生成模板</span>
+          <el-select v-model="info.tplCategory" @change="tplSelectChange">
+            <el-option label="单表（增删改查）" value="crud" />
+            <el-option label="树表（增删改查）" value="tree" />
+            <el-option label="主子表（增删改查）" value="sub" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="packageName">
+          <span slot="label">
+            生成包路径
+            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.packageName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="moduleName">
+          <span slot="label">
+            生成模块名
+            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.moduleName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="businessName">
+          <span slot="label">
+            生成业务名
+            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.businessName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="functionName">
+          <span slot="label">
+            生成功能名
+            <el-tooltip content="用作类描述，例如 用户" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.functionName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            上级菜单
+            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <treeselect
+            :append-to-body="true"
+            v-model="info.parentMenuId"
+            :options="menus"
+            :normalizer="normalizer"
+            :show-count="true"
+            placeholder="请选择系统菜单"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="genType">
+          <span slot="label">
+            生成代码方式
+            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
+          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24" v-if="info.genType == '1'">
+        <el-form-item prop="genPath">
+          <span slot="label">
+            自定义路径
+            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.genPath">
+            <el-dropdown slot="append">
+              <el-button type="primary">
+                最近路径快速选择
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row v-show="info.tplCategory == 'tree'">
+      <h4 class="form-header">其他信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树编码字段
+            <el-tooltip content="树显示的编码字段名， 如：dept_id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树父编码字段
+            <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeParentCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树名称字段
+            <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row v-show="info.tplCategory == 'sub'">
+      <h4 class="form-header">关联信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            关联子表的表名
+            <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
+            <el-option
+              v-for="(table, index) in tables"
+              :key="index"
+              :label="table.tableName + '：' + table.tableComment"
+              :value="table.tableName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            子表关联的外键名
+            <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableFkName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in subColumns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "BasicInfoForm",
+  components: { Treeselect },
+  props: {
+    info: {
+      type: Object,
+      default: null
+    },
+    tables: {
+      type: Array,
+      default: null
+    },
+    menus: {
+      type: Array,
+      default: []
+    },
+  },
+  data() {
+    return {
+      subColumns: [],
+      rules: {
+        tplCategory: [
+          { required: true, message: "请选择生成模板", trigger: "blur" }
+        ],
+        packageName: [
+          { required: true, message: "请输入生成包路径", trigger: "blur" }
+        ],
+        moduleName: [
+          { required: true, message: "请输入生成模块名", trigger: "blur" }
+        ],
+        businessName: [
+          { required: true, message: "请输入生成业务名", trigger: "blur" }
+        ],
+        functionName: [
+          { required: true, message: "请输入生成功能名", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {},
+  watch: {
+    'info.subTableName': function(val) {
+      this.setSubTableColumns(val);
+    }
+  },
+  methods: {
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
+    /** 选择子表名触发 */
+    subSelectChange(value) {
+      this.info.subTableFkName = '';
+    },
+    /** 选择生成模板触发 */
+    tplSelectChange(value) {
+      if(value !== 'sub') {
+        this.info.subTableName = '';
+        this.info.subTableFkName = '';
+      }
+    },
+    /** 设置关联外键 */
+    setSubTableColumns(value) {
+      for (var item in this.tables) {
+        const name = this.tables[item].tableName;
+        if (value === name) {
+          this.subColumns = this.tables[item].columns;
+          break;
+        }
+      }
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
new file mode 100644
index 0000000..56b2c0c
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/gen/importTable.vue
@@ -0,0 +1,117 @@
+<template>
+  <!-- 导入表 -->
+  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="表名称" prop="tableName">
+        <el-input
+          v-model="queryParams.tableName"
+          placeholder="请输入表名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="表描述" prop="tableComment">
+        <el-input
+          v-model="queryParams.tableComment"
+          placeholder="请输入表描述"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column prop="updateTime" label="更新时间"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleImportTable">确 定</el-button>
+      <el-button @click="visible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listDbTable, importTable } from "@/api/tool/gen";
+export default {
+  data() {
+    return {
+      // 遮罩层
+      visible: false,
+      // 选中数组值
+      tables: [],
+      // 总条数
+      total: 0,
+      // 表数据
+      dbTableList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tableName: undefined,
+        tableComment: undefined
+      }
+    };
+  },
+  methods: {
+    // 显示弹框
+    show() {
+      this.getList();
+      this.visible = true;
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.tables = selection.map(item => item.tableName);
+    },
+    // 查询表数据
+    getList() {
+      listDbTable(this.queryParams).then(res => {
+        if (res.code === 200) {
+          this.dbTableList = res.rows;
+          this.total = res.total;
+        }
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 导入按钮操作 */
+    handleImportTable() {
+      importTable({ tables: this.tables.join(",") }).then(res => {
+        this.msgSuccess(res.msg);
+        if (res.code === 200) {
+          this.visible = false;
+          this.$emit("ok");
+        }
+      });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
new file mode 100644
index 0000000..88031f3
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -0,0 +1,340 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="表名称" prop="tableName">
+        <el-input
+          v-model="queryParams.tableName"
+          placeholder="请输入表名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="表描述" prop="tableComment">
+        <el-input
+          v-model="queryParams.tableComment"
+          placeholder="请输入表描述"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleGenTable"
+          v-hasPermi="['tool:gen:code']"
+        >生成</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          @click="openImportTable"
+          v-hasPermi="['tool:gen:import']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleEditTable"
+          v-hasPermi="['tool:gen:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['tool:gen:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" align="center" width="55"></el-table-column>
+      <el-table-column label="序号" type="index" width="50" align="center">
+        <template slot-scope="scope">
+          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="表名称"
+        align="center"
+        prop="tableName"
+        :show-overflow-tooltip="true"
+        width="120"
+      />
+      <el-table-column
+        label="表描述"
+        align="center"
+        prop="tableComment"
+        :show-overflow-tooltip="true"
+        width="120"
+      />
+      <el-table-column
+        label="实体"
+        align="center"
+        prop="className"
+        :show-overflow-tooltip="true"
+        width="120"
+      />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            icon="el-icon-view"
+            @click="handlePreview(scope.row)"
+            v-hasPermi="['tool:gen:preview']"
+          >预览</el-button>
+          <el-button
+            type="text"
+            size="small"
+            icon="el-icon-edit"
+            @click="handleEditTable(scope.row)"
+            v-hasPermi="['tool:gen:edit']"
+          >编辑</el-button>
+          <el-button
+            type="text"
+            size="small"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['tool:gen:remove']"
+          >删除</el-button>
+          <el-button
+            type="text"
+            size="small"
+            icon="el-icon-refresh"
+            @click="handleSynchDb(scope.row)"
+            v-hasPermi="['tool:gen:edit']"
+          >同步</el-button>
+          <el-button
+            type="text"
+            size="small"
+            icon="el-icon-download"
+            @click="handleGenTable(scope.row)"
+            v-hasPermi="['tool:gen:code']"
+          >生成代码</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 预览界面 -->
+    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+      <el-tabs v-model="preview.activeName">
+        <el-tab-pane
+          v-for="(value, key) in preview.data"
+          :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
+          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
+          :key="key"
+        >
+        <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+    <import-table ref="import" @ok="handleQuery" />
+  </div>
+</template>
+
+<script>
+import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
+import importTable from "./importTable";
+import { downLoadZip } from "@/utils/zipdownload";
+import hljs from "highlight.js/lib/highlight";
+import "highlight.js/styles/github-gist.css";
+hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
+hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
+hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
+
+export default {
+  name: "Gen",
+  components: { importTable },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 唯一标识符
+      uniqueId: "",
+      // 选中数组
+      ids: [],
+      // 选中表数组
+      tableNames: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表数据
+      tableList: [],
+      // 日期范围
+      dateRange: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tableName: undefined,
+        tableComment: undefined
+      },
+      // 预览参数
+      preview: {
+        open: false,
+        title: "代码预览",
+        data: {},
+        activeName: "domain.java"
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  activated() {
+    const time = this.$route.query.t;
+    if (time != null && time != this.uniqueId) {
+      this.uniqueId = time;
+      this.resetQuery();
+    }
+  },
+  methods: {
+    /** 查询表集合 */
+    getList() {
+      this.loading = true;
+      listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.tableList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 生成代码操作 */
+    handleGenTable(row) {
+      const tableNames = row.tableName || this.tableNames;
+      if (tableNames == "") {
+        this.msgError("请选择要生成的数据");
+        return;
+      }
+      if(row.genType === "1") {
+        genCode(row.tableName).then(response => {
+          this.msgSuccess("成功生成到自定义路径：" + row.genPath);
+        });
+      } else {
+        downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
+      }
+    },
+    /** 同步数据库操作 */
+    handleSynchDb(row) {
+      const tableName = row.tableName;
+      this.$confirm('确认要强制同步"' + tableName + '"表结构吗？', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+          return synchDb(tableName);
+      }).then(() => {
+          this.msgSuccess("同步成功");
+      }).catch(() => {});
+    },
+    /** 打开导入表弹窗 */
+    openImportTable() {
+      this.$refs.import.show();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 预览按钮 */
+    handlePreview(row) {
+      previewTable(row.tableId).then(response => {
+        this.preview.data = response.data;
+        this.preview.open = true;
+      });
+    },
+    /** 高亮显示 */
+    highlightedCode(code, key) {
+      const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
+      var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+      const result = hljs.highlight(language, code || "", true);
+      return result.value || '&nbsp;';
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.tableId);
+      this.tableNames = selection.map(item => item.tableName);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 修改按钮操作 */
+    handleEditTable(row) {
+      const tableId = row.tableId || this.ids[0];
+      this.$router.push("/tool/gen-edit/index/" + tableId);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const tableIds = row.tableId || this.ids;
+      this.$confirm('是否确认删除表编号为"' + tableIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+          return delTable(tableIds);
+      }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue
new file mode 100644
index 0000000..b8becc6
--- /dev/null
+++ b/ruoyi-ui/src/views/tool/swagger/index.vue
@@ -0,0 +1,15 @@
+<template>
+  <i-frame :src="url" />
+</template>
+<script>
+import iFrame from "@/components/iFrame/index";
+export default {
+  name: "Swagger",
+  components: { iFrame },
+  data() {
+    return {
+      url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+    };
+  },
+};
+</script>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
new file mode 100644
index 0000000..387fe39
--- /dev/null
+++ b/ruoyi-ui/vue.config.js
@@ -0,0 +1,118 @@
+'use strict'
+const path = require('path')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+const name = process.env.VUE_APP_TITLE || '核销管理系统' // 网页标题
+
+const port = process.env.port || process.env.npm_config_port || 8099 // 端口
+
+// vue.config.js 配置说明
+//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
+// 这里只列一部分，具体配置参考文档
+module.exports = {
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+  outputDir: 'dist',
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+  assetsDir: 'static',
+  // 是否开启eslint保存检测，有效值：ture | false | 'error'
+  lintOnSave: process.env.NODE_ENV === 'development',
+  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置a
+  devServer: {
+    host: '0.0.0.0',
+    port: port,
+    open: true,
+    proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://localhost:7070`,
+        target: `http://221.195.106.155:8090`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      }
+    },
+    disableHostCheck: true
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    }
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/assets/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/assets/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    config
+      .when(process.env.NODE_ENV !== 'development',
+        config => {
+          config
+            .plugin('ScriptExtHtmlWebpackPlugin')
+            .after('html')
+            .use('script-ext-html-webpack-plugin', [{
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+              inline: /runtime\..*\.js$/
+            }])
+            .end()
+          config
+            .optimization.splitChunks({
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' // only package third parties that are initially dependent
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
+              }
+            })
+          config.optimization.runtimeChunk('single'),
+          {
+             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+             to: './' //到根目录下
+          }
+        }
+      )
+  }
+}
diff --git a/ry.bat b/ry.bat
new file mode 100644
index 0000000..a6ba5a5
--- /dev/null
+++ b/ry.bat
@@ -0,0 +1,67 @@
+@echo off
+
+rem jarƽ��Ŀ¼
+set AppName=ruoyi-admin.jar
+
+rem JVM����
+set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+
+
+ECHO. 
+	ECHO.  [1] ����%AppName%
+	ECHO.  [2] �ر�%AppName%
+	ECHO.  [3] ����%AppName%
+	ECHO.  [4] ����״̬ %AppName%
+	ECHO.  [5] �� �� 
+ECHO. 
+
+ECHO.������ѡ����Ŀ�����:
+set /p ID=
+	IF "%id%"=="1" GOTO start 
+	IF "%id%"=="2" GOTO stop 
+	IF "%id%"=="3" GOTO restart 
+	IF "%id%"=="4" GOTO status
+	IF "%id%"=="5" EXIT
+PAUSE 
+:start
+    for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if  defined pid (
+		echo %%is running 
+		PAUSE 
+	) 
+
+start javaw -jar %JAVA_OPTS% ruoyi-admin.jar
+
+echo  starting����
+echo  Start %AppName% success...
+goto:eof
+
+rem ����stopͨ��jps�������pid����������
+:stop
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% does not exists) else (
+		echo prepare to kill %image_name%
+		echo start kill %pid% ...
+		rem ���ݽ���ID��kill����
+		taskkill /f /pid %pid%
+	)
+goto:eof
+:restart
+	call :stop
+    call :start
+goto:eof
+:status
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% is dead ) else (
+		echo %image_name% is running
+	)
+goto:eof
\ No newline at end of file
diff --git a/ry.sh b/ry.sh
new file mode 100644
index 0000000..7c4f503
--- /dev/null
+++ b/ry.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+# author ruoyi
+# ./ry.sh start 启动
+# ./ry.sh stop 停止
+# ./ry.sh restart 重启
+# ./ry.sh status 状态
+AppName=ruoyi-admin.jar
+
+# JVM参数
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+APP_HOME=`pwd`
+LOG_PATH=$APP_HOME/logs/$AppName.log
+
+if [ "$1" = "" ];
+then
+    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
+    exit 1
+fi
+
+if [ "$AppName" = "" ];
+then
+    echo -e "\033[0;31m 未输入应用名 \033[0m"
+    exit 1
+fi
+
+function start()
+{
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+
+	if [ x"$PID" != x"" ]; then
+	    echo "$AppName is running..."
+	else
+		nohup java -jar  $JVM_OPTS target/$AppName > /dev/null 2>&1 &
+		echo "Start $AppName success..."
+	fi
+}
+
+function stop()
+{
+    echo "Stop $AppName"
+	
+	PID=""
+	query(){
+		PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+	}
+
+	query
+	if [ x"$PID" != x"" ]; then
+		kill -TERM $PID
+		echo "$AppName (pid:$PID) exiting..."
+		while [ x"$PID" != x"" ]
+		do
+			sleep 1
+			query
+		done
+		echo "$AppName exited."
+	else
+		echo "$AppName already stopped."
+	fi
+}
+
+function restart()
+{
+    stop
+    sleep 2
+    start
+}
+
+function status()
+{
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
+    if [ $PID != 0 ];then
+        echo "$AppName is running..."
+    else
+        echo "$AppName is not running..."
+    fi
+}
+
+case $1 in
+    start)
+    start;;
+    stop)
+    stop;;
+    restart)
+    restart;;
+    status)
+    status;;
+    *)
+
+esac
diff --git a/sql/quartz.sql b/sql/quartz.sql
new file mode 100644
index 0000000..8f57226
--- /dev/null
+++ b/sql/quartz.sql
@@ -0,0 +1,174 @@
+DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
+DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
+DROP TABLE IF EXISTS QRTZ_LOCKS;
+DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
+DROP TABLE IF EXISTS QRTZ_CALENDARS;
+
+-- ----------------------------
+-- 1、存储每一个已配置的 jobDetail 的详细信息
+-- ----------------------------
+create table QRTZ_JOB_DETAILS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    job_name             varchar(200)    not null            comment '任务名称',
+    job_group            varchar(200)    not null            comment '任务组名',
+    description          varchar(250)    null                comment '相关介绍',
+    job_class_name       varchar(250)    not null            comment '执行任务类名称',
+    is_durable           varchar(1)      not null            comment '是否持久化',
+    is_nonconcurrent     varchar(1)      not null            comment '是否并发',
+    is_update_data       varchar(1)      not null            comment '是否更新数据',
+    requests_recovery    varchar(1)      not null            comment '是否接受恢复执行',
+    job_data             blob            null                comment '存放持久化job对象',
+    primary key (sched_name, job_name, job_group)
+) engine=innodb comment = '任务详细信息表';
+
+-- ----------------------------
+-- 2、 存储已配置的 Trigger 的信息
+-- ----------------------------
+create table QRTZ_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_name         varchar(200)    not null            comment '触发器的名字',
+    trigger_group        varchar(200)    not null            comment '触发器所属组的名字',
+    job_name             varchar(200)    not null            comment 'qrtz_job_details表job_name的外键',
+    job_group            varchar(200)    not null            comment 'qrtz_job_details表job_group的外键',
+    description          varchar(250)    null                comment '相关介绍',
+    next_fire_time       bigint(13)      null                comment '上一次触发时间（毫秒）',
+    prev_fire_time       bigint(13)      null                comment '下一次触发时间（默认为-1表示不触发）',
+    priority             integer         null                comment '优先级',
+    trigger_state        varchar(16)     not null            comment '触发器状态',
+    trigger_type         varchar(8)      not null            comment '触发器的类型',
+    start_time           bigint(13)      not null            comment '开始时间',
+    end_time             bigint(13)      null                comment '结束时间',
+    calendar_name        varchar(200)    null                comment '日程表名称',
+    misfire_instr        smallint(2)     null                comment '补偿执行的策略',
+    job_data             blob            null                comment '存放持久化job对象',
+    primary key (sched_name, trigger_name, trigger_group),
+    foreign key (sched_name, job_name, job_group) references QRTZ_JOB_DETAILS(sched_name, job_name, job_group)
+) engine=innodb comment = '触发器详细信息表';
+
+-- ----------------------------
+-- 3、 存储简单的 Trigger，包括重复次数，间隔，以及已触发的次数
+-- ----------------------------
+create table QRTZ_SIMPLE_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_ name的外键',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    repeat_count         bigint(7)       not null            comment '重复的次数统计',
+    repeat_interval      bigint(12)      not null            comment '重复的间隔时间',
+    times_triggered      bigint(10)      not null            comment '已经触发的次数',
+    primary key (sched_name, trigger_name, trigger_group),
+    foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group)
+) engine=innodb comment = '简单触发器的信息表';
+
+-- ----------------------------
+-- 4、 存储 Cron Trigger，包括 Cron 表达式和时区信息
+-- ---------------------------- 
+create table QRTZ_CRON_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_name的外键',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    cron_expression      varchar(200)    not null            comment 'cron表达式',
+    time_zone_id         varchar(80)                         comment '时区',
+    primary key (sched_name, trigger_name, trigger_group),
+    foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group)
+) engine=innodb comment = 'Cron类型的触发器表';
+
+-- ----------------------------
+-- 5、 Trigger 作为 Blob 类型存储(用于 Quartz 用户用 JDBC 创建他们自己定制的 Trigger 类型，JobStore 并不知道如何存储实例的时候)
+-- ---------------------------- 
+create table QRTZ_BLOB_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_name的外键',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    blob_data            blob            null                comment '存放持久化Trigger对象',
+    primary key (sched_name, trigger_name, trigger_group),
+    foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group)
+) engine=innodb comment = 'Blob类型的触发器表';
+
+-- ----------------------------
+-- 6、 以 Blob 类型存储存放日历信息， quartz可配置一个日历来指定一个时间范围
+-- ---------------------------- 
+create table QRTZ_CALENDARS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    calendar_name        varchar(200)    not null            comment '日历名称',
+    calendar             blob            not null            comment '存放持久化calendar对象',
+    primary key (sched_name, calendar_name)
+) engine=innodb comment = '日历信息表';
+
+-- ----------------------------
+-- 7、 存储已暂停的 Trigger 组的信息
+-- ---------------------------- 
+create table QRTZ_PAUSED_TRIGGER_GRPS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    primary key (sched_name, trigger_group)
+) engine=innodb comment = '暂停的触发器表';
+
+-- ----------------------------
+-- 8、 存储与已触发的 Trigger 相关的状态信息，以及相联 Job 的执行信息
+-- ---------------------------- 
+create table QRTZ_FIRED_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    entry_id             varchar(95)     not null            comment '调度器实例id',
+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_name的外键',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    instance_name        varchar(200)    not null            comment '调度器实例名',
+    fired_time           bigint(13)      not null            comment '触发的时间',
+    sched_time           bigint(13)      not null            comment '定时器制定的时间',
+    priority             integer         not null            comment '优先级',
+    state                varchar(16)     not null            comment '状态',
+    job_name             varchar(200)    null                comment '任务名称',
+    job_group            varchar(200)    null                comment '任务组名',
+    is_nonconcurrent     varchar(1)      null                comment '是否并发',
+    requests_recovery    varchar(1)      null                comment '是否接受恢复执行',
+    primary key (sched_name, entry_id)
+) engine=innodb comment = '已触发的触发器表';
+
+-- ----------------------------
+-- 9、 存储少量的有关 Scheduler 的状态信息，假如是用于集群中，可以看到其他的 Scheduler 实例
+-- ---------------------------- 
+create table QRTZ_SCHEDULER_STATE (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    instance_name        varchar(200)    not null            comment '之前配置文件中org.quartz.scheduler.instanceId配置的名字，就会写入该字段',
+    last_checkin_time    bigint(13)      not null            comment '上次检查时间',
+    checkin_interval     bigint(13)      not null            comment '检查间隔时间',
+    primary key (sched_name, instance_name)
+) engine=innodb comment = '调度器状态表';
+
+-- ----------------------------
+-- 10、 存储程序的悲观锁的信息(假如使用了悲观锁)
+-- ---------------------------- 
+create table QRTZ_LOCKS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    lock_name            varchar(40)     not null            comment '悲观锁名称',
+    primary key (sched_name, lock_name)
+) engine=innodb comment = '存储的悲观锁信息表';
+
+-- ----------------------------
+-- 11、 Quartz集群实现同步机制的行锁表
+-- ---------------------------- 
+create table QRTZ_SIMPROP_TRIGGERS (
+    sched_name           varchar(120)    not null            comment '调度名称',
+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_ name的外键',
+    trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',
+    str_prop_1           varchar(512)    null                comment 'String类型的trigger的第一个参数',
+    str_prop_2           varchar(512)    null                comment 'String类型的trigger的第二个参数',
+    str_prop_3           varchar(512)    null                comment 'String类型的trigger的第三个参数',
+    int_prop_1           int             null                comment 'int类型的trigger的第一个参数',
+    int_prop_2           int             null                comment 'int类型的trigger的第二个参数',
+    long_prop_1          bigint          null                comment 'long类型的trigger的第一个参数',
+    long_prop_2          bigint          null                comment 'long类型的trigger的第二个参数',
+    dec_prop_1           numeric(13,4)   null                comment 'decimal类型的trigger的第一个参数',
+    dec_prop_2           numeric(13,4)   null                comment 'decimal类型的trigger的第二个参数',
+    bool_prop_1          varchar(1)      null                comment 'Boolean类型的trigger的第一个参数',
+    bool_prop_2          varchar(1)      null                comment 'Boolean类型的trigger的第二个参数',
+    primary key (sched_name, trigger_name, trigger_group),
+    foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group)
+) engine=innodb comment = '同步机制的行锁表';
+
+commit;
\ No newline at end of file
diff --git a/sql/ry_20210731.sql b/sql/ry_20210731.sql
new file mode 100644
index 0000000..8fb32fa
--- /dev/null
+++ b/sql/ry_20210731.sql
@@ -0,0 +1,687 @@
+-- ----------------------------
+-- 1、部门表
+-- ----------------------------
+drop table if exists sys_dept;
+create table sys_dept (
+  dept_id           bigint(20)      not null auto_increment    comment '部门id',
+  parent_id         bigint(20)      default 0                  comment '父部门id',
+  ancestors         varchar(50)     default ''                 comment '祖级列表',
+  dept_name         varchar(30)     default ''                 comment '部门名称',
+  order_num         int(4)          default 0                  comment '显示顺序',
+  leader            varchar(20)     default null               comment '负责人',
+  phone             varchar(11)     default null               comment '联系电话',
+  email             varchar(50)     default null               comment '邮箱',
+  status            char(1)         default '0'                comment '部门状态（0正常 1停用）',
+  del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time 	    datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  primary key (dept_id)
+) engine=innodb auto_increment=200 comment = '部门表';
+
+-- ----------------------------
+-- 初始化-部门表数据
+-- ----------------------------
+insert into sys_dept values(100,  0,   '0',          '若依科技',   0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(101,  100, '0,100',      '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(102,  100, '0,100',      '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(103,  101, '0,100,101',  '研发部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(104,  101, '0,100,101',  '市场部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(105,  101, '0,100,101',  '测试部门',   3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(106,  101, '0,100,101',  '财务部门',   4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(107,  101, '0,100,101',  '运维部门',   5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(108,  102, '0,100,102',  '市场部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+insert into sys_dept values(109,  102, '0,100,102',  '财务部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
+
+
+-- ----------------------------
+-- 2、用户信息表
+-- ----------------------------
+drop table if exists sys_user;
+create table sys_user (
+  user_id           bigint(20)      not null auto_increment    comment '用户ID',
+  dept_id           bigint(20)      default null               comment '部门ID',
+  user_name         varchar(30)     not null                   comment '用户账号',
+  nick_name         varchar(30)     not null                   comment '用户昵称',
+  user_type         varchar(2)      default '00'               comment '用户类型（00系统用户）',
+  email             varchar(50)     default ''                 comment '用户邮箱',
+  phonenumber       varchar(11)     default ''                 comment '手机号码',
+  sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
+  avatar            varchar(100)    default ''                 comment '头像地址',
+  password          varchar(100)    default ''                 comment '密码',
+  status            char(1)         default '0'                comment '帐号状态（0正常 1停用）',
+  del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
+  login_ip          varchar(128)    default ''                 comment '最后登录IP',
+  login_date        datetime                                   comment '最后登录时间',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time       datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (user_id)
+) engine=innodb auto_increment=100 comment = '用户信息表';
+
+-- ----------------------------
+-- 初始化-用户信息表数据
+-- ----------------------------
+insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员');
+insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员');
+
+
+-- ----------------------------
+-- 3、岗位信息表
+-- ----------------------------
+drop table if exists sys_post;
+create table sys_post
+(
+  post_id       bigint(20)      not null auto_increment    comment '岗位ID',
+  post_code     varchar(64)     not null                   comment '岗位编码',
+  post_name     varchar(50)     not null                   comment '岗位名称',
+  post_sort     int(4)          not null                   comment '显示顺序',
+  status        char(1)         not null                   comment '状态（0正常 1停用）',
+  create_by     varchar(64)     default ''                 comment '创建者',
+  create_time   datetime                                   comment '创建时间',
+  update_by     varchar(64)     default ''			       comment '更新者',
+  update_time   datetime                                   comment '更新时间',
+  remark        varchar(500)    default null               comment '备注',
+  primary key (post_id)
+) engine=innodb comment = '岗位信息表';
+
+-- ----------------------------
+-- 初始化-岗位信息表数据
+-- ----------------------------
+insert into sys_post values(1, 'ceo',  '董事长',    1, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(2, 'se',   '项目经理',  2, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(3, 'hr',   '人力资源',  3, '0', 'admin', sysdate(), '', null, '');
+insert into sys_post values(4, 'user', '普通员工',  4, '0', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 4、角色信息表
+-- ----------------------------
+drop table if exists sys_role;
+create table sys_role (
+  role_id              bigint(20)      not null auto_increment    comment '角色ID',
+  role_name            varchar(30)     not null                   comment '角色名称',
+  role_key             varchar(100)    not null                   comment '角色权限字符串',
+  role_sort            int(4)          not null                   comment '显示顺序',
+  data_scope           char(1)         default '1'                comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
+  menu_check_strictly  tinyint(1)      default 1                  comment '菜单树选择项是否关联显示',
+  dept_check_strictly  tinyint(1)      default 1                  comment '部门树选择项是否关联显示',
+  status               char(1)         not null                   comment '角色状态（0正常 1停用）',
+  del_flag             char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
+  create_by            varchar(64)     default ''                 comment '创建者',
+  create_time          datetime                                   comment '创建时间',
+  update_by            varchar(64)     default ''                 comment '更新者',
+  update_time          datetime                                   comment '更新时间',
+  remark               varchar(500)    default null               comment '备注',
+  primary key (role_id)
+) engine=innodb auto_increment=100 comment = '角色信息表';
+
+-- ----------------------------
+-- 初始化-角色信息表数据
+-- ----------------------------
+insert into sys_role values('1', '超级管理员',  'admin',  1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员');
+insert into sys_role values('2', '普通角色',    'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '普通角色');
+
+
+-- ----------------------------
+-- 5、菜单权限表
+-- ----------------------------
+drop table if exists sys_menu;
+create table sys_menu (
+  menu_id           bigint(20)      not null auto_increment    comment '菜单ID',
+  menu_name         varchar(50)     not null                   comment '菜单名称',
+  parent_id         bigint(20)      default 0                  comment '父菜单ID',
+  order_num         int(4)          default 0                  comment '显示顺序',
+  path              varchar(200)    default ''                 comment '路由地址',
+  component         varchar(255)    default null               comment '组件路径',
+  is_frame          int(1)          default 1                  comment '是否为外链（0是 1否）',
+  is_cache          int(1)          default 0                  comment '是否缓存（0缓存 1不缓存）',
+  menu_type         char(1)         default ''                 comment '菜单类型（M目录 C菜单 F按钮）',
+  visible           char(1)         default 0                  comment '菜单状态（0显示 1隐藏）',
+  status            char(1)         default 0                  comment '菜单状态（0正常 1停用）',
+  perms             varchar(100)    default null               comment '权限标识',
+  icon              varchar(100)    default '#'                comment '菜单图标',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time       datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  remark            varchar(500)    default ''                 comment '备注',
+  primary key (menu_id)
+) engine=innodb auto_increment=2000 comment = '菜单权限表';
+
+-- ----------------------------
+-- 初始化-菜单信息表数据
+-- ----------------------------
+-- 一级菜单
+insert into sys_menu values('1', '系统管理', '0', '1', 'system',           null,   1, 0, 'M', '0', '0', '', 'system',   'admin', sysdate(), '', null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '2', 'monitor',          null,   1, 0, 'M', '0', '0', '', 'monitor',  'admin', sysdate(), '', null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '3', 'tool',             null,   1, 0, 'M', '0', '0', '', 'tool',     'admin', sysdate(), '', null, '系统工具目录');
+insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null ,  0, 0, 'M', '0', '0', '', 'guide',    'admin', sysdate(), '', null, '若依官网地址');
+-- 二级菜单
+insert into sys_menu values('100',  '用户管理', '1',   '1', 'user',       'system/user/index',        1, 0, 'C', '0', '0', 'system:user:list',        'user',          'admin', sysdate(), '', null, '用户管理菜单');
+insert into sys_menu values('101',  '角色管理', '1',   '2', 'role',       'system/role/index',        1, 0, 'C', '0', '0', 'system:role:list',        'peoples',       'admin', sysdate(), '', null, '角色管理菜单');
+insert into sys_menu values('102',  '菜单管理', '1',   '3', 'menu',       'system/menu/index',        1, 0, 'C', '0', '0', 'system:menu:list',        'tree-table',    'admin', sysdate(), '', null, '菜单管理菜单');
+insert into sys_menu values('103',  '部门管理', '1',   '4', 'dept',       'system/dept/index',        1, 0, 'C', '0', '0', 'system:dept:list',        'tree',          'admin', sysdate(), '', null, '部门管理菜单');
+insert into sys_menu values('104',  '岗位管理', '1',   '5', 'post',       'system/post/index',        1, 0, 'C', '0', '0', 'system:post:list',        'post',          'admin', sysdate(), '', null, '岗位管理菜单');
+insert into sys_menu values('105',  '字典管理', '1',   '6', 'dict',       'system/dict/index',        1, 0, 'C', '0', '0', 'system:dict:list',        'dict',          'admin', sysdate(), '', null, '字典管理菜单');
+insert into sys_menu values('106',  '参数设置', '1',   '7', 'config',     'system/config/index',      1, 0, 'C', '0', '0', 'system:config:list',      'edit',          'admin', sysdate(), '', null, '参数设置菜单');
+insert into sys_menu values('107',  '通知公告', '1',   '8', 'notice',     'system/notice/index',      1, 0, 'C', '0', '0', 'system:notice:list',      'message',       'admin', sysdate(), '', null, '通知公告菜单');
+insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        '',                         1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
+insert into sys_menu values('109',  '在线用户', '2',   '1', 'online',     'monitor/online/index',     1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        'admin', sysdate(), '', null, '在线用户菜单');
+insert into sys_menu values('110',  '定时任务', '2',   '2', 'job',        'monitor/job/index',        1, 0, 'C', '0', '0', 'monitor:job:list',        'job',           'admin', sysdate(), '', null, '定时任务菜单');
+insert into sys_menu values('111',  '数据监控', '2',   '3', 'druid',      'monitor/druid/index',      1, 0, 'C', '0', '0', 'monitor:druid:list',      'druid',         'admin', sysdate(), '', null, '数据监控菜单');
+insert into sys_menu values('112',  '服务监控', '2',   '4', 'server',     'monitor/server/index',     1, 0, 'C', '0', '0', 'monitor:server:list',     'server',        'admin', sysdate(), '', null, '服务监控菜单');
+insert into sys_menu values('113',  '缓存监控', '2',   '5', 'cache',      'monitor/cache/index',      1, 0, 'C', '0', '0', 'monitor:cache:list',      'redis',         'admin', sysdate(), '', null, '缓存监控菜单');
+insert into sys_menu values('114',  '表单构建', '3',   '1', 'build',      'tool/build/index',         1, 0, 'C', '0', '0', 'tool:build:list',         'build',         'admin', sysdate(), '', null, '表单构建菜单');
+insert into sys_menu values('115',  '代码生成', '3',   '2', 'gen',        'tool/gen/index',           1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          'admin', sysdate(), '', null, '代码生成菜单');
+insert into sys_menu values('116',  '系统接口', '3',   '3', 'swagger',    'tool/swagger/index',       1, 0, 'C', '0', '0', 'tool:swagger:list',       'swagger',       'admin', sysdate(), '', null, '系统接口菜单');
+-- 三级菜单
+insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          'admin', sysdate(), '', null, '操作日志菜单');
+insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
+-- 用户管理按钮
+insert into sys_menu values('1001', '用户查询', '100', '1',  '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1002', '用户新增', '100', '2',  '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1003', '用户修改', '100', '3',  '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1004', '用户删除', '100', '4',  '', '', 1, 0, 'F', '0', '0', 'system:user:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1005', '用户导出', '100', '5',  '', '', 1, 0, 'F', '0', '0', 'system:user:export',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1006', '用户导入', '100', '6',  '', '', 1, 0, 'F', '0', '0', 'system:user:import',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1007', '重置密码', '100', '7',  '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd',       '#', 'admin', sysdate(), '', null, '');
+-- 角色管理按钮
+insert into sys_menu values('1008', '角色查询', '101', '1',  '', '', 1, 0, 'F', '0', '0', 'system:role:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1009', '角色新增', '101', '2',  '', '', 1, 0, 'F', '0', '0', 'system:role:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1010', '角色修改', '101', '3',  '', '', 1, 0, 'F', '0', '0', 'system:role:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1011', '角色删除', '101', '4',  '', '', 1, 0, 'F', '0', '0', 'system:role:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1012', '角色导出', '101', '5',  '', '', 1, 0, 'F', '0', '0', 'system:role:export',         '#', 'admin', sysdate(), '', null, '');
+-- 菜单管理按钮
+insert into sys_menu values('1013', '菜单查询', '102', '1',  '', '', 1, 0, 'F', '0', '0', 'system:menu:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1014', '菜单新增', '102', '2',  '', '', 1, 0, 'F', '0', '0', 'system:menu:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1015', '菜单修改', '102', '3',  '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1016', '菜单删除', '102', '4',  '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 'admin', sysdate(), '', null, '');
+-- 部门管理按钮
+insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1018', '部门新增', '103', '2',  '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1019', '部门修改', '103', '3',  '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1020', '部门删除', '103', '4',  '', '', 1, 0, 'F', '0', '0', 'system:dept:remove',         '#', 'admin', sysdate(), '', null, '');
+-- 岗位管理按钮
+insert into sys_menu values('1021', '岗位查询', '104', '1',  '', '', 1, 0, 'F', '0', '0', 'system:post:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1022', '岗位新增', '104', '2',  '', '', 1, 0, 'F', '0', '0', 'system:post:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1023', '岗位修改', '104', '3',  '', '', 1, 0, 'F', '0', '0', 'system:post:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1024', '岗位删除', '104', '4',  '', '', 1, 0, 'F', '0', '0', 'system:post:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1025', '岗位导出', '104', '5',  '', '', 1, 0, 'F', '0', '0', 'system:post:export',         '#', 'admin', sysdate(), '', null, '');
+-- 字典管理按钮
+insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', 1, 0, 'F', '0', '0', 'system:dict:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', 1, 0, 'F', '0', '0', 'system:dict:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', 1, 0, 'F', '0', '0', 'system:dict:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', 1, 0, 'F', '0', '0', 'system:dict:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', 1, 0, 'F', '0', '0', 'system:dict:export',         '#', 'admin', sysdate(), '', null, '');
+-- 参数设置按钮
+insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', 1, 0, 'F', '0', '0', 'system:config:query',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', 1, 0, 'F', '0', '0', 'system:config:add',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 'admin', sysdate(), '', null, '');
+-- 通知公告按钮
+insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
+-- 操作日志按钮
+insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove',     '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export',     '#', 'admin', sysdate(), '', null, '');
+-- 登录日志按钮
+insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export',  '#', 'admin', sysdate(), '', null, '');
+-- 在线用户按钮
+insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, '');
+-- 定时任务按钮
+insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1054', '任务导出', '110', '7', '#', '', 1, 0, 'F', '0', '0', 'monitor:job:export',         '#', 'admin', sysdate(), '', null, '');
+-- 代码生成按钮
+insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:query',             '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:edit',              '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:remove',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 6、用户和角色关联表  用户N-1角色
+-- ----------------------------
+drop table if exists sys_user_role;
+create table sys_user_role (
+  user_id   bigint(20) not null comment '用户ID',
+  role_id   bigint(20) not null comment '角色ID',
+  primary key(user_id, role_id)
+) engine=innodb comment = '用户和角色关联表';
+
+-- ----------------------------
+-- 初始化-用户和角色关联表数据
+-- ----------------------------
+insert into sys_user_role values ('1', '1');
+insert into sys_user_role values ('2', '2');
+
+
+-- ----------------------------
+-- 7、角色和菜单关联表  角色1-N菜单
+-- ----------------------------
+drop table if exists sys_role_menu;
+create table sys_role_menu (
+  role_id   bigint(20) not null comment '角色ID',
+  menu_id   bigint(20) not null comment '菜单ID',
+  primary key(role_id, menu_id)
+) engine=innodb comment = '角色和菜单关联表';
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+insert into sys_role_menu values ('2', '1');
+insert into sys_role_menu values ('2', '2');
+insert into sys_role_menu values ('2', '3');
+insert into sys_role_menu values ('2', '4');
+insert into sys_role_menu values ('2', '100');
+insert into sys_role_menu values ('2', '101');
+insert into sys_role_menu values ('2', '102');
+insert into sys_role_menu values ('2', '103');
+insert into sys_role_menu values ('2', '104');
+insert into sys_role_menu values ('2', '105');
+insert into sys_role_menu values ('2', '106');
+insert into sys_role_menu values ('2', '107');
+insert into sys_role_menu values ('2', '108');
+insert into sys_role_menu values ('2', '109');
+insert into sys_role_menu values ('2', '110');
+insert into sys_role_menu values ('2', '111');
+insert into sys_role_menu values ('2', '112');
+insert into sys_role_menu values ('2', '113');
+insert into sys_role_menu values ('2', '114');
+insert into sys_role_menu values ('2', '115');
+insert into sys_role_menu values ('2', '116');
+insert into sys_role_menu values ('2', '500');
+insert into sys_role_menu values ('2', '501');
+insert into sys_role_menu values ('2', '1000');
+insert into sys_role_menu values ('2', '1001');
+insert into sys_role_menu values ('2', '1002');
+insert into sys_role_menu values ('2', '1003');
+insert into sys_role_menu values ('2', '1004');
+insert into sys_role_menu values ('2', '1005');
+insert into sys_role_menu values ('2', '1006');
+insert into sys_role_menu values ('2', '1007');
+insert into sys_role_menu values ('2', '1008');
+insert into sys_role_menu values ('2', '1009');
+insert into sys_role_menu values ('2', '1010');
+insert into sys_role_menu values ('2', '1011');
+insert into sys_role_menu values ('2', '1012');
+insert into sys_role_menu values ('2', '1013');
+insert into sys_role_menu values ('2', '1014');
+insert into sys_role_menu values ('2', '1015');
+insert into sys_role_menu values ('2', '1016');
+insert into sys_role_menu values ('2', '1017');
+insert into sys_role_menu values ('2', '1018');
+insert into sys_role_menu values ('2', '1019');
+insert into sys_role_menu values ('2', '1020');
+insert into sys_role_menu values ('2', '1021');
+insert into sys_role_menu values ('2', '1022');
+insert into sys_role_menu values ('2', '1023');
+insert into sys_role_menu values ('2', '1024');
+insert into sys_role_menu values ('2', '1025');
+insert into sys_role_menu values ('2', '1026');
+insert into sys_role_menu values ('2', '1027');
+insert into sys_role_menu values ('2', '1028');
+insert into sys_role_menu values ('2', '1029');
+insert into sys_role_menu values ('2', '1030');
+insert into sys_role_menu values ('2', '1031');
+insert into sys_role_menu values ('2', '1032');
+insert into sys_role_menu values ('2', '1033');
+insert into sys_role_menu values ('2', '1034');
+insert into sys_role_menu values ('2', '1035');
+insert into sys_role_menu values ('2', '1036');
+insert into sys_role_menu values ('2', '1037');
+insert into sys_role_menu values ('2', '1038');
+insert into sys_role_menu values ('2', '1039');
+insert into sys_role_menu values ('2', '1040');
+insert into sys_role_menu values ('2', '1041');
+insert into sys_role_menu values ('2', '1042');
+insert into sys_role_menu values ('2', '1043');
+insert into sys_role_menu values ('2', '1044');
+insert into sys_role_menu values ('2', '1045');
+insert into sys_role_menu values ('2', '1046');
+insert into sys_role_menu values ('2', '1047');
+insert into sys_role_menu values ('2', '1048');
+insert into sys_role_menu values ('2', '1049');
+insert into sys_role_menu values ('2', '1050');
+insert into sys_role_menu values ('2', '1051');
+insert into sys_role_menu values ('2', '1052');
+insert into sys_role_menu values ('2', '1053');
+insert into sys_role_menu values ('2', '1054');
+insert into sys_role_menu values ('2', '1055');
+insert into sys_role_menu values ('2', '1056');
+insert into sys_role_menu values ('2', '1057');
+insert into sys_role_menu values ('2', '1058');
+insert into sys_role_menu values ('2', '1059');
+insert into sys_role_menu values ('2', '1060');
+
+-- ----------------------------
+-- 8、角色和部门关联表  角色1-N部门
+-- ----------------------------
+drop table if exists sys_role_dept;
+create table sys_role_dept (
+  role_id   bigint(20) not null comment '角色ID',
+  dept_id   bigint(20) not null comment '部门ID',
+  primary key(role_id, dept_id)
+) engine=innodb comment = '角色和部门关联表';
+
+-- ----------------------------
+-- 初始化-角色和部门关联表数据
+-- ----------------------------
+insert into sys_role_dept values ('2', '100');
+insert into sys_role_dept values ('2', '101');
+insert into sys_role_dept values ('2', '105');
+
+
+-- ----------------------------
+-- 9、用户与岗位关联表  用户1-N岗位
+-- ----------------------------
+drop table if exists sys_user_post;
+create table sys_user_post
+(
+  user_id   bigint(20) not null comment '用户ID',
+  post_id   bigint(20) not null comment '岗位ID',
+  primary key (user_id, post_id)
+) engine=innodb comment = '用户与岗位关联表';
+
+-- ----------------------------
+-- 初始化-用户与岗位关联表数据
+-- ----------------------------
+insert into sys_user_post values ('1', '1');
+insert into sys_user_post values ('2', '2');
+
+
+-- ----------------------------
+-- 10、操作日志记录
+-- ----------------------------
+drop table if exists sys_oper_log;
+create table sys_oper_log (
+  oper_id           bigint(20)      not null auto_increment    comment '日志主键',
+  title             varchar(50)     default ''                 comment '模块标题',
+  business_type     int(2)          default 0                  comment '业务类型（0其它 1新增 2修改 3删除）',
+  method            varchar(100)    default ''                 comment '方法名称',
+  request_method    varchar(10)     default ''                 comment '请求方式',
+  operator_type     int(1)          default 0                  comment '操作类别（0其它 1后台用户 2手机端用户）',
+  oper_name         varchar(50)     default ''                 comment '操作人员',
+  dept_name         varchar(50)     default ''                 comment '部门名称',
+  oper_url          varchar(255)    default ''                 comment '请求URL',
+  oper_ip           varchar(128)    default ''                 comment '主机地址',
+  oper_location     varchar(255)    default ''                 comment '操作地点',
+  oper_param        varchar(2000)   default ''                 comment '请求参数',
+  json_result       varchar(2000)   default ''                 comment '返回参数',
+  status            int(1)          default 0                  comment '操作状态（0正常 1异常）',
+  error_msg         varchar(2000)   default ''                 comment '错误消息',
+  oper_time         datetime                                   comment '操作时间',
+  primary key (oper_id)
+) engine=innodb auto_increment=100 comment = '操作日志记录';
+
+
+-- ----------------------------
+-- 11、字典类型表
+-- ----------------------------
+drop table if exists sys_dict_type;
+create table sys_dict_type
+(
+  dict_id          bigint(20)      not null auto_increment    comment '字典主键',
+  dict_name        varchar(100)    default ''                 comment '字典名称',
+  dict_type        varchar(100)    default ''                 comment '字典类型',
+  status           char(1)         default '0'                comment '状态（0正常 1停用）',
+  create_by        varchar(64)     default ''                 comment '创建者',
+  create_time      datetime                                   comment '创建时间',
+  update_by        varchar(64)     default ''                 comment '更新者',
+  update_time      datetime                                   comment '更新时间',
+  remark           varchar(500)    default null               comment '备注',
+  primary key (dict_id),
+  unique (dict_type)
+) engine=innodb auto_increment=100 comment = '字典类型表';
+
+insert into sys_dict_type values(1,  '用户性别', 'sys_user_sex',        '0', 'admin', sysdate(), '', null, '用户性别列表');
+insert into sys_dict_type values(2,  '菜单状态', 'sys_show_hide',       '0', 'admin', sysdate(), '', null, '菜单状态列表');
+insert into sys_dict_type values(3,  '系统开关', 'sys_normal_disable',  '0', 'admin', sysdate(), '', null, '系统开关列表');
+insert into sys_dict_type values(4,  '任务状态', 'sys_job_status',      '0', 'admin', sysdate(), '', null, '任务状态列表');
+insert into sys_dict_type values(5,  '任务分组', 'sys_job_group',       '0', 'admin', sysdate(), '', null, '任务分组列表');
+insert into sys_dict_type values(6,  '系统是否', 'sys_yes_no',          '0', 'admin', sysdate(), '', null, '系统是否列表');
+insert into sys_dict_type values(7,  '通知类型', 'sys_notice_type',     '0', 'admin', sysdate(), '', null, '通知类型列表');
+insert into sys_dict_type values(8,  '通知状态', 'sys_notice_status',   '0', 'admin', sysdate(), '', null, '通知状态列表');
+insert into sys_dict_type values(9,  '操作类型', 'sys_oper_type',       '0', 'admin', sysdate(), '', null, '操作类型列表');
+insert into sys_dict_type values(10, '系统状态', 'sys_common_status',   '0', 'admin', sysdate(), '', null, '登录状态列表');
+
+
+-- ----------------------------
+-- 12、字典数据表
+-- ----------------------------
+drop table if exists sys_dict_data;
+create table sys_dict_data
+(
+  dict_code        bigint(20)      not null auto_increment    comment '字典编码',
+  dict_sort        int(4)          default 0                  comment '字典排序',
+  dict_label       varchar(100)    default ''                 comment '字典标签',
+  dict_value       varchar(100)    default ''                 comment '字典键值',
+  dict_type        varchar(100)    default ''                 comment '字典类型',
+  css_class        varchar(100)    default null               comment '样式属性（其他样式扩展）',
+  list_class       varchar(100)    default null               comment '表格回显样式',
+  is_default       char(1)         default 'N'                comment '是否默认（Y是 N否）',
+  status           char(1)         default '0'                comment '状态（0正常 1停用）',
+  create_by        varchar(64)     default ''                 comment '创建者',
+  create_time      datetime                                   comment '创建时间',
+  update_by        varchar(64)     default ''                 comment '更新者',
+  update_time      datetime                                   comment '更新时间',
+  remark           varchar(500)    default null               comment '备注',
+  primary key (dict_code)
+) engine=innodb auto_increment=100 comment = '字典数据表';
+
+insert into sys_dict_data values(1,  1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 'admin', sysdate(), '', null, '性别男');
+insert into sys_dict_data values(2,  2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别女');
+insert into sys_dict_data values(3,  3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别未知');
+insert into sys_dict_data values(4,  1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单');
+insert into sys_dict_data values(5,  2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '隐藏菜单');
+insert into sys_dict_data values(6,  1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(7,  2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+insert into sys_dict_data values(8,  1,  '正常',     '0',       'sys_job_status',      '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(9,  2,  '暂停',     '1',       'sys_job_status',      '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+insert into sys_dict_data values(10, 1,  '默认',     'DEFAULT', 'sys_job_group',       '',   '',        'Y', '0', 'admin', sysdate(), '', null, '默认分组');
+insert into sys_dict_data values(11, 2,  '系统',     'SYSTEM',  'sys_job_group',       '',   '',        'N', '0', 'admin', sysdate(), '', null, '系统分组');
+insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是');
+insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '系统默认否');
+insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知');
+insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 'admin', sysdate(), '', null, '公告');
+insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '关闭状态');
+insert into sys_dict_data values(18, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '新增操作');
+insert into sys_dict_data values(19, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '修改操作');
+insert into sys_dict_data values(20, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '删除操作');
+insert into sys_dict_data values(21, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作');
+insert into sys_dict_data values(22, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作');
+insert into sys_dict_data values(23, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作');
+insert into sys_dict_data values(24, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '强退操作');
+insert into sys_dict_data values(25, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作');
+insert into sys_dict_data values(26, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '清空操作');
+insert into sys_dict_data values(27, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态');
+insert into sys_dict_data values(28, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
+
+
+-- ----------------------------
+-- 13、参数配置表
+-- ----------------------------
+drop table if exists sys_config;
+create table sys_config (
+  config_id         int(5)          not null auto_increment    comment '参数主键',
+  config_name       varchar(100)    default ''                 comment '参数名称',
+  config_key        varchar(100)    default ''                 comment '参数键名',
+  config_value      varchar(500)    default ''                 comment '参数键值',
+  config_type       char(1)         default 'N'                comment '系统内置（Y是 N否）',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time       datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (config_id)
+) engine=innodb auto_increment=100 comment = '参数配置表';
+
+insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
+insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
+insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' );
+insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）');
+insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser',      'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');
+
+
+-- ----------------------------
+-- 14、系统访问记录
+-- ----------------------------
+drop table if exists sys_logininfor;
+create table sys_logininfor (
+  info_id        bigint(20)     not null auto_increment   comment '访问ID',
+  user_name      varchar(50)    default ''                comment '用户账号',
+  ipaddr         varchar(128)   default ''                comment '登录IP地址',
+  login_location varchar(255)   default ''                comment '登录地点',
+  browser        varchar(50)    default ''                comment '浏览器类型',
+  os             varchar(50)    default ''                comment '操作系统',
+  status         char(1)        default '0'               comment '登录状态（0成功 1失败）',
+  msg            varchar(255)   default ''                comment '提示消息',
+  login_time     datetime                                 comment '访问时间',
+  primary key (info_id)
+) engine=innodb auto_increment=100 comment = '系统访问记录';
+
+
+-- ----------------------------
+-- 15、定时任务调度表
+-- ----------------------------
+drop table if exists sys_job;
+create table sys_job (
+  job_id              bigint(20)    not null auto_increment    comment '任务ID',
+  job_name            varchar(64)   default ''                 comment '任务名称',
+  job_group           varchar(64)   default 'DEFAULT'          comment '任务组名',
+  invoke_target       varchar(500)  not null                   comment '调用目标字符串',
+  cron_expression     varchar(255)  default ''                 comment 'cron执行表达式',
+  misfire_policy      varchar(20)   default '3'                comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
+  concurrent          char(1)       default '1'                comment '是否并发执行（0允许 1禁止）',
+  status              char(1)       default '0'                comment '状态（0正常 1暂停）',
+  create_by           varchar(64)   default ''                 comment '创建者',
+  create_time         datetime                                 comment '创建时间',
+  update_by           varchar(64)   default ''                 comment '更新者',
+  update_time         datetime                                 comment '更新时间',
+  remark              varchar(500)  default ''                 comment '备注信息',
+  primary key (job_id, job_name, job_group)
+) engine=innodb auto_increment=100 comment = '定时任务调度表';
+
+insert into sys_job values(1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams',        '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')',  '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)',  '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+
+
+-- ----------------------------
+-- 16、定时任务调度日志表
+-- ----------------------------
+drop table if exists sys_job_log;
+create table sys_job_log (
+  job_log_id          bigint(20)     not null auto_increment    comment '任务日志ID',
+  job_name            varchar(64)    not null                   comment '任务名称',
+  job_group           varchar(64)    not null                   comment '任务组名',
+  invoke_target       varchar(500)   not null                   comment '调用目标字符串',
+  job_message         varchar(500)                              comment '日志信息',
+  status              char(1)        default '0'                comment '执行状态（0正常 1失败）',
+  exception_info      varchar(2000)  default ''                 comment '异常信息',
+  create_time         datetime                                  comment '创建时间',
+  primary key (job_log_id)
+) engine=innodb comment = '定时任务调度日志表';
+
+
+-- ----------------------------
+-- 17、通知公告表
+-- ----------------------------
+drop table if exists sys_notice;
+create table sys_notice (
+  notice_id         int(4)          not null auto_increment    comment '公告ID',
+  notice_title      varchar(50)     not null                   comment '公告标题',
+  notice_type       char(1)         not null                   comment '公告类型（1通知 2公告）',
+  notice_content    longblob        default null               comment '公告内容',
+  status            char(1)         default '0'                comment '公告状态（0正常 1关闭）',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time       datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  remark            varchar(255)    default null               comment '备注',
+  primary key (notice_id)
+) engine=innodb auto_increment=10 comment = '通知公告表';
+
+-- ----------------------------
+-- 初始化-公告信息表数据
+-- ----------------------------
+insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', sysdate(), '', null, '管理员');
+
+
+-- ----------------------------
+-- 18、代码生成业务表
+-- ----------------------------
+drop table if exists gen_table;
+create table gen_table (
+  table_id          bigint(20)      not null auto_increment    comment '编号',
+  table_name        varchar(200)    default ''                 comment '表名称',
+  table_comment     varchar(500)    default ''                 comment '表描述',
+  sub_table_name    varchar(64)     default null               comment '关联子表的表名',
+  sub_table_fk_name varchar(64)     default null               comment '子表关联的外键名',
+  class_name        varchar(100)    default ''                 comment '实体类名称',
+  tpl_category      varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作）',
+  package_name      varchar(100)                               comment '生成包路径',
+  module_name       varchar(30)                                comment '生成模块名',
+  business_name     varchar(30)                                comment '生成业务名',
+  function_name     varchar(50)                                comment '生成功能名',
+  function_author   varchar(50)                                comment '生成功能作者',
+  gen_type          char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
+  gen_path          varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
+  options           varchar(1000)                              comment '其它生成选项',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time 	    datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  remark            varchar(500)    default null               comment '备注',
+  primary key (table_id)
+) engine=innodb auto_increment=1 comment = '代码生成业务表';
+
+
+-- ----------------------------
+-- 19、代码生成业务表字段
+-- ----------------------------
+drop table if exists gen_table_column;
+create table gen_table_column (
+  column_id         bigint(20)      not null auto_increment    comment '编号',
+  table_id          varchar(64)                                comment '归属表编号',
+  column_name       varchar(200)                               comment '列名称',
+  column_comment    varchar(500)                               comment '列描述',
+  column_type       varchar(100)                               comment '列类型',
+  java_type         varchar(500)                               comment 'JAVA类型',
+  java_field        varchar(200)                               comment 'JAVA字段名',
+  is_pk             char(1)                                    comment '是否主键（1是）',
+  is_increment      char(1)                                    comment '是否自增（1是）',
+  is_required       char(1)                                    comment '是否必填（1是）',
+  is_insert         char(1)                                    comment '是否为插入字段（1是）',
+  is_edit           char(1)                                    comment '是否编辑字段（1是）',
+  is_list           char(1)                                    comment '是否列表字段（1是）',
+  is_query          char(1)                                    comment '是否查询字段（1是）',
+  query_type        varchar(200)    default 'EQ'               comment '查询方式（等于、不等于、大于、小于、范围）',
+  html_type         varchar(200)                               comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
+  dict_type         varchar(200)    default ''                 comment '字典类型',
+  sort              int                                        comment '排序',
+  create_by         varchar(64)     default ''                 comment '创建者',
+  create_time 	    datetime                                   comment '创建时间',
+  update_by         varchar(64)     default ''                 comment '更新者',
+  update_time       datetime                                   comment '更新时间',
+  primary key (column_id)
+) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
\ No newline at end of file
diff --git a/wxpay-sdk/.gitignore b/wxpay-sdk/.gitignore
new file mode 100644
index 0000000..a1c2a23
--- /dev/null
+++ b/wxpay-sdk/.gitignore
@@ -0,0 +1,23 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/wxpay-sdk/LICENSE b/wxpay-sdk/LICENSE
new file mode 100644
index 0000000..25e7391
--- /dev/null
+++ b/wxpay-sdk/LICENSE
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020, YClimb
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/wxpay-sdk/README.md b/wxpay-sdk/README.md
new file mode 100644
index 0000000..5717f22
--- /dev/null
+++ b/wxpay-sdk/README.md
@@ -0,0 +1,220 @@
+微信支付 Java SDK
+------
+
+2018最新最全微信支付集成SDK，一行代码调用微信支付，更多丰富接口注释和例子，包含基础支付功能（网页授权、各种签名、统一下单、退款、对账单、用户信息获取）、验收用例指引（沙箱支付、支付验收、免充值产品开通）、商户平台（现金红包、企业付款到用户、代金券或立减优惠）、公众平台（微信卡券、社交立减金活动）、小程序（生成永久二维码、发送模版消息）等等功能。
+
+本项目依托于 [微信支付开发者文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)，对文档中的接口进行二次封装，从而为小伙伴们提供一个`拿来即用`的支付sdk工具。
+
+相关的sdk文档已经更新，请进入以下地址查看：
+
+文档地址：https://yclimb.gitbook.io/wxpay
+
+gitbook：https://github.com/YClimb/wxpay-gitbook
+
+
+## 如何接入自身项目？
+
+```
+现在一般是有两种方式，pom 引用 jar 包和直接 copy，详情如下：
+
+1.第一种是直接把当前项目 clone 下来当作一个支付中间件，修改关键的支付参数后 deploy 到个人或者公司的私服中去，其他项目引用 jar 包；
+2.第二种是直接把我的 sdk 中 java 下的目录和文件拷贝到你的项目中，放到 java 项目路径下；
+
+释：两种方式各有利弊，jar 方式比较灵活，独立项目，但是修改参数要注意历史版本兼容和及时推包到私服，否则报错；
+直接拷贝的方式就比较简单，不独立，修改起来方便，但是如果有多个公众号或者小程序，或者多个项目需要使用，则需要拷贝到多个项目中，麻烦不容易管理，比较复杂；
+具体如何选择，看朋友们自身项目决定吧，建议公司级别项目使用第一种，更弹性可扩展。
+```
+
+## 项目结构
+首先需要简单说明整个 `wxpay-sdk` 的项目结构，主体结构如下所示：
+    
+    - wxpay-sdk
+        - src
+            - main
+                - java
+                    - com.weixin.pay
+                        - card              // 微信卡券
+                        - constants         // 常量文件
+                        - redis             // redis工具类
+                        - util              // 支付工具类（支付、签名、加密解密）
+                        - xxx class         // 支付实体类，基础配置信息
+                - test
+                    - controller
+                        - xxx class         // 测试的相关类
+        - .gitignore
+        - pom.xml                           // 引用包
+        - README.md
+        
+
+
+
+提供微信支付的基础功能，脱胎于微信官方Java-SDK，进行二次封装后，提供一系列的方法；
+基础方法主要在 `com.weixin.pay.WXPay` 、 `com.weixin.pay.util.WXUtils`类下，此项目包含的微信支付功能主要分为以下几个部分，这里列举一些主要功能，具体的详细功能查询作者gitbook或者公众号查看。
+
+### 1. 基础支付功能
+
+ `com.weixin.pay.WXPay` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |microPay| 刷卡支付 |
+ |unifiedOrder | 统一下单|
+ |chooseWXPayMap | 微信支付二次签名|
+ |orderQuery | 查询订单 |
+ |reverse | 撤销订单 |
+ |closeOrder|关闭订单|
+ |refund|申请退款|
+ |refundQuery|查询退款|
+ |downloadBill|下载对账单|
+ |report|交易保障|
+ |shortUrl|转换短链接|
+ |authCodeToOpenid|授权码查询openid|
+
+    
+
+### 2. 验收用例
+
+支付验收指引：`https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=23_1`
+
+ `controller.TestWXPay` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |unifiedOrder | 统一下单|
+ |orderQuery | 查询订单 |
+ |reverse | 撤销订单 |
+ |closeOrder|关闭订单|
+ |refund|申请退款|
+ |refundQuery|查询退款|
+
+### 3. 商户平台-现金红包
+
+ `com.weixin.pay.WXPay` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |sendRedPack| 企业向指定微信用户的openid发放指定金额红包 |
+ |getRedPackInfo| 查询红包记录 |
+
+### 4. 商户平台-代金券或立减优惠
+
+ `com.weixin.pay.WXPay` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |sendCoupon| 发放代金券 |
+ |queryCouponsInfo| 查询代金券信息 |
+ |queryCouponStock| 查询代金券批次 |
+
+### 5. 公众平台-微信卡券
+
+ `com.weixin.pay.util.WXUtils` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |getAccessToken| 获取微信全局accessToken |
+ |getJsapiAccessTokenByCode| 网页授权获取用户信息时用于获取access_token以及openid |
+ |getJsapiUserinfo| 通过access_token和openid请求获取用户信息 |
+ |getWxCardApiTicket| 获取卡券 api_ticket 的 api |
+ |getWxApiTicket| 获取卡券 api_ticket 的 api |
+
+### 6. 公众平台-社交立减金活动
+
+ `com.weixin.pay.util.WXUtils` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |getCardList| 根据代金券批次ID得到组合的cardList |
+ |createCardActivity| 创建支付后领取立减金活动接口 |
+
+
+### 7. 小程序
+
+ `com.weixin.pay.util.WXUtils` ：
+ 
+ |方法名 | 说明 |
+ |--------|--------|
+ |getMiniBaseUserInfo| 获取小程序静默登录返回信息 |
+ |getWxMiniQRImg| 生成带参数的小程序二维码[] |
+
+## 微信支付调用示例
+
+具体示例及文章可以查看作者的sdk文档，地址如下：
+
+文档地址：https://yclimb.gitbook.io/wxpay
+
+或者在本文末扫码关注作者微信公众号，加作者微信&加入讨论群与大家一起讨论。
+
+ `微信公众号网页授权` ：
+```$xslt
+https://yclimb.gitbook.io/wxpay/pay/authorize
+```
+
+ `统一下单接口` ：
+
+```$xslt
+public Map<String, String> saveWxPayUnifiedOrder(Payment payment, User user) throws Exception {
+    if (payment == null) {
+        return null;
+    }
+    if (user == null) {
+        return null;
+    }
+
+    // 1.调用微信统一下单接口
+    WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+    Map<String, String> resultMap = wxPay.unifiedOrder(...);
+
+    // 1.1.记录付款流水
+    ...
+
+    // 下单失败，进行处理
+    if (WXPayConstants.FAIL.equals(resultMap.get(WXPayConstants.RETURN_CODE)) ||
+            WXPayConstants.FAIL.equals(resultMap.get(WXPayConstants.RESULT_CODE))) {
+
+        // 处理结果返回，无需继续执行
+        resultMap.put(WXPayConstants.RESULT_CODE, WXPayConstants.FAIL);
+        resultMap.put(WXPayConstants.ERR_CODE_DES, resultMap.get(WXPayConstants.RETURN_MSG));
+        return resultMap;
+    }
+
+    // 1.2.获取prepay_id、nonce_str
+    String prepay_id = resultMap.get("prepay_id");
+    String nonce_str = resultMap.get("nonce_str");
+
+    // 2.根据微信统一下单接口返回数据组装微信支付参数，返回结果
+    return wxPay.chooseWXPayMap(prepay_id, nonce_str);
+}
+```
+
+ `支付结果通知` ：
+```$xslt
+https://yclimb.gitbook.io/wxpay/pay/wxnotify
+```
+
+ `查询订单和关闭订单` ：
+```$xslt
+https://yclimb.gitbook.io/wxpay/pay/orderquery
+```
+
+ `申请退款、退款回调接口、查询退款` ：
+```$xslt
+https://yclimb.gitbook.io/wxpay/refund/refund
+```
+
+
+    
+基础调用方式如上所述，统一返回值为 `Map<String, String>`，详细信息见实体类，文档会实时更新，尽情期待！！！
+    
+    
+关注作者微信公众号，点击下方`讨论群`，扫码即可加入`微信支付讨论群`与小伙伴一起探讨哦～
+---
+
+![关注我的公众号](https://img-blog.csdn.net/20180130111432962?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvWUNsaW1i/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
+
+---
+
+
+
+## License
+BSD
diff --git a/wxpay-sdk/pom.xml b/wxpay-sdk/pom.xml
new file mode 100644
index 0000000..99e8a49
--- /dev/null
+++ b/wxpay-sdk/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.6.0</version>
+        <!--        <relativePath>../pom.xml</relativePath>-->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.weixin.pay</groupId>
+    <artifactId>wxpay-sdk</artifactId>
+    <version>0.0.1</version>
+    <name>wxpay-sdk</name>
+    <description>wxpay sdk</description>
+<!--    <url>https://github.com/YClimb/wxpay-sdk</url>-->
+    <!-- 官方版 -->
+    <!--<url>https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=11_1</url>-->
+
+    <!--<licenses>
+        <license>
+            <name>The BSD 3-Clause License</name>
+            <url>https://opensource.org/licenses/BSD-3-Clause</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>wxpay</name>
+            <email>yclimb@qq.com</email>
+            <url>https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=11_1</url>
+        </developer>
+    </developers>-->
+
+    <properties>
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.31</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-web -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.3.14.RELEASE</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-redis -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+    </dependencies>
+
+    <!--<build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    &lt;!&ndash; Source &ndash;&gt;
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    &lt;!&ndash; Javadoc &ndash;&gt;
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>-->
+
+</project>
\ No newline at end of file
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPay.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPay.java
new file mode 100644
index 0000000..ffbe657
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPay.java
@@ -0,0 +1,1355 @@
+package com.weixin.pay;
+
+import com.weixin.pay.constants.WXPayConstants;
+import com.weixin.pay.constants.WXPayConstants.SignType;
+import com.weixin.pay.util.DateTimeUtil;
+import com.weixin.pay.util.WXPayUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPay {
+
+    private WXPayConfig config;
+    private SignType signType;
+    private boolean autoReport;
+    private boolean useSandbox;
+    private String notifyUrl;
+    private WXPayRequest wxPayRequest;
+
+    public WXPay(final WXPayConfig config) throws Exception {
+        this(config, null, true, false);
+        // this(config, null, true, true);
+    }
+
+    public WXPay(final WXPayConfig config, final boolean autoReport) throws Exception {
+        this(config, null, autoReport, false);
+        // this(config, null, autoReport, true);
+    }
+
+
+    public WXPay(final WXPayConfig config, final boolean autoReport, final boolean useSandbox) throws Exception {
+        this(config, null, autoReport, useSandbox);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl) throws Exception {
+        this(config, notifyUrl, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport) throws Exception {
+        this(config, notifyUrl, autoReport, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport, final boolean useSandbox) throws Exception {
+        this.config = config;
+        this.notifyUrl = notifyUrl;
+        this.autoReport = autoReport;
+        this.useSandbox = useSandbox;
+        if (useSandbox) {
+            this.signType = SignType.MD5; // 沙箱环境
+        } else {
+            this.signType = SignType.MD5; // 此处原来不是MD5！！！
+        }
+        this.wxPayRequest = new WXPayRequest(config);
+    }
+
+    private void checkWXPayConfig() throws Exception {
+        if (this.config == null) {
+            throw new Exception("config is null");
+        }
+        if (this.config.getAppID() == null || this.config.getAppID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getMchID() == null || this.config.getMchID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getCertStream() == null) {
+            throw new Exception("cert stream in config is empty");
+        }
+        if (this.config.getWXPayDomain() == null) {
+            throw new Exception("config.getWXPayDomain() is null");
+        }
+
+        if (this.config.getHttpConnectTimeoutMs() < 10) {
+            throw new Exception("http connect timeout is too small");
+        }
+        if (this.config.getHttpReadTimeoutMs() < 10) {
+            throw new Exception("http read timeout is too small");
+        }
+
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign_type、sign <br>
+     * 该函数适用于商户适用于统一下单等接口，不适用于红包、代金券接口
+     *
+     * @param reqData r
+     * @return map
+     * @throws Exception e
+     */
+    public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        if (SignType.MD5.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.MD5);
+        } else if (SignType.HMACSHA256.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.HMACSHA256);
+        }
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign <br>
+     * 该函数适用于商户适用于适用于红包查询接口，不适用于统一下单接口
+     *
+     * @param reqData r
+     * @return map
+     * @throws Exception e
+     */
+    public Map<String, String> fillRequestDataNotType(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 判断xml数据的sign是否有效，必须包含sign字段，否则返回false。
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception e
+     */
+    public boolean isResponseSignatureValid(Map<String, String> reqData) throws Exception {
+        // 返回数据的签名方式和请求中给定的签名方式是一致的
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), this.signType);
+    }
+
+    /**
+     * 判断支付结果通知中的sign是否有效
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isPayResultNotifySignatureValid(Map<String, String> reqData) throws Exception {
+        String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
+        SignType signType;
+        if (signTypeInData == null) {
+            signType = SignType.MD5;
+        } else {
+            signTypeInData = signTypeInData.trim();
+            if (signTypeInData.length() == 0) {
+                signType = SignType.MD5;
+            } else if (WXPayConstants.MD5.equals(signTypeInData)) {
+                signType = SignType.MD5;
+            } else if (WXPayConstants.HMACSHA256.equals(signTypeInData)) {
+                signType = SignType.HMACSHA256;
+            } else {
+                throw new Exception(String.format("Unsupported sign_type: %s", signTypeInData));
+            }
+        }
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), signType);
+    }
+
+
+    /**
+     * 不需要证书的请求
+     *
+     * @param urlSuffix        String
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs    超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithoutCert(String urlSuffix, Map<String, String> reqData,
+                                     int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithoutCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, autoReport);
+        return resp;
+    }
+
+
+    /**
+     * 需要证书的请求
+     *
+     * @param urlSuffix        String
+     * @param reqData          向wxpay post的请求数据  Map
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs    超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithCert(String urlSuffix, Map<String, String> reqData,
+                                  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, this.autoReport);
+        return resp;
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     *
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception e
+     */
+    public Map<String, String> processResponseXml(String xmlStr) throws Exception {
+        return processResponseXml(xmlStr, true);
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     *
+     * @param xmlStr API返回的XML格式数据
+     * @param isFlag 是否对返回的数据进行sign校验
+     * @return Map类型数据
+     * @throws Exception e
+     */
+    public Map<String, String> processResponseXml(String xmlStr, boolean isFlag) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        } else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (return_code.equals(WXPayConstants.FAIL)) {
+            return respData;
+        } else if (return_code.equals(WXPayConstants.SUCCESS)) {
+            // 如果isFlag为false，则不需要进行sign校验
+            if (!isFlag) {
+                return respData;
+            }
+            if (this.isResponseSignatureValid(respData)) {
+                return respData;
+            } else {
+                throw new Exception(String.format("Invalid sign value in XML: %s", xmlStr));
+            }
+        } else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     *
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception
+     */
+    public Map<String, String> sendRedPackProcessResponseXml(String xmlStr) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        } else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (StringUtils.isNotBlank(return_code)) {
+            return respData;
+        } else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData) throws Exception {
+        return this.microPay(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_MICROPAY_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.MICROPAY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     *
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData) throws Exception {
+        return this.microPayWithPos(reqData, this.config.getHttpConnectTimeoutMs());
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     *
+     * @param reqData
+     * @param connectTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData, int connectTimeoutMs) throws Exception {
+        int remainingTimeMs = 60 * 1000;
+        long startTimestampMs = 0;
+        Map<String, String> lastResult = null;
+        Exception lastException = null;
+
+        while (true) {
+            startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+            int readTimeoutMs = remainingTimeMs - connectTimeoutMs;
+            if (readTimeoutMs > 1000) {
+                try {
+                    lastResult = this.microPay(reqData, connectTimeoutMs, readTimeoutMs);
+                    String returnCode = lastResult.get("return_code");
+                    if (returnCode.equals("SUCCESS")) {
+                        String resultCode = lastResult.get("result_code");
+                        String errCode = lastResult.get("err_code");
+                        if (resultCode.equals("SUCCESS")) {
+                            break;
+                        } else {
+                            // 看错误码，若支付结果未知，则重试提交刷卡支付
+                            if (errCode.equals("SYSTEMERROR") || errCode.equals("BANKERROR") || errCode.equals("USERPAYING")) {
+                                remainingTimeMs = remainingTimeMs - (int) (WXPayUtil.getCurrentTimestampMs() - startTimestampMs);
+                                if (remainingTimeMs <= 100) {
+                                    break;
+                                } else {
+                                    WXPayUtil.getLogger().info("microPayWithPos: try micropay again");
+                                    if (remainingTimeMs > 5 * 1000) {
+                                        Thread.sleep(5 * 1000);
+                                    } else {
+                                        Thread.sleep(1 * 1000);
+                                    }
+                                    continue;
+                                }
+                            } else {
+                                break;
+                            }
+                        }
+                    } else {
+                        break;
+                    }
+                } catch (Exception ex) {
+                    lastResult = null;
+                    lastException = ex;
+                }
+            } else {
+                break;
+            }
+        }
+
+        if (lastResult == null) {
+            throw lastException;
+        } else {
+            return lastResult;
+        }
+    }
+
+    /**
+     * 作用：商户平台-现金红包-发放普通红包<br>
+     * 场景：现金红包发放后会以公众号消息的形式触达用户
+     * 其他：需要证书
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> sendRedPack(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SENDREDPACK_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.SENDREDPACK_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.redPackRequestData(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.sendRedPackProcessResponseXml(respXml);
+    }
+
+    public Map<String, String> redPackRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("wxappid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateUUID());
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 作用：商户平台-现金红包-查询红包记录<br>
+     * 场景：用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
+     * 其他：需要证书
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> getRedPackInfo(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_GETHBINFO_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.GETHBINFO_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-发放代金券<br>
+     * 场景：用于商户主动调用接口给用户发放代金券的场景，已做防小号处理，给小号发放代金券将返回错误码。
+     * 注意：通过接口发放的代金券不会进入微信卡包
+     * 其他：需要证书
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> sendCoupon(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SEND_COUPON_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.SEND_COUPON_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestDataNotType(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.processResponseXml(respXml, false);
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券信息<br>
+     * 场景：查询代金券信息
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> queryCouponsInfo(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_QUERYCOUPONSINFO_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.QUERYCOUPONSINFO_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestDataNotType(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.processResponseXml(respXml, false);
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券批次<br>
+     * 场景：查询代金券批次信息
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> queryCouponStock(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_QUERY_COUPON_STOCK_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.QUERY_COUPON_STOCK_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestDataNotType(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.processResponseXml(respXml, false);
+    }
+
+    /**
+     * 作用：商户平台-企业付款-企业向微信用户个人付款 <br>
+     * 场景：企业付款到零钱资金使用商户号余额资金。
+     * 其他：需要证书
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> transfers(Map<String, String> reqData) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_TRANSFERS_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.TRANSFERS_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.transfersRequestData(reqData), config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+        return this.sendRedPackProcessResponseXml(respXml);
+    }
+
+    public Map<String, String> transfersRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("mch_appid", config.getAppID());
+        reqData.put("mchid", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateUUID());
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData) throws Exception {
+        return this.unifiedOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_UNIFIEDORDER_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.UNIFIEDORDER_URL_SUFFIX;
+        }
+        if (this.notifyUrl != null) {
+            reqData.put("notify_url", this.notifyUrl);
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData) throws Exception {
+        return this.orderQuery(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData          向wxpay post的请求数据 int
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_ORDERQUERY_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.ORDERQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData) throws Exception {
+        return this.reverse(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REVERSE_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.REVERSE_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData) throws Exception {
+        return this.closeOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_CLOSEORDER_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.CLOSEORDER_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData) throws Exception {
+        return this.refund(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUND_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.REFUND_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData) throws Exception {
+        return this.refundQuery(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUNDQUERY_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.REFUNDQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：对账单下载（成功时返回对账单数据，失败时返回XML格式数据）<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData) throws Exception {
+        return this.downloadBill(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     * 其中return_code为`SUCCESS`，data为对账单数据。
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return 经过封装的API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_DOWNLOADBILL_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.DOWNLOADBILL_URL_SUFFIX;
+        }
+        String respStr = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs).trim();
+        Map<String, String> ret;
+        // 出现错误，返回XML数据
+        if (respStr.indexOf("<") == 0) {
+            ret = WXPayUtil.xmlToMap(respStr);
+        } else {
+            // 正常返回csv数据
+            ret = new HashMap<String, String>();
+            ret.put("return_code", WXPayConstants.SUCCESS);
+            ret.put("return_msg", "ok");
+            ret.put("data", respStr);
+        }
+        return ret;
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData) throws Exception {
+        return this.report(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REPORT_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.REPORT_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return WXPayUtil.xmlToMap(respXml);
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData) throws Exception {
+        return this.shortUrl(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SHORTURL_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.SHORTURL_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData) throws Exception {
+        return this.authCodeToOpenid(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     *
+     * @param reqData          向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs    读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_AUTHCODETOOPENID_URL_SUFFIX;
+        } else {
+            url = WXPayConstants.AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：商户在小程序中先调用该接口在微信支付服务后台生成预支付交易单，返回正确的预支付交易后调起支付。
+     * 接口链接：URL地址：https://api.mch.weixin.qq.com/pay/unifiedorder
+     * 是否需要证书：否
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
+     *
+     * @param notify_url       公众号用户openid
+     * @param body             商品简单描述，该字段请按照规范传递，例：腾讯充值中心-QQ会员充值
+     * @param out_trade_no     商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*且在同一个商户号下唯一
+     * @param total_fee        订单总金额，传入参数单位为：元
+     * @param spbill_create_ip APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP
+     * @param goods_tag        订单优惠标记，用于区分订单是否可以享受优惠
+     * @param detail           商品详情	，单品优惠活动该字段必传
+     * @param time_start        订单生成时间，格式为yyyyMMddHHmmss
+     * @param time_expire       订单失效时间，格式为yyyyMMddHHmmss，如2009年12月27日9点10分10秒表示为20091227091010
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> unifiedOrder(String notify_url, String openid, String body, String out_trade_no, String total_fee,
+                                            String spbill_create_ip, String goods_tag, String detail,
+                                            Date time_start, Date time_expire) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 字段名	变量名	必填	类型	示例值	描述
+        // 标价币种	fee_type	否	String(16)	CNY	符合ISO 4217标准的三位字母代码，默认人民币：CNY，详细列表请参见货币类型
+        data.put("fee_type", WXPayConstants.FEE_TYPE_CNY);
+        // 通知地址	notify_url	是	String(256)	http://www.weixin.qq.com/wxpay/pay.php	异步接收微信支付结果通知的回调地址，通知url必须为外网可访问的url，不能携带参数。
+        data.put("notify_url", notify_url);
+        // 交易类型	trade_type	是	String(16)	JSAPI	小程序取值如下：JSAPI，详细说明见参数规定
+        data.put("trade_type", WXPayConstants.TRADE_TYPE);
+        // 用户标识	openid	否	String(128)	oUpF8uMuAJO_M2pxb1Q9zNjWeS6o	trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识。openid如何获取，可参考【获取openid】。
+        data.put("openid", openid);
+        // 商品描述	body	是	String(128)	腾讯充值中心-QQ会员充值 商品简单描述，该字段请按照规范传递，具体请见参数规定
+        data.put("body", body);
+        // 商户订单号	out_trade_no	是	String(32)	20150806125346	商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*且在同一个商户号下唯一。详见商户订单号
+        data.put("out_trade_no", out_trade_no);
+        // 标价金额	total_fee	是	Int	88	订单总金额，单位为分，详见支付金额
+        // 默认单位为分，系统是元，所以需要*100
+        data.put("total_fee", String.valueOf(new BigDecimal(total_fee).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+        // 终端IP	spbill_create_ip	是	String(16)	123.12.12.123	APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP。
+        data.put("spbill_create_ip", spbill_create_ip);
+
+        /** 以下参数为非必填参数 **/
+        // 订单优惠标记	goods_tag	否	String(32)	WXG	订单优惠标记，使用代金券或立减优惠功能时需要的参数，说明详见代金券或立减优惠
+        if (StringUtils.isNotBlank(goods_tag)) {
+            data.put("goods_tag", goods_tag);
+        }
+        // 商品详情	detail	否	String(6000)	 	商品详细描述，对于使用单品优惠的商户，改字段必须按照规范上传，详见“单品优惠参数说明”
+        if (StringUtils.isNotBlank(detail)) {
+            data.put("detail", detail);
+            // 接口版本号 新增字段，接口版本号，区分原接口，默认填写1.0。入参新增version后，则支付通知接口也将返回单品优惠信息字段promotion_detail，请确保支付通知的签名验证能通过。
+            data.put("version", "1.0");
+        }
+        // 设备号	device_info	否	String(32)	013467007045764	自定义参数，可以为终端设备号(门店号或收银设备ID)，PC网页或公众号内支付可以传"WEB"
+        data.put("device_info", "WEB");
+
+        // 交易起始时间	time_start	否	String(14)	20091225091010	订单生成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
+        data.put("time_start", DateTimeUtil.getTimeShortString(time_start));
+        // 交易结束时间	time_expire	否	String(14)	20091227091010	订单失效时间，格式为yyyyMMddHHmmss，如2009年12月27日9点10分10秒表示为20091227091010。订单失效时间是针对订单号而言的，由于在请求支付的时候有一个必传参数prepay_id只有两小时的有效期，所以在重入时间超过2小时的时候需要重新请求下单接口获取新的prepay_id。其他详见时间规则,建议：最短失效时间间隔大于1分钟
+        data.put("time_expire", DateTimeUtil.getTimeShortString(time_expire));
+		/*// 商品ID	product_id	否	String(32)	12235413214070356458058	trade_type=NATIVE时（即扫码支付），此参数必传。此参数为二维码中包含的商品ID，商户自行定义。
+		data.put("product_id", null);
+		// 指定支付方式	limit_pay	否	String(32)	no_credit	上传此参数no_credit--可限制用户不能使用信用卡支付
+		data.put("limit_pay", null);
+		// 附加数据	attach	否	String(127)	深圳分店	附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用。
+		data.put("attach", null);*/
+
+        /** 以下五个参数，在 this.fillRequestData 方法中会自动赋值 **/
+		/*// 小程序ID	appid	是	String(32)	wxd678efh567hg6787	微信分配的小程序ID
+        data.put("appid", WXPayConstants.APP_ID);
+        // 商户号	mch_id	是	String(32)	1230000109	微信支付分配的商户号
+        data.put("mch_id", WXPayConstants.MCH_ID);
+		// 随机字符串	nonce_str	是	String(32)	5K8264ILTKCH16CQ2502SI8ZNMTM67VS	随机字符串，长度要求在32位以内。推荐随机数生成算法
+		data.put("nonce_str", nonce_str);
+		// 签名类型	sign_type	否	String(32)	MD5	签名类型，默认为MD5，支持HMAC-SHA256和MD5。
+        data.put("sign_type", WXPayConstants.MD5);
+		// 签名	sign	是	String(32)	C380BEC2BFD727A4B6845133519F3AD6	通过签名算法计算得出的签名值，详见签名生成算法
+		data.put("sign", sign);*/
+
+        // 微信统一下单接口请求地址
+        Map<String, String> resultMap = this.unifiedOrder(data);
+
+        WXPayUtil.getLogger().info("wxPay.unifiedOrder:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：生成微信支付所需参数，微信支付二次签名<br>
+     * 场景：根据微信统一下单接口返回的 prepay_id 生成微信支付所需的参数
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6
+     *
+     * @param prepay_id 预支付id
+     * @param nonce_str 随机字符串
+     * @return 支付方法调用所需参数map
+     * @throws Exception e
+     */
+    public Map<String, String> chooseWXPayMap(String prepay_id, String nonce_str) throws Exception {
+
+        // 支付方法调用所需参数map
+        Map<String, String> chooseWXPayMap = new HashMap<>();
+        chooseWXPayMap.put("appId", config.getAppID());
+        chooseWXPayMap.put("timeStamp", String.valueOf(WXPayUtil.getCurrentTimestamp()));
+        chooseWXPayMap.put("nonceStr", nonce_str);
+        chooseWXPayMap.put("package", "prepay_id=" + prepay_id);
+        chooseWXPayMap.put("signType", WXPayConstants.MD5);
+
+        WXPayUtil.getLogger().info("wxPay.chooseWXPayMap:" + chooseWXPayMap.toString());
+
+        // 生成支付签名
+        String paySign = WXPayUtil.generateSignature(chooseWXPayMap, config.getKey());
+        chooseWXPayMap.put("paySign", paySign);
+
+        WXPayUtil.getLogger().info("wxPay.paySign:" + paySign);
+
+        return chooseWXPayMap;
+    }
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：当交易发生之后一段时间内，由于买家或者卖家的原因需要退款时，卖家可以通过退款接口将支付款退还给买家，
+     * 微信支付将在收到退款请求并且验证成功之后，按照退款规则将支付款按原路退到买家帐号上。
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=9_4
+     *
+     * @param notify_url     回调地址
+     * @param transaction_id 微信生成的订单号，在支付通知中有返回
+     * @param out_trade_no   商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+     * @param out_refund_no  商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+     * @param total_fee      订单总金额，传入参数单位为：元
+     * @param refund_fee     退款总金额，订单总金额，传入参数单位为：元
+     * @param refund_desc    退款原因，若商户传入，会在下发给用户的退款消息中体现退款原因
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> refund(String notify_url, String transaction_id, String out_trade_no, String out_refund_no,
+                                      String total_fee, String refund_fee, String refund_desc) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 变量名		字段名	必填	类型	示例值	描述
+        // 微信订单号	二选一	String(32)	1.21775E+27	微信生成的订单号，在支付通知中有返回
+        if (transaction_id != null) {
+            data.put("transaction_id", transaction_id);
+        }
+        // 商户订单号	String(32)	1.21775E+27	商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+        data.put("out_trade_no", out_trade_no);
+        // 商户退款单号	是	String(64)	1.21775E+27	商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+        data.put("out_refund_no", out_refund_no);
+        // 订单金额	是	Int	100	订单总金额，单位为分，只能为整数，详见支付金额
+        data.put("total_fee", String.valueOf(new BigDecimal(total_fee).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+        // 退款金额	是	Int	100	退款总金额，订单总金额，单位为分，只能为整数，详见支付金额
+        // 默认单位为分，系统是元，所以需要*100
+        data.put("refund_fee", String.valueOf(new BigDecimal(refund_fee).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+        // 退款原因	否	String(80)	商品已售完	若商户传入，会在下发给用户的退款消息中体现退款原因
+        data.put("refund_desc", refund_desc);
+        // 货币种类	否	String(8)	CNY	货币类型，符合ISO 4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
+        data.put("refund_fee_type", WXPayConstants.FEE_TYPE_CNY);
+        // 退款结果通知url	否	String(256)	https://weixin.qq.com/notify/	异步接收微信支付退款结果通知的回调地址，通知URL必须为外网可访问的url，不允许带参数,如果参数中传了notify_url，则商户平台上配置的回调地址将不会生效。
+        data.put("notify_url", notify_url);
+
+        /** 以下参数为非必填参数 **/
+        // 退款资金来源	否	String(30)	REFUND_SOURCE_RECHARGE_FUNDS	仅针对老资金流商户使用;REFUND_SOURCE_UNSETTLED_FUNDS---未结算资金退款（默认使用未结算资金退款）;REFUND_SOURCE_RECHARGE_FUNDS---可用余额退款
+        // data.put("refund_account", null);
+
+
+        /** 以下五个参数，在 this.fillRequestData 方法中会自动赋值 **/
+		/*// 小程序ID	appid	是	String(32)	wxd678efh567hg6787	微信分配的小程序ID
+        data.put("appid", WXPayConstants.APP_ID);
+        // 商户号	mch_id	是	String(32)	1230000109	微信支付分配的商户号
+        data.put("mch_id", WXPayConstants.MCH_ID);
+		// 随机字符串	nonce_str	是	String(32)	5K8264ILTKCH16CQ2502SI8ZNMTM67VS	随机字符串，长度要求在32位以内。推荐随机数生成算法
+		data.put("nonce_str", nonce_str);
+		// 签名类型	sign_type	否	String(32)	MD5	签名类型，默认为MD5，支持HMAC-SHA256和MD5。
+        data.put("sign_type", WXPayConstants.MD5);
+		// 签名	sign	是	String(32)	C380BEC2BFD727A4B6845133519F3AD6	通过签名算法计算得出的签名值，详见签名生成算法
+		data.put("sign", sign);*/
+
+        // 微信退款接口
+        Map<String, String> resultMap = this.refund(data);
+
+        WXPayUtil.getLogger().info("wxPay.refund:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：企业向微信用户个人付款<br>
+     * 场景：企业付款为企业提供付款至用户零钱的能力，支持通过API接口付款，或通过微信支付商户平台（pay.weixin.qq.com）网页操作付款。
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=14_2
+     *
+     * @param partner_trade_no 商户订单号
+     * @param openid           用户openid
+     * @param amount           企业付款金额
+     * @param desc             企业付款描述信息
+     * @param spbill_create_ip 该IP可传用户端或者服务端的IP
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> transfers(String partner_trade_no, String openid, String amount, String desc, String spbill_create_ip) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 商户订单号	partner_trade_no	是	10000098201411111234567890	String	商户订单号，需保持唯一性(只能是字母或者数字，不能包含有符号)
+        data.put("partner_trade_no", partner_trade_no);
+        // 用户openid	openid	是	oxTWIuGaIt6gTKsQRLau2M0yL16E	String	商户appid下，某用户的openid
+        data.put("openid", openid);
+        // 校验用户姓名选项	check_name	是	FORCE_CHECK	String	NO_CHECK：不校验真实姓名,FORCE_CHECK：强校验真实姓名
+        data.put("check_name", "NO_CHECK");
+        // 金额	amount	是	10099	int	企业付款金额，单位为分
+        data.put("amount", String.valueOf(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+        // 企业付款描述信息	desc	是	理赔	String	企业付款操作说明信息。必填。
+        data.put("desc", desc);
+        // Ip地址	spbill_create_ip	是	192.168.0.1	String(32)	该IP同在商户平台设置的IP白名单中的IP没有关联，该IP可传用户端或者服务端的IP。
+        data.put("spbill_create_ip", spbill_create_ip);
+
+        /** 以下参数为非必填参数 **/
+
+        /*// 设备号	device_info	否	013467007045764	String(32)	微信支付分配的终端设备号
+        data.put("device_info", "xxx");
+        // 收款用户姓名	re_user_name	可选	王小王	String	收款用户真实姓名。(如果check_name设置为FORCE_CHECK，则必填用户真实姓名)
+        data.put("re_user_name", "xxx");*/
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.transfers(data);
+
+        WXPayUtil.getLogger().info("wxPay.transfers:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：企业向指定微信用户的openid发放指定金额红包<br>
+     * 场景：商户可以通过本平台向微信支付用户发放现金红包。用户领取红包后，资金到达用户微信支付零钱账户，和零钱包的其他资金有一样的使用出口；若用户未领取，资金将会在24小时后退回商户的微信支付账户中。
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
+     *
+     * @param mch_billno       商户订单号
+     * @param openid           用户openid
+     * @param amount           企业付款金额
+     * @param act_name         活动名称
+     * @param wishing          红包祝福语
+     * @param remark           备注
+     * @param spbill_create_ip 该IP可传用户端或者服务端的IP
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> sendRedPack(String mch_billno, String openid, String amount, String act_name, String wishing, String remark, String spbill_create_ip) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 商户订单号	 mch_billno	是	10000098201411111234567890	String(28) 商户订单号（每个订单号必须唯一。取值范围：0~9，a~z，A~Z）接口根据商户订单号支持重入，如出现超时可再调用。
+        data.put("mch_billno", mch_billno);
+        // 商户名称	send_name	是	天虹百货	String(32)	红包发送者名称
+        data.put("send_name", "商户名称");
+        // 用户openid	re_openid	是	oxTWIuGaIt6gTKsQRLau2M0yL16E	String(32) 接受红包的用户openid openid为用户在wxappid下的唯一标识（获取openid参见微信公众平台开发者文档：网页授权获取用户基本信息）
+        data.put("re_openid", openid);
+        // 付款金额	total_amount	是	1000	int	付款金额，单位分
+        data.put("total_amount", String.valueOf(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+        // 红包发放总人数	total_num	是	1	int 红包发放总人数 total_num=1
+        data.put("total_num", "1");
+        // 红包祝福语	wishing	是	感谢您参加猜灯谜活动，祝您元宵节快乐！	String(128)	红包祝福语
+        data.put("wishing", wishing);
+        // Ip地址	client_ip	是	192.168.0.1	String(15)	调用接口的机器Ip地址
+        data.put("client_ip", spbill_create_ip);
+        // 活动名称	act_name	是	猜灯谜抢红包活动	String(32)	活动名称
+        data.put("act_name", act_name);
+        // 备注	remark	是	猜越多得越多，快来抢！	String(256)	备注信息
+        data.put("remark", remark);
+
+        /** 以下参数为非必填参数 **/
+        /*
+         * 场景id：scene_id	否	PRODUCT_8	String(32) 发放红包使用场景，红包金额大于200或者小于1元时必传
+         * PRODUCT_1:商品促销
+         * PRODUCT_2:抽奖
+         * PRODUCT_3:虚拟物品兑奖
+         * PRODUCT_4:企业内部福利
+         * PRODUCT_5:渠道分润
+         * PRODUCT_6:保险回馈
+         * PRODUCT_7:彩票派奖
+         * PRODUCT_8:税务刮奖
+         */
+        //data.put("scene_id", "PRODUCT_1");
+        /*
+         * 活动信息	risk_info	否	posttime%3d123123412%26clientversion%3d234134%26mobile%3d122344545%26deviceid%3dIOS	String(128)
+         * posttime:用户操作的时间戳
+         * mobile:业务系统账号的手机号，国家代码-手机号。不需要+号
+         * deviceid :mac 地址或者设备唯一标识
+         * clientversion :用户操作的客户端版本 把值为非空的信息用key=value进行拼接，再进行urlencode urlencode(posttime=xx& mobile =xx&deviceid=xx)
+         */
+        // 资金授权商户号	consume_mch_id	否	1222000096	String(32) 资金授权商户号 服务商替特约商户发放时使用
+
+        /** 以下四个参数，在 this.redPackRequestData 方法中会自动赋值 **/
+        // 商户号	mch_id	是	10000098	String(32)	微信支付分配的商户号
+        // 随机字符串	nonce_str	是	5K8264ILTKCH16CQ2502SI8ZNMTM67VS	String(32)	随机字符串，不长于32位
+        // 签名	sign	是	C380BEC2BFD727A4B6845133519F3AD6	String(32)	详见签名生成算法
+        // 公众账号appid	wxappid	是	wx8888888888888888	String(32)	微信分配的公众账号ID（企业号corpid即为此appId）。在微信开放平台（open.weixin.qq.com）申请的移动应用appid无法使用该接口。
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.sendRedPack(data);
+
+        WXPayUtil.getLogger().info("wxPay.sendRedPack:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：查询红包记录<br>
+     * 场景：用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_6&index=5
+     *
+     * @param mch_billno 商户订单号
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> getRedPackInfo(String mch_billno) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 商户订单号	 mch_billno	是	10000098201411111234567890	String(28) 商户订单号（每个订单号必须唯一。取值范围：0~9，a~z，A~Z）接口根据商户订单号支持重入，如出现超时可再调用。
+        data.put("mch_billno", mch_billno);
+        // 订单类型	bill_type	是	MCHT	String(32)	MCHT:通过商户订单号获取红包信息。
+        data.put("bill_type", "MCHT");
+
+        /** 以下四个参数，在 this.fillRequestData 方法中会自动赋值 **/
+        // 商户号	mch_id	是	10000098	String(32)	微信支付分配的商户号
+        // 随机字符串	nonce_str	是	5K8264ILTKCH16CQ2502SI8ZNMTM67VS	String(32)	随机字符串，不长于32位
+        // 签名	sign	是	C380BEC2BFD727A4B6845133519F3AD6	String(32)	详见签名生成算法
+        // 公众账号appid	appid	是	wx8888888888888888	String(32)	微信分配的公众账号ID（企业号corpid即为此appId）。在微信开放平台（open.weixin.qq.com）申请的移动应用appid无法使用该接口。
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.getRedPackInfo(data);
+
+        WXPayUtil.getLogger().info("wxPay.getRedPackInfo:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-发放代金券<br>
+     * 场景：用于商户主动调用接口给用户发放代金券的场景，已做防小号处理，给小号发放代金券将返回错误码。
+     * 注意：通过接口发放的代金券不会进入微信卡包
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_3&index=4
+     *
+     * @param coupon_stock_id 代金券批次id
+     * @param partner_trade_no 商户单据号
+     * @param openid 用户openid
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> sendCoupon(String coupon_stock_id, String partner_trade_no, String openid) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 代金券批次id	coupon_stock_id	是	1757	String	代金券批次id
+        data.put("coupon_stock_id", coupon_stock_id);
+        // openid记录数	openid_count	是	1	int	openid记录数（目前支持num=1）
+        data.put("openid_count", "1");
+        // 商户单据号	partner_trade_no	是	1000009820141203515766	String	商户此次发放凭据号（格式：商户id+日期+流水号），商户侧需保持唯一性
+        data.put("partner_trade_no", partner_trade_no);
+        // 用户openid	openid	是	onqOjjrXT-776SpHnfexGm1_P7iE	String	Openid信息，用户在appid下的唯一标识
+        data.put("openid", openid);
+
+        /** 以下参数为非必填参数 **/
+        // 操作员	op_user_id	否	10000098	String(32)	操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限
+        // 设备号	device_info	否	 	String(32)	微信支付分配的终端设备号
+        // 协议版本	version	否	1.0	String(32)	默认1.0
+        // 协议类型	type	否	XML	String(32)	XML【目前仅支持默认XML】
+
+
+        /** 以下四个参数，在 this.fillRequestData 方法中会自动赋值 **/
+        // 公众账号ID appid	是	wx5edab3bdfba3dc1c	String(32)	微信为发券方商户分配的公众账号ID，接口传入的所有appid应该为公众号的appid（在mp.weixin.qq.com申请的），不能为APP的appid（在open.weixin.qq.com申请的）。
+        // 商户号	mch_id	是	10000098	String(32)	微信为发券方商户分配的商户号
+        // 随机字符串	nonce_str	是	1417574675	String(32)	随机字符串，不长于32位
+        // 签名	sign	是	841B3002FE2220C87A2D08ABD8A8F791	String(32)	签名参数，详见签名生成算法
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.sendCoupon(data);
+
+        WXPayUtil.getLogger().info("wxPay.sendCoupon:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券信息<br>
+     * 场景：查询代金券信息
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_5&index=6
+     *
+     * @param coupon_id 代金券id
+     * @param stock_id 批次号
+     * @param openid 用户openid
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> queryCouponsInfo(String coupon_id, String stock_id, String openid) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 代金券id	coupon_id	是	1565	String	代金券id
+        data.put("coupon_id", coupon_id);
+        // 用户openid	openid	是	onqOjjrXT-776SpHnfexGm1_P7iE	String	Openid信息，用户在appid下的唯一标识
+        data.put("openid", openid);
+        // 批次号	stock_id	是	58818	String(32)	代金劵对应的批次号
+        data.put("stock_id", stock_id);
+
+        /** 以下参数为非必填参数 **/
+        // 操作员	op_user_id	否	10000098	String(32)	操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限
+        // 设备号	device_info	否	 	String(32)	微信支付分配的终端设备号
+        // 协议版本	version	否	1.0	String(32)	默认1.0
+        // 协议类型	type	否	XML	String(32)	XML【目前仅支持默认XML】
+
+
+        /** 以下四个参数，在 this.fillRequestData 方法中会自动赋值 **/
+        // 公众账号ID appid	是	wx5edab3bdfba3dc1c	String(32)	微信为发券方商户分配的公众账号ID，接口传入的所有appid应该为公众号的appid（在mp.weixin.qq.com申请的），不能为APP的appid（在open.weixin.qq.com申请的）。
+        // 商户号	mch_id	是	10000098	String(32)	微信为发券方商户分配的商户号
+        // 随机字符串	nonce_str	是	1417574675	String(32)	随机字符串，不长于32位
+        // 签名	sign	是	841B3002FE2220C87A2D08ABD8A8F791	String(32)	签名参数，详见签名生成算法
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.queryCouponsInfo(data);
+
+        WXPayUtil.getLogger().info("wxPay.queryCouponsInfo:" + resultMap);
+
+        return resultMap;
+    }
+
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券批次<br>
+     * 场景：查询代金券批次信息
+     * 接口文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_4&index=5
+     *
+     * @param coupon_stock_id 代金券批次id
+     * @return API返回数据
+     * @throws Exception e
+     */
+    public Map<String, String> queryCouponStock(String coupon_stock_id) throws Exception {
+
+        /** 构造请求参数数据 **/
+        Map<String, String> data = new HashMap<>();
+
+        // 代金券批次id	coupon_stock_id	是	1757	String	代金券批次id
+        data.put("coupon_stock_id", coupon_stock_id);
+
+        /** 以下参数为非必填参数 **/
+        // 操作员	op_user_id	否	10000098	String(32)	操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限
+        // 设备号	device_info	否	 	String(32)	微信支付分配的终端设备号
+        // 协议版本	version	否	1.0	String(32)	默认1.0
+        // 协议类型	type	否	XML	String(32)	XML【目前仅支持默认XML】
+
+
+        /** 以下四个参数，在 this.fillRequestData 方法中会自动赋值 **/
+        // 公众账号ID appid	是	wx5edab3bdfba3dc1c	String(32)	微信为发券方商户分配的公众账号ID，接口传入的所有appid应该为公众号的appid（在mp.weixin.qq.com申请的），不能为APP的appid（在open.weixin.qq.com申请的）。
+        // 商户号	mch_id	是	10000098	String(32)	微信为发券方商户分配的商户号
+        // 随机字符串	nonce_str	是	1417574675	String(32)	随机字符串，不长于32位
+        // 签名	sign	是	841B3002FE2220C87A2D08ABD8A8F791	String(32)	签名参数，详见签名生成算法
+
+        // 微信调用接口
+        Map<String, String> resultMap = this.queryCouponStock(data);
+
+        WXPayUtil.getLogger().info("wxPay.queryCouponStock:" + resultMap);
+
+        return resultMap;
+    }
+
+} // end class
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfig.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfig.java
new file mode 100644
index 0000000..246ee6e
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfig.java
@@ -0,0 +1,104 @@
+package com.weixin.pay;
+
+import java.io.InputStream;
+
+/**
+ * 微信支付配置接口，用户设置获取微信支付关键信息抽象方法
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public abstract class WXPayConfig {
+
+    /**
+     * 获取 App ID
+     *
+     * @return App ID
+     */
+    public abstract String getAppID();
+
+    /**
+     * 获取 Mch ID
+     *
+     * @return Mch ID
+     */
+    public abstract String getMchID();
+
+    /**
+     * 获取 API 密钥
+     *
+     * @return API密钥
+     */
+    public abstract String getKey();
+
+    /**
+     * 获取商户证书内容
+     *
+     * @return 商户证书内容
+     */
+    public abstract InputStream getCertStream();
+
+    /**
+     * HTTP(S) 连接超时时间，单位毫秒
+     *
+     * @return int
+     */
+    public int getHttpConnectTimeoutMs() {
+        return 6 * 1000;
+    }
+
+    /**
+     * HTTP(S) 读数据超时时间，单位毫秒
+     *
+     * @return int
+     */
+    public int getHttpReadTimeoutMs() {
+        return 8 * 1000;
+    }
+
+    /**
+     * 获取WXPayDomain, 用于多域名容灾自动切换
+     *
+     * @return IWXPayDomain
+     */
+    public abstract WXPayDomain getWXPayDomain();
+
+    /**
+     * 是否自动上报。
+     * 若要关闭自动上报，子类中实现该函数返回 false 即可。
+     *
+     * @return boolean
+     */
+    public boolean shouldAutoReport() {
+        return true;
+    }
+
+    /**
+     * 进行健康上报的线程的数量
+     *
+     * @return int
+     */
+    public int getReportWorkerNum() {
+        return 6;
+    }
+
+    /**
+     * 健康上报缓存消息的最大数量。会有线程去独立上报
+     * 粗略计算：加入一条消息200B，10000消息占用空间 2000 KB，约为2MB，可以接受
+     *
+     * @return int
+     */
+    public int getReportQueueMaxSize() {
+        return 10000;
+    }
+
+    /**
+     * 批量上报，一次最多上报多个数据
+     *
+     * @return int
+     */
+    public int getReportBatchSize() {
+        return 10;
+    }
+
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfigImpl.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfigImpl.java
new file mode 100644
index 0000000..458fa12
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayConfigImpl.java
@@ -0,0 +1,95 @@
+package com.weixin.pay;
+
+import com.weixin.pay.constants.WXPayConstants;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * 微信支付配置接口实现类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayConfigImpl extends WXPayConfig {
+
+    private byte[] certData;
+    private static WXPayConfigImpl INSTANCE;
+
+    private WXPayConfigImpl() throws Exception {
+        String certPath = WXPayConstants.APICLIENT_CERT;
+        File file = new File(certPath);
+        InputStream certStream = new FileInputStream(file);
+        this.certData = new byte[(int) file.length()];
+        certStream.read(this.certData);
+        certStream.close();
+    }
+
+    public static WXPayConfigImpl getInstance() throws Exception {
+        if (INSTANCE == null) {
+            synchronized (WXPayConfigImpl.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayConfigImpl();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    @Override
+    public String getAppID() {
+        return WXPayConstants.APP_ID;
+    }
+
+    @Override
+    public String getMchID() {
+        return WXPayConstants.MCH_ID;
+    }
+
+    @Override
+    public String getKey() {
+        return WXPayConstants.API_KEY;
+    }
+
+    @Override
+    public InputStream getCertStream() {
+        ByteArrayInputStream certBis;
+        certBis = new ByteArrayInputStream(this.certData);
+        return certBis;
+    }
+
+    @Override
+    public int getHttpConnectTimeoutMs() {
+        return 2000;
+    }
+
+    @Override
+    public int getHttpReadTimeoutMs() {
+        return 10000;
+    }
+
+    @Override
+    public WXPayDomain getWXPayDomain() {
+        return WXPayDomainSimpleImpl.instance();
+    }
+
+    public String getPrimaryDomain() {
+        return "api.mch.weixin.qq.com";
+    }
+
+    public String getAlternateDomain() {
+        return "api2.mch.weixin.qq.com";
+    }
+
+    @Override
+    public int getReportWorkerNum() {
+        return 1;
+    }
+
+    @Override
+    public int getReportBatchSize() {
+        return 2;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomain.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomain.java
new file mode 100644
index 0000000..ac58650
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomain.java
@@ -0,0 +1,45 @@
+package com.weixin.pay;
+
+/**
+ * 域名管理，实现主备域名自动切换
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public abstract interface WXPayDomain {
+    /**
+     * 上报域名网络状况
+     * @param domain 域名。 比如：api.mch.weixin.qq.com
+     * @param elapsedTimeMillis 耗时
+     * @param ex 网络请求中出现的异常。
+     *           null表示没有异常
+     *           ConnectTimeoutException，表示建立网络连接异常
+     *           UnknownHostException， 表示dns解析异常
+     */
+    abstract void report(final String domain, long elapsedTimeMillis, final Exception ex);
+
+    /**
+     * 获取域名
+     * @param config 配置
+     * @return 域名
+     */
+    abstract DomainInfo getDomain(final WXPayConfig config);
+
+    static class DomainInfo{
+        public String domain;       //域名
+        public boolean primaryDomain;     //该域名是否为主域名。例如:api.mch.weixin.qq.com为主域名
+        public DomainInfo(String domain, boolean primaryDomain) {
+            this.domain = domain;
+            this.primaryDomain = primaryDomain;
+        }
+
+        @Override
+        public String toString() {
+            return "DomainInfo{" +
+                    "domain='" + domain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    '}';
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomainSimpleImpl.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomainSimpleImpl.java
new file mode 100644
index 0000000..8293659
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayDomainSimpleImpl.java
@@ -0,0 +1,117 @@
+package com.weixin.pay;
+
+import com.weixin.pay.constants.WXPayConstants;
+import org.apache.http.conn.ConnectTimeoutException;
+
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信支付域名实现类（官方简单版）
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayDomainSimpleImpl implements WXPayDomain {
+    private WXPayDomainSimpleImpl() {
+    }
+
+    private static class WxpayDomainHolder {
+        private static WXPayDomain holder = new WXPayDomainSimpleImpl();
+    }
+
+    public static WXPayDomain instance() {
+        return WxpayDomainHolder.holder;
+    }
+
+    @Override
+    public synchronized void report(final String domain, long elapsedTimeMillis, final Exception ex) {
+        DomainStatics info = domainData.get(domain);
+        if (info == null) {
+            info = new DomainStatics(domain);
+            domainData.put(domain, info);
+        }
+
+        // success
+        if (ex == null) {
+            if (info.succCount >= 2) {
+                // continue succ, clear error count
+                info.connectTimeoutCount = info.dnsErrorCount = info.otherErrorCount = 0;
+            } else {
+                ++info.succCount;
+            }
+        } else if (ex instanceof ConnectTimeoutException) {
+            info.succCount = info.dnsErrorCount = 0;
+            ++info.connectTimeoutCount;
+        } else if (ex instanceof UnknownHostException) {
+            info.succCount = 0;
+            ++info.dnsErrorCount;
+        } else {
+            info.succCount = 0;
+            ++info.otherErrorCount;
+        }
+    }
+
+    @Override
+    public synchronized DomainInfo getDomain(final WXPayConfig config) {
+        DomainStatics primaryDomain = domainData.get(WXPayConstants.DOMAIN_API);
+        if (primaryDomain == null ||
+                primaryDomain.isGood()) {
+            return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+        }
+
+        long now = System.currentTimeMillis();
+        if (switchToAlternateDomainTime == 0) {
+            // first switch
+            switchToAlternateDomainTime = now;
+            return new DomainInfo(WXPayConstants.DOMAIN_API2, false);
+        } else if (now - switchToAlternateDomainTime < MIN_SWITCH_PRIMARY_MSEC) {
+            DomainStatics alternateDomain = domainData.get(WXPayConstants.DOMAIN_API2);
+            if (alternateDomain == null ||
+                    alternateDomain.isGood() ||
+                    alternateDomain.badCount() < primaryDomain.badCount()) {
+                return new DomainInfo(WXPayConstants.DOMAIN_API2, false);
+            } else {
+                return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+            }
+        } else {  //force switch back
+            switchToAlternateDomainTime = 0;
+            primaryDomain.resetCount();
+            DomainStatics alternateDomain = domainData.get(WXPayConstants.DOMAIN_API2);
+            if (alternateDomain != null) {
+                alternateDomain.resetCount();
+            }
+            return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+        }
+    }
+
+    static class DomainStatics {
+        final String domain;
+        int succCount = 0;
+        int connectTimeoutCount = 0;
+        int dnsErrorCount = 0;
+        int otherErrorCount = 0;
+
+        DomainStatics(String domain) {
+            this.domain = domain;
+        }
+
+        void resetCount() {
+            succCount = connectTimeoutCount = dnsErrorCount = otherErrorCount = 0;
+        }
+
+        boolean isGood() {
+            return connectTimeoutCount <= 2 && dnsErrorCount <= 2;
+        }
+
+        int badCount() {
+            return connectTimeoutCount + dnsErrorCount * 5 + otherErrorCount / 4;
+        }
+    }
+
+    // 3 minutes
+    private final int MIN_SWITCH_PRIMARY_MSEC = 3 * 60 * 1000;
+    private long switchToAlternateDomainTime = 0;
+    private Map<String, DomainStatics> domainData = new HashMap<String, DomainStatics>();
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayReport.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayReport.java
new file mode 100644
index 0000000..4f06835
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayReport.java
@@ -0,0 +1,267 @@
+package com.weixin.pay;
+
+import com.weixin.pay.constants.WXPayConstants;
+import com.weixin.pay.util.WXPayUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * 交易保障（官方版）
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayReport {
+
+    public static class ReportInfo {
+
+        /**
+         * 布尔变量使用int。0为false， 1为true。
+         */
+
+        // 基本信息
+        private String version = "v1";
+        private String sdk = WXPayConstants.WXPAYSDK_VERSION;
+        private String uuid;  // 交易的标识
+        private long timestamp;   // 上报时的时间戳，单位秒
+        private long elapsedTimeMillis; // 耗时，单位 毫秒
+
+        // 针对主域名
+        private String firstDomain;  // 第1次请求的域名
+        private boolean primaryDomain; //是否主域名
+        private int firstConnectTimeoutMillis;  // 第1次请求设置的连接超时时间，单位 毫秒
+        private int firstReadTimeoutMillis;  // 第1次请求设置的读写超时时间，单位 毫秒
+        private int firstHasDnsError;  // 第1次请求是否出现dns问题
+        private int firstHasConnectTimeout; // 第1次请求是否出现连接超时
+        private int firstHasReadTimeout; // 第1次请求是否出现连接超时
+
+        public ReportInfo(String uuid, long timestamp, long elapsedTimeMillis, String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis, boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+            this.uuid = uuid;
+            this.timestamp = timestamp;
+            this.elapsedTimeMillis = elapsedTimeMillis;
+            this.firstDomain = firstDomain;
+            this.primaryDomain = primaryDomain;
+            this.firstConnectTimeoutMillis = firstConnectTimeoutMillis;
+            this.firstReadTimeoutMillis = firstReadTimeoutMillis;
+            this.firstHasDnsError = firstHasDnsError ? 1 : 0;
+            this.firstHasConnectTimeout = firstHasConnectTimeout ? 1 : 0;
+            this.firstHasReadTimeout = firstHasReadTimeout ? 1 : 0;
+        }
+
+        @Override
+        public String toString() {
+            return "ReportInfo{" +
+                    "version='" + version + '\'' +
+                    ", sdk='" + sdk + '\'' +
+                    ", uuid='" + uuid + '\'' +
+                    ", timestamp=" + timestamp +
+                    ", elapsedTimeMillis=" + elapsedTimeMillis +
+                    ", firstDomain='" + firstDomain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    ", firstConnectTimeoutMillis=" + firstConnectTimeoutMillis +
+                    ", firstReadTimeoutMillis=" + firstReadTimeoutMillis +
+                    ", firstHasDnsError=" + firstHasDnsError +
+                    ", firstHasConnectTimeout=" + firstHasConnectTimeout +
+                    ", firstHasReadTimeout=" + firstHasReadTimeout +
+                    '}';
+        }
+
+        /**
+         * 转换成 csv 格式
+         *
+         * @return
+         */
+        public String toLineString(String key) {
+            String separator = ",";
+            Object[] objects = new Object[]{
+                    version, sdk, uuid, timestamp, elapsedTimeMillis,
+                    firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                    firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout
+            };
+            StringBuffer sb = new StringBuffer();
+            for (Object obj : objects) {
+                sb.append(obj).append(separator);
+            }
+            try {
+                String sign = WXPayUtil.HMACSHA256(sb.toString(), key);
+                sb.append(sign);
+                return sb.toString();
+            } catch (Exception ex) {
+                return null;
+            }
+
+        }
+
+    }
+
+    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
+    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
+
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6 * 1000;
+    private static final int DEFAULT_READ_TIMEOUT_MS = 8 * 1000;
+
+    private LinkedBlockingQueue<String> reportMsgQueue = null;
+    private WXPayConfig config;
+    private ExecutorService executorService;
+
+    private volatile static WXPayReport INSTANCE;
+
+    private WXPayReport(final WXPayConfig config) {
+        this.config = config;
+        reportMsgQueue = new LinkedBlockingQueue<String>(config.getReportQueueMaxSize());
+
+        // 添加处理线程
+        executorService = Executors.newFixedThreadPool(config.getReportWorkerNum(), new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setDaemon(true);
+                return t;
+            }
+        });
+
+        if (config.shouldAutoReport()) {
+            WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
+            for (int i = 0; i < config.getReportWorkerNum(); ++i) {
+                executorService.execute(new Runnable() {
+                    public void run() {
+                        while (true) {
+                            // 先用 take 获取数据
+                            try {
+                                StringBuffer sb = new StringBuffer();
+                                String firstMsg = reportMsgQueue.take();
+                                WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
+                                String msg = null;
+                                sb.append(firstMsg); //会阻塞至有消息
+                                int remainNum = config.getReportBatchSize() - 1;
+                                for (int j = 0; j < remainNum; ++j) {
+                                    WXPayUtil.getLogger().info("try get remain report msg");
+                                    // msg = reportMsgQueue.poll();  // 不阻塞了
+                                    msg = reportMsgQueue.take();
+                                    WXPayUtil.getLogger().info("get remain report msg: {}", msg);
+                                    if (msg == null) {
+                                        break;
+                                    } else {
+                                        sb.append("\n");
+                                        sb.append(msg);
+                                    }
+                                }
+                                // 上报
+                                WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                            } catch (Exception ex) {
+                                WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+    }
+
+    /**
+     * 单例，双重校验，请在 JDK 1.5及更高版本中使用
+     *
+     * @param config
+     * @return
+     */
+    public static WXPayReport getInstance(WXPayConfig config) {
+        if (INSTANCE == null) {
+            synchronized (WXPayReport.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayReport(config);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public void report(String uuid, long elapsedTimeMillis,
+                       String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis,
+                       boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+        long currentTimestamp = WXPayUtil.getCurrentTimestamp();
+        ReportInfo reportInfo = new ReportInfo(uuid, currentTimestamp, elapsedTimeMillis,
+                firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
+        String data = reportInfo.toLineString(config.getKey());
+        WXPayUtil.getLogger().info("report {}", data);
+        if (data != null) {
+            reportMsgQueue.offer(data);
+        }
+    }
+
+
+    @Deprecated
+    private void reportSync(final String data) throws Exception {
+        httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+    }
+
+    @Deprecated
+    private void reportAsync(final String data) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                } catch (Exception ex) {
+                    WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * http 请求
+     *
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    private static String httpRequest(String data, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(REPORT_URL);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT);
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+    }
+
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/WXPayRequest.java b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayRequest.java
new file mode 100644
index 0000000..3241d7a
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/WXPayRequest.java
@@ -0,0 +1,266 @@
+package com.weixin.pay;
+
+import com.weixin.pay.util.WXPayUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+
+import static com.weixin.pay.constants.WXPayConstants.USER_AGENT;
+
+/**
+ * 微信支付请求类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayRequest {
+    private WXPayConfig config;
+
+    public WXPayRequest(WXPayConfig config) throws Exception {
+
+        this.config = config;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     *
+     * @param domain
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @param useCert          是否使用证书，针对退款、撤销等操作
+     * @return
+     * @throws Exception
+     */
+    private String requestOnce(final String domain, String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        if (useCert) {
+            // 证书
+            char[] password = config.getMchID().toCharArray();
+            InputStream certStream = config.getCertStream();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(certStream, password);
+
+            // 实例化密钥库 & 初始化密钥工厂
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, password);
+
+            // 创建 SSLContext
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(kmf.getKeyManagers(), null, new SecureRandom());
+
+            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext,
+                    new String[]{"TLSv1"},
+                    null,
+                    new DefaultHostnameVerifier());
+
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", sslConnectionSocketFactory)
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        } else {
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        String url = "https://" + domain + urlSuffix;
+        HttpPost httpPost = new HttpPost(url);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", USER_AGENT + " " + config.getMchID());
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+
+    }
+
+
+    private String request(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert, boolean autoReport) throws Exception {
+        Exception exception = null;
+        long elapsedTimeMillis = 0;
+        long startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+        boolean firstHasDnsErr = false;
+        boolean firstHasConnectTimeout = false;
+        boolean firstHasReadTimeout = false;
+        WXPayDomain.DomainInfo domainInfo = config.getWXPayDomain().getDomain(config);
+        if (domainInfo == null) {
+            throw new Exception("WXPayConfig.getWXPayDomain().getDomain() is empty or null");
+        }
+        try {
+            String result = requestOnce(domainInfo.domain, urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, useCert);
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs() - startTimestampMs;
+            config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, null);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+            return result;
+        } catch (UnknownHostException ex) {  // dns 解析错误，或域名不存在
+            exception = ex;
+            firstHasDnsErr = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs() - startTimestampMs;
+            WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        } catch (ConnectTimeoutException ex) {
+            exception = ex;
+            firstHasConnectTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs() - startTimestampMs;
+            WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        } catch (SocketTimeoutException ex) {
+            exception = ex;
+            firstHasReadTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs() - startTimestampMs;
+            WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        } catch (Exception ex) {
+            exception = ex;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs() - startTimestampMs;
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, exception);
+        throw exception;
+    }
+
+
+    /**
+     * 可重试的，非双向认证的请求
+     *
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), false, autoReport);
+    }
+
+    /**
+     * 可重试的，非双向认证的请求
+     *
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, false, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     *
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), true, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     *
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, true, autoReport);
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/XxxWXPayConfigImpl.java b/wxpay-sdk/src/main/java/com/weixin/pay/XxxWXPayConfigImpl.java
new file mode 100644
index 0000000..7447957
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/XxxWXPayConfigImpl.java
@@ -0,0 +1,95 @@
+package com.weixin.pay;
+
+import com.weixin.pay.constants.WXPayConstants;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * 测试/第二个微信支付实体的微信支付实现类
+ *
+ * @author yclimb
+ * @date 2018/7/31
+ */
+public class XxxWXPayConfigImpl extends WXPayConfig {
+
+    private byte[] certData;
+    private static XxxWXPayConfigImpl INSTANCE;
+
+    private XxxWXPayConfigImpl() throws Exception{
+        String certPath = WXPayConstants.APICLIENT_CERT_XXX;
+        File file = new File(certPath);
+        InputStream certStream = new FileInputStream(file);
+        this.certData = new byte[(int) file.length()];
+        certStream.read(this.certData);
+        certStream.close();
+    }
+
+    public static XxxWXPayConfigImpl getInstance() throws Exception{
+        if (INSTANCE == null) {
+            synchronized (XxxWXPayConfigImpl.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new XxxWXPayConfigImpl();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    @Override
+    public String getAppID() {
+        return WXPayConstants.APP_ID_XXX;
+    }
+
+    @Override
+    public String getMchID() {
+        return WXPayConstants.MCH_ID_XXX;
+    }
+
+    @Override
+    public String getKey() {
+        return WXPayConstants.API_KEY_XXX;
+    }
+
+    @Override
+    public InputStream getCertStream() {
+        ByteArrayInputStream certBis;
+        certBis = new ByteArrayInputStream(this.certData);
+        return certBis;
+    }
+
+    @Override
+    public int getHttpConnectTimeoutMs() {
+        return 2000;
+    }
+
+    @Override
+    public int getHttpReadTimeoutMs() {
+        return 10000;
+    }
+
+    @Override
+    public WXPayDomain getWXPayDomain() {
+        return WXPayDomainSimpleImpl.instance();
+    }
+
+    public String getPrimaryDomain() {
+        return "api.mch.weixin.qq.com";
+    }
+
+    public String getAlternateDomain() {
+        return "api2.mch.weixin.qq.com";
+    }
+
+    @Override
+    public int getReportWorkerNum() {
+        return 1;
+    }
+
+    @Override
+    public int getReportBatchSize() {
+        return 2;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/card/CardBgColorEnum.java b/wxpay-sdk/src/main/java/com/weixin/pay/card/CardBgColorEnum.java
new file mode 100644
index 0000000..6019c02
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/card/CardBgColorEnum.java
@@ -0,0 +1,91 @@
+package com.weixin.pay.card;
+
+/**
+ * 微信卡券背景颜色枚举类
+ *
+ * @author yclimb
+ * @date 2018/9/18
+ */
+public enum CardBgColorEnum {
+
+    /**
+     * 淡绿色
+     */
+    COLOR_010("Color010", "#63b359"),
+    /**
+     * 深绿色
+     */
+    COLOR_020("Color020", "#2c9f67"),
+    /**
+     * 淡蓝色
+     */
+    COLOR_030("Color030", "#509fc9"),
+    /**
+     * 深蓝色
+     */
+    COLOR_040("Color040", "#5885cf"),
+    /**
+     * 淡紫色
+     */
+    COLOR_050("Color050", "#9062c0"),
+    /**
+     * 土黄色
+     */
+    COLOR_060("Color060", "#d09a45"),
+    /**
+     * 淡黄色
+     */
+    COLOR_070("Color070", "#e4b138"),
+    /**
+     * 橘黄色
+     */
+    COLOR_080("Color080", "#ee903c"),
+    /**
+     * 橘黄色 plus
+     */
+    COLOR_081("Color081", "#f08500"),
+    /**
+     * 青色
+     */
+    COLOR_082("Color082", "#a9d92d"),
+    /**
+     * 淡红色
+     */
+    COLOR_090("Color090", "#dd6549"),
+    /**
+     * 深红色
+     */
+    COLOR_100("Color100", "#cc463d"),
+    /**
+     * 玫红色
+     */
+    COLOR_101("Color101", "#cf3e36"),
+    /**
+     * 深灰色
+     */
+    COLOR_102("Color102", "#5E6671")
+    ;
+
+    /**
+     * 背景颜色名称
+     */
+    private String bgName;
+
+    /**
+     * 色值
+     */
+    private String bgVal;
+
+    CardBgColorEnum(String bgName, String bgVal) {
+        this.bgName = bgName;
+        this.bgVal = bgVal;
+    }
+
+    public String getBgName() {
+        return bgName;
+    }
+
+    public String getBgVal() {
+        return bgVal;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXConstants.java b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXConstants.java
new file mode 100644
index 0000000..58619a5
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXConstants.java
@@ -0,0 +1,52 @@
+package com.weixin.pay.constants;
+
+/**
+ * 微信基础常量类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXConstants {
+
+    /**
+     * 对于前端访问返回参数，本例使用string，推荐自主封装json对象
+     */
+    public static final String SUCCESS = "success";
+    public static final String ERROR = "error";
+
+    /**
+     * 授权作用域  不弹出授权页面，直接跳转，只能获取用户openid
+     **/
+    public static final String OAUTH_BASE_SCOPE = "snsapi_base";
+
+    /**
+     * 授权作用域  弹出授权页面 能获取昵称、头像等信息
+     **/
+    public static final String OAUTH_USERINFO_SCOPE = "snsapi_userinfo";
+
+    /**
+     * 网页授权 重定向后会带上state参数
+     */
+    public static final String OAUTH_STATE = "xxx";
+
+    /**
+     * 小程序获取 access token code
+     */
+    public static final String WX_MINI_PROGRAM_CODE = "xxxx";
+
+    /**
+     * 微信全局accessToken
+     */
+    public static final String WECHAT_ACCESSTOKEN = OAUTH_STATE + ":wx:accessToken:";
+
+    /**
+     * 微信全局accessTokenLock
+     */
+    public static final String WECHAT_ACCESSTOKEN_LOCK = OAUTH_STATE + ":wx:accessTokenLock:";
+
+    /**
+     * 微信网页授权openid，时限：7200秒
+     */
+    public static final String WECHAT_JSAPI_OPENID = OAUTH_STATE + ":wx:jsapi:openid:";
+
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayCodeEnum.java b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayCodeEnum.java
new file mode 100644
index 0000000..f2f9519
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayCodeEnum.java
@@ -0,0 +1,39 @@
+package com.weixin.pay.constants;
+
+/**
+ * 微信支付code码常量类
+ *
+ * @author yclimb
+ * @date 2018/8/6
+ */
+public enum WXPayCodeEnum {
+
+    /**
+     * 余额不足
+     */
+    ERR_CODE_NOTENOUGH("NOTENOUGH", "余额不足");
+
+    private String code;
+    private String des;
+
+    WXPayCodeEnum(String code, String des) {
+        this.code = code;
+        this.des = des;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public void setDes(String des) {
+        this.des = des;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayConstants.java b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayConstants.java
new file mode 100644
index 0000000..f6ad60b
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXPayConstants.java
@@ -0,0 +1,248 @@
+package com.weixin.pay.constants;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 微信支付SDK常量
+ */
+public class WXPayConstants {
+
+    /**
+     * 异步接收微信支付结果通知的回调地址，通知url必须为外网可访问的url，不能携带参数。
+     */
+    public static String NOTIFY_URL = "https://xxx.com/v1/weixin/pay/wxnotify";
+
+    /**
+     * 异步接收微信支付退款结果通知的回调地址，通知URL必须为外网可访问的url，不允许带参数，如果参数中传了notify_url，则商户平台上配置的回调地址将不会生效。
+     */
+    public static String NOTIFY_URL_REFUND = "https://xxx.com/v1/weixin/pay/refund";
+
+    /**
+     * 微信签名枚举类型
+     */
+    public enum SignType {
+        MD5, HMACSHA256, SHA1
+    }
+
+    /**
+     * 公众号、小程序appid
+     */
+    public static String APP_ID = "xxx"; // 真实
+    public static String APP_ID_XXX = "xxx"; // 测试/第二个账号
+
+    /**
+     * AppSecret
+     */
+    public static String SECRET = "xxx"; // 真实
+    public static String SECRET_XXX = "xxx"; // 测试/第二个账号
+
+    /**
+     * 商户号
+     */
+    public static final String MCH_ID = "xxx"; // 真实
+    public static final String MCH_ID_XXX = "xxx"; // 测试/第二个账号
+
+
+    /**
+     * API密钥，在商户平台设置
+     */
+    public static final String API_KEY = "xxx"; // 真实
+    public static final String API_KEY_XXX = "xxx"; // 测试/第二个账号
+    public static final String API_KEY_SANDBOX = "xxx"; // sandbox_signkey
+
+    /**
+     * 证书路径
+     */
+    public static String APICLIENT_CERT = "/data/ops/cert/apiclient_cert.p12"; // 真实
+    public static String APICLIENT_CERT_XXX = "/data/ops/cert_xxx/apiclient_cert.p12"; // 真实
+
+    /**
+     * 交易类型
+     * JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里
+     * MICROPAY--刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
+     */
+    public static final String TRADE_TYPE =  "JSAPI";
+    public static final String TRADE_TYPE_APP =  "APP";
+    public static final String TRADE_TYPE_NATIVE =  "NATIVE";
+
+    /**
+     * 微信 - API域名地址
+     * 域名管理实现主备域名自动切换
+     */
+    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+    /**
+     * 微信 - 默认接口返回状态码
+     * SUCCESS/FAIL
+     * 此字段是通信标识，非交易标识，交易是否成功需要查看result_code来判断
+     */
+    public static final String RESULT_CODE     = "result_code";
+    public static final String FAIL     = "FAIL";
+    public static final String SUCCESS  = "SUCCESS";
+    /**
+     * 返回状态码 return_code SUCCESS/FAIL 此字段是通信标识，非交易标识，交易是否成功需要查看result_code来判断
+     * 返回信息 return_msg 当return_code为FAIL时返回信息为错误原因
+     * 错误代码 err_code 当result_code为FAIL时返回错误代码，详细参见下文错误列表
+     * 错误代码描述 err_code_des 当result_code为FAIL时返回错误描述，详细参见下文错误列表
+     */
+    public static final String RETURN_CODE = "return_code";
+    public static final String RETURN_MSG = "return_msg";
+    public static final String ERR_CODE = "err_code";
+    public static final String ERR_CODE_DES  = "err_code_des";
+
+    /**
+     * 签名类型，默认为MD5，支持HMAC-SHA256和MD5。
+     */
+    public static final String HMACSHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+
+    /**
+     * 标价币种：fee_type
+     * 符合ISO 4217标准的三位字母代码，默认人民币：CNY，详细列表请参见货币类型
+     */
+    public static final String FEE_TYPE_CNY = "CNY";
+
+    /**
+     * 微信签名：通过签名算法计算得出的签名值
+     */
+    public static final String FIELD_SIGN = "sign";
+    public static final String FIELD_SIGN_TYPE = "sign_type";
+
+    /**
+     * 微信支付版本
+     */
+    public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+    public static final String USER_AGENT = WXPAYSDK_VERSION +
+            " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+            ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+    /**
+     * 作用：企业付款到零钱资金使用商户号余额资金<br>
+     * 场景：用于企业向微信用户个人付款
+     */
+    public static final String TRANSFERS_URL_SUFFIX = "/mmpaymkttransfers/promotion/transfers";
+    /**
+     * 作用：商户平台-现金红包-发放普通红包<br>
+     * 场景：现金红包发放后会以公众号消息的形式触达用户
+     * 其他：需要证书
+     */
+    public static final String SENDREDPACK_URL_SUFFIX = "/mmpaymkttransfers/sendredpack";
+    /**
+     * 作用：商户平台-现金红包-查询红包记录<br>
+     * 场景：用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
+     * 其他：需要证书
+     */
+    public static final String GETHBINFO_URL_SUFFIX = "/mmpaymkttransfers/gethbinfo";
+    /**
+     * 作用：商户平台-代金券或立减优惠-发放代金券<br>
+     * 场景：用于商户主动调用接口给用户发放代金券的场景，已做防小号处理，给小号发放代金券将返回错误码。
+     * 注意：通过接口发放的代金券不会进入微信卡包
+     * 其他：请求需要双向证书
+     */
+    public static final String SEND_COUPON_URL_SUFFIX = "/mmpaymkttransfers/send_coupon";
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券信息<br>
+     * 场景：查询代金券信息。
+     */
+    public static final String QUERYCOUPONSINFO_URL_SUFFIX = "/mmpaymkttransfers/querycouponsinfo";
+    /**
+     * 作用：商户平台-代金券或立减优惠-查询代金券批次<br>
+     * 场景：查询代金券批次信息。
+     */
+    public static final String QUERY_COUPON_STOCK_URL_SUFFIX = "/mmpaymkttransfers/query_coupon_stock";
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     */
+    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     */
+    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     */
+    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     */
+    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     */
+    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     */
+    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     */
+    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     *      其中return_code为`SUCCESS`，data为对账单数据。
+     */
+    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     */
+    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     */
+    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     */
+    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+    /**
+     * 沙箱说明：sandbox
+     *
+     * 微信支付沙箱环境，是提供给微信支付商户的开发者，用于模拟支付及回调通知。以验证商户是否理解回调通知、账单格式，以及是否对异常做了正确的处理。
+     * ◆ 如何对接沙箱环境？
+     * 1、修改商户自有程序或配置中，微信支付api的链接，如：被扫支付官网的url为：https://api.mch.weixin.qq.com/pay/micropay增加sandbox路径，变更为https://api.mch.weixin.qq.com/sandbox/pay/micropay， 即可接入沙箱验收环境，其它接口类似；
+     * 2、在微信支付开发调试站点（站点链接：http://mch.weixin.qq.com/wiki/doc/api/index.php），按接口文档填入正确的支付参数，发起微信支付请求，完成支付；
+     * 3、验收完成后，修改程序或配置中的api链接（重要！），去掉sandbox路径。对接现网环境。
+     *
+     * 说明地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=23_1
+     *         https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=21_2
+     */
+    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
+    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
+    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
+    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
+    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/pay/refund";
+    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
+    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
+    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
+    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+    public static final String SANDBOX_SENDREDPACK_URL_SUFFIX  = "/sandboxnew/mmpaymkttransfers/sendredpack";
+    public static final String SANDBOX_TRANSFERS_URL_SUFFIX    = "/sandboxnew/mmpaymkttransfers/promotion/transfers";
+    public static final String SANDBOX_GETHBINFO_URL_SUFFIX    = "/sandboxnew/mmpaymkttransfers/promotion/gethbinfo";
+    public static final String SANDBOX_SEND_COUPON_URL_SUFFIX = "/sandboxnew/mmpaymkttransfers/send_coupon";
+    public static final String SANDBOX_QUERYCOUPONSINFO_URL_SUFFIX = "/sandboxnew/mmpaymkttransfers/querycouponsinfo";
+    public static final String SANDBOX_QUERY_COUPON_STOCK_URL_SUFFIX = "/sandboxnew/mmpaymkttransfers/query_coupon_stock";
+
+
+}
+
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXURL.java b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXURL.java
new file mode 100644
index 0000000..d91fdeb
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/constants/WXURL.java
@@ -0,0 +1,113 @@
+package com.weixin.pay.constants;
+
+/**
+ * 微信基础URL链接
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXURL {
+
+    /**
+     * 请求URL之获取jsapi_ticket
+     */
+    public static final String PAGE_URL_SIGN = "jsapi_ticket={0}&noncestr={1}&timestamp={2}&url={3}";
+
+    /**
+     * 请求URL之获取access_token
+     */
+    public static final String BASE_ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}";
+
+    /**
+     * 请求URL之获取jsapi_ticket
+     */
+    public static final String BASE_JSAPI_TICKET = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=jsapi";
+
+    /**
+     * 请求URL之创建菜单
+     */
+    public static final String MENU_CREATE = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token={0}";
+
+    /**
+     * 请求URL之查询菜单
+     */
+    public static final String MENU_QUERY = "https://api.weixin.qq.com/cgi-bin/menu/get?access_token={0}";
+
+    /**
+     * 请求URL之删除菜单
+     */
+    public static final String MENU_DELETE = "https://api.weixin.qq.com/cgi-bin/menu/delete?access_token={0}";
+
+    /**
+     * 页面授权获取code地址
+     */
+    public static final String OAUTH_CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=" + WXConstants.OAUTH_STATE + "#wechat_redirect";
+
+    /**
+     * 通过code换取网页授权access_token
+     */
+    public static final String OAUTH_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={0}&secret={1}&code={2}&grant_type=authorization_code";
+
+    /**
+     * 页面授权获取指定微信号的基础信息
+     */
+    public static final String OAUTH_GET_USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token={0}&openid={1}&lang=zh_CN";
+
+    /**
+     * 获取指定微信号的基础信息 通过全局access_token
+     */
+    public static final String GET_USERINFO_URL = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
+
+    /**
+     * 微信模板消息发送
+     */
+    public static final String WX_TEMPLATE_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}";
+
+    /**
+     * 微信客户消息发送
+     */
+    public static final String WX_CUSTMOER_SERVICE_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token={0}";
+
+    /***
+     * 微信创建二维码ticket
+     */
+    public static final String WX_TICKET_CREATE = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token={0}";
+
+    /**
+     * 小程序登录校验
+     */
+    public static final String WX_MINI_LOGIN = "https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code";
+
+    /**
+     * 小程序模板信息
+     */
+    public static final String WX_MINI_TEMPLATE_MSG = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token={0}";
+
+    /**
+     * 获取小程序二维码，通过该接口生成的小程序码，永久有效，数量暂无限制
+     */
+    public static final String WX_MINI_QR_CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={0}";
+
+    /**
+     * 创建支付后领取立减金活动接口
+     * 通过此接口创建立减金活动。
+     * 将已创建的代金券cardid、跳转小程序appid、发起支付的商户号等信息通过此接口创建立减金活动，成功返回活动id即为创建成功。
+     * 接口地址：https://mp.weixin.qq.com/wiki?t=resource/res_main&id=21515658940X5pIn
+     *
+     * 协议：https
+     * http请求方式: POST
+     * 请求URL：https://api.weixin.qq.com/card/mkt/activity/create?access_token=ACCESS_TOKEN
+     * POST数据格式：JSON
+     */
+    public static final String WX_CARD_ACTIVITY_CREATE_URL = "https://api.weixin.qq.com/card/mkt/activity/create?access_token={0}";
+
+    /**
+     * 卡券签名和JSSDK的签名完全独立，两者的算法和意义完全不同，请不要混淆。
+     * JSSDK的签名是使用所有JS接口都需要走的一层鉴权，用以标识调用者的身份，和卡券本身并无关系。
+     * 其次，卡券的签名考虑到协议的扩展性和简单的防数据擅改，设计了一套独立的签名协议。
+     * 另外由于历史原因，卡券的JS接口先于JSSDK出现，当时的JSAPI并没有鉴权体系，所以在卡券的签名里也加上了appsecret/api_ticket这些身份信息，希望开发者理解。
+     * 卡券 api_ticket 是用于调用卡券相关接口的临时票据，有效期为 7200 秒，通过 access_token 来获取。这里要注意与 jsapi_ticket 区分开来。
+     * 由于获取卡券 api_ticket 的 api 调用次数非常有限，频繁刷新卡券 api_ticket 会导致 api 调用受限，影响自身业务，开发者必须在自己的服务全局缓存卡券 api_ticket 。
+     */
+    public static final String BASE_API_TICKET = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=wx_card";
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyEnum.java b/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyEnum.java
new file mode 100644
index 0000000..c749237
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyEnum.java
@@ -0,0 +1,84 @@
+package com.weixin.pay.redis;
+
+/**
+ * Redis 枚举类
+ *
+ * @author yclimb
+ * @date 2018/4/19
+ */
+public enum RedisKeyEnum {
+
+    /**
+     * 生成带参数的小程序二维码KEY
+     */
+    XXX_MINI_WX_CODE(RedisKeyUtil.KEY_PREFIX, "mini", "getwxacodeunlimit", "生成永久无限制微信二维码"),
+    /**
+     * 获取卡券api_ticket
+     */
+    IMALL_WXCARD_APITICKET(RedisKeyUtil.KEY_PREFIX, "jsapi", "getWxCardApiTicket", "获取卡券api_ticket的api"),
+    /**
+     * 获取卡券api_ticket
+     */
+    IMALL_WX_APITICKET(RedisKeyUtil.KEY_PREFIX, "jsapi", "getWxApiTicket", "获取api_ticket的api")
+
+    ;
+
+    /**
+     * 系统标识
+     */
+    private String keyPrefix;
+
+    /**
+     * 模块名称
+     */
+    private String module;
+
+    /**
+     * 方法名称
+     */
+    private String func;
+
+    /**
+     * remark
+     */
+    private String remark;
+
+    RedisKeyEnum(String keyPrefix, String module, String func, String remark) {
+        this.keyPrefix = keyPrefix;
+        this.module = module;
+        this.func = func;
+        this.remark = remark;
+    }
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getFunc() {
+        return func;
+    }
+
+    public void setFunc(String func) {
+        this.func = func;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyUtil.java
new file mode 100644
index 0000000..716c706
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/redis/RedisKeyUtil.java
@@ -0,0 +1,122 @@
+package com.weixin.pay.redis;
+
+/**
+ * Redis 工具类
+ *
+ * @author yclimb
+ * @date 2018/4/19
+ */
+public class RedisKeyUtil {
+
+    /**
+     * 主数据系统标识
+     */
+    public static final String KEY_PREFIX = "xxx";
+
+    /**
+     * 分割字符，默认[:]
+     */
+    public static final String KEY_SPLIT_CHAR = ":";
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param module 模块名称
+     * @param func   方法名称
+     * @return key
+     */
+    public static String keyBuilder(String module, String func) {
+        return keyBuilder(null, module, func, (String[]) null);
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param module 模块名称
+     * @param func   方法名称
+     * @param args   参数..
+     * @return key
+     */
+    public static String keyBuilder(String module, String func, String... args) {
+        return keyBuilder(null, module, func, args);
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param module 模块名称
+     * @param func   方法名称
+     * @param objStr 对象.toString()
+     * @return key
+     */
+    public static String keyBuilder(String module, String func, String objStr) {
+        return keyBuilder(null, module, func, new String[]{objStr});
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param prefix 项目前缀
+     * @param module 模块名称
+     * @param func   方法名称
+     * @param objStr 对象.toString()
+     * @return key
+     */
+    public static String keyBuilder(String prefix, String module, String func, String objStr) {
+        return keyBuilder(prefix, module, func, new String[]{objStr});
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param prefix 项目前缀
+     * @param module 模块名称
+     * @param func   方法名称
+     * @param args   参数..
+     * @return key
+     */
+    public static String keyBuilder(String prefix, String module, String func, String... args) {
+        // 项目前缀
+        if (prefix == null) {
+            prefix = KEY_PREFIX;
+        }
+
+        StringBuilder key = new StringBuilder(prefix);
+        // KEY_SPLIT_CHAR 为分割字符
+        key.append(KEY_SPLIT_CHAR).append(module).append(KEY_SPLIT_CHAR).append(func);
+
+        // args 为空时不需要循环
+        if (args == null || args.length <= 0) {
+            return key.toString();
+        }
+
+        // args 不为空时循环拼接字符
+        for (String arg : args) {
+            key.append(KEY_SPLIT_CHAR).append(arg);
+        }
+
+        return key.toString();
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param redisEnum 枚举对象
+     * @return key
+     */
+    public static String keyBuilder(RedisKeyEnum redisEnum) {
+        return keyBuilder(redisEnum.getKeyPrefix(), redisEnum.getModule(), redisEnum.getFunc(), (String[]) null);
+    }
+
+    /**
+     * redis的key键规则定义
+     *
+     * @param redisEnum 枚举对象
+     * @param objStr    对象.toString()
+     * @return key
+     */
+    public static String keyBuilder(RedisKeyEnum redisEnum, String objStr) {
+        return keyBuilder(redisEnum.getKeyPrefix(), redisEnum.getModule(), redisEnum.getFunc(), objStr);
+    }
+
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/AESUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/AESUtil.java
new file mode 100644
index 0000000..549e1f5
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/AESUtil.java
@@ -0,0 +1,121 @@
+package com.weixin.pay.util;
+
+import com.weixin.pay.constants.WXPayConstants;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.security.Security;
+import java.util.Base64;
+
+/**
+ * 微信支付AES加解密工具类
+ *
+ * @author yclimb
+ * @date 2018/6/21
+ */
+public class AESUtil {
+
+    /**
+     * 密钥算法
+     */
+    private static final String ALGORITHM = "AES";
+
+    /**
+     * 加解密算法/工作模式/填充方式
+     */
+    private static final String ALGORITHM_MODE_PADDING = "AES/ECB/PKCS7Padding";
+
+    /**
+     * 生成key
+     */
+    private static SecretKeySpec KEY;
+
+    static {
+        try {
+            KEY = new SecretKeySpec(WXPayUtil.MD5(WXPayConstants.API_KEY).toLowerCase().getBytes(), ALGORITHM);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * AES加密
+     *
+     * @param data d
+     * @return str
+     * @throws Exception e
+     */
+    public static String encryptData(String data) throws Exception {
+        // 创建密码器
+        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+        Cipher cipher = Cipher.getInstance(ALGORITHM_MODE_PADDING, "BC");
+        // 初始化
+        cipher.init(Cipher.ENCRYPT_MODE, KEY);
+        return base64Encode8859(new String(cipher.doFinal(data.getBytes()), "ISO-8859-1"));
+
+    }
+
+    /**
+     * AES解密
+     *
+     * @param base64Data 64
+     * @return str
+     * @throws Exception e
+     */
+    public static String decryptData(String base64Data) throws Exception {
+        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+        Cipher cipher = Cipher.getInstance(ALGORITHM_MODE_PADDING, "BC");
+        cipher.init(Cipher.DECRYPT_MODE, KEY);
+        return new String(cipher.doFinal(base64Decode8859(base64Data).getBytes("ISO-8859-1")), "utf-8");
+    }
+
+    /**
+     * Base64解码
+     * @param source base64 str
+     * @return str
+     */
+    public static String base64Decode8859(final String source) {
+        String result = "";
+        final Base64.Decoder decoder = Base64.getDecoder();
+        try {
+            // 此处的字符集是ISO-8859-1
+            result = new String(decoder.decode(source), "ISO-8859-1");
+        } catch (final UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * Base64加密
+     * @param source str
+     * @return base64 str
+     */
+    public static String base64Encode8859(final String source) {
+        String result = "";
+        final Base64.Encoder encoder = Base64.getEncoder();
+        byte[] textByte = null;
+        try {
+            //注意此处的编码是ISO-8859-1
+            textByte = source.getBytes("ISO-8859-1");
+            result = encoder.encodeToString(textByte);
+        } catch (final UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        String A = "qS/pmvAXYetUObwHm9bAod9G3SVBKQK5CiIgETwHJT4ExUpJnIg87m37KlokIsBZCnQBIO2Ear7Q/IazZ6jDNsnmsITqYt1hPYloGjdjRGlqdSSBVRjk9NIkRRQIlb+5AOHJttfVKMsbMK8FzoysE+rL8yKaOzXvsNCA2g60z3bEw3x891ZwPPiUSkVJGeIHpafWdR94Y/j3hfsrEw5KOTGiPneH5d9zhC73MW/kDWu9+wDkJCtCf5fNc9GIC5x2zKNZozpQ9wT/WLyjSz/En166xbgUt9tApaaQSayFQ0eSokMjYYLKO5KJQ355QtkvZlW96rX9IO6hVHXDgPD7kJOTh/L99ZQtG5umLBfOd9i3xVH4qH+gvi/i0gEpvQOhTvxcrZeKs8Rsliua46u/aBdUy6GlICRxQPmvKBfL9cE2L5MZGqHkCMTmSr1i4L8Ubxoi3Yv6TCTTOo4MVc64igb9HttMVfOiLFrZKAyH64Y5C6+GATUMSzWhXDn089QyrZk+W6GFkQlA6dBlO7v0aucF8t3L6SFtnxm6XkH6eD4/FFxKz+wsqKDX1s+GnPGQdwjxsS3RLGjJuNoSB7N+v4AUbMgLT2sBzew89ow7/vEUMjJMQt3eISwprOaDZqZQBgdLVUwDyWnrWi50Rr2wEuJXv/m6x8f40wN93L8GvGbMsWGXlp9V9W3LR2LZD9CnrWAlhoYoDGMAwCKuPh+dfjXmVGttGxegM+PlUR8nq6Qr1zwHz4dV3PgzWlf3n5qR72tAJ/Y0045n3dT7Iw4UNzBHC6XkUIA884paHbZ3D0V95+WrdyVQ4icsgZIneaAMZfslVsnigUjnXl3m/qZGlW5A6d93VXNe8bQgA6s6lJeEsaZc3sLVPi5Tlr2nfbgdhB4XqYkR4DebEbUzalSOqM+OOeCsYj920+FboIxvShy2ECk6bjebMM3kYw0s1NUWXynKFTvbgZ35H9TNKaeom1qYVmbb/581N8+sO3yDDFzZaaqLqOtaUtgIe2SOS2A6GRnKSanqbsJVU4j2amWEpicl3WchYV9KPeuoqodu+4UCsaY2juUIcbbof/ygkG5NkDz27RA4fBxxAlqvtzEftw==";
+
+        Security.addProvider(new BouncyCastleProvider());
+
+        System.out.println(AESUtil.decryptData(A));
+
+        /*String B = AESUtil.decryptData(A);
+        System.out.println(B);*/
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/DateTimeUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/DateTimeUtil.java
new file mode 100644
index 0000000..2ddd4d5
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/DateTimeUtil.java
@@ -0,0 +1,159 @@
+package com.weixin.pay.util;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 时间处理工具类
+ *
+ * @author yclimb
+ * @date 2018/11/1
+ */
+public class DateTimeUtil {
+
+    public static final String TIME_FORMAT_SHORT = "yyyyMMddHHmmss";
+    public static final String TIME_FORMAT_SHORT_HOUR = "yyyyMMddHH";
+    public static final String TIME_FORMAT_YMD = "yyyy/MM/dd HH:mm:ss";
+    public static final String TIME_FORMAT_NORMAL = "yyyy-MM-dd HH:mm:ss";
+    public static final String TIME_FORMAT_ENGLISH = "MM/dd/yyyy HH:mm:ss";
+    public static final String TIME_FORMAT_CHINA = "yyyy年MM月dd日 HH时mm分ss秒";
+    public static final String TIME_FORMAT_CHINA_M = "yyyy年MM月dd日 HH时mm分";
+    public static final String TIME_FORMAT_CHINA_S = "yyyy年M月d日 H时m分s秒";
+    public static final String TIME_FORMAT_SHORT_S = "HH:mm:ss";
+
+    public static final String DATE_FORMAT_SHORT = "yyyyMMdd";
+    public static final String DATE_FORMAT_NORMAL = "yyyy-MM-dd";
+    public static final String DATE_FORMAT_ENGLISH = "MM/dd/yyyy";
+    public static final String DATE_FORMAT_CHINA = "yyyy年MM月dd日";
+    public static final String DATE_FORMAT_CHINA_YEAR_MONTH = "yyyy年MM月";
+    public static final String MONTH_FORMAT = "yyyyMM";
+    public static final String YEAR_MONTH_FORMAT = "yyyy-MM";
+    public static final String DATE_FORMAT_MINUTE = "yyyyMMddHHmm";
+    public static final String MONTH_DAY_FORMAT = "MM-dd";
+    public static final String YEAR_FORMAT = "yyyy";
+    public static final String TIME_FORMAT_TIME = "yyyy/MM/dd HH:mm";
+    private static final SimpleDateFormat sdf = new SimpleDateFormat(
+            DATE_FORMAT_NORMAL);
+
+    private static final SimpleDateFormat sdfTime = new SimpleDateFormat(
+            TIME_FORMAT_NORMAL);
+
+    private static final SimpleDateFormat sdfTimes = new SimpleDateFormat(
+            "yyyyMMddHHmmssSSS");
+
+    private static final SimpleDateFormat sdfTChina = new SimpleDateFormat(
+            TIME_FORMAT_CHINA);
+
+    /**
+     * 把日期字符串转换为日期类型
+     *
+     * @param dateStr 日期字符串
+     * @return 日期
+     * @since 0.1
+     */
+    public static Date convertAsDate(String dateStr) {
+        if (dateStr == null || "".equals(dateStr)) {
+            return null;
+        }
+        DateFormat fmt = null;
+        if (dateStr.matches("\\d{14}")) {
+            fmt = new SimpleDateFormat(TIME_FORMAT_SHORT);
+        } else if (dateStr
+                .matches("\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}")) {
+            fmt = new SimpleDateFormat(TIME_FORMAT_NORMAL);
+        } else if (dateStr
+                .matches("\\d{1,2}/\\d{1,2}/\\d{4} \\d{1,2}:\\d{1,2}:\\d{1,2}")) {
+            fmt = new SimpleDateFormat(TIME_FORMAT_ENGLISH);
+        } else if (dateStr
+                .matches("\\d{4}年\\d{1,2}月\\d{1,2}日 \\d{1,2}时\\d{1,2}分\\d{1,2}秒")) {
+            fmt = new SimpleDateFormat(TIME_FORMAT_CHINA);
+        } else if (dateStr.matches("\\d{8}")) {
+            fmt = new SimpleDateFormat(DATE_FORMAT_SHORT);
+        } else if (dateStr.matches("\\d{4}-\\d{1,2}-\\d{1,2}")) {
+            fmt = new SimpleDateFormat(DATE_FORMAT_NORMAL);
+        } else if (dateStr.matches("\\d{1,2}/\\d{1,2}/\\d{4}")) {
+            fmt = new SimpleDateFormat(DATE_FORMAT_ENGLISH);
+        } else if (dateStr.matches("\\d{4}年\\d{1,2}月\\d{1,2}日")) {
+            fmt = new SimpleDateFormat(DATE_FORMAT_CHINA);
+        } else if (dateStr.matches("\\d{4}\\d{1,2}\\d{1,2}\\d{1,2}\\d{1,2}")) {
+            fmt = new SimpleDateFormat(DATE_FORMAT_MINUTE);
+        } else if (dateStr.matches("\\d{1,2}:\\d{1,2}:\\d{1,2}")) {
+            fmt = new SimpleDateFormat(TIME_FORMAT_SHORT_S);
+        }
+        try {
+            return fmt.parse(dateStr);
+        } catch (ParseException e) {
+            throw new IllegalArgumentException(
+                    "Date or Time String is invalid.");
+        }
+    }
+
+    /**
+     * 得到时间字符串,格式为 yyyyMMddHHmmss
+     * @return 返回当前时间的字符串
+     *
+     * @author yclimb
+     * @date 2018/11/1
+     */
+    public static String getTimeShortString(Date date) {
+        return new SimpleDateFormat(TIME_FORMAT_SHORT).format(date);
+    }
+
+    /**
+     * 得到十位数的时间戳
+     * @param date 时间对象
+     * @return long
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public static long getTenTimeByDate(Date date) {
+        return date.getTime() / 1000;
+    }
+
+    /**
+     * 得到十位数的时间戳
+     * @param dateStr 时间字符串
+     * @return long
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public static long getTenTimeByDate(String dateStr) {
+        return convertAsDate(dateStr).getTime() / 1000;
+    }
+
+
+    /**
+     * Description: 比较两个字符串格式的时间大小<br/>
+     * 如果第二个时间大于第一个时间返回true,否则返回false
+     *
+     * @param strFirst  第一个时间
+     * @param strSecond 第二个时间
+     * @param strFormat 时间格式化方式 eg:"yyyy-MM-dd HH:mm:ss"," yyyy-MM-dd"
+     * @return true-第二个时间晚于第一个时间,false-第二个时间不晚于第一个时间
+     *
+     * @author yclimb
+     * @date 2018/11/1
+     */
+    public static boolean latterThan(String strFirst, String strSecond,
+                                     String strFormat) {
+        SimpleDateFormat ft = new SimpleDateFormat(strFormat);
+        try {
+            Date date1 = ft.parse(strFirst);
+            Date date2 = ft.parse(strSecond);
+            long quot = date2.getTime() - date1.getTime();
+            if (0 < quot) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayUtil.java
new file mode 100644
index 0000000..db897b1
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayUtil.java
@@ -0,0 +1,385 @@
+package com.weixin.pay.util;
+
+import com.weixin.pay.constants.WXPayConstants;
+import com.weixin.pay.constants.WXPayConstants.SignType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.*;
+
+/**
+ * 微信支付工具类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXPayUtil {
+
+    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    private static final Random RANDOM = new SecureRandom();
+
+    /**
+     * XML格式字符串转换为Map
+     *
+     * @param strXML XML字符串
+     * @return XML数据转换后的Map
+     * @throws Exception
+     */
+    public static Map<String, String> xmlToMap(String strXML) throws Exception {
+        try {
+            Map<String, String> data = new HashMap<String, String>();
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            org.w3c.dom.Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                // do nothing
+            }
+            return data;
+        } catch (Exception ex) {
+            WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+        return generateSignedXml(data, key, WXPayConstants.SignType.MD5);
+    }
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名类型
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+        String sign = generateSignature(data, key, signType);
+        data.put(WXPayConstants.FIELD_SIGN, sign);
+        return mapToXml(data);
+    }
+
+
+    /**
+     * 判断签名是否正确
+     *
+     * @param xmlStr XML格式数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+        Map<String, String> data = xmlToMap(xmlStr);
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key).equals(sign);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+        return isSignatureValid(data, key, SignType.MD5);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key, signType).equals(sign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+        return generateSignature(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals(WXPayConstants.FIELD_SIGN)) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        if (SignType.MD5.equals(signType)) {
+            WXPayUtil.getLogger().info("signPay=" + sb.toString());
+            return MD5(sb.toString()).toUpperCase();
+        }
+        else if (SignType.HMACSHA256.equals(signType)) {
+            return HMACSHA256(sb.toString(), key);
+        }
+        else {
+            throw new Exception(String.format("Invalid sign_type: %s", signType));
+        }
+    }
+
+
+    /**
+     * 获取随机字符串 Nonce Str
+     *
+     * @return String 随机字符串
+     */
+    public static String generateNonceStr() {
+        char[] nonceChars = new char[32];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+
+    /**
+     * 根据字典排序
+     * @param type 1:根据key键排序;2:根据value值排序
+     * @param data d
+     * @return sb
+     */
+    public static String dictionaryOrder(final Map<String, String> data, int type) {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        StringBuilder sb = new StringBuilder();
+        if (type == 2) {
+            String[] valArray = new String[keySet.size()];
+            for (int i = 0; i < keySet.size(); i++) {
+                valArray[i] = data.get(keyArray[i]);
+            }
+            Arrays.sort(valArray);
+            for (String v : valArray) {
+                // 参数值为空，则不参与签名
+                if (v.trim().length() > 0) {
+                    sb.append(v);
+                }
+            }
+        } else {
+            Arrays.sort(keyArray);
+            for (int i = 0; i < keyArray.length; i++) {
+                // 参数值为空，则不参与签名
+                if (data.get(keyArray[i]).trim().length() > 0) {
+                    if (i == keyArray.length - 1) {
+                        sb.append(keyArray[i]).append("=").append(data.get(keyArray[i]).trim());
+                    } else {
+                        sb.append(keyArray[i]).append("=").append(data.get(keyArray[i]).trim()).append("&");
+                    }
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+
+    /**
+     * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String MD5(String data) throws Exception {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] array = md.digest(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception e
+     */
+    public static String HMACSHA256(String data, String key) throws Exception {
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+        sha256_HMAC.init(secret_key);
+        byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * SHA1 安全加密算法
+     * @param data 待处理数据
+     * @return str
+     * @throws Exception e
+     */
+    public static String SHA1(String data) throws Exception {
+        //指定sha1算法
+        MessageDigest digest = MessageDigest.getInstance("SHA-1");
+        digest.update(data.getBytes("UTF-8"));
+        //获取字节数组
+        byte messageDigest[] = digest.digest();
+        // Create Hex String
+        StringBuilder hexString = new StringBuilder();
+        // 字节数组转换为 十六进制 数
+        for (int i = 0; i < messageDigest.length; i++) {
+            String shaHex = Integer.toHexString(messageDigest[i] & 0xFF);
+            if (shaHex.length() < 2) {
+                hexString.append(0);
+            }
+            hexString.append(shaHex);
+        }
+        return hexString.toString();
+
+    }
+
+    /**
+     * 日志
+     * @return log
+     */
+    public static Logger getLogger() {
+        return LoggerFactory.getLogger("wxpay java sdk");
+    }
+
+    /**
+     * 获取当前时间戳，单位秒
+     * @return long
+     */
+    public static long getCurrentTimestamp() {
+        return System.currentTimeMillis() / 1000;
+    }
+
+    /**
+     * 获取当前时间戳，单位毫秒
+     * @return long
+     */
+    public static long getCurrentTimestampMs() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * 生成 uuid， 即用来标识一笔单，也用做 nonce_str
+     * @return str
+     */
+    public static String generateUUID() {
+        return UUID.randomUUID().toString().replaceAll("-", "").substring(0, 32);
+    }
+
+    /**
+     * 通用商户单号（每个单号必须唯一）28位
+     * 组成：mch_id+yyyyMMddHHmmss+4位随机数
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public static String getPayNo() {
+        String yyyyMMddHHmmss = DateTimeUtil.getTimeShortString(new Date());
+        int str4 = (int) (Math.random() * 9000) + 1000;
+        return WXPayConstants.MCH_ID + yyyyMMddHHmmss + str4;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayXmlUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayXmlUtil.java
new file mode 100644
index 0000000..698c2ea
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXPayXmlUtil.java
@@ -0,0 +1,43 @@
+package com.weixin.pay.util;
+
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * 微信支付xml转换工具类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public final class WXPayXmlUtil {
+
+    /**
+     * 生成一个微信的xml文档
+     * @return DocumentBuilder
+     * @throws ParserConfigurationException e
+     */
+    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    /**
+     * 新建doc文档
+     * @return Document
+     * @throws ParserConfigurationException e
+     */
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/WXSignatureUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXSignatureUtil.java
new file mode 100644
index 0000000..bd506b5
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXSignatureUtil.java
@@ -0,0 +1,226 @@
+package com.weixin.pay.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.weixin.pay.constants.WXPayConstants;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 微信签名工具
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+public class WXSignatureUtil {
+	
+	/**
+	 * 获取微信签名信息
+	 * @param request
+	 * @param requestUrl	请求页面地址
+	 * @return	返回map：noncestr:随机字符串；timestamp：签名时间戳；appid;微信公众号Id;signature:签名串
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 * @throws CloneNotSupportedException
+	 */
+	public static Map<String,Object> getSignature(HttpServletRequest request, String requestUrl) throws ClientProtocolException, IOException, CloneNotSupportedException{
+		Map<String, Object> map = new HashMap<String,Object>();
+
+		HttpSession session = request.getSession();
+
+		// 直接查询签名信息
+		Object objMap = session.getAttribute(requestUrl);
+		if (objMap != null) {
+			return (Map<String, Object>) objMap;
+		}
+
+		String appid = WXPayConstants.APP_ID;
+		String secret = WXPayConstants.SECRET;
+		String token;
+		String jsapi_ticket;
+
+		Object tokenObj = session.getAttribute("token");
+		if (tokenObj != null) {
+			token = String.valueOf(tokenObj);
+		} else {
+			token = getToken(appid, secret);
+			session.setAttribute("token", token);
+		}
+
+		Object jsapiTicketObj = session.getAttribute("jsapi_ticket");
+		if (jsapiTicketObj != null) {
+			jsapi_ticket = String.valueOf(jsapiTicketObj);
+		} else {
+			jsapi_ticket = getTicket(token);
+			session.setAttribute("jsapi_ticket", jsapi_ticket);
+		}
+
+		String nonce_str = createNonceStr();
+		String timestamp = createTimestamp();
+
+		String signature = "";
+
+		//注意这里参数名必须全部小写，且必须有序
+		String string1 = "jsapi_ticket=" + jsapi_ticket +
+				"&noncestr=" + nonce_str +
+				"&timestamp=" + timestamp +
+				"&url=" + requestUrl;
+		WXPayUtil.getLogger().info(string1);
+
+		try {
+			MessageDigest crypt = MessageDigest.getInstance("SHA-1");
+			crypt.reset();
+			crypt.update(string1.getBytes("UTF-8"));
+			signature = byteToHex(crypt.digest());
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+
+		map.put("noncestr", nonce_str);
+		map.put("timestamp", timestamp);
+		map.put("appid", appid);
+		map.put("signature", signature);
+
+		session.setAttribute(requestUrl, map);
+
+		return map;
+	}
+
+	private static String byteToHex(final byte[] hash) {
+		Formatter formatter = new Formatter();
+		for (byte b : hash)
+		{
+			formatter.format("%02x", b);
+		}
+		String result = formatter.toString();
+		formatter.close();
+		return result;
+	}
+
+	public static String createNonceStr() {
+		return UUID.randomUUID().toString();
+	}
+
+	public static String createTimestamp() {
+		return Long.toString(System.currentTimeMillis() / 1000);
+	}
+	
+	/**
+	 * 
+	 * @param appid		公众号应用id
+	 * @param secret	公众号应用密钥
+	 * @return 返回token
+	 * @throws IOException
+	 * @throws CloneNotSupportedException
+	 */
+	public static String getToken(String appid,String secret) throws IOException, CloneNotSupportedException{
+		String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appid+"&secret="+secret;
+		WXPayUtil.getLogger().info("url:" + url);
+		// 生成一个请求对象
+		HttpGet httpGet = new HttpGet(url);
+		// 生成一个Http客户端对象
+        HttpClient httpClient = new DefaultHttpClient();
+        // 下面使用Http客户端发送请求，并获取响应内容
+        InputStream inputStream = null;
+        // 发送请求并获得响应对象
+        HttpResponse mHttpResponse = null;
+        
+        BufferedReader bufferedReader = null;
+        String result = "";
+		String line;
+		try {
+			mHttpResponse = httpClient.execute(httpGet);
+			// 获得响应的消息实体
+	        HttpEntity mHttpEntity = mHttpResponse.getEntity();
+	       
+	        // 获取一个输入流
+			inputStream = mHttpEntity.getContent();
+			bufferedReader = new BufferedReader(
+			                new InputStreamReader(inputStream));
+			while ((line = bufferedReader.readLine()) != null) {
+			    result += line;
+			}
+			JSONObject json = JSONObject.parseObject(result);
+			return json.get("access_token").toString();
+		} catch (IOException e) {
+			throw new IOException("获取access_token异常！");
+		}finally {
+			bufferedReader.close();
+			inputStream.close();
+			httpGet.clone();
+		}
+	}
+	
+	/**
+	 * 
+	 * @param access_token 生成的token
+	 * @return	返回jsapi_ticket
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	public static String getTicket(String access_token) throws ClientProtocolException, IOException{
+		HttpGet httpGet = new HttpGet("https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token="+access_token+"&type=jsapi");
+		// 生成一个Http客户端对象
+        HttpClient httpClient = new DefaultHttpClient();
+        // 下面使用Http客户端发送请求，并获取响应内容
+        InputStream inputStream = null;
+        // 发送请求并获得响应对象
+        HttpResponse mHttpResponse = null;
+        
+        BufferedReader bufferedReader = null;
+        String result = "";
+		String line;
+		try {
+			mHttpResponse = httpClient.execute(httpGet);
+			HttpEntity mHttpEntity = mHttpResponse.getEntity();
+			inputStream = mHttpEntity.getContent();
+			bufferedReader = new BufferedReader(
+					new InputStreamReader(inputStream));
+			while ((line = bufferedReader.readLine()) != null) {
+				result += line;
+			}
+			JSONObject json2 = JSONObject.parseObject(result);
+			
+			return json2.get("ticket").toString();
+		} catch (IOException e) {
+			throw new IOException("获取jsapi_ticket异常！");
+		}finally {
+			bufferedReader.close();
+			inputStream.close();
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title getPhotoWeixinUrl
+	 * @Description 获取微信图片上传路径
+	 * @param media_id
+	 * @return
+	 * @throws NoSuchAlgorithmException 
+	 * @throws CloneNotSupportedException 
+	 * @throws IOException 
+	 * @throws 
+	 */
+	public static String getPhotoWeixinUrl(String media_id) throws NoSuchAlgorithmException, IOException, CloneNotSupportedException{
+		String appid = WXPayConstants.APP_ID;
+		String secret = WXPayConstants.SECRET;
+		String token = getToken(appid,secret);
+        String url = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token=" + token + "&media_id=" + media_id;
+        return url;
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUserUtil.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUserUtil.java
new file mode 100644
index 0000000..c437bc0
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUserUtil.java
@@ -0,0 +1,41 @@
+package com.weixin.pay.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * 对于微信用户名称emoji等特殊字符处理
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+@Slf4j
+public class WXUserUtil {
+
+    /**
+     * 编码用户昵称
+     *
+     * @param nickName 未编码等名称
+     * @return base64 str
+     */
+    public static String encodeNickName(String nickName) {
+        try {
+            return Base64.encodeBase64String(nickName.toString().getBytes("utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            log.error("编码用户昵称报错", e);
+        }
+        return null;
+    }
+
+    /**
+     * 解码用户昵称
+     *
+     * @param nickName base64 str
+     * @return 原始名称
+     */
+    public static String decodeNickName(String nickName) {
+        return new String(Base64.decodeBase64(nickName));
+    }
+}
diff --git a/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUtils.java b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUtils.java
new file mode 100644
index 0000000..caea314
--- /dev/null
+++ b/wxpay-sdk/src/main/java/com/weixin/pay/util/WXUtils.java
@@ -0,0 +1,622 @@
+package com.weixin.pay.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.weixin.pay.card.CardBgColorEnum;
+import com.weixin.pay.constants.WXConstants;
+import com.weixin.pay.constants.WXPayConstants;
+import com.weixin.pay.constants.WXURL;
+import com.weixin.pay.redis.RedisKeyEnum;
+import com.weixin.pay.redis.RedisKeyUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 微信小工具类
+ *
+ * @author yclimb
+ * @date 2018/8/17
+ */
+@Slf4j
+@Component
+public class WXUtils {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 获取微信全局accessToken
+     *
+     * @param code 标识
+     * @return accessToken
+     */
+    public String getAccessToken(String code) {
+
+        // 取redis数据
+        String key = WXConstants.WECHAT_ACCESSTOKEN + code;
+        String accessToken = (String) redisTemplate.opsForValue().get(key);
+        if (accessToken != null) {
+            return accessToken;
+        }
+
+        // 通过接口取得access_token
+        JSONObject jsonObject = restTemplate.getForObject(MessageFormat.format(WXURL.BASE_ACCESS_TOKEN, WXPayConstants.APP_ID, WXPayConstants.SECRET), JSONObject.class);
+        String token = (String) jsonObject.get("access_token");
+        if (StringUtils.isNotBlank(token)) {
+            // 存储redis
+            redisTemplate.opsForValue().set(key, token, 7000, TimeUnit.SECONDS);
+            return token;
+        } else {
+            log.error("获取微信accessToken出错，微信返回信息为：[{}]", jsonObject.toString());
+        }
+        return null;
+    }
+
+    /**
+     * 获取小程序静默登录返回信息
+     *
+     * @param code code
+     * @param appId appId
+     * @param appSecret appSecret
+     * @return json
+     */
+    public JSONObject getMiniBaseUserInfo(String code, String appId, String appSecret) {
+        log.info("getMiniBaseUserInfo:params:[{}]", code);
+        String data = restTemplate.getForObject(WXURL.WX_MINI_LOGIN, String.class, appId, appSecret, code);
+        log.info("getMiniBaseUserInfo:result:[{}]", data);
+        return JSONObject.parseObject(data);
+
+    }
+
+    /**
+     * 网页授权获取用户信息时用于获取access_token以及openid
+     * 请求路径：https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code(最后一个参数不变)
+     * @param code c
+     * @return access_token json obj
+     *
+     * @author yclimb
+     * @date 2018/7/30
+     */
+    public JSONObject getJsapiAccessTokenByCode(String code) {
+        if (StringUtils.isBlank(code)) {
+            return null;
+        }
+        try {
+            // 获取access_token
+            String access_token_json = restTemplate.getForObject(WXURL.OAUTH_ACCESS_TOKEN_URL, String.class,
+                    WXPayConstants.APP_ID_XXX, WXPayConstants.SECRET_XXX, code);
+            log.info("getAccessToken:access_token_json:{}", access_token_json);
+            if (StringUtils.isBlank(access_token_json)) {
+                return null;
+            }
+            JSONObject jsonObject = JSON.parseObject(access_token_json);
+            if (StringUtils.isBlank(jsonObject.getString("access_token"))) {
+                return null;
+            }
+            return jsonObject;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 通过access_token和openid请求获取用户信息
+     * 请求路径：https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN
+     * @param access_token t
+     * @param openid o
+     * @return userinfo json obj
+     *
+     * @author yclimb
+     * @date 2018/7/30
+     */
+    public JSONObject getJsapiUserinfo(String access_token, String openid) {
+        if (StringUtils.isBlank(access_token) || StringUtils.isBlank(openid)) {
+            return null;
+        }
+        try {
+            // 获取access_token和openid
+            String userinfo_json = restTemplate.getForObject(WXURL.OAUTH_GET_USERINFO_URL, String.class, access_token, openid);
+            log.info("getUserinfo:userinfo_json:{}", userinfo_json);
+            if (StringUtils.isBlank(userinfo_json)) {
+                return null;
+            }
+            JSONObject jsonObject = JSON.parseObject(userinfo_json);
+            if (0 != jsonObject.getIntValue("errcode")) {
+                return null;
+            }
+            return jsonObject;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 生成带参数的小程序二维码[]
+     *
+     * @param scene 参数
+     * @param page  小程序页面
+     * @return img path
+     */
+    public String getWxMiniQRImg(String scene, String page) {
+        InputStream inputStream = null;
+        String imgUrl = "";
+        try {
+
+            // redis key
+            String redisKey = RedisKeyUtil.keyBuilder(RedisKeyEnum.XXX_MINI_WX_CODE, scene + RedisKeyUtil.KEY_SPLIT_CHAR + page);
+
+            // 从redis中获取缓存图片
+            Object obj = redisTemplate.opsForValue().get(redisKey);
+            if (obj != null) {
+                return obj.toString();
+            }
+
+            // 获取微信永久无限制二维码
+            byte[] code = this.getwxacodeunlimit(scene, page);
+            if (code == null || code.length <= 0) {
+                return imgUrl;
+            }
+
+            // 将返回字节数组转为输入流
+            inputStream = new ByteArrayInputStream(code);
+
+            // 取得uuid的文件名称
+            String newFileName = UUID.randomUUID().toString().replaceAll("-", "").replace(".", "") + ".png";
+            log.info("getWxMiniQRImg:fileName:" + newFileName);
+
+            // 上传图片到OSS服务器
+            // imgUrl = ossUtils.uploadOss(inputStream, ossUtils.getImgPathYYYYMMDD(), newFileName);
+
+            // 图片为空直接返回
+            if (StringUtils.isBlank(imgUrl)) {
+                return imgUrl;
+            }
+            // 设置到redis中，下次取直接拿缓存即可，防止多次生成
+            redisTemplate.opsForValue().set(redisKey, imgUrl);
+
+        } catch (Exception e) {
+            log.error("getWxMiniQRImg:调用小程序生成微信永久小程序码URL接口异常", e);
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+        return imgUrl;
+    }
+
+    /**
+     * 获取 application/json;charset=UTF-8 的 HttpHeaders 对象
+     *
+     * @return HttpHeaders
+     * @author yclimb
+     * @date 2018/7/18
+     */
+    public HttpHeaders getHttpHeadersUTF8JSON() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.add("Accept", MediaType.APPLICATION_JSON_VALUE);
+        return headers;
+    }
+
+    /**
+     * 作用：生成永久无限制微信二维码<br>
+     * 场景：微信二维码生成，根据参数和页面配置微信二维码，返回二维码字节流
+     * 接口链接：https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN
+     * 接口文档地址：https://developers.weixin.qq.com/miniprogram/dev/api/qrcode.html
+     *
+     * @param scene 最大32个可见字符，只支持数字，大小写英文以及部分特殊字符：!#$&'()*+,/:;=?@-._~，其它字符请自行编码为合法字符（因不支持%，中文无法使用 urlencode 处理，请使用其他编码方式）
+     * @param page  必须是已经发布的小程序存在的页面（否则报错），例如 "pages/index/index" ,根路径前不要填加'/',不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面
+     * @return 二维码字节流
+     * @author yclimb
+     * @date 2018/7/18
+     */
+    public byte[] getwxacodeunlimit(String scene, String page) {
+        try {
+
+            // 获取access token
+            String accessToken = this.getAccessToken("xxx");
+
+            // 拼接传入参数
+            Map<String, Object> param = new HashMap<>(5);
+            param.put("scene", scene);
+            param.put("page", page);
+            // 默认：430；二维码的宽度，最小为280
+            param.put("width", 280);
+            // 默认：false；自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+            param.put("auto_color", false);
+
+            // 默认：{"r":"0","g":"0","b":"0"}；二维码图片颜色参数，auto_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"} 十进制表示
+            Map<String, Object> line_color = new HashMap<>(3);
+            line_color.put("r", 0);
+            line_color.put("g", 0);
+            line_color.put("b", 0);
+            param.put("line_color", line_color);
+
+            // map转换为json传输
+            String jsonParam = JSON.toJSONString(param);
+            log.info("getwxacodeunlimit:param:" + jsonParam);
+
+            // 请求微信接口，得到返回结果[二进制流]
+            HttpEntity<String> entity = new HttpEntity<>(jsonParam, this.getHttpHeadersUTF8JSON());
+            ResponseEntity<byte[]> responseEntity = restTemplate.postForEntity(WXURL.WX_MINI_QR_CODE_URL, entity, byte[].class, accessToken);
+
+            // return byte[]
+            return responseEntity.getBody();
+        } catch (Exception e) {
+            log.error("getwxacodeunlimit:postForEntity:" + e.getMessage(), e);
+        }
+
+        return null;
+    }
+
+    /**
+     * 创建支付后领取立减金活动接口
+     * 通过此接口创建立减金活动。
+     * 将已创建的代金券cardid、跳转小程序appid、发起支付的商户号等信息通过此接口创建立减金活动，成功返回活动id即为创建成功。
+     * 接口地址：https://mp.weixin.qq.com/wiki?t=resource/res_main&id=21515658940X5pIn
+     *
+     * @param begin_time               活动开始时间，精确到秒
+     * @param end_time                 活动结束时间，精确到秒
+     * @param gift_num                 单个礼包社交立减金数量（3-15个）
+     * @param max_partic_times_act     每个用户活动期间最大领取次数,最大为50，默认为1
+     * @param max_partic_times_one_day 每个用户活动期间单日最大领取次数,最大为50，默认为1
+     * @param card_id                  卡券ID
+     * @param min_amt                  最少支付金额，单位是元
+     * @param membership_appid         奖品指定的会员卡appid。如用户标签有选择商户会员，则需要填写会员卡appid，该appid需要跟所有发放商户号有绑定关系。
+     * @param new_tinyapp_user         可以指定为是否小程序新用户（membership_appid为空、new_tinyapp_user为false时，指定为所有用户）
+     * @return json
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public JSONObject createCardActivity(String begin_time, String end_time, int gift_num, int max_partic_times_act,
+                                         int max_partic_times_one_day, String card_id, String min_amt,
+                                         String membership_appid, boolean new_tinyapp_user) {
+        try {
+
+            // 创建活动接口之前的验证
+            String msg = checkCardActivity(begin_time, end_time, gift_num, max_partic_times_act, max_partic_times_one_day, min_amt);
+            if (null != msg) {
+                JSONObject resultJson = new JSONObject(2);
+                resultJson.put("errcode", "1");
+                resultJson.put("errmsg", msg);
+                return resultJson;
+            }
+
+            // 获取[商户名称]公众号的 access_token
+            String accessToken = this.getAccessToken(WXConstants.WX_MINI_PROGRAM_CODE);
+
+            // 调用接口传入参数
+            JSONObject paramJson = new JSONObject(1);
+
+            // info 包含 basic_info、card_info_list、custom_info
+            JSONObject info = new JSONObject(3);
+
+            // 基础信息对象
+            JSONObject basic_info = new JSONObject(8);
+            // activity_bg_color	是	活动封面的背景颜色，可参考：选取卡券背景颜色
+            basic_info.put("activity_bg_color", CardBgColorEnum.COLOR_090.getBgName());
+            // activity_tinyappid	是	用户点击链接后可静默添加到列表的小程序appid；
+            basic_info.put("activity_tinyappid", WXPayConstants.APP_ID);
+            // mch_code	是	支付商户号
+            basic_info.put("mch_code", WXPayConstants.MCH_ID);
+            // begin_time	是	活动开始时间，精确到秒（unix时间戳）
+            basic_info.put("begin_time", DateTimeUtil.getTenTimeByDate(begin_time));
+            // end_time	是	活动结束时间，精确到秒（unix时间戳）
+            basic_info.put("end_time", DateTimeUtil.getTenTimeByDate(end_time));
+            // gift_num	是	单个礼包社交立减金数量（3-15个）
+            basic_info.put("gift_num", gift_num);
+            // max_partic_times_act	否	每个用户活动期间最大领取次数,最大为50，不填默认为1
+            basic_info.put("max_partic_times_act", max_partic_times_act);
+            // max_partic_times_one_day	否	每个用户活动期间单日最大领取次数,最大为50，不填默认为1
+            basic_info.put("max_partic_times_one_day", max_partic_times_one_day);
+
+            // card_info_list	是	可以配置两种发放规则：小程序新老用户、新老会员
+            JSONArray card_info_list = new JSONArray(1);
+            JSONObject card_info = new JSONObject(3);
+            // card_id	是	卡券ID
+            card_info.put("card_id", card_id);
+            // min_amt	是	最少支付金额，单位是分
+            card_info.put("min_amt", String.valueOf(new BigDecimal(min_amt).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue()));
+            /*
+             * membership_appid	是	奖品指定的会员卡appid。如用户标签有选择商户会员，则需要填写会员卡appid，该appid需要跟所有发放商户号有绑定关系。
+             * new_tinyapp_user	是	可以指定为是否小程序新用户
+             * total_user	是	可以指定为所有用户
+             * membership_appid、new_tinyapp_user、total_user以上字段3选1，未选择请勿填，不必故意填写false
+             */
+            if (StringUtils.isNotBlank(membership_appid)) {
+                card_info.put("membership_appid", membership_appid);
+            } else {
+                if (new_tinyapp_user) {
+                    card_info.put("new_tinyapp_user", true);
+                } else {
+                    card_info.put("total_user", true);
+                }
+            }
+            card_info_list.add(card_info);
+
+            // 自定义字段，表示支付后领券
+            JSONObject custom_info = new JSONObject(1);
+            custom_info.put("type", "AFTER_PAY_PACKAGE");
+
+            // 拼装json对象
+            info.put("basic_info", basic_info);
+            info.put("card_info_list", card_info_list);
+            info.put("custom_info", custom_info);
+            paramJson.put("info", info);
+
+            // 请求微信接口，得到返回结果[json]
+            HttpEntity<JSONObject> entity = new HttpEntity<>(paramJson, this.getHttpHeadersUTF8JSON());
+            JSONObject resultJson = restTemplate.postForObject(WXURL.WX_CARD_ACTIVITY_CREATE_URL, entity, JSONObject.class, accessToken);
+
+            // {"errcode":0,"errmsg":"ok","activity_id":"4728935"}
+            System.out.println(resultJson.toJSONString());
+
+            return resultJson;
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 创建活动接口之前的验证
+     *
+     * @param begin_time               活动开始时间，精确到秒
+     * @param end_time                 活动结束时间，精确到秒
+     * @param gift_num                 单个礼包社交立减金数量（3-15个）
+     * @param max_partic_times_act     每个用户活动期间最大领取次数,最大为50，默认为1
+     * @param max_partic_times_one_day 每个用户活动期间单日最大领取次数,最大为50，默认为1
+     * @param min_amt                  最少支付金额，单位是元
+     * @return msg str
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public String checkCardActivity(String begin_time, String end_time, int gift_num, int max_partic_times_act,
+                                    int max_partic_times_one_day, String min_amt) {
+
+        // 开始时间不能小于结束时间
+        if (DateTimeUtil.latterThan(end_time, begin_time, DateTimeUtil.TIME_FORMAT_NORMAL)) {
+            return "活动开始时间不能小于活动结束时间";
+        }
+
+        // 单个礼包社交立减金数量（3-15个）
+        if (gift_num < 3 || gift_num > 15) {
+            return "单个礼包社交立减金数量（3-15个）";
+        }
+
+        // 每个用户活动期间最大领取次数,最大为50，默认为1
+        if (max_partic_times_act <= 0 || max_partic_times_act > 50) {
+            return "每个用户活动期间最大领取次数,最大为50，默认为1";
+        }
+
+        // 每个用户活动期间单日最大领取次数,最大为50，默认为1
+        if (max_partic_times_one_day <= 0 || max_partic_times_one_day > 50) {
+            return "每个用户活动期间单日最大领取次数,最大为50，默认为1";
+        }
+
+        // 最少支付金额，单位是元
+        if (BigDecimal.ONE.compareTo(new BigDecimal(min_amt)) > 0) {
+            return "最少支付金额必须大于1元";
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取卡券 api_ticket 的 api
+     * 请求路径：https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=wx_card
+     *
+     * @param access_token token
+     * @return api_ticket json obj
+     * @author yclimb
+     * @date 2018/9/21
+     */
+    public String getWxCardApiTicket(String access_token) {
+        if (StringUtils.isBlank(access_token)) {
+            return null;
+        }
+        try {
+
+            // redis key
+            String redisKey = RedisKeyUtil.keyBuilder(RedisKeyEnum.IMALL_WXCARD_APITICKET, access_token);
+
+            // 从redis中获取缓存
+            Object obj = redisTemplate.opsForValue().get(redisKey);
+            if (obj != null) {
+                return obj.toString();
+            }
+
+            // 获取卡券 api_ticket
+            String api_ticket = restTemplate.getForObject(WXURL.BASE_API_TICKET, String.class, access_token);
+            WXPayUtil.getLogger().info("getWxCardApiTicket:api_ticket:{}", api_ticket);
+            if (StringUtils.isBlank(api_ticket)) {
+                return null;
+            }
+            JSONObject jsonObject = JSON.parseObject(api_ticket);
+            if (0 != jsonObject.getIntValue("errcode")) {
+                return null;
+            }
+
+            // 设置到redis中，下次取直接拿缓存即可，防止多次生成
+            String ticket = jsonObject.getString("ticket");
+            redisTemplate.opsForValue().set(redisKey, ticket, jsonObject.getIntValue("expires_in"), TimeUnit.SECONDS);
+
+            return ticket;
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 获取 jsapi_ticket
+     * 请求路径：https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=jsapi
+     *
+     * @param access_token token
+     * @return api_ticket json obj
+     * @author yclimb
+     * @date 2018/9/25
+     */
+    public String getWxApiTicket(String access_token) {
+        if (StringUtils.isBlank(access_token)) {
+            return null;
+        }
+        try {
+
+            // redis key
+            String redisKey = RedisKeyUtil.keyBuilder(RedisKeyEnum.IMALL_WX_APITICKET, access_token);
+
+            // 从redis中获取缓存
+            Object obj = redisTemplate.opsForValue().get(redisKey);
+            if (obj != null) {
+                return obj.toString();
+            }
+
+            // 获取 api_ticket
+            String api_ticket = restTemplate.getForObject(WXURL.BASE_JSAPI_TICKET, String.class, access_token);
+            WXPayUtil.getLogger().info("getWxApiTicket:api_ticket:{}", api_ticket);
+            if (StringUtils.isBlank(api_ticket)) {
+                return null;
+            }
+            JSONObject jsonObject = JSON.parseObject(api_ticket);
+            if (0 != jsonObject.getIntValue("errcode")) {
+                return null;
+            }
+
+            // 设置到redis中，下次取直接拿缓存即可，防止多次生成
+            String ticket = jsonObject.getString("ticket");
+            redisTemplate.opsForValue().set(redisKey, ticket, jsonObject.getIntValue("expires_in"), TimeUnit.SECONDS);
+
+            return ticket;
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 根据代金券批次ID得到组合的cardList
+     *
+     * @param cardId 卡包ID
+     * @return cardList
+     * @author yclimb
+     * @date 2018/9/21
+     */
+    public JSONArray getCardList(String cardId) {
+        if (StringUtils.isBlank(cardId)) {
+            return null;
+        }
+        try {
+
+            // 获取[商户名称]公众号的 access_token
+            String accessToken = this.getAccessToken(WXConstants.WX_MINI_PROGRAM_CODE);
+            String timestamp = String.valueOf(WXPayUtil.getCurrentTimestamp());
+            String nonce_str = WXPayUtil.generateNonceStr();
+
+            // 卡券的扩展参数。需进行 JSON 序列化为字符串传入
+            JSONObject cardExt = new JSONObject();
+            //cardExt.put("code", "");
+            //cardExt.put("openid", "");
+            //cardExt.put("fixed_begintimestamp", "");
+            //cardExt.put("outer_str", "");
+            cardExt.put("timestamp", timestamp);
+            cardExt.put("nonce_str", nonce_str);
+
+            /**
+             * 1.将 api_ticket、timestamp、card_id、code、openid、nonce_str的value值进行字符串的字典序排序。
+             * 2.将所有参数字符串拼接成一个字符串进行sha1加密，得到signature。
+             * 3.signature中的timestamp，nonce字段和card_ext中的timestamp，nonce_str字段必须保持一致。
+             */
+            Map<String, String> map = new HashMap<>(8);
+            //map.put("code", "");
+            //map.put("openid", "");
+            map.put("api_ticket", this.getWxCardApiTicket(accessToken));
+            map.put("timestamp", timestamp);
+            map.put("card_id", cardId);
+            map.put("nonce_str", nonce_str);
+            cardExt.put("signature", WXPayUtil.SHA1(WXPayUtil.dictionaryOrder(map, 2)));
+
+            // 卡券对象
+            JSONObject cardInfo = new JSONObject();
+            cardInfo.put("cardId", cardId);
+            cardInfo.put("cardExt", cardExt.toJSONString());
+
+            // 需要添加的卡券列表
+            JSONArray cardList = new JSONArray(1);
+            cardList.add(cardInfo);
+
+            return cardList;
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 获取微信签名信息
+     *
+     * @param requestUrl 请求页面地址
+     * @param appid      appid
+     * @param code       code
+     * @return 返回map：noncestr:随机字符串；timestamp：签名时间戳；appid;微信公众号Id;signature:签名串
+     * @author yclimb
+     * @date 2018/9/25
+     */
+    public Map<String, Object> getSignature(String requestUrl, String appid, String code) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+
+            // 获取公众号的 access_token、jsapi_ticket
+            String accessToken = this.getAccessToken(code);
+            String jsapi_ticket = this.getWxApiTicket(accessToken);
+            String nonce_str = WXPayUtil.generateNonceStr();
+            String timestamp = Long.toString(WXPayUtil.getCurrentTimestamp());
+
+            // 注意这里参数名必须全部小写，且必须有序
+            String dataStr = "jsapi_ticket=" + jsapi_ticket +
+                    "&noncestr=" + nonce_str +
+                    "&timestamp=" + timestamp +
+                    "&url=" + requestUrl;
+            WXPayUtil.getLogger().info(dataStr);
+
+            String signature = WXPayUtil.SHA1(dataStr);
+            map.put("noncestr", nonce_str);
+            map.put("timestamp", timestamp);
+            map.put("appid", appid);
+            map.put("signature", signature);
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error(e.getMessage(), e);
+        }
+
+        return map;
+    }
+
+}
diff --git a/wxpay-sdk/src/main/test/controller/TestWXPay.java b/wxpay-sdk/src/main/test/controller/TestWXPay.java
new file mode 100644
index 0000000..c649cc6
--- /dev/null
+++ b/wxpay-sdk/src/main/test/controller/TestWXPay.java
@@ -0,0 +1,389 @@
+package controller;
+
+import com.weixin.pay.WXPay;
+import com.weixin.pay.WXPayConfigImpl;
+import com.weixin.pay.XxxWXPayConfigImpl;
+import com.weixin.pay.util.WXPayUtil;
+import com.weixin.pay.util.WXUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 统一接口测试
+ */
+public class TestWXPay {
+
+    private WXPay wxpay;
+    private WXPayConfigImpl config;
+    private String out_trade_no;
+    private String total_fee;
+
+    public TestWXPay() throws Exception {
+        config = WXPayConfigImpl.getInstance();
+        // wxpay = new WXPay(config);
+        wxpay = new WXPay(config, true, true);
+        total_fee = "1.01";
+        // out_trade_no = "201701017496748980290321";
+        out_trade_no = "20180912004";
+    }
+
+    /**
+     * 获取微信签名
+     * @param url
+     */
+    private void getWeixinMap(String url) {
+
+        /*Map<String, Object> map = new HashMap<>();
+
+        try {
+            map = WXSignatureUtil.getSignature(request, url);
+        } catch (IOException | CloneNotSupportedException e) {
+            e.printStackTrace();
+            System.out.println("获取微信签名信息异常！" + e.getMessage());
+        }
+        model.addAttribute("noncestr", map.get("noncestr"));
+        model.addAttribute("timestamp", map.get("timestamp"));
+        model.addAttribute("appid", map.get("appid"));
+        model.addAttribute("signature", map.get("signature"));*/
+    }
+
+    /**
+     * 获取微信签名
+     */
+    private void getWeixinMap() {
+        getWeixinMap(getRequestURL());
+    }
+
+    private String getRequestURL() {
+        String url = null;
+        /*if (null == request.getQueryString()) {
+            url = request.getRequestURL().toString();
+        } else {
+            url = request.getRequestURL() + "?" + request.getQueryString();
+        }*/
+        return url;
+    }
+
+    /**
+     * 扫码支付  下单
+     */
+    private void doUnifiedOrder() throws Exception {
+        WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+        Map<String, String> resultMap = wxPay.unifiedOrder("https://xxx.com/v1/weixin/pay/wxnotify",
+                "oPR7T5PFjcfgugIu2abQG6ijQGV4", "xxx-测试商品", WXPayUtil.getPayNo(), "10.01", "127.0.0.1",
+                "vip", "",null,null);
+
+        String prepay_id = resultMap.get("prepay_id");
+        String nonce_str = resultMap.get("nonce_str");
+        Map<String, String> map = wxPay.chooseWXPayMap(prepay_id, nonce_str);
+        System.out.println("map:" + map);
+    }
+
+
+    private void doOrderClose() {
+        System.out.println("关闭订单");
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", out_trade_no);
+        try {
+            Map<String, String> r = wxpay.closeOrder(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void doOrderQuery() {
+        System.out.println("查询订单");
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", out_trade_no);
+//        data.put("transaction_id", "4008852001201608221962061594");
+        try {
+            Map<String, String> r = wxpay.orderQuery(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void doOrderReverse() {
+        System.out.println("撤销");
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", out_trade_no);
+//        data.put("transaction_id", "4008852001201608221962061594");
+        try {
+            Map<String, String> r = wxpay.reverse(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 长链接转短链接
+     * 测试成功
+     */
+    private void doShortUrl() {
+        String long_url = "weixin://wxpay/bizpayurl?pr=etxB4DY";
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("long_url", long_url);
+        try {
+            Map<String, String> r = wxpay.shortUrl(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 退款
+     * 已测试
+     */
+    private void doRefund() {
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", out_trade_no);
+        data.put("out_refund_no", out_trade_no);
+        data.put("total_fee", total_fee);
+        data.put("refund_fee", total_fee);
+        data.put("refund_fee_type", "CNY");
+        data.put("op_user_id", config.getMchID());
+
+        try {
+            Map<String, String> r = wxpay.refund(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 查询退款
+     * 已经测试
+     */
+    private void doRefundQuery() {
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("out_trade_no", out_trade_no);
+        //data.put("transactionId", out_trade_no);
+        data.put("out_refund_no", out_trade_no);
+        //data.put("refund_id", out_trade_no);
+        try {
+            Map<String, String> r = wxpay.refundQuery(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 对账单下载
+     * 已测试
+     */
+    private void doDownloadBill() {
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("bill_date", "20161102");
+        data.put("bill_type", "ALL");
+        try {
+            Map<String, String> r = wxpay.downloadBill(data);
+            System.out.println(r);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取沙盒 sandbox_signkey
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void doGetSandboxSignKey() throws Exception {
+        WXPayConfigImpl config = WXPayConfigImpl.getInstance();
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("mch_id", config.getMchID());
+        data.put("nonce_str", WXPayUtil.generateNonceStr());
+        String sign = WXPayUtil.generateSignature(data, config.getKey());
+        data.put("sign", sign);
+        WXPay wxPay = new WXPay(config);
+        // String result = wxPay.requestWithoutCert("https://api.mch.weixin.qq.com/sandbox/pay/getsignkey", data, 10000, 10000);
+        String result = wxPay.requestWithoutCert("/sandboxnew/pay/getsignkey", data, 10000, 10000);
+        System.out.println(result);
+    }
+
+    private void doReport() {
+        HashMap<String, String> data = new HashMap<String, String>();
+        data.put("interface_url", "20160822");
+        data.put("bill_type", "ALL");
+    }
+
+    /**
+     * 小测试
+     */
+    private void test001() {
+        String xmlStr="<xml><return_code><![CDATA[SUCCESS]]></return_code>\n" +
+                "<return_msg><![CDATA[OK]]></return_msg>\n" +
+                "<appid><![CDATA[wx273fe72f2db863ed]]></appid>\n" +
+                "<mch_id><![CDATA[1228845802]]></mch_id>\n" +
+                "<nonce_str><![CDATA[lCXjx3wNx45HfTV2]]></nonce_str>\n" +
+                "<sign><![CDATA[68D7573E006F0661FD2A77BA59124E87]]></sign>\n" +
+                "<result_code><![CDATA[SUCCESS]]></result_code>\n" +
+                "<openid><![CDATA[oZyc_uPx_oed7b4q1yKmj_3M2fTU]]></openid>\n" +
+                "<is_subscribe><![CDATA[N]]></is_subscribe>\n" +
+                "<trade_type><![CDATA[NATIVE]]></trade_type>\n" +
+                "<bank_type><![CDATA[CFT]]></bank_type>\n" +
+                "<total_fee>1</total_fee>\n" +
+                "<fee_type><![CDATA[CNY]]></fee_type>\n" +
+                "<transaction_id><![CDATA[4008852001201608221983528929]]></transaction_id>\n" +
+                "<out_trade_no><![CDATA[20160822162018]]></out_trade_no>\n" +
+                "<attach><![CDATA[]]></attach>\n" +
+                "<time_end><![CDATA[20160822202556]]></time_end>\n" +
+                "<trade_state><![CDATA[SUCCESS]]></trade_state>\n" +
+                "<cash_fee>1</cash_fee>\n" +
+                "</xml>";
+        try {
+            System.out.println(xmlStr);
+            System.out.println("+++++++++++++++++");
+            System.out.println(WXPayUtil.isSignatureValid(xmlStr, config.getKey()));
+            Map<String, String> hm = WXPayUtil.xmlToMap(xmlStr);
+            System.out.println("+++++++++++++++++");
+            System.out.println(hm);
+            System.out.println(hm.get("attach").length());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private void testUnifiedOrderSpeed() throws Exception {
+        TestWXPay dodo = new TestWXPay();
+
+        for (int i=0; i<100; ++i) {
+            long startTs = System.currentTimeMillis();
+            out_trade_no = out_trade_no+i;
+            dodo.doUnifiedOrder();
+            long endTs = System.currentTimeMillis();
+            System.out.println(endTs-startTs);
+            Thread.sleep(1000);
+        }
+
+    }
+
+    /**
+     * 提现
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    public void doTranster() throws Exception {
+        // 微信调用接口
+        WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+        Map<String, String> resultMap = wxPay.transfers("1507928321201809301504246520",
+                "oPR7T5DWvXuhfKfyqNdi6MTQGaxo", "1.9", "测试退款", "127.0.0.1");
+        System.out.println("wxPay.transfers:" + resultMap);
+    }
+
+    /**
+     * 发送现金红包
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void sendRedPack() throws Exception {
+        WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+        wxPay.sendRedPack(WXPayUtil.getPayNo(), "obX_c0YRpT47zKcvq-ZYpjU6GFuA", "1",
+                "活动名称", "红包祝福语", "备注", "127.0.0.1");
+    }
+
+    /**
+     * 查询现金红包
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void getRedPackInfo() throws Exception {
+        WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+        wxPay.getRedPackInfo("1507928321201809171554055254");
+    }
+
+    /**
+     * 发送代金券
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void sendCoupon() throws Exception {
+        WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance());
+        wxPay.sendCoupon("9248266", WXPayUtil.getPayNo(), "obX_c0YRpT47zKcvq-ZYpjU6GFuA");
+    }
+
+    /**
+     * 查询代金券信息
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void queryCouponsInfo() throws Exception {
+        WXPay wxPay = new WXPay(XxxWXPayConfigImpl.getInstance());
+        wxPay.queryCouponsInfo("3983069127", "9248266", "obX_c0YRpT47zKcvq-ZYpjU6GFuA");
+    }
+
+    /**
+     * 查询代金券批次信息
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void queryCouponStock() throws Exception {
+        WXPay wxPay = new WXPay(XxxWXPayConfigImpl.getInstance());
+        wxPay.queryCouponStock("9248266");
+    }
+
+    /**
+     * 创建支付后领取立减金活动接口
+     *
+     * @author yclimb
+     * @date 2018/9/18
+     */
+    private void createCardActivity() {
+        WXUtils wxUtils = new WXUtils();
+        wxUtils.createCardActivity("2018-09-18 18:00:00", "2018-09-18 19:59:59", 3, 1,
+                1, "pX2-vjpU_MT1gFDsP8lNl15PdaZE", "100",
+                null, false);
+    }
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("--------------->");
+
+        TestWXPay dodo = new TestWXPay();
+        //dodo.doGetSandboxSignKey();
+        //dodo.doOrderQuery();
+        //dodo.doRefundQuery();
+        //dodo.doDownloadBill();
+        //dodo.sendRedPack();
+        //dodo.getRedPackInfo();
+        //dodo.sendCoupon();
+        //dodo.queryCouponsInfo();
+        //dodo.queryCouponStock();
+        //dodo.createCardActivity();
+        //dodo.doUnifiedOrder();
+        dodo.doTranster();
+
+
+        // 沙箱环境测试
+        //WXPay wxPay = new WXPay(WXPayConfigImpl.getInstance(), true, true);
+        //WXPay wxPay = new WXPay(ChunboWXPayConfigImpl.getInstance());
+
+        /*Map<String, String> resultMap = wxPay.refund("http://127.0.0.1:11000/weixin/pay/wxnotify", null,
+                "20180912004", "20180912004", "5.52", "5.52", "测试退款");*/
+
+        //System.out.println(resultMap);
+
+        /*Map<String, String> resultMap = wxPay.refund(null, "10000", "10001", "1.01", "0.01", "测试微信退款");
+        System.out.println(WXPayUtil.isSignatureValid(resultMap, WXPayConstants.API_KEY));*/
+
+
+        System.out.println("<---------------");
+    }
+
+}
diff --git a/wxpay-sdk/src/main/test/controller/WXAuthController.java b/wxpay-sdk/src/main/test/controller/WXAuthController.java
new file mode 100644
index 0000000..08df23b
--- /dev/null
+++ b/wxpay-sdk/src/main/test/controller/WXAuthController.java
@@ -0,0 +1,107 @@
+package controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.weixin.pay.constants.WXConstants;
+import com.weixin.pay.util.WXUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 微信用户授权控制类
+ *
+ * @author yclimb
+ * @date 2018/7/30
+ */
+@Slf4j
+@RestController
+@RequestMapping("/weixin/auth")
+public class WXAuthController {
+
+    @Resource
+    private WXUtils wxUtils;
+
+    /**
+     * 微信网页授权
+     * https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140842
+     * 第一步：用户同意授权，获取code
+     * 第二步：通过code换取网页授权access_token
+     * @return str
+     *
+     * @author yclimb
+     * @date 2018/7/30
+     */
+    /*@ApiOperation(value = "微信支付|网页授权", httpMethod = "GET", notes = "获取前端微信用户的网页授权，得到用户基础信息")*/
+    @GetMapping("/authorize")
+    public String authorize(HttpServletRequest request) throws Exception {
+
+        // 跳转页面标识
+        String state = request.getParameter("state");
+        // 通过code获取access_token
+        String code = request.getParameter("code");
+        log.info("authorize:code:{}", code);
+
+        // 获取access_token和openid
+        JSONObject jsonToken = wxUtils.getJsapiAccessTokenByCode(code);
+        if (null == jsonToken) {
+            return WXConstants.ERROR;
+        }
+
+        return WXConstants.SUCCESS;
+    }
+
+    /**
+     * 通过access_token和openid请求获取用户信息(需scope为 snsapi_userinfo)
+     * @return str
+     *
+     * @author yclimb
+     * @date 2018/7/31
+     */
+    /*@ApiOperation(value = "微信支付|通过access_token和openid请求获取用户信息", httpMethod = "POST", notes = "通过access_token和openid请求获取用户信息")*/
+    @PostMapping("/userinfo/{access_token}/{openid}")
+    public String userinfo(@PathVariable String access_token, @PathVariable String openid) {
+
+        // 通过access_token和openid请求获取用户信息
+        JSONObject jsonUserinfo = wxUtils.getJsapiUserinfo(access_token, openid);
+        if (null == jsonUserinfo) {
+            return WXConstants.ERROR;
+        }
+
+        // 判断用户是否在系统中是一个用户
+        String unionid = jsonUserinfo.getString("unionid");
+        if (StringUtils.isBlank(unionid)) {
+            return WXConstants.ERROR;
+        }
+
+        /*
+        // 存储用户信息到数据库
+        User user = userService.queryByUnionId(unionid);
+        if (user == null) {
+            user = JSON.parseObject(jsonUserinfo.toJSONString(), User.class);
+            user.setUserId(user.getId());
+            user.setCreateDate(new Date());
+            user.setIsDel(CommonConstantEnum.UNDELETED.getCode());
+            // 处理微信昵称emoji表情
+            if (StringUtils.isNotBlank(user.getNickName())) {
+                // 编码Base64.decodeBase64()
+                user.setNickName(UserNickUtil.encodeNickName(user.getNickName()));
+            }
+            userService.createEntity(user);
+        }
+
+        // 用户账户信息
+        Map<String, Object> map = new HashMap<>(2);
+        // 用户名称解码
+        user.setNickName(UserNickUtil.decodeNickName(user.getNickName()));
+        UserAccount userAccount = userAccountService.queryByUserId(user.getId());
+        map.put("user", user);
+
+        return AppMessage.success(map);*/
+
+        return WXConstants.SUCCESS;
+    }
+
+}
diff --git a/wxpay-sdk/src/main/test/controller/WXPayController.java b/wxpay-sdk/src/main/test/controller/WXPayController.java
new file mode 100644
index 0000000..e75c4b7
--- /dev/null
+++ b/wxpay-sdk/src/main/test/controller/WXPayController.java
@@ -0,0 +1,302 @@
+package controller;
+
+import com.weixin.pay.constants.WXConstants;
+import com.weixin.pay.constants.WXPayConstants;
+import com.weixin.pay.util.AESUtil;
+import com.weixin.pay.util.WXPayUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * 微信支付Controller
+ *
+ * @author yclimb
+ * @date 2018/6/15
+ */
+@Slf4j
+@RestController
+@RequestMapping("/weixin/pay")
+public class WXPayController {
+
+    /**
+     * 返回成功xml
+     */
+    private String resSuccessXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+
+    /**
+     * 返回失败xml
+     */
+    private String resFailXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
+
+    /**
+     * 该链接是通过【统一下单API】中提交的参数notify_url设置，如果链接无法访问，商户将无法接收到微信通知。
+     * 通知url必须为直接可访问的url，不能携带参数。示例：notify_url：“https://pay.weixin.qq.com/wxpay/pay.action”
+     * <p>
+     * 支付完成后，微信会把相关支付结果和用户信息发送给商户，商户需要接收处理，并返回应答。
+     * 对后台通知交互时，如果微信收到商户的应答不是成功或超时，微信认为通知失败，微信会通过一定的策略定期重新发起通知，尽可能提高通知的成功率，但微信不保证通知最终能成功。
+     * （通知频率为15/15/30/180/1800/1800/1800/1800/3600，单位：秒）
+     * 注意：同样的通知可能会多次发送给商户系统。商户系统必须能够正确处理重复的通知。
+     * 推荐的做法是，当收到通知进行处理时，首先检查对应业务数据的状态，判断该通知是否已经处理过，如果没有处理过再进行处理，如果处理过直接返回结果成功。在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱。
+     * 特别提醒：商户系统对于支付结果通知的内容一定要做签名验证，防止数据泄漏导致出现“假通知”，造成资金损失。
+     *
+     * @author yclimb
+     * @date 2018/6/15
+     */
+    /*@ApiOperation(value = "微信支付|支付回调接口", httpMethod = "POST", notes = "该链接是通过【统一下单API】中提交的参数notify_url设置，如果链接无法访问，商户将无法接收到微信通知。")*/
+    @RequestMapping("/wxnotify")
+    public void wxnotify(HttpServletRequest request, HttpServletResponse response) {
+
+        String resXml = "";
+        InputStream inStream;
+        try {
+
+            inStream = request.getInputStream();
+            ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+
+            WXPayUtil.getLogger().info("wxnotify:微信支付----start----");
+
+            // 获取微信调用我们notify_url的返回信息
+            String result = new String(outSteam.toByteArray(), "utf-8");
+            WXPayUtil.getLogger().info("wxnotify:微信支付----result----=" + result);
+
+            // 关闭流
+            outSteam.close();
+            inStream.close();
+
+            // xml转换为map
+            Map<String, String> map = WXPayUtil.xmlToMap(result);
+            boolean isSuccess = false;
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(map.get(WXPayConstants.RESULT_CODE))) {
+
+                WXPayUtil.getLogger().info("wxnotify:微信支付----返回成功");
+
+                if (WXPayUtil.isSignatureValid(map, WXPayConstants.API_KEY)) {
+
+                    // 订单处理 操作 orderconroller 的回写操作?
+                    WXPayUtil.getLogger().info("wxnotify:微信支付----验证签名成功");
+
+                    // 通知微信.异步确认成功.必写.不然会一直通知后台.八次之后就认为交易失败了.
+                    resXml = resSuccessXml;
+                    isSuccess = true;
+
+                } else {
+                    WXPayUtil.getLogger().error("wxnotify:微信支付----判断签名错误");
+                }
+
+            } else {
+                WXPayUtil.getLogger().error("wxnotify:支付失败,错误信息：" + map.get(WXPayConstants.ERR_CODE_DES));
+                resXml = resFailXml;
+            }
+
+            /*// 根据付款单号查询付款记录
+            Payment payment = paymentService.queryPaymentByFlowNumer(map.get("out_trade_no"), PaymentConstantEnum.PAYMENT_TYPE_ORDER.getCode());
+
+            // 付款记录修改 & 记录付款日志
+            int resultPay = paymentService.modifyPaymentByWxnotify(payment, isSuccess);
+            if (resultPay > 0) {
+                // 处理业务 - 修改订单状态
+                WXPayUtil.getLogger().info("wxnotify:微信支付回调：修改的订单===>" + map.get("out_trade_no"));
+                int updateResult = tradeService.modifyWxnotifyByRelationId(payment.getRelationId(), payment.getPrepayId(), isSuccess);
+                if (updateResult > 0) {
+                    WXPayUtil.getLogger().info("wxnotify:微信支付回调：修改订单支付状态成功");
+                } else {
+                    WXPayUtil.getLogger().error("wxnotify:微信支付回调：修改订单支付状态失败");
+                }
+            }*/
+
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error("wxnotify:支付回调发布异常：", e);
+        } finally {
+            try {
+                // 处理业务完毕
+                BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
+                out.write(resXml.getBytes());
+                out.flush();
+                out.close();
+            } catch (IOException e) {
+                WXPayUtil.getLogger().error("wxnotify:支付回调发布异常:out：", e);
+            }
+        }
+
+    }
+
+    /**
+     * 退款结果通知
+     * <p>
+     * 在申请退款接口中上传参数“notify_url”以开通该功能
+     * 如果链接无法访问，商户将无法接收到微信通知。
+     * 通知url必须为直接可访问的url，不能携带参数。示例：notify_url：“https://pay.weixin.qq.com/wxpay/pay.action”
+     * <p>
+     * 当商户申请的退款有结果后，微信会把相关结果发送给商户，商户需要接收处理，并返回应答。
+     * 对后台通知交互时，如果微信收到商户的应答不是成功或超时，微信认为通知失败，微信会通过一定的策略定期重新发起通知，尽可能提高通知的成功率，但微信不保证通知最终能成功。
+     * （通知频率为15/15/30/180/1800/1800/1800/1800/3600，单位：秒）
+     * 注意：同样的通知可能会多次发送给商户系统。商户系统必须能够正确处理重复的通知。
+     * 推荐的做法是，当收到通知进行处理时，首先检查对应业务数据的状态，判断该通知是否已经处理过，如果没有处理过再进行处理，如果处理过直接返回结果成功。在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱。
+     * 特别说明：退款结果对重要的数据进行了加密，商户需要用商户秘钥进行解密后才能获得结果通知的内容
+     * @param request req
+     * @param response resp
+     * @return res xml
+     *
+     * @author yclimb
+     * @date 2018/6/21
+     */
+    /*@ApiOperation(value = "微信支付|微信退款回调接口", httpMethod = "POST", notes = "该链接是通过【微信退款API】中提交的参数notify_url设置，如果参数中传了notify_url，则商户平台上配置的回调地址将不会生效。")*/
+    @RequestMapping("/refund")
+    public void refund(HttpServletRequest request, HttpServletResponse response) {
+
+        String resXml = "";
+        InputStream inStream;
+        try {
+
+            inStream = request.getInputStream();
+            ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+            WXPayUtil.getLogger().info("refund:微信退款----start----");
+
+            // 获取微信调用我们notify_url的返回信息
+            String result = new String(outSteam.toByteArray(), "utf-8");
+            WXPayUtil.getLogger().info("refund:微信退款----result----=" + result);
+
+            // 关闭流
+            outSteam.close();
+            inStream.close();
+
+            // xml转换为map
+            Map<String, String> map = WXPayUtil.xmlToMap(result);
+            boolean isSuccess = false;
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(map.get(WXPayConstants.RETURN_CODE))) {
+
+                WXPayUtil.getLogger().info("refund:微信退款----返回成功");
+
+                /*if (WXPayUtil.isSignatureValid(map, WXPayConstants.API_KEY)) {*/
+
+                    /** 以下字段在return_code为SUCCESS的时候有返回： **/
+                    // 加密信息：加密信息请用商户秘钥进行解密，详见解密方式
+                    String req_info = map.get("req_info");
+
+                    /**
+                     * 解密方式
+                     * 解密步骤如下：
+                     * （1）对加密串A做base64解码，得到加密串B
+                     * （2）对商户key做md5，得到32位小写key* ( key设置路径：微信商户平台(pay.weixin.qq.com)-->账户设置-->API安全-->密钥设置 )
+                     * （3）用key*对加密串B做AES-256-ECB解密（PKCS7Padding）
+                     */
+                    String resultStr = AESUtil.decryptData(req_info);
+
+                    // WXPayUtil.getLogger().info("refund:解密后的字符串:" + resultStr);
+                    Map<String, String> aesMap = WXPayUtil.xmlToMap(resultStr);
+
+
+                    /** 以下为返回的加密字段： **/
+                    //	商户退款单号	是	String(64)	1.21775E+27	商户退款单号
+                    String out_refund_no = aesMap.get("out_refund_no");
+                    //	退款状态	是	String(16)	SUCCESS	SUCCESS-退款成功、CHANGE-退款异常、REFUNDCLOSE—退款关闭
+                    String refund_status = aesMap.get("refund_status");
+                    /*//	微信订单号	是	String(32)	1.21775E+27	微信订单号
+                    String transaction_id = null;
+                    //	商户订单号	是	String(32)	1.21775E+27	商户系统内部的订单号
+                    String out_trade_no = null;
+                    //	微信退款单号	是	String(32)	1.21775E+27	微信退款单号
+                    String refund_id = null;
+                    //	订单金额	是	Int	100	订单总金额，单位为分，只能为整数，详见支付金额
+                    String total_fee = null;
+                    //	应结订单金额	否	Int	100	当该订单有使用非充值券时，返回此字段。应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+                    String settlement_total_fee = null;
+                    //	申请退款金额	是	Int	100	退款总金额,单位为分
+                    String refund_fee = null;
+                    //	退款金额	是	Int	100	退款金额=申请退款金额-非充值代金券退款金额，退款金额<=申请退款金额
+                    String settlement_refund_fee = null;*/
+
+                    // 退款是否成功
+                    if (!WXPayConstants.SUCCESS.equals(refund_status)) {
+                        resXml = resFailXml;
+                    } else {
+                        // 通知微信.异步确认成功.必写.不然会一直通知后台.八次之后就认为交易失败了.
+                        resXml = resSuccessXml;
+                        isSuccess = true;
+                    }
+
+                    /*// 根据付款单号查询付款记录
+                    Payment payment = paymentService.queryPaymentByFlowNumer(out_refund_no, PaymentConstantEnum.PAYMENT_TYPE_REFUND.getCode());
+
+                    // 付款记录修改 & 记录付款日志
+                    int resultPay = paymentService.modifyPaymentByWxnotify(payment, isSuccess);
+                    if (resultPay > 0) {
+
+                        // 退款订单记录
+                        List<PaymentOrderRefund> paymentOrderRefundList = paymentOrderRefundService.queryListByPaymentId(payment.getId());
+
+                        // 处理业务 - 修改订单状态
+                        WXPayUtil.getLogger().info("refund:微信支付回调：修改的订单===>" + out_refund_no);
+                        int updateResult = tradeService.modifyWxrefundByRelationId(payment.getRelationId(), paymentOrderRefundList, isSuccess);
+                        if (updateResult > 0) {
+                            WXPayUtil.getLogger().info("refund:微信支付回调：修改订单支付状态成功");
+                        } else {
+                            WXPayUtil.getLogger().error("refund:微信支付回调：修改订单支付状态失败");
+                        }
+                    }*/
+
+                /*} else {
+                    WXPayUtil.getLogger().error("refund:微信支付----判断签名错误");
+                }*/
+
+            } else {
+                WXPayUtil.getLogger().error("refund:支付失败,错误信息：" + map.get(WXPayConstants.RETURN_MSG));
+                resXml = resFailXml;
+            }
+
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error("refund:微信退款回调发布异常：", e);
+        } finally {
+            try {
+                // 处理业务完毕
+                BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
+                out.write(resXml.getBytes());
+                out.flush();
+                out.close();
+            } catch (IOException e) {
+                WXPayUtil.getLogger().error("refund:微信退款回调发布异常:out：", e);
+            }
+        }
+    }
+
+    /**
+     * 企业付款到零钱
+     * @return msg
+     *
+     * @author yclimb
+     * @date 2018/7/30
+     */
+    /*@Token(remove = true)
+    @ApiOperation(value = "微信支付|企业付款到零钱", httpMethod = "POST", notes = "用于企业向微信用户个人付款")*/
+    @PostMapping("/transfers")
+    public String transfers(HttpServletRequest request) {
+        try {
+            String remoteAddr = request.getRemoteAddr();
+            return WXConstants.SUCCESS;
+        } catch (Exception e) {
+            WXPayUtil.getLogger().error("transfers:微信提现支付异常：", e);
+        }
+        return WXConstants.ERROR;
+    }
+
+}