first commit

.gitignore

@@ -0,0 +1,44 @@
+######################################################################
+# 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/
+*/node_modules/
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

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.

README.md

@@ -0,0 +1,110 @@
+## 基础框架
+
+框架基于ruoyi-vue版本，做了部分优化改造，并命名为miaxis。
+
+原ruoyi-vue提供了以下功能:
+
+1.  用户管理：用户是系统操作者，该功能主要完成系统用户配置。
+2.  部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
+3.  岗位管理：配置系统用户所属担任职务。
+4.  菜单管理：配置系统菜单，操作权限，按钮权限标识等。
+5.  角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。
+6.  字典管理：对系统中经常使用的一些较为固定的数据进行维护。
+7.  参数管理：对系统动态配置常用参数。
+8.  通知公告：系统通知公告信息发布维护。
+9.  操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
+10. 登录日志：系统登录日志记录查询包含登录异常。
+11. 在线用户：当前系统中活跃用户状态监控。
+12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。
+13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。
+14. 系统接口：根据业务代码自动生成相关的api接口文档。
+15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
+16. 在线构建器：拖动表单元素生成相应的HTML代码。
+17. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
+
+改造内容:
+* ORM框架 使用 Mybatis-Plus 简化CRUD
+* Bean简化 使用 Lombok 简化 get set toString 等等
+* 代码生成模板 改为适配 Mybatis-Plus 的代码，以及自带swagger标签
+* 集成swagger-bootstrap-ui 打开地址：http://localhost:8080/doc.html
+* 改造所有返回值AjaxResult为Response让Swagger的@ApiModel识别（因为swagger不支持返回的hashMap和Json形式
+* 项目修改为 maven多环境配置,打包时候自动配置
+* 新增登录方法（不含验证码） /login/noCode ,方便生成token用swagger登录Authorize授权测试
+* 新增非系统用户的登录方式，包含密码登录和手机验证码登录
+* ResponseEnum统一状态消息管理，方便排查问题
+* 修改打包方式为war包，方便部署远程tomcat
+# 技术选型
+* 前端:Vue、Element UI
+* 后端:Spring Boot、Spring Security、Redis、Jwt、Swagger2 & Swagger-Bootstrap-UI、 Lombok、mybatis、mybatis-plus。
+
+# 项目结构
+
+```
+com.miaxis 
+├──project-admin              //web服务入口Controller管理模块（业务表生成的Controller层代码可以放在这里的project包下面）
+│    │    └──project                //这里写你的项目业务代码Controller
+│    │    └──system                 //系统自带Controller(不要随意修改)
+│    │    └──启动类          //springboot项目启动类（默认启动地址http://localhost:8080）
+│    │               
+├──project-common             //通用模块（通用工具类等）
+├──project-framework          //框架核心模块（包含redis，druid，Log等）
+├──project-generator          //代码生成器模块
+├──project-quartz             //定时任务模块
+├──project-system             //系统模块 (不要随意修改)
+├──project-xxx                //业务模块,除了controller 之外的都放在这边
+├──doc                      //说明文档文件夹
+├──sql                      //sql脚本文件夹 
+│   └──create_db.sql                //生成数据库和用户
+│   └──create_business.sql          //用于存放你们自己业务表的sql
+│   └──quartz.sql                   //用于存放定时任务sql
+│   └──ry_20201021.sql              //系统基本表自带的sql
+├──pom.xml                  //项目整体依赖
+
+```
+
+# 后端开发流程
+1. 创建表，表结构规范参考
+2. 使用代码生成器
+本次以sys_config举例，实际项目中不要去生成系统自带的sys开头的表，否则启动不了，因为代码模板不一样，有细微区别
+打开后台管理系统，点击菜单——>系统工具——>代码生成
+
+![Image text](doc/img/gen-import.jpg)
+![Image text](doc/img/gen-doc.jpg)
+
+如果生成之前要更改信息，可以点击编辑进入更改，注意要修改路径，模块名
+
+![Image text](doc/img/gen-edit.jpg)
+
+
+可以点击预览查看代码生成的效果
+
+![Image text](doc/img/gen-view.jpg)
+
+勾选然后可以点击生成（如果数据库中配好了comment注释，和table注释可以直接生成注释文字）
+
+![Image text](doc/img/gen-gen.jpg)
+
+解压后可以看到代码生产结果,然后拷贝到项目中对应的文件夹即可——main是java代码，vue是前端代码，deptMenu.sql是在菜单表中添加一条菜单数据，后端而言，可以直接复制整个main文件夹到我们项目模块src下
+
+![Image text](doc/img/gen-zip.jpg)
+
+到此，基本的增删改查代码已经生成。
+
+3. swagger文档使用
+
+未登录授权前，接口无法调试
+
+![Image text](doc/img/login-before.png)
+
+登录用法-用登录（免验证码）
+
+![Image text](doc/img/login.png)
+
+然后保存
+
+![Image text](doc/img/login-save.png)
+
+之后就能愉快的调试了
+
+![Image text](doc/img/login-after.png)
+

bin/clean.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [ÐÅÏ¢] ÇåÀíÉú³É·¾¶¡£
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
+pause

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

bin/run.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [ÐÅÏ¢] ÔËÐÐ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

fx-admin/pom.xml

@@ -0,0 +1,129 @@
+<?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>
+        <groupId>com.miaxis</groupId>
+        <artifactId>fx</artifactId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>war</packaging>
+    <artifactId>fx-admin</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>
+
+
+
+         <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.miaxis</groupId>
+            <artifactId>fx-framework</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- app端-->
+        <dependency>
+            <groupId>com.miaxis</groupId>
+            <artifactId>fx-service</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <!-- 定时任务-->
+        <!--<dependency>-->
+            <!--<groupId>com.miaxist</groupId>-->
+            <!--<artifactId>miaxis-quartz</artifactId>-->
+        <!--</dependency>-->
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.miaxis</groupId>
+            <artifactId>fx-generator</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <!--谷歌二维码生成-->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+
+        <!--hutool工具包-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <!-- 过滤后缀为pem、pfx的证书文件 -->
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>p12</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pem</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>cer</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>

fx-admin/src/main/java/com/miaxis/FxApplication.java

@@ -0,0 +1,27 @@
+package com.miaxis;
+
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * 启动程序
+ *
+ * @author miaxis
+ */
+@EnableFeignClients
+@EnableScheduling//开启定时任务注解
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class FxApplication
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(FxApplication.class, args);
+        System.out.println(" 一起来复训吧：D  \n") ;
+
+    }
+}

fx-admin/src/main/java/com/miaxis/FxServletInitializer.java

@@ -0,0 +1,18 @@
+package com.miaxis;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ *
+ * @author miaxis
+ */
+public class FxServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(FxApplication.class);
+    }
+}

fx-admin/src/main/java/com/miaxis/h5/controller/user/UserInfoController.java

@@ -0,0 +1,59 @@
+package com.miaxis.h5.controller.user;
+
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.user.service.IUserInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/user")
+@Api(tags = {"【H5-用户信息】"})
+@Slf4j
+public class UserInfoController extends BaseController {
+
+    @Autowired
+    private IUserInfoService userInfoService;
+
+
+
+    @GetMapping(value = "/info")
+    @ApiOperation("获取用户信息")
+    public Response<UserInfo> getInfo(){
+        Long userId  = SecurityUtils.getLoginUser().getStudent().getId();
+        return Response.success(userInfoService.getById(userId));
+    }
+
+
+    @PutMapping(value = "/realname")
+    @ApiOperation("更新用户信息真实姓名")
+    public Response updaterealname(String  realName){
+        Long userId  = SecurityUtils.getLoginUser().getStudent().getId();
+        UserInfo userInfo = userInfoService.getById(userId);
+        userInfo.setRealName(realName);
+        return Response.success(userInfoService.updateById(userInfo));
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

fx-admin/src/main/java/com/miaxis/h5/controller/wx/WxController.java

@@ -0,0 +1,195 @@
+package com.miaxis.h5.controller.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.miaxis.common.config.WxpayConfig;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.uuid.CommonUtils;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.WxOrderDTO;
+import com.miaxis.wx.service.IWxOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+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.RestController;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.util.Base64;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
+/**
+ * 【小程序-微信支付】Controller
+ *
+ * @author miaxis
+ * @date 2021-03-10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/wx")
+@Api(tags = {"【H5-微信支付】"})
+@Slf4j
+public class WxController extends BaseController {
+
+    @Autowired
+    private HttpClient httpClient;
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+
+    @Autowired
+    private IWxOrderService wxOrderService;
+
+
+    @Value("${zzgzh.appid}")
+    private String appid;
+    @Value("${wxpay.notifyUrl}")
+    private  String notifyUrl ;
+
+
+
+
+
+
+
+    /**
+     * 微信支付获取预订单id
+     */
+    @PostMapping(value = "/prepareOrder")
+    @ApiOperation("微信支付下单")
+    public Response<JSONObject> getPrepareOrder(@RequestBody WxOrderDTO wxOrderDTO) throws Exception{
+
+
+        SysDictData sysDictData = dictDataService.selectDictDataById(wxOrderDTO.getDictCode());
+        String[] values = sysDictData.getDictValue().split(",");
+        //创建本地微信订单
+        WxOrder order = createOrder(values);
+        wxOrderService.save(order);
+        return Response.success(placeWxOrder(order, sysDictData.getDictLabel(),notifyUrl));
+
+
+    }
+
+    private WxOrder createOrder(String[] values) {
+        WxOrder order = new WxOrder();
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        String orderCode = getOrderCode(student.getId());
+        order.setOutTradeNo(orderCode);
+        order.setOpenid(student.getOpenid());
+        order.setUnionId(student.getUnionId());
+        Double dprice = Double.valueOf(values[0]);
+        Double v =dprice* 100;
+        order.setTotal(v.intValue());
+        order.setOrderDataJson(values[2]);
+        return order;
+    }
+
+    //下单
+    private JSONObject placeWxOrder(WxOrder order, String goodsName, String notifyUrl) throws Exception {
+        HttpPost httpPost = initHttpPost();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectNode rootNode = objectMapper.createObjectNode();
+        rootNode.put("mchid",wxpayConfig.getMerchantId())
+                .put("appid", appid)
+                .put("description", goodsName)
+                .put("notify_url", notifyUrl)
+                .put("out_trade_no", order.getOutTradeNo());
+        rootNode.putObject("amount")
+                .put("total", order.getTotal());
+        rootNode.putObject("payer")
+                .put("openid", order.getOpenid());
+        objectMapper.writeValue(bos, rootNode);
+        httpPost.setEntity(new StringEntity(rootNode.toString(), "utf-8"));
+        HttpResponse response = httpClient.execute(httpPost);
+        String bodyAsString = EntityUtils.toString(response.getEntity());
+        if (JSONObject.parseObject(bodyAsString).get("prepay_id") == null){
+            throw new CustomException(JSONObject.parseObject(bodyAsString).get("message").toString());
+        }
+        return getWxParamJson(bodyAsString,order.getOutTradeNo());
+
+    }
+
+    // 生成调用调起微信支付所需参数
+    private JSONObject getWxParamJson(String bodyAsString, String orderCode) throws Exception {
+        String  packageStr = "prepay_id="+JSONObject.parseObject(bodyAsString).get("prepay_id");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("package",packageStr);
+        String nonce_str = RandomStringUtils.randomAlphanumeric(32);
+        jsonObject.put("nonceStr",nonce_str);
+        long timestamp =  System.currentTimeMillis()/1000;
+        jsonObject.put("timeStamp",String.valueOf(timestamp));
+        jsonObject.put("signType","RSA");
+        StringBuffer sb = new StringBuffer();
+        sb.append(appid + "\n");
+        sb.append(timestamp + "\n");
+        sb.append(nonce_str + "\n");
+        sb.append(packageStr+ "\n");
+        System.out.println(sb);
+
+        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
+        String realPath =file.getAbsolutePath();
+        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initSign(privateKey);
+        signature.update(sb.toString().getBytes("UTF-8"));
+        byte[] signedData = signature.sign();
+        String base64Str =  Base64.getEncoder().encodeToString(signedData);
+        jsonObject.put("paySign",base64Str);
+        jsonObject.put("appId",appid);
+        return jsonObject;
+    }
+
+
+
+
+
+
+    private HttpPost initHttpPost() {
+        HttpPost httpPost = new HttpPost(wxpayConfig.getV3url());
+        httpPost.addHeader("Accept", "application/json");
+        httpPost.addHeader("Content-type","application/json; charset=utf-8");
+        return httpPost;
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

fx-admin/src/main/java/com/miaxis/h5/controller/wx/WxNotifyController.java

@@ -0,0 +1,198 @@
+package com.miaxis.h5.controller.wx;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.config.WxpayConfig;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.AesUtil;
+import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.wx.domain.RefundRecord;
+import com.miaxis.wx.dto.WxNotifyReturnDTO;
+import com.miaxis.wx.dto.WxpayNotifyDTO;
+import com.miaxis.wx.service.IRefundRecordService;
+import com.miaxis.wx.service.IWxOrderService;
+import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Base64Utils;
+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.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.cert.X509Certificate;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.OPEN_PREFIX+"/wx/notify")
+@Api(tags = {"【H5-微信回调】"})
+@Slf4j
+public class WxNotifyController {
+
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+
+
+    @Autowired
+    private IWxOrderService wxOrderService;
+
+
+    @Autowired
+    private IUserInfoService userInfoService;
+
+    @Autowired
+    private  IRefundRecordService  refundRecordService;
+
+    @Autowired
+    private AutoUpdateCertificatesVerifier verifier;
+
+
+
+
+
+
+
+    /**
+     * 微信支付回调接口
+     */
+    @PostMapping(value = "/wxpay")
+    @ApiOperation("微信支付回调")
+    public WxNotifyReturnDTO wxpayNotify(@RequestBody WxpayNotifyDTO wxpayNotifyDTO, HttpServletRequest request) throws GeneralSecurityException, IOException {
+        String bodyString = getBodyString(request);
+//        if (!validate(request,bodyString)){
+//            throw new CustomException("签名失败");
+//        }
+        String resourceString = getSourString(wxpayNotifyDTO);
+        log.info("微信支付回调数据"+resourceString);
+        JSONObject jsonObject = JSONObject.parseObject(resourceString);
+        //将回调数据写入数据库, 并成为会员
+        wxOrderService.writeNotifyDataToDb(jsonObject);
+        WxNotifyReturnDTO wxNotifyReturnDTO = new WxNotifyReturnDTO();
+        wxNotifyReturnDTO.setCode("SUCCESS");
+        wxNotifyReturnDTO.setMessage("成功");
+        return wxNotifyReturnDTO;
+    }
+
+
+
+
+
+    private String getBodyString(HttpServletRequest request) {
+            BufferedReader br = null;
+            StringBuilder sb = new StringBuilder("");
+            try
+            {
+                br = request.getReader();
+                String str;
+                while ((str = br.readLine()) != null)
+                {
+                    sb.append(str);
+                }
+                br.close();
+            }
+            catch (IOException e)
+            {
+                e.printStackTrace();
+            }
+            finally
+            {
+                if (null != br)
+                {
+                    try
+                    {
+                        br.close();
+                    }
+                    catch (IOException e)
+                    {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            return sb.toString();
+
+    }
+
+    private Boolean validate(HttpServletRequest request, String bodyString) throws  NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+        String sign = request.getHeader("Wechatpay-Signature");
+        String timestamp = request.getHeader("Wechatpay-Timestamp");
+        String nonce = request.getHeader("Wechatpay-Nonce");
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(timestamp + "\n");
+        sb.append(nonce + "\n");
+        sb.append(bodyString + "\n");
+        X509Certificate validCertificate = verifier.getValidCertificate();
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        // 用微信平台公钥对签名器进行初始化
+        signature.initVerify(validCertificate);
+        // 把我们构造的验签名串更新到签名器中
+        signature.update(sb.toString().getBytes(StandardCharsets.UTF_8));
+        Boolean result = signature.verify(Base64Utils.decodeFromString(sign));
+        log.info("微信支付回调验签:"+result.toString());
+        return result;
+
+    }
+
+
+    /**
+     * 微信退款回调
+     */
+    @PostMapping(value = "/refund")
+    @ApiOperation("微信退款回调")
+    public WxNotifyReturnDTO refundNotify(@RequestBody WxpayNotifyDTO wxpayNotifyDTO, HttpServletRequest request) throws GeneralSecurityException, IOException {
+        String bodyString = getBodyString(request);
+        if (!validate(request,bodyString)){
+            throw new CustomException("签名失败");
+        }
+        String resourceString = getSourString(wxpayNotifyDTO);
+        log.info(resourceString);
+        JSONObject jsonObject = JSONObject.parseObject(resourceString);
+        //将回调数据写入数据库
+        writeRefundNotifyDataToDb(jsonObject);
+
+        WxNotifyReturnDTO wxNotifyReturnDTO = new WxNotifyReturnDTO();
+        wxNotifyReturnDTO.setCode("SUCCESS");
+        wxNotifyReturnDTO.setMessage("成功");
+
+        return wxNotifyReturnDTO;
+    }
+
+    private void writeRefundNotifyDataToDb(JSONObject jsonObject) {
+        String refundId = jsonObject.getString("refund_id");
+        RefundRecord refundRecord = refundRecordService.getByRefundId(refundId);
+        if (refundRecord == null) {
+            throw new CustomException("该退款订单不存在");
+        }
+        refundRecord.setTransactionId(jsonObject.getString("transaction_id"));
+        refundRecord.setUserReceivedAccount(jsonObject.getString("user_received_account"));
+        refundRecord.setStatus(jsonObject.getString("refund_status"));
+        refundRecordService.updateById(refundRecord);
+
+
+    }
+
+    private String getSourString(WxpayNotifyDTO wxpayNotifyDTO) throws GeneralSecurityException, IOException {
+        AesUtil aesUtil = new AesUtil(wxpayConfig.getV3key().getBytes());
+        WxpayNotifyDTO.WxpaySource wxpaySource = wxpayNotifyDTO.getResource();
+        return aesUtil.decryptToString(wxpaySource.getAssociated_data().getBytes(), wxpaySource.getNonce().getBytes(), wxpaySource.getCiphertext());
+    }
+
+
+
+
+
+
+
+
+}

fx-admin/src/main/java/com/miaxis/h5/controller/wx/WxgzhController.java

@@ -0,0 +1,104 @@
+package com.miaxis.h5.controller.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.utils.wx.SignUtil;
+import com.miaxis.wx.service.IWxGzhService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+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 javax.servlet.http.HttpServletRequest;
+
+/**
+ * 微信公众号相关
+ * @author wwl
+ * @version 1.0
+ * @date 2021/10/26 9:28
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.OPEN_PREFIX + "/wx/gzh")
+@Api(tags={"【H5-wx微信公众号相关】"})
+@Slf4j
+public class WxgzhController {
+
+    private final IWxGzhService wxGzhService;
+
+
+    private final HttpServletRequest request;
+
+
+    @Value("${cos.bucketName}")
+    private String bucketName;
+    @Value("${cos.path}")
+    private String path;
+    @Value("${cos.preffix}")
+    private String preffix;
+
+
+
+    /**
+     * 获取微信验签
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/notifyMsg")
+    @ApiOperation("获取微信验签")
+    public String checkSign(HttpServletRequest request) {
+        log.info("-----------进入---------");
+        try {
+            String signature = request.getParameter("signature");
+            String timestamp = request.getParameter("timestamp");
+            String nonce = request.getParameter("nonce");
+            String echostr = request.getParameter("echostr");
+            log.info("本身" + signature);
+            log.info("-----------微信验签---------");
+            return SignUtil.checkSignature(signature, timestamp, nonce) == true ? echostr : null;
+        } catch (Exception e) {
+            log.error("验证公众号token失败", e);
+        }
+        return null;
+    }
+
+
+    /**
+     * 处理服务器推送消息
+     * @param request
+     * @return
+     */
+    @PostMapping(value = "/notifyMsg")
+    @ApiOperation("处理服务器推送消息")
+    public String dealNotify(HttpServletRequest request) {
+        log.info("-----------进入---------");
+        try {
+            log.info("-----------推送消息处理---------");
+            return wxGzhService.handlePublicMsg(request);
+        } catch (Exception e) {
+            log.error("处理推送消息失败", e);
+        }
+        return null;
+    }
+
+    /**
+     * 获取公众号访问jspapi 需要的参数
+     * @return
+     */
+    @GetMapping(value = "/jspapi")
+    @ApiOperation("获取jspapi参数")
+    public Response<JSONObject> getJspapi(String url) {
+
+        return Response.success(wxGzhService.getJspapi(url));
+
+
+    }
+
+
+}

fx-admin/src/main/java/com/miaxis/pc/controller/area/AreaInfoController.java

@@ -0,0 +1,57 @@
+package com.miaxis.pc.controller.area;
+
+import com.miaxis.area.domain.AreaInfo;
+import com.miaxis.area.service.IAreaInfoService;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【地区】Controller
+ *
+ * @author miaxis
+ * @date 2022-03-14
+ */
+@RestController
+@RequestMapping("/area/info")
+@Api(tags={"【PC-地区】"})
+public class AreaInfoController extends BaseController{
+    @Autowired
+    private IAreaInfoService areaInfoService;
+
+    /**
+     * 查询地区列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询地区列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<AreaInfo> list(@ModelAttribute AreaInfo areaInfo){
+        startPage();
+        List<AreaInfo> list = areaInfoService.selectAreaInfoList(areaInfo);
+        return toResponsePageInfo(list);
+    }
+    
+
+    /**
+     * 获取地区详细信息
+     */
+    @GetMapping(value = "/{code}")
+    @ApiOperation("获取地区详细信息")
+    public Response<AreaInfo> getInfo(
+            @ApiParam(name = "code", value = "地区参数", required = true)
+            @PathVariable("code") String code
+    ){
+        return Response.success(areaInfoService.getById(code));
+    }
+
+
+
+}

fx-admin/src/main/java/com/miaxis/pc/controller/wx/WxMenuController.java

@@ -0,0 +1,97 @@
+package com.miaxis.pc.controller.wx;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.wx.service.IWxMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wwl
+ * @version 1.0
+ * @date 2021/11/3 9:18
+ */
+@RestController
+@RequestMapping("/pc/menu")
+@Api(tags={"【H5-微信公众号菜单】"})
+@AllArgsConstructor
+public class WxMenuController extends BaseController {
+
+    private final IWxMenuService wxMenuService;
+
+
+//    /**
+//     * 查询微信公众号菜单列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('menu:info:list')")
+//    @GetMapping("/list")
+//    @ApiOperation("查询微信公众号菜单列表")
+//    public Response<List<WxMenuVo>> list(){
+//        return wxMenuService.selectWxMenuTreeList();
+//    }
+//
+//
+//    /**
+//     * 获取微信公众号菜单详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('menu:info:query')")
+//    @GetMapping(value = "/{id}")
+//    @ApiOperation("获取微信公众号菜单详细信息")
+//    public Response<WxMenu> getInfo(
+//            @ApiParam(name = "id", value = "微信公众号菜单参数", required = true)
+//            @PathVariable("id") Long id
+//    ){
+//        return Response.success(wxMenuService.getById(id));
+//    }
+//
+//    /**
+//     * 新增微信公众号菜单
+//     */
+//    @PreAuthorize("@ss.hasPermi('menu:info:add')")
+//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.INSERT)
+//    @PostMapping
+//    @ApiOperation("新增微信公众号菜单")
+//    public Response add(@RequestBody WxMenu wxMenu){
+//        return wxMenuService.saveMenu(wxMenu);
+//    }
+//
+//    /**
+//     * 修改微信公众号菜单
+//     */
+//    @PreAuthorize("@ss.hasPermi('menu:info:edit')")
+//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.UPDATE)
+//    @PutMapping
+//    @ApiOperation("修改微信公众号菜单")
+//    public Response edit(@RequestBody WxMenu wxMenu){
+//        return wxMenuService.updateMenuById(wxMenu);
+//    }
+//
+//    /**
+//     * 删除微信公众号菜单
+//     */
+//    @PreAuthorize("@ss.hasPermi('menu:info:remove')")
+//    @Log(title = "微信公众号菜单", businessType = BusinessTypeEnum.DELETE)
+//    @DeleteMapping("/{ids}")
+//    @ApiOperation("删除微信公众号菜单")
+//    public  Response remove(
+//            @ApiParam(name = "ids", value = "微信公众号菜单ids参数", required = true)
+//            @PathVariable Long[] ids
+//    ){
+//        return wxMenuService.removeMenuByIds(ids);
+//    }
+
+    /**
+     * 一键更新公众号菜单
+     */
+    @GetMapping("/sendMenu")
+    @ApiOperation("一键更新公众号菜单--手动修改数据库操作")
+    public Response sendMenu(){
+        return wxMenuService.sendMenuBySql();
+    }
+
+
+}

fx-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java

@@ -0,0 +1,91 @@
+package com.miaxis.system.controller.common;
+
+import com.google.code.kaptcha.Producer;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.common.utils.sign.Base64;
+import com.miaxis.common.utils.uuid.IdUtils;
+import com.miaxis.system.dto.system.CaptchaImageDTO;
+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.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 验证码操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@Api(tags={"【系统-验证码操作处理】"})
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    // 验证码类型
+    @Value("${miaxis.captchaType}")
+    private String captchaType;
+
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    @ApiOperation("生成验证码")
+    public Response<CaptchaImageDTO> getCode(HttpServletResponse response) throws IOException
+    {
+        // 保存验证码信息
+        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 Response.error().setMsg(e.getMessage());
+        }
+        CaptchaImageDTO captchaImageDTO = new CaptchaImageDTO();
+        captchaImageDTO.setUuid(uuid);
+        captchaImageDTO.setImg(Base64.encode(os.toByteArray()));
+        return Response.success(captchaImageDTO);
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -0,0 +1,124 @@
+package com.miaxis.system.controller.common;
+
+import com.miaxis.common.config.MiaxisConfig;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.enums.FileUploadTypeEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.EnumUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.file.FileUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 通用请求处理
+ *
+ * @author miaxis
+ */
+@RestController
+@Api(tags={"【系统-通用请求处理】"})
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+
+    /**
+     * 通用下载请求
+     *
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
+    @ApiOperation("通用下载请求")
+    public void fileDownload(
+            @ApiParam(name = "fileName", value = "文件名称")
+            @RequestParam(name = "fileName", required = true) String fileName,
+            @ApiParam(name = "delete", value = "是否删除")
+            @RequestParam(name = "delete", required = true) Boolean delete,
+            HttpServletResponse response,
+            HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.isValidFilename(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = MiaxisConfig.getDownloadPath() + fileName;
+
+            response.setCharacterEncoding("utf-8");
+            response.setContentType("multipart/form-data");
+            response.setHeader("Content-Disposition",
+                    "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/common/download/resource")
+    public void resourceDownload(
+            @ApiParam(name = "name", value = "文件名称")
+            @RequestParam(name = "name", required = true) String name,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception
+    {
+        // 本地资源路径
+        String localPath = MiaxisConfig.getProfile();
+        // 数据库资源地址
+        String downloadPath = localPath + StringUtils.substringAfter(name, Constants.RESOURCE_PREFIX);
+        // 下载名称
+        String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+        response.setCharacterEncoding("utf-8");
+        response.setContentType("multipart/form-data");
+        response.setHeader("Content-Disposition",
+                "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
+        FileUtils.writeBytes(downloadPath, response.getOutputStream());
+    }
+
+
+    private Boolean validateFileSuffix(String originalFilenamefile, FileUploadTypeEnum fileUploadTypeEnum) {
+        if (fileUploadTypeEnum == null){
+            throw new CustomException("fileType参数不合法");
+        }
+        if (StringUtils.isEmpty(originalFilenamefile)){
+            throw new CustomException("文件名不合法");
+        }
+        String[] allowSuffixs = fileUploadTypeEnum.getSuffix();
+        for(String suffix : allowSuffixs){
+            String fileSuffix = "."+suffix;
+            if (originalFilenamefile.equals(fileSuffix)){
+                return true;
+            }
+        }
+        return false;
+
+    }
+
+    private FileUploadTypeEnum getPathByType(Integer fileType) {
+        if (fileType == null){
+            throw new CustomException("文件类型不能为空");
+        }
+        return (FileUploadTypeEnum) EnumUtils.getEnumEntityByCode(FileUploadTypeEnum.class, fileType);
+
+    }
+
+}

fx-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java

@@ -0,0 +1,32 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.framework.web.domain.Server;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+/**
+ * 服务器监控
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/server")
+@Api(tags={"【系统-服务器监控】"})
+public class ServerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    @ApiOperation("获取服务器监控信息")
+    public Response<Server> getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return Response.success(server);
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java

@@ -0,0 +1,77 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysLogininfor;
+import com.miaxis.system.service.ISysLogininforService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统访问记录
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+@Api(tags={"【系统-系统访问记录】"})
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询登录日志信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysLogininfor> list(@ModelAttribute SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出登录日志Excel")
+    public Response<String> export(@ModelAttribute 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 = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{infoIds}")
+    @ApiOperation("删除登录日志")
+    public Response<Integer> remove(
+            @ApiParam(name = "infoIds", value = "登录日志ids{逗号分隔}", required = true)
+            @PathVariable Long[] infoIds
+    )
+    {
+        return toResponse(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clean")
+    @ApiOperation("清除登录日志")
+    public Response clean()
+    {
+        logininforService.cleanLogininfor();
+        return Response.success();
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java

@@ -0,0 +1,75 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysOperLog;
+import com.miaxis.system.service.ISysOperLogService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 操作日志记录
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+@Api(tags={"【系统-操作日志记录】"})
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询操作日志记录列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysOperLog> list(@ModelAttribute SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出操作日志Excel")
+    public Response<String> export(@ModelAttribute SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        return util.exportExcel(list, "操作日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    @ApiOperation("删除操作日志")
+    public Response<Integer> remove(
+            @ApiParam(name = "infoIds", value = "操作日志ids{逗号分隔}", required = true)
+            @PathVariable Long[] operIds
+    ) {
+        return toResponse(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessTypeEnum.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    @ApiOperation("清除操作日志")
+    public Response clean()
+    {
+        operLogService.cleanOperLog();
+        return Response.success();
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,104 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.system.domain.SysUserOnline;
+import com.miaxis.system.service.ISysUserOnlineService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 在线用户监控
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/monitor/online")
+@Api(tags={"【系统-在线用户监控】"})
+public class SysUserOnlineController extends BaseController
+{
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询在线用户监控列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysUserOnline> list(
+            @ApiParam(name = "ipaddr", value = "ip地址")
+            @RequestParam(name = "ipaddr" ,required = false) String ipaddr,
+
+            @ApiParam(name = "userName", value = "用户名")
+            @RequestParam(name = "userName" ,required = false) 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 toResponsePageInfo(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessTypeEnum.FORCE)
+    @DeleteMapping("/{tokenId}")
+    @ApiOperation("强退用户")
+    public Response forceLogout(
+            @ApiParam(name = "tokenId", value = "令牌tokenId", required = true)
+            @PathVariable("tokenId") String tokenId
+    ) {
+        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+        return Response.success();
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java

@@ -0,0 +1,152 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.annotation.RepeatSubmit;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysConfig;
+import com.miaxis.system.service.ISysConfigService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/config")
+@Api(tags={"【系统-参数配置 信息操作处理】"})
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询参数配置列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+//    })
+    public ResponsePageInfo<SysConfig> list(@ModelAttribute SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出参数管理Excel")
+    public Response<String> export(@ModelAttribute 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}")
+    @ApiOperation("根据参数编号获取详细信息")
+    public Response<SysConfig> getInfo(
+            @ApiParam(name = "configId", value = "参数编号", required = true)
+            @PathVariable("configId") Long configId
+    ){
+        return Response.success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    @ApiOperation("根据参数键名查询参数值")
+    public Response<String> getConfigKey(
+            @ApiParam(name = "configKey", value = "参数键名", required = true)
+            @PathVariable("configKey") String configKey
+    ){
+        return Response.success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @RepeatSubmit
+    @ApiOperation("新增参数配置")
+    public Response<Integer> add(
+            @RequestBody @Validated SysConfig config
+    ){
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return Response.error(ResponseEnum.CONFIG_ADD_ERROR_EXIST);
+        }
+        config.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改参数配置")
+    public Response<Integer> edit(
+            @Validated @RequestBody SysConfig config
+    ){
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return Response.error(ResponseEnum.CONFIG_UPDATE_ERROR_EXIST);
+        }
+        config.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{configIds}")
+    @ApiOperation("删除参数配置")
+    public Response<Integer> remove(
+            @ApiParam(name = "configIds", value = "参数编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] configIds
+    ){
+        return toResponse(configService.deleteConfigByIds(configIds));
+    }
+
+    /**
+     * 清空缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clearCache")
+    @ApiOperation("清空缓存")
+    public Response clearCache()
+    {
+        configService.clearCache();
+        return Response.success();
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java

@@ -0,0 +1,180 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.TreeSelect;
+import com.miaxis.common.core.domain.entity.SysDept;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.system.dto.system.RoleDeptDTO;
+import com.miaxis.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.*;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dept")
+@Api(tags={"【系统-部门信息】"})
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询部门信息列表")
+    public Response<List<SysDept>> list(@ModelAttribute SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return Response.success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    @ApiOperation("查询部门信息列表（排除节点）")
+    public Response<List<SysDept>> excludeChild(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @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 Response.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    @ApiOperation("根据部门编号获取详细信息")
+    public Response<SysDept> getInfo(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable("deptId") Long deptId
+    ){
+        return Response.success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    @ApiOperation("获取部门下拉树列表")
+    public Response<List<TreeSelect>> treeselect(@ModelAttribute SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return Response.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    @ApiOperation("加载对应角色部门列表树")
+    public Response<RoleDeptDTO> roleDeptTreeselect(
+            @ApiParam(name = "roleId", value = "角色ID", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        RoleDeptDTO roleDeptDTO = new RoleDeptDTO();
+        roleDeptDTO.setCheckedKeys(deptService.selectDeptListByRoleId(roleId));
+        roleDeptDTO.setDepts(deptService.buildDeptTreeSelect(depts));
+        return Response.success(roleDeptDTO);
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增部门")
+    public Response<Integer> add(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_ADD_ERROR_EXIST);
+        }
+        dept.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改部门")
+    public Response<Integer> edit(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_EXIST);
+        }
+        else if (dept.getParentId().equals(dept.getDeptId()))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SELF);
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SUB);
+        }
+        dept.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{deptId}")
+    @ApiOperation("删除部门")
+    public Response<Integer> remove(
+            @ApiParam(name = "deptId", value = "部门id", required = true)
+            @PathVariable("deptId") Long deptId
+    ){
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_SUB);
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_USER);
+        }
+        return toResponse(deptService.deleteDeptById(deptId));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java

@@ -0,0 +1,126 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.system.service.ISysDictTypeService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+@Api(tags={"【系统-数据字典信息】"})
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询数据字典信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysDictData> list(@ModelAttribute SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出数据字典信息列表Excel")
+    public Response<String> export(@ModelAttribute 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}")
+    @ApiOperation("查询字典数据详细")
+    public Response<SysDictData> getInfo(
+            @ApiParam(name = "dictCode", value = "字典编号", required = true)
+            @PathVariable("dictCode") Long dictCode
+    ){
+        return Response.success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    @ApiOperation("根据字典类型查询字典数据信息")
+    public Response<List<SysDictData>> dictType(
+            @ApiParam(name = "dictType", value = "根据字典类型查询字典数据信息", required = true)
+            @PathVariable("dictType") String dictType
+    ){
+        return Response.success(dictTypeService.selectDictDataByType(dictType));
+    }
+
+    /**
+     * 新增字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增字典数据")
+    public Response<Integer> add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改保存字典数据")
+    public Response<Integer> edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    @ApiOperation("删除字典数据")
+    public Response<Integer> remove(
+            @ApiParam(name = "dictCodes", value = "字典编号codes{逗号分隔}", required = true)
+            @PathVariable Long[] dictCodes
+    ){
+        return toResponse(dictDataService.deleteDictDataByIds(dictCodes));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java

@@ -0,0 +1,144 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysDictType;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.service.ISysDictTypeService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 数据字典类型信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+@Api(tags={"【系统-数据字典类型信息】"})
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询数据字典类型信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysDictType> list(@ModelAttribute SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出数据字典类型信息列表Excel")
+    public Response<String> export(@ModelAttribute 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}")
+    @ApiOperation("查询字典类型详细")
+    public Response<SysDictType> getInfo(
+            @ApiParam(name = "dictId", value = "字典ID", required = true)
+            @PathVariable("dictId") Long dictId
+    ){
+        return Response.success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增字典类型")
+    public Response<Integer> add(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return Response.error(ResponseEnum.DICTIONARY_ADD_ERROR_EXIST);
+        }
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改字典类型")
+    public Response<Integer> edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return Response.error(ResponseEnum.DICTIONARY_UPDATE_ERROR_EXIST);
+        }
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{dictIds}")
+    @ApiOperation("删除字典类型")
+    public Response<Integer> remove(
+            @ApiParam(name = "dictIds", value = "字典Ids{逗号分隔}", required = true)
+            @PathVariable Long[] dictIds
+    ){
+        return toResponse(dictTypeService.deleteDictTypeByIds(dictIds));
+    }
+
+    /**
+     * 清空缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clearCache")
+    @ApiOperation("清空缓存")
+    public Response clearCache()
+    {
+        dictTypeService.clearCache();
+        return Response.success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    @ApiOperation("获取字典选择框列表")
+    public Response<List<SysDictType>> optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return Response.success(dictTypes);
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -0,0 +1,242 @@
+package com.miaxis.system.controller.system;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.*;
+import com.miaxis.common.enums.StudentLoginTypeEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.framework.web.service.SysLoginService;
+import com.miaxis.framework.web.service.SysPermissionService;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.common.RouterDTO;
+import com.miaxis.system.dto.system.TokenDTO;
+import com.miaxis.system.dto.system.UserInfoDTO;
+import com.miaxis.system.service.ISysMenuService;
+import com.miaxis.wx.service.WxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.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 java.util.List;
+import java.util.Set;
+
+/**
+ * 登录验证
+ *
+ * @author miaxis
+ */
+@RestController
+@Api(tags={"【系统-登录验证】"})
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private TokenService tokenService;
+
+
+    @Autowired
+    private WxService wxService;
+    private static Logger logger = LoggerFactory.getLogger(SysLoginController.class);
+
+
+
+
+    @Value("${zzgzh.appId}")
+    private String appid;
+
+    @Value("${zzgzh.appSecret}")
+    private String appSecret;
+
+    @Value("${xcx.appId}")
+    private String xcxAppid;
+
+    @Value("${xcx.secret}")
+    private String xcxSecret;
+
+
+    /**
+     * 登录方法 （含验证码）
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    @ApiOperation("系统-登录方法")
+    public Response<TokenDTO> login(@RequestBody LoginBody loginBody)
+    {   TokenDTO tokenDTO = new TokenDTO();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        tokenDTO.setToken(token);
+        return Response.success(tokenDTO);
+    }
+    /**
+     * 登录方法 （不含验证码）
+     *
+     * @param loginBodyNoCode 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login/noCode")
+    @ApiOperation("登录方法（不含验证码）")
+    public Response<TokenDTO> loginNoCode(@RequestBody LoginBodyNoCode loginBodyNoCode)
+    {   TokenDTO tokenDTO = new TokenDTO();
+        // 生成令牌
+        String token = loginService.login(loginBodyNoCode.getUsername(), loginBodyNoCode.getPassword());
+        tokenDTO.setToken(token);
+        return Response.success(tokenDTO);
+    }
+
+    /**
+     * 用户 openid登录
+     *
+     */
+    @PostMapping("/login/code")
+    @ApiOperation("用户授权码模式登录")
+    public Response<TokenDTO> loginByAuthorizationCode(String authorizationCode ){
+        String wxResultStr = wxService.getWxToken(appid, appSecret, authorizationCode, "authorization_code");
+        logger.info("微信授权码登录返回值:"+wxResultStr);
+        WxResult wxResult = JSONObject.parseObject(wxResultStr,WxResult.class);
+
+        // 生成令牌
+        if (wxResult.getErrcode() != null){
+            throw new CustomException("微信授权无效，请重新授权");
+        }
+        String userInfoStr = wxService.getUserInfo("zh_CN", wxResult.getAccess_token(), wxResult.getOpenid());
+        WxUserInfo wxUserInfo = JSONObject.parseObject(userInfoStr,WxUserInfo.class);
+        ServletUtils.getRequest().setAttribute("openid",wxUserInfo.getOpenid());
+        String token = loginService.login(wxUserInfo,null, StudentLoginTypeEnum.AUTHORIZATION_CODE_LOGIN.getCode());
+        TokenDTO tokenDTO = new TokenDTO();
+        tokenDTO.setToken(token);
+        tokenDTO.setWxUserInfo(wxUserInfo);
+        return Response.success(tokenDTO) ;
+
+
+
+    }
+    @PostMapping("/login/code/test")
+    @ApiOperation("用户授权码模式登录--测试")
+    public Response<TokenDTO> testloginByAuthorizationCode(String authorizationCode ){
+        WxUserInfo wxUserInfo = new WxUserInfo();
+        wxUserInfo.setOpenid("ovKTX5-FKLF6_sgTtCIXpG_lz3PY");
+        wxUserInfo.setUnionid("oqEKX6GxPyBPfRbM-Bk01CGwA0oM");
+        wxUserInfo.setNickname("Althars");
+        wxUserInfo.setSex("0");
+        wxUserInfo.setHeadimgurl("https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83erGMFzKaOmz6cIaA0J1nicWSlBLdLKY46N5CNCoASiajT7Z3RIfPngPhJsjmqsSjGCFibPU4vCtfz3aw/132");
+        String token = loginService.login(wxUserInfo,null, StudentLoginTypeEnum.AUTHORIZATION_CODE_LOGIN.getCode());
+        TokenDTO tokenDTO = new TokenDTO();
+        tokenDTO.setToken(token);
+
+        tokenDTO.setWxUserInfo(wxUserInfo);
+        return Response.success(tokenDTO) ;
+
+
+
+    }
+
+    /**
+     * 用户 jscode登录
+     *
+     */
+    @PostMapping("/login/jscode")
+    @ApiOperation("小程序jscode登录")
+    public Response<TokenDTO> getInfo(String jscode){
+        String result = wxService.getWxInfo(xcxAppid, xcxSecret, jscode,"authorization_code");
+        JSONObject jsonString = JSONObject.parseObject(result);
+        WxResult wxResult = JSONObject.toJavaObject(jsonString, WxResult.class);
+        TokenDTO tokenDTO = new TokenDTO();
+        // 生成令牌
+        if (wxResult.getOpenid() != null){
+            // 生成令牌
+            WxUserInfo wxUserInfo = new WxUserInfo();
+            BeanUtils.copyProperties(wxResult,wxUserInfo);
+            ServletUtils.getRequest().setAttribute("xcxOpenid",wxUserInfo.getOpenid());
+            String token = loginService.login(wxUserInfo,null, StudentLoginTypeEnum.AUTHORIZATION_XCX_LOGIN.getCode());
+            tokenDTO.setToken(token);
+            return Response.success(tokenDTO) ;
+        }
+        else{
+            return Response.error(500,wxResult.getErrmsg());
+        }
+
+    }
+
+//
+//    /**
+//     * 用户 jscode登录
+//     *
+//     */
+//    @PostMapping("/login/jscode-test")
+//    @ApiOperation("用户jscode登录(测试，固定openid)")
+//    public Response<TokenDTO> getInfoTest(String jscode){
+//        TokenDTO tokenDTO = new TokenDTO();
+//            // 生成令牌
+//        String token = loginService.login("oO7PJ5CPQJo62kZWA3uiUX2KG2s4",null, StudentLoginTypeEnum.AUTHORIZATION_CODE_LOGIN.getCode());
+//        tokenDTO.setToken(token);
+//        return Response.success(tokenDTO) ;
+//
+//
+//    }
+
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    @ApiOperation("获取用户信息")
+    public Response<UserInfoDTO> getInfo()
+    {
+        SecurityUtils.getLoginUser();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        UserInfoDTO userInfoDTO = new UserInfoDTO();
+        SysUser user = loginUser.getUser();
+        if (user != null){
+            userInfoDTO.setUser(user);
+            // 角色集合
+            Set<String> roles = permissionService.getRolePermission(user);
+            // 权限集合
+            Set<String> permissions = permissionService.getMenuPermission(user);
+            userInfoDTO.setRoles(roles);
+            userInfoDTO.setPermissions(permissions);
+        }
+        userInfoDTO.setStudent(loginUser.getStudent());
+        return Response.success(userInfoDTO);
+    }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    @ApiOperation("获取路由信息")
+    public Response<List<RouterDTO>> getRouters()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        // 用户信息
+        SysUser user = loginUser.getUser();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        return Response.success(menuService.buildMenus(menus));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java

@@ -0,0 +1,171 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.TreeSelect;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.MenuDTO;
+import com.miaxis.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.*;
+
+import java.util.List;
+
+/**
+ * 菜单信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/menu")
+@Api(tags={"【系统-菜单信息】"})
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取菜单列表")
+    public Response<List<SysMenu>> list(@ModelAttribute SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return Response.success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    @ApiOperation("根据菜单编号获取详细信息")
+    public Response<SysMenu> getInfo(
+            @ApiParam(name = "menuId", value = "菜单编号", required = true)
+            @PathVariable("menuId") Long menuId
+    ){
+        return Response.success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    @ApiOperation("获取菜单下拉树列表")
+    public Response<List<TreeSelect>> treeselect(@ModelAttribute SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return Response.success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    @ApiOperation("加载对应角色菜单列表树")
+    public Response<MenuDTO> roleMenuTreeselect(
+            @ApiParam(name = "roleId", value = "角色ID", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        MenuDTO menuDTO= new MenuDTO();
+        menuDTO.setCheckedKeys(menuService.selectMenuListByRoleId(roleId));
+        menuDTO.setMenus(menuService.buildMenuTreeSelect(menus));
+        return Response.success(menuDTO);
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增菜单")
+    public Response<Integer> add(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return Response.error(ResponseEnum.MENU_ADD_ERROR_EXIST);
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return Response.error(ResponseEnum.MENU_ADD_ERROR_HTTP);
+        }
+        menu.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改菜单")
+    public Response<Integer> edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_EXIST);
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_HTTP);
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_SELF);
+        }
+        menu.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{menuId}")
+    @ApiOperation("删除菜单")
+    public Response<Integer> remove(
+            @ApiParam(name = "menuId", value = "菜单ID", required = true)
+            @PathVariable("menuId") Long menuId
+    ){
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return Response.error(ResponseEnum.MENU_DELETE_ERROR_SUB);
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return Response.error(ResponseEnum.MENU_DELETE_ERROR_ROLE);
+        }
+        return toResponse(menuService.deleteMenuById(menuId));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java

@@ -0,0 +1,101 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.system.domain.SysNotice;
+import com.miaxis.system.service.ISysNoticeService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/notice")
+@Api(tags={"【系统-公告信息操作处理】"})
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取通知公告列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysNotice> list(@ModelAttribute SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    @ApiOperation("根据通知公告编号获取详细信息")
+    public Response<SysNotice> getInfo(
+            @ApiParam(name = "noticeId", value = "通知公告编号", required = true)
+            @PathVariable("noticeId") Long noticeId
+    ){
+        return Response.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增通知公告")
+    public Response<Integer> add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改通知公告")
+    public Response<Integer> edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    @ApiOperation("删除通知公告")
+    public Response<Integer> remove(
+            @ApiParam(name = "noticeIds", value = "通知ids{逗号分隔}", required = true)
+            @PathVariable Long[] noticeIds
+    ){
+        return toResponse(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java

@@ -0,0 +1,142 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysPost;
+import com.miaxis.system.service.ISysPostService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/post")
+@Api(tags={"【系统-岗位信息操作处理】"})
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取岗位列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysPost> list(@ModelAttribute SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出岗位列表Excel")
+    public Response<String> export(@ModelAttribute 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}")
+    @ApiOperation("根据岗位编号获取详细信息")
+    public Response<SysPost> getInfo(
+            @ApiParam(name = "postId", value = "岗位编号", required = true)
+            @PathVariable("postId") Long postId
+    ){
+        return Response.success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增岗位")
+    public Response<Integer> add(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_CODE);
+        }
+        post.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改岗位")
+    public Response<Integer> edit(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_CODE);
+        }
+        post.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{postIds}")
+    @ApiOperation("删除岗位")
+    public Response<Integer> remove(
+            @ApiParam(name = "postIds", value = "岗位编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] postIds
+    ){
+        return toResponse(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    @ApiOperation("获取岗位选择框列表")
+    public Response<List<SysPost>> optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return Response.success(posts);
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java

@@ -0,0 +1,132 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.config.MiaxisConfig;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.file.FileUploadUtils;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.PersonInfoDTO;
+import com.miaxis.system.dto.system.UpdatePwdDTO;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * 个人信息 业务处理
+ * 修改识别 swagger
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+@Api(tags={"【系统-个人信息业务处理】"})
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    @ApiOperation("个人信息")
+    public Response<PersonInfoDTO> profile()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        PersonInfoDTO personInfoDTO = new  PersonInfoDTO();
+        personInfoDTO.setUser(user);
+        personInfoDTO.setPostGroup(userService.selectUserPostGroup(loginUser.getUsername()));
+        personInfoDTO.setRoleGroup(userService.selectUserRoleGroup(loginUser.getUsername()));
+        return  Response.success(personInfoDTO);
+    }
+
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改用户")
+    public Response updateProfile(@RequestBody SysUser user)
+    {
+        if (userService.updateUserProfile(user) > 0)
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            // 更新缓存用户信息
+            loginUser.getUser().setNickName(user.getNickName());
+            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getUser().setEmail(user.getEmail());
+            loginUser.getUser().setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return Response.success();
+        }
+        return Response.error(ResponseEnum.USER_UPDATE_ERROR);
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/updatePwd")
+    @ApiOperation("重置密码")
+    public Response updatePwd(@RequestBody UpdatePwdDTO updatePwdDTO) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(updatePwdDTO.getOldPassword(), password))
+        {
+            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_ERROR);
+        }
+        if (SecurityUtils.matchesPassword(updatePwdDTO.getNewPassword(), password))
+        {
+            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_REPEAT);
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updatePwdDTO.getNewPassword())) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(updatePwdDTO.getNewPassword()));
+            tokenService.setLoginUser(loginUser);
+            return Response.success();
+        }
+        return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR);
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessTypeEnum.UPDATE)
+    @PostMapping("/avatar")
+    @ApiOperation("头像上传")
+    public Response<String> avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            String avatar = FileUploadUtils.upload(MiaxisConfig.getAvatarPath(), file);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                Response response = Response.success(avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return response;
+            }
+        }
+        return Response.error(ResponseEnum.ABNORMAL_PICTURE_UPLOAD);
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java

@@ -0,0 +1,196 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysRole;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.framework.web.service.SysPermissionService;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/role")
+@Api(tags={"【系统-角色信息】"})
+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")
+    @ApiOperation("查询角色信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" ,dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysRole> list(@ModelAttribute SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出角色信息列表Excel")
+    public Response<String> export(@ModelAttribute 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}")
+    @ApiOperation("根据角色编号获取详细信息")
+    public Response<SysRole> getInfo(
+            @ApiParam(name = "roleId", value = "角色编号", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        return Response.success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增角色")
+    public Response<Integer> add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_AUTHORITY);
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改保存角色")
+    public Response edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_AUTHORITY);
+        }
+        role.setUpdateBy(SecurityUtils.getUsername());
+
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            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 Response.success();
+        }
+        return Response.error(ResponseEnum.ROLE_UPDATE_ERROR);
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/dataScope")
+    @ApiOperation("修改保存数据权限")
+    public Response<Integer> dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        return toResponse(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
+    public Response<Integer> changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{roleIds}")
+    @ApiOperation("删除角色")
+    public Response<Integer> remove(
+            @ApiParam(name = "roleIds", value = "角色编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] roleIds
+    ){
+        return toResponse(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    @ApiOperation("获取角色选择框列表")
+    public Response<List<SysRole>> optionselect()
+    {
+        return Response.success(roleService.selectRoleAll());
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -0,0 +1,222 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysRole;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.UserInfoDetailDTO;
+import com.miaxis.system.service.ISysPostService;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.*;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/user")
+@Api(tags={"【系统-用户信息】"})
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    @ApiOperation("系统-获取用户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysUser> list(@ModelAttribute SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出用户列表Excel")
+    public Response<String> export(@ModelAttribute SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    @ApiOperation("导入用户列表Excel")
+    public Response<String> importData(
+            @ApiParam(name = "file", value = "二进制文件",required = true)
+            @RequestBody MultipartFile file,
+            @ApiParam(name = "updateSupport", value = "是否更新支持，如果已存在，则进行更新数据",required = true)
+            @RequestBody boolean updateSupport
+    ) throws Exception {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String operName = loginUser.getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return Response.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    @ApiOperation("导入用户模板")
+    public Response<String> importTemplate()
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.importTemplateExcel("用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    @ApiOperation("根据用户编号获取详细信息")
+    public Response<UserInfoDetailDTO> getInfo(
+            @ApiParam(name = "userId", value = "用户编号", required = true)
+            @PathVariable(value = "userId", required = false) Long userId
+    ){
+        UserInfoDetailDTO userInfoDetailDTO = new UserInfoDetailDTO();
+        List<SysRole> roles = roleService.selectRoleAll();
+        List<SysRole> rolesRet = SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList());
+        userInfoDetailDTO.setRoles(rolesRet);
+        userInfoDetailDTO.setPosts(postService.selectPostAll());
+        if (StringUtils.isNotNull(userId))
+        {
+            userInfoDetailDTO.setUser(userService.selectUserById(userId));
+            userInfoDetailDTO.setPostIds(postService.selectPostListByUserId(userId));
+            userInfoDetailDTO.setRoleIds(roleService.selectRoleListByUserId(userId));
+        }
+        return Response.success(userInfoDetailDTO);
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增用户")
+    public Response<Integer> add(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
+        }
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toResponse(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改用户")
+    public Response<Integer> edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{userIds}")
+    @ApiOperation("删除用户")
+    public Response<Integer> remove(
+            @ApiParam(name = "userIds", value = "用户编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] userIds
+    ){
+        return toResponse(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/resetPwd")
+    @ApiOperation("重置密码")
+    public Response<Integer> resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
+    public Response<Integer> changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.updateUserStatus(user));
+    }
+}

fx-admin/src/main/java/com/miaxis/system/controller/test/TestController.java

@@ -0,0 +1,116 @@
+package com.miaxis.system.controller.test;
+
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.feign.service.IWxMpService;
+import com.miaxis.feign.service.IWxSendService;
+import com.miaxis.wx.service.IWxGzhService;
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.model.ObjectMetadata;
+import com.qcloud.cos.model.PutObjectRequest;
+import com.qcloud.cos.model.PutObjectResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Calendar;
+
+/**
+ * @author wwl
+ * @version 1.0
+ * @date 2021/10/21 14:02
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.OPEN_PREFIX + "/wxTest")
+@Api(tags={"wx测试"})
+public class TestController {
+
+    private static final Logger log = LoggerFactory.getLogger(TestController.class);
+
+    @Autowired
+    IWxSendService wxSendService;
+
+    @Autowired
+    IWxGzhService wxGzhService;
+
+    @Autowired
+    IWxMpService wxMpService;
+
+    @Autowired
+    HttpServletRequest request;
+
+    @Autowired
+    private COSClient cosClient;
+
+    @Value("${cos.bucketName}")
+    private String bucketName;
+    @Value("${cos.path}")
+    private String path;
+    @Value("${cos.preffix}")
+    private String preffix;
+
+    @Value("${file.ticketPath}")
+    private String ticketPath;
+
+    @Value("${wxgzh.mediaUpload}")
+    private String materialUrl;
+
+
+
+    /**
+     * cos上传二维码
+     */
+    @GetMapping(value = "/test01")
+    @ApiOperation("cos上传二维码")
+    public Response test01() throws Exception{
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        ImageIO.write(QrCodeUtil.generate(
+                "二维码内容", //二维码内容
+                300, 300
+        ), "JPG", os);
+        InputStream inputStream = new ByteArrayInputStream(os.toByteArray());
+
+        ObjectMetadata objectMetadata = new ObjectMetadata();
+        // 从输入流上传必须制定content length, 否则http客户端可能会缓存所有数据，存在内存OOM的情况
+        objectMetadata.setContentLength(os.size());
+
+        // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
+        String bucketName = this.bucketName;
+
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        int month=cal.get(Calendar.MONTH)+ 1;
+        int day=cal.get(Calendar.DATE);
+
+        //存储的文件名
+        String storagefileName = System.currentTimeMillis() + ".png";
+        // 指定要上传到 COS 上的路径
+        String key = "/"+this.preffix+"/"+ "testTicket"+"/"+year+"/"+month+"/"+day+"/"+storagefileName;
+        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, inputStream,objectMetadata);
+        PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
+        String fileUrl=this.path + putObjectRequest.getKey();
+
+        return Response.success(fileUrl);
+    }
+
+
+
+
+
+}

fx-admin/src/main/java/com/miaxis/system/controller/tool/SwaggerController.java

@@ -0,0 +1,24 @@
+package com.miaxis.system.controller.tool;
+
+import com.miaxis.common.core.controller.BaseController;
+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;
+
+/**
+ * swagger 接口
+ *
+ * @author miaxis
+ */
+@Controller
+@RequestMapping("/tool/swagger")
+public class SwaggerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
+    @GetMapping()
+    public String index()
+    {
+        return redirect("/doc.html");
+    }
+}

fx-admin/src/main/java/com/miaxis/xcx/controller/user/XcXUserInfoController.java

@@ -0,0 +1,65 @@
+package com.miaxis.xcx.controller.user;
+
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.user.dto.UserInfoUpdateDto;
+import com.miaxis.user.service.IUserInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/xcx/user")
+@Api(tags = {"【小程序-用户信息】"})
+@Slf4j
+public class XcXUserInfoController extends BaseController {
+
+    @Autowired
+    private IUserInfoService userInfoService;
+
+
+
+    /**
+     * 修改用户信息
+     */
+    @PostMapping
+    @ApiOperation("修改用户信息")
+    public Response edit(@RequestBody UserInfoUpdateDto userInfoUpdateDto){
+
+        UserInfo userInfo= SecurityUtils.getLoginUser().getStudent();
+        if (userInfo!= null){
+            if (!StringUtils.isEmpty(userInfoUpdateDto.getHeadImage())){
+                userInfo.setHeadImage(userInfoUpdateDto.getHeadImage());
+            }
+            if (!StringUtils.isEmpty(userInfoUpdateDto.getNickName())){
+                userInfo.setNickName(userInfoUpdateDto.getNickName());
+            }
+        }
+        //更新数据库
+        userInfoService.updateById(userInfo);
+        return Response.success("更新成功");
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

fx-admin/src/main/java/com/miaxis/xcx/controller/wx/XcxWxController.java

@@ -0,0 +1,191 @@
+package com.miaxis.xcx.controller.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.miaxis.common.config.WxpayConfig;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.uuid.CommonUtils;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.WxOrderDTO;
+import com.miaxis.wx.service.IWxOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+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.RestController;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.util.Base64;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
+/**
+ * 【小程序-微信支付】Controller
+ *
+ * @author miaxis
+ * @date 2021-03-10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/xcx/wx")
+@Api(tags = {"【小程序-微信支付】"})
+@Slf4j
+public class XcxWxController extends BaseController {
+
+    @Autowired
+    private HttpClient httpClient;
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+
+    @Autowired
+    private IWxOrderService wxOrderService;
+
+
+    @Value("${xcx.appId}")
+    private String appId;
+    @Value("${wxpay.notifyUrl}")
+    private  String notifyUrl ;
+
+
+
+    /**
+     * 微信支付获取预订单id
+     */
+    @PostMapping(value = "/prepareOrder")
+    @ApiOperation("微信支付下单")
+    public Response<JSONObject> getXcxPrepareOrder(@RequestBody WxOrderDTO wxOrderDTO) throws Exception{
+
+
+        SysDictData sysDictData = dictDataService.selectDictDataById(wxOrderDTO.getDictCode());
+        String[] values = sysDictData.getDictValue().split(",");
+        //创建本地微信订单
+        WxOrder order = createOrder(values);
+        wxOrderService.save(order);
+        return Response.success(placeWxOrder(order, sysDictData.getDictLabel(),notifyUrl));
+
+
+    }
+
+    private WxOrder createOrder(String[] values) {
+        WxOrder order = new WxOrder();
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        String orderCode = getOrderCode(student.getId());
+        order.setOutTradeNo(orderCode);
+        order.setXcxOpenid(student.getXcxOpenid());
+        order.setUnionId(student.getUnionId());
+        Double dprice = Double.valueOf(values[0]);
+        Double v =dprice* 100;
+        order.setTotal(v.intValue());
+        order.setOrderDataJson(values[2]);
+        return order;
+    }
+
+    //下单
+    private JSONObject placeWxOrder(WxOrder order, String goodsName, String notifyUrl) throws Exception {
+        HttpPost httpPost = initHttpPost();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectNode rootNode = objectMapper.createObjectNode();
+        rootNode.put("mchid",wxpayConfig.getMerchantId())
+                .put("appid", appId)
+                .put("description", goodsName)
+                .put("notify_url", notifyUrl)
+                .put("out_trade_no", order.getOutTradeNo());
+        rootNode.putObject("amount")
+                .put("total", order.getTotal());
+        rootNode.putObject("payer")
+                .put("openid", order.getXcxOpenid());
+        objectMapper.writeValue(bos, rootNode);
+        httpPost.setEntity(new StringEntity(rootNode.toString(), "utf-8"));
+        HttpResponse response = httpClient.execute(httpPost);
+        String bodyAsString = EntityUtils.toString(response.getEntity());
+        if (JSONObject.parseObject(bodyAsString).get("prepay_id") == null){
+            throw new CustomException(JSONObject.parseObject(bodyAsString).get("message").toString());
+        }
+        return getWxParamJson(bodyAsString,order.getOutTradeNo());
+
+    }
+
+    // 生成调用调起微信支付所需参数
+    private JSONObject getWxParamJson(String bodyAsString, String orderCode) throws Exception {
+        String  packageStr = "prepay_id="+JSONObject.parseObject(bodyAsString).get("prepay_id");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("package",packageStr);
+        String nonce_str = RandomStringUtils.randomAlphanumeric(32);
+        jsonObject.put("nonceStr",nonce_str);
+        long timestamp =  System.currentTimeMillis()/1000;
+        jsonObject.put("timeStamp",String.valueOf(timestamp));
+        jsonObject.put("signType","RSA");
+        StringBuffer sb = new StringBuffer();
+        sb.append(appId + "\n");
+        sb.append(timestamp + "\n");
+        sb.append(nonce_str + "\n");
+        sb.append(packageStr+ "\n");
+        System.out.println(sb);
+
+        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
+        String realPath =file.getAbsolutePath();
+        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initSign(privateKey);
+        signature.update(sb.toString().getBytes("UTF-8"));
+        byte[] signedData = signature.sign();
+        String base64Str =  Base64.getEncoder().encodeToString(signedData);
+        jsonObject.put("paySign",base64Str);
+        jsonObject.put("outTradeNo",orderCode);
+        return jsonObject;
+    }
+
+
+
+
+
+
+    private HttpPost initHttpPost() {
+        HttpPost httpPost = new HttpPost(wxpayConfig.getV3url());
+        httpPost.addHeader("Accept", "application/json");
+        httpPost.addHeader("Content-type","application/json; charset=utf-8");
+        return httpPost;
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

fx-admin/src/main/resources/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson.*.jar

fx-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,126 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                #url: jdbc:mysql://192.168.8.213:3306/fx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://1.15.26.233:3307/fx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: miaxis110
+            # 从库数据源
+#            newgzpt:
+#                # 从数据源开关/默认关闭
+#                enabled: true
+#                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
+#                username: newgzpt
+#                password: newgzpt2016
+            # 初始连接数
+            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: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        # 端口，默认为6379
+        port: 29466
+        # 密码
+        password: miaxis110
+        # 连接超时时间
+        timeout: 10000
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        # 指定库
+        database: 5
+
+
+
+# 中振科技微信公众号
+zzgzh:
+    appId: wx3043c2c1decb01ed
+    appSecret: 8ae5d448d9b0778142d38d551c221ad3
+# 微信小程序
+xcx:
+    appId: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+    merchantId: 1615410794
+    serialNumber: 5F85D69504B3B33DAF5A7C5B86A3E93915D3D5B0
+    v3key: 8604f2a6eb6338cfa64e7df4ec2c08b3
+    notifyUrl: http://1.15.26.233:8080/fx-admin/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://1.15.26.233:8080/fx-admin/open-api/wx/notify/refund
+    xcxNotifyUrl: http://1.15.26.233:8080/fx-admin/open-api/wx/notify/xcxWxpay
+    xcxNotifyUrlRefund: http://1.15.26.233:8080/fx-admin/open-api/wx/notify/xcxRefund
+    appId: wx67ca1b8c9816ef28
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: fx-1305573081
+    path: https://fx-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: fx-test
+
+
+# 分销二维码生成路径
+file:
+    ticketPath: /data/test/
+
+
+# 公众号
+wxgzh:
+    # 上传永久素材
+    materialUrl: https://api.weixin.qq.com/cgi-bin/material/add_material?access_token=
+    # 上传临时素材
+    mediaUpload: https://api.weixin.qq.com/cgi-bin/media/upload?access_token=

fx-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,124 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://172.17.0.6:3306/fx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: Miaxis@2020
+            # 从库数据源
+#            newgzpt:
+#                # 从数据源开关/默认关闭
+#                enabled: true
+#                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
+#                username: newgzpt
+#                password: newgzpt2016
+            # 初始连接数
+            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: 172.17.66.3
+        # 端口，默认为6379
+        port: 6379
+        # 密码
+        password: miaxis110
+        # 连接超时时间
+        timeout: 10000
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        # 指定库
+        database: 15
+
+# 中振科技微信公众号
+zzgzh:
+    appId: wx3043c2c1decb01ed
+    appSecret: 8ae5d448d9b0778142d38d551c221ad3
+
+# 微信小程序
+xcx:
+    appId: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+    merchantId: 1615410794
+    serialNumber: 5F85D69504B3B33DAF5A7C5B86A3E93915D3D5B0
+    v3key: 8604f2a6eb6338cfa64e7df4ec2c08b3
+    notifyUrl: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/refund
+    xcxNotifyUrl: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/xcxWxpay
+    xcxNotifyUrlRefund: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/xcxRefund
+
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: fx-1305573081
+    path: https://fx-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: fx-prod
+
+
+# 带参数的二维码生成路径
+file:
+    ticketPath: /data/test/
+
+
+# 公众号
+wxgzh:
+    # 上传永久素材
+    materialUrl: https://api.weixin.qq.com/cgi-bin/material/add_material?access_token=
+    # 上传临时素材
+    mediaUpload: https://api.weixin.qq.com/cgi-bin/media/upload?access_token=

fx-admin/src/main/resources/application-prodtest.yml

@@ -0,0 +1,124 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/fx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: Miaxis@2020
+            # 从库数据源
+#            newgzpt:
+#                # 从数据源开关/默认关闭
+#                enabled: true
+#                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
+#                username: newgzpt
+#                password: newgzpt2016
+            # 初始连接数
+            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: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        # 端口，默认为6379
+        port: 29466
+        # 密码
+        password: miaxis110
+        # 连接超时时间
+        timeout: 10000
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        # 指定库
+        database: 15
+
+# 中振科技微信公众号
+zzgzh:
+    appId: wx3043c2c1decb01ed
+    appSecret: 8ae5d448d9b0778142d38d551c221ad3
+
+# 微信小程序
+xcx:
+    appId: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+    merchantId: 1615410794
+    serialNumber: 5F85D69504B3B33DAF5A7C5B86A3E93915D3D5B0
+    v3key: 8604f2a6eb6338cfa64e7df4ec2c08b3
+    notifyUrl: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/refund
+    xcxNotifyUrl: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/xcxWxpay
+    xcxNotifyUrlRefund: http://jpcj-h5.zzxcx.net/prod-api/open-api/wx/notify/xcxRefund
+
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: fx-1305573081
+    path: https://fx-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: fx-prod
+
+
+# 带参数的二维码生成路径
+file:
+    ticketPath: /data/test/
+
+
+# 公众号
+wxgzh:
+    # 上传永久素材
+    materialUrl: https://api.weixin.qq.com/cgi-bin/material/add_material?access_token=
+    # 上传临时素材
+    mediaUpload: https://api.weixin.qq.com/cgi-bin/media/upload?access_token=

fx-admin/src/main/resources/application.yml

@@ -0,0 +1,206 @@
+# 项目相关配置
+miaxis:
+  # 名称
+  name: Miaxis
+  # 版本
+  version: 1.0.1
+  # 版权年份
+  copyrightYear: 2020
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径,使用jvm系统变量,兼容windows和linux;
+  profile: ${user.dir}/miaxis/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    basedir: ${user.dir}
+    accesslog:
+      # 开启日志记录
+      enabled: true
+      # 访问日志存放目录
+      directory: logs
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+#  undertow:
+#    # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
+#    max-http-post-size: -1
+#    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
+#    # 每块buffer的空间大小,越小的空间被利用越充分
+#    buffer-size: 512
+#    # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
+#    io-threads: 8
+#    # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
+#    worker-threads: 256
+#    # 是否分配的直接内存
+#    direct-buffers: true
+
+# 日志配置
+logging:
+  level:
+    com.miaxis: @logging.level@
+    org.springframework: warn
+
+# Spring配置
+spring:
+  jmx:
+    default-domain: fx
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: @profiles.active@
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 1440
+
+# MyBatis配置
+# https://baomidou.com/config/
+mybatis-plus:
+  # 对应的 XML 文件位置
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  # 实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.miaxis.**.domain,com.miaxis.**.dto,com.miaxis.**.vo
+  # 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
+  #typeAliasesSuperType: Class<?>
+  # 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler
+  #typeHandlersPackage: null
+  # 如果配置了该属性，会将路径下的枚举类进行注入，让实体类字段能够简单快捷的使用枚举属性
+  #typeEnumsPackage: null
+  # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
+  checkConfigLocation: false
+  # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
+  # SIMPLE：该执行器类型不做特殊的事情，为每个语句的执行创建一个新的预处理语句（PreparedStatement）
+  # REUSE：该执行器类型会复用预处理语句（PreparedStatement）
+  # BATCH：该执行器类型会批量执行所有的更新语句
+  executorType: SIMPLE
+  # 指定外部化 MyBatis Properties 配置，通过该配置可以抽离配置，实现不同环境的配置部署
+  configurationProperties: null
+  configuration:
+    # 自动驼峰命名规则（camel case）映射
+    # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
+    mapUnderscoreToCamelCase: true
+    # 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
+    # org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
+    # org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引
+    # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 枚举类需要实现IEnum接口或字段标记@EnumValue注解.
+    defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
+    # 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
+    aggressiveLazyLoading: true
+    # MyBatis 自动映射策略
+    # NONE：不启用自动映射
+    # PARTIAL：只对非嵌套的 resultMap 进行自动映射
+    # FULL：对所有的 resultMap 都进行自动映射
+    autoMappingBehavior: PARTIAL
+    # MyBatis 自动映射时未知列或未知属性处理策
+    # NONE：不做任何处理 (默认值)
+    # WARNING：以日志的形式打印相关警告信息
+    # FAILING：当作映射失败处理，并抛出异常和详细信息
+    autoMappingUnknownColumnBehavior: NONE
+    # Mybatis一级缓存，默认为 SESSION
+    # SESSION session级别缓存，同一个session相同查询语句不会再次查询数据库
+    # STATEMENT 关闭一级缓存
+    localCacheScope: SESSION
+    # 开启Mybatis二级缓存，默认为 true
+    cacheEnabled: true
+  global-config:
+    # 是否打印 Logo banner
+    banner: true
+    # 是否初始化 SqlRunner
+    enableSqlRunner: false
+    dbConfig:
+      # 主键类型
+      # AUTO 数据库ID自增
+      # NONE 空
+      # INPUT 用户输入ID
+      # ASSIGN_ID 全局唯一ID
+      # ASSIGN_UUID 全局唯一ID UUID
+      idType: AUTO
+      # 表名前缀
+      tablePrefix: null
+      # 字段 format,例: %s,(对主键无效)
+      columnFormat: null
+      # 表名是否使用驼峰转下划线命名,只对表名生效
+      tableUnderline: true
+      # 大写命名,对表名和字段名均生效
+      capitalMode: false
+      # 全局的entity的逻辑删除字段属性名
+      logicDeleteField: null
+      # 逻辑已删除值
+      logicDeleteValue: 1
+      # 逻辑未删除值
+      logicNotDeleteValue: 0
+      # 字段验证策略之 insert,在 insert 的时候的字段验证策略
+      # IGNORED 忽略判断
+      # NOT_NULL 非NULL判断
+      # NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断)
+      # DEFAULT 默认的,一般只用于注解里
+      # NEVER 不加入 SQL
+      insertStrategy: NOT_NULL
+      # 字段验证策略之 update,在 update 的时候的字段验证策略
+      updateStrategy: NOT_NULL
+      # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
+      selectStrategy: NOT_NULL
+
+# PageHelper分页插件
+pagehelper:
+#  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice/*
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+
+
+
+
+
+

fx-admin/src/main/resources/banner.txt

@@ -0,0 +1,6 @@
+.------..------..------..------.
+|A.--. ||E.--. ||8.--. ||6.--. |
+| (\/) || (\/) || :/\: || (\/) |
+| :\/: || :\/: || :\/: || :\/: |
+| '--'A|| '--'E|| '--'8|| '--'6|
+`------'`------'`------'`------'

fx-admin/src/main/resources/i18n/messages.properties

@@ -0,0 +1,36 @@
+#错误消息
+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.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}]

fx-admin/src/main/resources/logback.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="log.path" value="/data/logs/fx"/>
+    <property name="console.log.pattern"
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+	<!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+		</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.miaxis" 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>

fx-admin/src/main/resources/wechatpay/apiclient_cert.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID+TCCAuGgAwIBAgIUX4XWlQSzsz2vWnxbhqPpORXT1bAwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjExMDIwMDkxOTA2WhcNMjYxMDE5MDkxOTA2WjCBijETMBEGA1UEAwwK
+MTYxNTQxMDc5NDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTYwNAYDVQQL
+DC3npo/lt57puL/nqIvlpKnlronpqb7pqbblkZjln7norq3mnInpmZDlhazlj7gx
+CzAJBgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMwRV01WeeQ83V5siu6GFKN7j1yt7DnULtyv9JnbE14z
+WcKCd5L6nyVvWBBtCtjlOjZ9ZXhxS4HUyzy1TDzY/gcVrpLwiV73Mvcjpe643Kax
++tGlfWTcFTEw/eFNzQyj+jaTvYvHqW5iJibNECVbPnkeDiT3M2yB9z6iyIwibKth
+cLXvBqPUkIv/xPRZPjOJvenW64J62whGv8aG/5+dY+lrpKkZlO6P5bEwCZvEd7K5
+F3wf08F8rSE2OTUzzc84I19hNFkKy8iapkw1gKC6y8SLrHvMmiGZhcdo5dG4h5Wr
+vKrkMsXjSq7Zu6RRYDY6d+xr9ZRxWI2iR68A9/fTfsECAwEAAaOBgTB/MAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNh
+Lml0cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0
+QjA2QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAi0Yj
+8PTQOy+kocAvZmWJwZIzvkDSO05nT5HbUhpc83eXBxXLq2PdWlZ0g4dWzoB7eumv
+68nTQ3ohV86vK++J0itaNkXteQVJFSk89OvH7rYfFaUloi6bYFKmuB7Rddu2nkUo
+qMpE6l41MhISe/F7KK1lGP1AgEQIVYcNrMgphlvCTh6KCwRsa2BmdsuG5AeLtnln
+dRuo1Y4dRa/1DyCG8Pi3UsDcCciff6KZXomSoTQy578NV5ApNCAV3v2DPW/8YcWk
+CCon7krnxtJMAeCkZRVzt/HI0HMRzQk6B/oGuBDUlDwdNKnXXyZ36WGelD94WIQ4
+kWNf7oZ4wMDbK0MJ/Q==
+-----END CERTIFICATE-----

fx-admin/src/main/resources/wechatpay/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMEVdNVnnkPN1e
+bIruhhSje49crew51C7cr/SZ2xNeM1nCgneS+p8lb1gQbQrY5To2fWV4cUuB1Ms8
+tUw82P4HFa6S8Ile9zL3I6XuuNymsfrRpX1k3BUxMP3hTc0Mo/o2k72Lx6luYiYm
+zRAlWz55Hg4k9zNsgfc+osiMImyrYXC17waj1JCL/8T0WT4zib3p1uuCetsIRr/G
+hv+fnWPpa6SpGZTuj+WxMAmbxHeyuRd8H9PBfK0hNjk1M83POCNfYTRZCsvImqZM
+NYCgusvEi6x7zJohmYXHaOXRuIeVq7yq5DLF40qu2bukUWA2Onfsa/WUcViNokev
+APf3037BAgMBAAECggEBAIrAy7yRLQYMgHRgl0LBtizGqd7Zf0J+zHJPzaADfrLR
+dZm0/jrY3/cjMxzQF80MZ71/G8x+NFoN5zbbCwBghrEog+/zT2Rb7rJt8bhUx+ss
+HyAHRzCaGGq/JhDYxrBumoYbhIkTdFfSsqA1VGIiHWNbFUD7OGLyJ7vWEUh/a6ZG
+vt5+qsWLk9ioih06zWeaNXfulovmavZ0vvljhNXj2H83H/E1/3daVrYxuhk63WBm
+x2XJUNL9U8+yqW1WqPRw9u35TV34yoAJSoRbGWcAaJejfrBa6KS815NNJb6dT9Vi
+2cEl6R4YloT3rd/unXTgWMiHVQ+L8StYfB6RellbrDECgYEA6sCKK5h91+5AD39T
++jRt7Rgu7GyW0JI9ev/aT4xdIU2daP0P+YdPzSvvoaje9iknTfLkBJ9mNZDtwUHO
+LWxG5lKYYlXCOlCbVtUSYq8OPthJFo18VOFz7kSigvoS/VGUtTm/QB8soXf8GFf2
+QKdLui9tAFDHUOboXkgR1/Gu6q0CgYEA3onPrmBPYHtYkkJcuoSWsw28hqy0/ZrJ
+yN/Ss2M+zHsefSmPFjGKx5DKZ0bjPTA5Ly2NR78MyzFFSP9XFxOE4wter74i9BTe
+osNhYceWdTIv2vUIHTjOyjKTx1nyeUNAxV0ekce1V4Smql9c9ZybTb9LEb4eD9vw
+EoG8jBNeGuUCgYEA0jZEBDHzTq8cUkRUsNLONOfY7QF4M6EgyMnfdihdJPtZn7As
+4+eVQEa9uOd9cLT9a0G7iaAraIA1Rz9kHyy8eHcx2ayt1oZj8+etJQ1ZFlGbcUSV
+N3UD2TNAy0SgSJMLNRVW+1ZvItBMwIfUDaVBnKHnW8b6FKoRHowu3k6fsakCgYB+
+aXJb78GnYOnTS3c5TI/+blMlfX3igccWIG6kEEBgD6AmITFyvfnDm3Aecpoq6/XP
+4uRaWSB/XCGrccCbDy9xecfztOJOHHzLoIj07ld9g2DD1GUjlF2DZm+j0mh2kcl9
+U4RF81gDuwqhxUIdEzT1WTDfh0u0Xo9lM+VS/L18MQKBgAPHeSoKzFb3bPlAaAN4
+DxyBilpCsq6x0ebXjLj01wqaXT3g2XQqpcgN2QnYQw4pC30lEpP8LhdkEint86Ag
+SwMjtGVUz29fncxcd5tiAVf4+r5azdGcpN0Y0ZC1G20TbMolIyXFet/VbhSYxdop
+I0CuiwRTRJVwH3qRYbkUmM0x
+-----END PRIVATE KEY-----

fx-admin/src/main/resources/wechatpay/public.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQpxN3gksreobgbu3Wy4
+4OV1KWVNtAE4q740vG2HlzO8pfEiDYqHD9vZ9nsiEBWjMFmiwsH/7HGMB1Fwt47i
+BmQa1u2G4ykZ25LHod2PRziq4Bh/ro7hiea5ZZwV0ol2weUEHaM2AcQNuPL1ynF3
+7y+C1IqIUbEqeAVFECs7W0U6ledT7t5ciatlh+SkfD6w4U7IAO+EBnJIluyNC6HF
+O3cxrxI2mEEgYkGLmXsMsDRVoZ27mbCHuPJZvdWJhybPG2InzrfLX6yPhyU//pTh
+K7ubjOu4nctHWc/POIofiZLZlgNARDy0feCmIxkTPzyRMk5uQ/whMckAtwAVpkuL
+3wIDAQAB
+-----END PUBLIC KEY-----

fx-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -0,0 +1,112 @@
+package com.miaxis.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.miaxis.FxApplication;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.feign.dto.WxGzhBatchUser;
+import com.miaxis.feign.service.IWxSendService;
+import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.wx.service.IWxGzhService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@ActiveProfiles("prodtest")
+@SpringBootTest(classes = FxApplication.class)
+@RunWith(SpringRunner.class)
+public class NormalTest {
+
+
+
+    @Resource
+    IWxSendService wxSendService;
+    @Resource
+    IWxGzhService wxGzhService;
+    @Resource
+    IUserInfoService userInfoService;
+    @Test
+    public void test666() throws Exception {
+        String gzhToken = wxGzhService.getGzhToken();
+//        String res = wxSendService.userInfo(gzhToken, "ovKTX59m65qpQAd-Bh0AIc5KhW3Q", "zh_CN");
+        List<UserInfo> list = userInfoService.list();
+        int times = (list.size()-1)/100+1;
+        for (int i= 0; i < times-1; i++){
+            WxGzhBatchUser batchUser = new WxGzhBatchUser();
+            List<JSONObject> jlist = new ArrayList<JSONObject>();
+            for(int j=0+i*100;j<99+i*100;j++){
+                JSONObject jo = new JSONObject();
+                jo.put("lang","zh_CN");
+                jo.put("openid",list.get(j).getOpenid());
+                jlist.add(jo);
+            }
+            batchUser.setUser_list(jlist);
+            String res = wxSendService.batchUserInfo(gzhToken,batchUser);
+            System.out.println(res);
+        }
+        WxGzhBatchUser batchUser = new WxGzhBatchUser();
+        List<JSONObject> jlist = new ArrayList<JSONObject>();
+        for(int j=0+(times-1)*100;j<list.size()-1;j++){
+            JSONObject jo = new JSONObject();
+            jo.put("lang","zh_CN");
+            jo.put("openid",list.get(j).getOpenid());
+            jlist.add(jo);
+        }
+        batchUser.setUser_list(jlist);
+        String res = wxSendService.batchUserInfo(gzhToken,batchUser);
+        System.out.println("最后一次");
+        System.out.println(res);
+
+
+
+
+    }
+    @Test
+    public void test777() throws Exception {
+        List<UserInfo> list = userInfoService.list(new QueryWrapper<UserInfo>().isNull("union_id"));
+        System.out.println(list.size());
+        int index =1 ;
+        for (UserInfo userInfo : list){
+            String res = wxSendService.userInfo( wxGzhService.getGzhToken(), userInfo.getOpenid(), "zh_CN");
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            if (jsonObject.getString("unionid") ==null){
+                System.out.println( index);
+                index++;
+                continue;
+            }
+            userInfo.setUnionId(jsonObject.getString("unionid"));
+
+            index++;
+        }
+        userInfoService.updateBatchById(list);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

fx-common/pom.xml

@@ -0,0 +1,253 @@
+<?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>
+        <groupId>com.miaxis</groupId>
+        <artifactId>fx</artifactId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>fx-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>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!--oracle驱动-->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
+
+        <!--腾讯云存储依赖-->
+        <dependency>
+            <groupId>com.qcloud</groupId>
+            <artifactId>cos_api</artifactId>
+            <version>5.6.38</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.3</version>
+        </dependency>
+
+        <!--腾讯云sdk依赖,排除log4j依赖，解决与框架中logback的冲突-->
+        <dependency>
+            <groupId>com.qcloud</groupId>
+            <artifactId>vod_api</artifactId>
+            <version>2.1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>com.tencentcloudapi</groupId>-->
+            <!--<artifactId>tencentcloud-sdk-java</artifactId>-->
+            <!--&lt;!&ndash; go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. &ndash;&gt;-->
+            <!--&lt;!&ndash; 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询所有版本，最新版本如下 &ndash;&gt;-->
+            <!--<version>3.1.296</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>
+
+        <!--防止进入swagger页面报类型转换错误(java.lang.NumberFormatException: For input string: "")，
+        排除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>
+        <!-- swagger-bootstrap-UI-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
+        <!--aliyunOSS OSS-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form-spring</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.wechatpay-apiv3</groupId>
+            <artifactId>wechatpay-apache-httpclient</artifactId>
+            <version>0.2.2</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

fx-common/src/main/java/com/miaxis/common/annotation/DataScope.java

@@ -0,0 +1,24 @@
+package com.miaxis.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限过滤注解
+ * 
+ * @author miaxis
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope
+{
+    /**
+     * 部门表的别名
+     */
+    public String deptAlias() default "";
+
+    /**
+     * 用户表的别名
+     */
+    public String userAlias() default "";
+}

fx-common/src/main/java/com/miaxis/common/annotation/DataSource.java

@@ -0,0 +1,24 @@
+package com.miaxis.common.annotation;
+
+import com.miaxis.common.enums.DataSourceTypeEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义多数据源切换注解
+ *
+ * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
+ *
+ * @author miaxis
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DataSource
+{
+    /**
+     * 切换数据源名称
+     */
+    public DataSourceTypeEnum value() default DataSourceTypeEnum.MASTER;
+}

fx-common/src/main/java/com/miaxis/common/annotation/Excel.java

@@ -0,0 +1,144 @@
+package com.miaxis.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 miaxis
+ */
+@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：仅导入）
+     */
+    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);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+}

fx-common/src/main/java/com/miaxis/common/annotation/Excels.java

@@ -0,0 +1,18 @@
+package com.miaxis.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ * 
+ * @author miaxis
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels
+{
+    Excel[] value();
+}

fx-common/src/main/java/com/miaxis/common/annotation/Log.java

@@ -0,0 +1,38 @@
+package com.miaxis.common.annotation;
+
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.enums.OperatorTypeEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义操作日志记录注解
+ *
+ * @author miaxis
+ *
+ */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log
+{
+    /**
+     * 模块
+     */
+    public String title() default "";
+
+    /**
+     * 功能
+     */
+    public BusinessTypeEnum businessType() default BusinessTypeEnum.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    public OperatorTypeEnum operatorType() default OperatorTypeEnum.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    public boolean isSaveRequestData() default true;
+}

fx-common/src/main/java/com/miaxis/common/annotation/RepeatSubmit.java

@@ -0,0 +1,18 @@
+package com.miaxis.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义注解防止表单重复提交
+ * 
+ * @author miaxis
+ *
+ */
+@Inherited
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit
+{
+
+}

fx-common/src/main/java/com/miaxis/common/config/BeanConfig.java

@@ -0,0 +1,82 @@
+package com.miaxis.common.config;
+
+import com.miaxis.common.utils.uuid.CommonUtils;
+import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
+import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
+import org.apache.http.client.HttpClient;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.io.FileReader;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.X509EncodedKeySpec;
+
+
+@Configuration
+public class BeanConfig {
+
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+    @Autowired
+    private AutoUpdateCertificatesVerifier verifier;
+
+    /**
+     * 腾讯云 COS
+     * @return
+     */
+
+
+
+
+    /**
+     * 微信支付 httpclient 对象
+     * @return
+     * @throws Exception
+     */
+    @Bean
+    public HttpClient wxpayConfigBean() throws Exception{
+        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
+        String realPath =file.getAbsolutePath();
+        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
+        // 初始化httpClient
+        HttpClient httpClient = WechatPayHttpClientBuilder.create()
+                .withMerchant(wxpayConfig.getMerchantId(), wxpayConfig.getSerialNumber(), privateKey)
+                .withValidator(new WechatPay2Validator(verifier)).build();
+        return httpClient;
+
+    }
+
+
+    /**
+     * 创建微信公钥 对象
+     * @return
+     * @throws Exception
+     */
+    @Bean
+    public RSAPublicKey readPublicKey() throws Exception {
+        KeyFactory factory = KeyFactory.getInstance("RSA");
+
+        File file = new ClassPathResource("wechatpay/public.pem").getFile();
+        try (FileReader keyReader = new FileReader(file);
+             PemReader pemReader = new PemReader(keyReader)) {
+
+            PemObject pemObject = pemReader.readPemObject();
+            byte[] content = pemObject.getContent();
+            X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(content);
+            return (RSAPublicKey) factory.generatePublic(pubKeySpec);
+        }
+    }
+
+
+
+
+}

fx-common/src/main/java/com/miaxis/common/config/CosConfig.java

@@ -0,0 +1,63 @@
+package com.miaxis.common.config;
+
+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.http.HttpProtocol;
+import com.qcloud.cos.region.Region;
+import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
+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;
+
+/**
+ * cos对象存储
+ * @author wwl
+ * @version 1.0
+ * @date 2021/10/25 15:40
+ */
+@Configuration
+public class CosConfig {
+
+    @Value("${cos.secretId}")
+    private String secretId;
+    @Value("${cos.secretKey}")
+    private String secretKey;
+    @Value("${cos.bucket}")
+    private String bucket;
+    @Value("${cos.bucketName}")
+    private String bucketName;
+    @Value("${cos.path}")
+    private String path;
+    @Value("${cos.preffix}")
+    private String preffix;
+
+
+    /**
+     * 腾讯云 COS
+     * @return
+     */
+
+    @Bean
+    public COSClient COSClientconfigBean() {
+        // 1 初始化用户身份信息（secretId, secretKey）。
+        // SECRETID和SECRETKEY请登录访问管理控制台 https://console.cloud.tencent.com/cam/capi 进行查看和管理
+        String secretId = this.secretId;
+        String secretKey = this.secretKey;
+        COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
+        // 2 设置 bucket 的地域, COS 地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
+        // clientConfig 中包含了设置 region, https(默认 http), 超时, 代理等 set 方法, 使用可参见源码或者常见问题 Java SDK 部分。
+        Region region = new Region(this.bucket);
+        ClientConfig clientConfig = new ClientConfig(region);
+        // 这里建议设置使用 https 协议
+        // 从 5.6.54 版本开始，默认使用了 https
+        clientConfig.setHttpProtocol(HttpProtocol.https);
+        // 3 生成 cos 客户端。
+        COSClient cosClient = new COSClient(cred, clientConfig);
+        return cosClient;
+    }
+
+
+}

fx-common/src/main/java/com/miaxis/common/config/FeignConfig.java

@@ -0,0 +1,22 @@
+package com.miaxis.common.config;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignConfig {
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+}

fx-common/src/main/java/com/miaxis/common/config/MiaxisConfig.java

@@ -0,0 +1,116 @@
+package com.miaxis.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取项目相关配置
+ * 
+ * @author miaxis
+ */
+@Component
+@ConfigurationProperties(prefix = "miaxis")
+public class MiaxisConfig
+{
+    /** 项目名称 */
+    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)
+    {
+        MiaxisConfig.profile = profile;
+    }
+
+    public static boolean isAddressEnabled()
+    {
+        return addressEnabled;
+    }
+
+    public void setAddressEnabled(boolean addressEnabled)
+    {
+        MiaxisConfig.addressEnabled = addressEnabled;
+    }
+
+    /**
+     * 获取头像上传路径
+     */
+    public static String getAvatarPath()
+    {
+        return getProfile() + "/avatar";
+    }
+
+    /**
+     * 获取下载路径
+     */
+    public static String getDownloadPath()
+    {
+        return getProfile() + "/download/";
+    }
+
+    /**
+     * 获取上传路径
+     */
+    public static String getUploadPath()
+    {
+        return getProfile() + "/upload";
+    }
+}

fx-common/src/main/java/com/miaxis/common/config/WxPayConfigImpl.java

@@ -0,0 +1,93 @@
+package com.miaxis.common.config;
+
+import com.github.wxpay.sdk.WXPayConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+
+public class WxPayConfigImpl implements WXPayConfig {
+    public static String url = "你设置的回调接口";
+    private static WxPayConfigImpl wxPayConfig;
+    private byte[] certData = null;
+
+
+//    @Resource
+//    private WxpayConfig wxpayConfigBean;
+
+
+
+    public static WxPayConfigImpl getInstance() {
+        if (wxPayConfig == null) {
+            synchronized (WxPayConfigImpl.class) {
+                wxPayConfig = new WxPayConfigImpl();
+            }
+        }
+        return wxPayConfig;
+    }
+
+    public WxPayConfigImpl() {
+        try {
+            //这个证书的位置不是瞎鸡儿填的，你要在这个路径真的有一个证书
+            // InputStream is = new FileInputStream("F:\\fx\\fx\\fx-admin\\src\\main\\resources\\wechatpay\\apiclient_cert.p12");
+            InputStream is = new FileInputStream(new ClassPathResource("wechatpay/apiclient_cert.p12").getFile());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] bs = new byte[1024];
+            int cnt = -1;
+            while ((cnt = is.read(bs)) != -1) {
+                baos.write(bs, 0, cnt);
+            }
+            is.close();
+            certData = baos.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String getAppID() {
+        return "wx67ca1b8c9816ef28";
+    }
+
+    @Override
+    public String getMchID() {
+        return "1615410794";
+    }
+
+    @Override
+    public String getKey() {
+        return "12345678123456781234567812345678";
+    }
+
+    @Override
+    public InputStream getCertStream() {
+        ByteArrayInputStream certBis;
+        certBis = new ByteArrayInputStream(this.certData);
+        return certBis;
+    }
+
+    @Override
+    public int getHttpConnectTimeoutMs() {
+        // TODO Auto-generated method stub
+        return 8000;
+    }
+
+    @Override
+    public int getHttpReadTimeoutMs() {
+        // TODO Auto-generated method stub
+        return 10000;
+    }
+
+
+    public String getPrimaryDomain() {
+        return "api.mch.weixin.qq.com";
+    }
+
+    public String getNotifyUrl(){
+        return url;
+    }
+}

fx-common/src/main/java/com/miaxis/common/config/WxVerifierConfig.java

@@ -0,0 +1,37 @@
+package com.miaxis.common.config;
+
+import com.miaxis.common.utils.uuid.CommonUtils;
+import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
+import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.security.PrivateKey;
+
+
+@Configuration
+public class WxVerifierConfig {
+
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+
+    @Bean
+    public AutoUpdateCertificatesVerifier getVerifier() throws Exception{
+        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
+        String realPath =file.getAbsolutePath();
+        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
+        // 加载平台证书（mchId：商户号,mchSerialNo：商户证书序列号,apiV3Key：V3密钥）
+        AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
+                new WechatPay2Credentials(wxpayConfig.getMerchantId(),
+                        new PrivateKeySigner(wxpayConfig.getSerialNumber(), privateKey)),
+                wxpayConfig.getV3key().getBytes("utf-8"));
+        return verifier;
+
+    }
+
+}

fx-common/src/main/java/com/miaxis/common/config/WxpayConfig.java

@@ -0,0 +1,22 @@
+package com.miaxis.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "wxpay")
+public class WxpayConfig {
+
+    private String v3url;
+    //退款
+    private String v3urlRefund;
+    //退款回调
+    private String notifyUrlRefund;
+    //商户id
+    private String merchantId;
+    private String serialNumber;
+    private String v3key;
+
+}

fx-common/src/main/java/com/miaxis/common/constant/Constants.java

@@ -0,0 +1,191 @@
+package com.miaxis.common.constant;
+
+/**
+ * 通用常量信息
+ *
+ * @author miaxis
+ */
+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 LOGIN_FAIL = "Error";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 登录短信验证码 redis key
+     */
+    public static final String SMS_LOGIN_CODE = "sms:login:code:";
+    /**
+     * 登录短信验证码次数 redis key
+     */
+    public static final String SMS_LOGIN_CODE_COUNT = "sms:login:code:count:";
+
+
+    /**
+     * 小程序消息推送 token
+     */
+    public static final String XCX_MESSAGE_TOKEN = "xcx:message:token:";
+
+
+    /**
+     * 公众号消息推送 token
+     */
+    public static final String GZH_MESSAGE_TOKEN = "gzh:message:token:";
+
+    /**
+     * 公众号推广码ticket
+     */
+    public static final String GZH_TICKET_KEY = "gzh:ticket:";
+    /**
+     * 公众号推广码素材信息
+     */
+    public static final String GZH_MATERIAL_KEY = "gzh:material:";
+
+
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 验证码有效期（分钟）
+     */
+    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 = "sub";
+
+    /**
+     * 用户头像
+     */
+    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:";
+
+    /**
+     * 浏览记录 cache key
+     */
+    public static final String BROWSE_RECORD_KEY = "browse_record:";
+
+    /**
+     * 首页数据 cache key
+     */
+    public static final String HOME_PAGE_DATA_KEY = "home_page_data:";
+
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX = "/profile";
+
+    /**
+     * 开放api路径 前缀
+     */
+    public static final String OPEN_PREFIX = "/open-api";
+
+    /**
+     * 学员权限路径
+     */
+    public static final String STUDENT_PREFIX = "/student";
+
+    /**
+     * VIP
+     */
+    public static final String VIP_PREFIX = "/vip";
+
+
+    /**
+     * 电影api 黑名单
+     */
+    public static final String[] FILM_BLACK_LIST = new String[]{"api/order/create"};
+}

fx-common/src/main/java/com/miaxis/common/constant/GenConstants.java

@@ -0,0 +1,106 @@
+package com.miaxis.common.constant;
+
+/**
+ * 代码生成通用常量
+ * 
+ * @author miaxis
+ */
+public class GenConstants
+{
+    /** 单表（增删改查） */
+    public static final String TPL_CRUD = "crud";
+
+    /** 树表（增删改查） */
+    public static final String TPL_TREE = "tree";
+
+    /** 树编码字段 */
+    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", "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_UPLOAD_IMAGE = "uploadImage";
+
+    /** 富文本控件 */
+    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";
+}

fx-common/src/main/java/com/miaxis/common/constant/ScheduleConstants.java

@@ -0,0 +1,50 @@
+package com.miaxis.common.constant;
+
+/**
+ * 任务调度通用常量
+ * 
+ * @author miaxis
+ */
+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;
+        }
+    }
+}

fx-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java

@@ -0,0 +1,36 @@
+package com.miaxis.common.constant;
+
+/**
+ * 短信模板常量
+ *
+ * @Author wwl
+ * @Date 2020/12/23
+ * @Version 1.0
+ */
+public class SmsTemplateConstants {
+
+    /**
+     * 短信模板类型(可拓展)
+     */
+    public static final String[] SMS_TEMPLATE_TYPE = {"login","modify","signUp"};
+
+    /**
+     * 登录短信模板
+     */
+//    public static final String login = "登录手机号验证码：code,验证码两分钟内有效";
+    public static final String LOGIN = "本次验证码：code,验证码两分钟内有效";
+
+    /**
+     * 修改手机号短信模板
+     */
+//    public static final String modify = "修改手机号验证码：code,验证码两分钟内有效";
+    public static final String MODIFY = "本次验证码：code,验证码两分钟内有效";
+
+    /**
+     * 注册报名短信模板
+     */
+//    public static final String signUp = "报名手机号验证码：code,验证码两分钟内有效";
+    public static final String SIGNUP = "本次验证码：code,验证码两分钟内有效";
+
+
+}

fx-common/src/main/java/com/miaxis/common/constant/UserConstants.java

@@ -0,0 +1,60 @@
+package com.miaxis.common.constant;
+
+/**
+ * 用户常量信息
+ * 
+ * @author miaxis
+ */
+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";
+}

fx-common/src/main/java/com/miaxis/common/core/controller/BaseController.java

@@ -0,0 +1,97 @@
+package com.miaxis.common.core.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.PageBean;
+import com.miaxis.common.core.page.PageBuilder;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.DateUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.sql.SqlUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * web层通用数据处理
+ *
+ * @author miaxis
+ */
+public class BaseController
+{
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+
+    /**
+     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder)
+    {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+        {
+            @Override
+            public void setAsText(String text)
+            {
+                setValue(DateUtils.parseDate(text));
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据 PageHelper劫持sql查询实现分页
+     */
+    protected void startPage()
+    {
+        PageBean pageBean = PageBuilder.buildPageRequest();
+        Integer pageNum = pageBean.getPageNum();
+        Integer pageSize = pageBean.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageBean.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
+    /**
+     * 响应请求分页数据 可以swagger识别
+     * @param list 加入泛型任何list
+     * @author JuniorRay
+     */
+    protected <T>ResponsePageInfo<T> toResponsePageInfo(List<T> list)
+    {
+        ResponsePageInfo<T> responsePageInfo = new ResponsePageInfo<T>();
+        responsePageInfo.setCode(ResponseEnum.SUCCESS.getCode());
+        responsePageInfo.setMsg("查询成功");
+        responsePageInfo.setRows(list);
+        responsePageInfo.setTotal(new PageInfo(list).getTotal());
+        return responsePageInfo;
+    }
+    /**
+     * 响应返回结果  可以swagger识别
+     *
+     * @param rows 影响行数
+     * @author JuniorRay
+     * @return 操作结果
+     */
+    protected Response<Integer> toResponse(int rows)
+    {
+        return rows > 0 ? Response.success(rows) : Response.error();
+    }
+
+
+    /**
+     * 页面跳转
+     */
+    public String redirect(String url)
+    {
+        return StringUtils.format("redirect:{}", url);
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/BaseBusinessEntity.java

@@ -0,0 +1,51 @@
+package com.miaxis.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "BaseBusinessEntity", description = "业务基类")
+@Data
+public class BaseBusinessEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+
+
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    @ApiModelProperty(value = "更新时间" ,hidden = true)
+    private Date updateTime;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    @JsonIgnore
+    @ApiModelProperty(value = "请求参数",hidden = true)
+    private Map<String, Object> params = new HashMap<String, Object>();
+
+
+
+
+
+
+}

fx-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java

@@ -0,0 +1,166 @@
+package com.miaxis.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "BaseEntity", description = "Entity基类")
+@Data
+public class BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 搜索值 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "搜索值" ,hidden = true)
+    private String searchValue;
+
+    /** 创建者 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "创建者"  ,hidden = true)
+    private String createBy;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    @ApiModelProperty(value = "更新时间" ,hidden = true)
+    private Date updateTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "更新者"  ,hidden = true)
+    private String updateBy;
+
+    /** 备注 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "备注" ,hidden = true)
+    private String remark;
+
+    /** 开始时间 */
+    @JsonIgnore
+    @TableField(exist = false)
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    /** 结束时间 */
+    @JsonIgnore
+    @TableField(exist = false)
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "请求参数",hidden = true)
+    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 String getBeginTime()
+    {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime)
+    {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/Response.java

@@ -0,0 +1,125 @@
+package com.miaxis.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 【Response返回实体类】
+ *
+ * @author JuniorRay
+ * @date 2020-11-12
+ */
+@ApiModel(description = "结果返回类")
+public class Response<T> {
+    @ApiModelProperty(value = "状态码")
+    private Integer code;
+
+    @ApiModelProperty(value = "返回内容")
+    private String msg;
+
+    @ApiModelProperty(value = "数据对象")
+    private T data;
+
+    /**
+     * 构造方法私有化，不允许外部new Response
+     * @param data
+     */
+    private Response(T data){
+        this.code = ResponseEnum.SUCCESS.getCode();
+        this.msg = ResponseEnum.SUCCESS.getMessage();
+        this.data = data;
+    }
+
+    /**
+     * 构造方法私有化，不允许外部new Response
+     * @param responseEnum
+     */
+    private Response(ResponseEnum responseEnum){
+        if (null == responseEnum) {
+            return;
+        }
+        this.code = responseEnum.getCode();
+        this.msg = responseEnum.getMessage();
+    }
+
+    private Response(Integer code,String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+    /**
+     * 成功时调用
+     * @param
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> success(){
+        return success(null);
+    }
+    /**
+     * 成功时调用
+     * @param data
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> success(T data){
+        return new Response<T>(data);
+    }
+    /**
+     * 失败时调用
+     * @param
+     * @param <T>
+     * @return
+     */
+    public static <T> Response error(){
+        return error(ResponseEnum.ERROR);
+    }
+    /**
+     * 失败时调用
+     * @param responseEnum
+     * @param <T>
+     * @return
+     */
+    public static <T> Response error(ResponseEnum responseEnum){
+        return new Response<T>(responseEnum);
+    }
+
+    /**
+     * 失败时调用
+     * @param
+     * @param <T>
+     * @return
+     */
+    public static <T> Response error(Integer code,String msg){
+        return new Response<T>(code,msg);
+    }
+
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public Response<T> setCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public Response<T> setMsg(String msg) {
+        this.msg = msg;
+        return this;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public Response<T> setData(T data) {
+        this.data = data;
+        return this;
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java

@@ -0,0 +1,151 @@
+package com.miaxis.common.core.domain;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 【Response返回状态的枚举类】
+ *
+ * @author JuniorRay
+ * @date 2020-11-12
+ */
+public enum ResponseEnum {
+    /**********************通用日志信息***************************/
+
+    /**操作成功**/
+    SUCCESS(200,"操作成功"),
+    /**操作失败**/
+    FAIL(000,"操作失败"),
+    /**服务端异常**/
+    ERROR(500,"系统内部错误"),
+    /**业务错误**/
+    BUSINESS_ERROR(502,"业务错误"),
+    /**对象创建成功**/
+    CREATED ( 201,"对象创建成功"),
+    /**请求已经被接受**/
+    ACCEPTED(202,"请求已经被接受"),
+    /**操作已经执行成功，但是没有返回数据**/
+    NO_CONTENT(204,"操作已经执行成功，但是没有返回数据"),
+    /**资源已被移除**/
+    MOVED_PERM(301,"资源已被移除"),
+    /**重定向*/
+    SEE_OTHER(303,"重定向"),
+    /**资源没有被修改**/
+    NOT_MODIFIED(304,"资源没有被修改"),
+    /**参数列表错误（缺少，格式不匹配**/
+    BAD_REQUEST(400,"参数列表错误（缺少，格式不匹配）"),
+    /**未授权**/
+    UNAUTHORIZED(401,"未授权"),
+    /**访问受限，授权过期**/
+    FORBIDDEN(403,"访问受限，授权过期"),
+    /**资源，服务未找到**/
+    NOT_FOUND(404,"资源，服务未找到"),
+    /**不允许的http方法**/
+    BAD_METHOD(405,"不允许的http方法"),
+    /**资源冲突，或者资源被锁**/
+    CONFLICT(409,"资源冲突，或者资源被锁"),
+    /**不支持的数据，媒体类型**/
+    UNSUPPORTED_TYPE(415,"不支持的数据，媒体类型"),
+    /**接口未实现**/
+    NOT_IMPLEMENTED(501,"接口未实现"),
+
+    /**********************基本增删改查信息***************************/
+    /**重复提交**/
+    REPEAT_SUBMIT(9999,"不允许重复提交，请稍后再试"),
+    ADD_FAIL(9901,"新增失败"),
+    ADD_SUCCESS(9902,"新增成功"),
+    DELETE_FAIL(9903,"删除失败"),
+    DELETE_SUCCESS(9904,"删除成功"),
+    UPDATE_FAIL(9905,"修改失败"),
+    UPDATE_SUCCESS(9906,"修改成功"),
+    QUERY_FAIL(9907,"查询失败"),
+    QUERY_SUCCESS(9908,"查询成功"),
+
+    /**********************其他日志信息***************************/
+    /**菜单模块**/
+    MENU_ADD_ERROR_EXIST(9001,"新增菜单失败，菜单名称已存在"),
+    MENU_ADD_ERROR_HTTP(9002,"新增菜单失败，地址必须以http(s)://开头"),
+    MENU_ADD_ERROR_SELF(9003,"新增菜单失败，上级菜单不能选择自己"),
+    MENU_DELETE_ERROR_SUB(9004,"删除菜单失败，存在子菜单,不允许删除"),
+    MENU_DELETE_ERROR_ROLE(9005,"删除菜单失败，菜单已分配角色,不允许删除"),
+    MENU_UPDATE_ERROR_EXIST(9006,"修改菜单失败，菜单名称已存在"),
+    MENU_UPDATE_ERROR_HTTP(9007,"修改菜单失败，地址必须以http(s)://开头"),
+    MENU_UPDATE_ERROR_SELF(9008,"修改菜单失败，上级菜单不能选择自己"),
+    /**参数模块**/
+    CONFIG_ADD_ERROR_EXIST(9010,"新增参数失败,参数键名已存在"),
+    CONFIG_UPDATE_ERROR_EXIST(9011,"修改参数失败,参数键名已存在"),
+    /**部门模块**/
+    DEPARTMENT_ADD_ERROR_EXIST(9021,"新增部门失败,部门名称已存在"),
+    DEPARTMENT_UPDATE_ERROR_EXIST(9022,"修改部门失败,部门名称已存在"),
+    DEPARTMENT_UPDATE_ERROR_SELF(9023,"修改部门失败,上级部门不能是自己"),
+    DEPARTMENT_UPDATE_ERROR_SUB(9024,"修改部门失败,该部门包含未停用的子部门！"),
+    DEPARTMENT_DELETE_ERROR_SUB(9025,"删除部门失败,存在下级部门,不允许删除！"),
+    DEPARTMENT_DELETE_ERROR_USER(9026,"删除部门失败,部门存在用户,不允许删除！"),
+    /**字典模块**/
+    DICTIONARY_ADD_ERROR_EXIST(9030,"新增字典失败,字典类型已存在"),
+    DICTIONARY_UPDATE_ERROR_EXIST(9031,"修改字典失败,字典类型已存在"),
+    /**岗位模块**/
+    POST_ADD_ERROR_EXIST_NAME(9040,"新增岗位失败,岗位名称已存在"),
+    POST_ADD_ERROR_EXIST_CODE(9041,"新增岗位失败,岗位编码已存在"),
+    POST_UPDATE_ERROR_EXIST_NAME(9042,"修改岗位失败,岗位名称已存在"),
+    POST_UPDATE_ERROR_EXIST_CODE(9043,"修改岗位失败,岗位编码已存在"),
+    /**角色模块**/
+    ROLE_ADD_ERROR_EXIST_NAME(9040,"新增角色失败,角色名称已存在"),
+    ROLE_ADD_ERROR_EXIST_AUTHORITY(9041,"新增角色失败,角色权限已存在"),
+    ROLE_UPDATE_ERROR_EXIST_NAME(9042,"修改角色失败,角色名称已存在"),
+    ROLE_UPDATE_ERROR_EXIST_AUTHORITY(9043,"修改角色失败,角色权限已存在"),
+    ROLE_UPDATE_ERROR(9044,"修改角色失败"),
+    /**用户模块**/
+    USER_ADD_ERROR_USERNAME(9050,"新增用户失败,登录账号已存在"),
+    USER_ADD_ERROR_PHONE(9051,"新增用户失败,手机号码已存在"),
+    USER_ADD_ERROR_MAIL(9052,"新增用户失败,邮箱账号已存在"),
+    USER_UPDATE_ERROR_PHONE(9053,"修改用户失败,手机号码已存在"),
+    USER_UPDATE_ERROR_MAIL(9054,"修改用户失败,邮箱账号已存在"),
+    USER_UPDATE_ERROR(9055,"修改个人信息异常，请联系管理员"),
+    UPDATE_PASSWORD_ERROR_OLD_ERROR(9056,"修改密码失败，旧密码错误"),
+    UPDATE_PASSWORD_ERROR_OLD_REPEAT(9057,"新密码和旧密码重复，请重新修改密码"),
+    UPDATE_PASSWORD_ERROR(9058,"修改密码异常，请联系管理员"),
+    /**登录模块**/
+    LOGIN_SUCCESS(200,"登录成功"),
+    LOGIN_FAIL(9101,"登录失败"),
+    LOGOUT_SUCCESS(200,"退出成功"),
+    LOGOUT_FAIL(9103,"退出失败"),
+    /**其他**/
+    DEMO_MODE(9114,"演示模式，不允许操作"),
+    CRON_ERROR(9115,"cron表达式不正确"),
+    ABNORMAL_PICTURE_UPLOAD(9116,"上传图片异常，请联系管理员");
+
+
+    // 成员变量
+    private Integer code;
+    private String message;
+
+    // 构造方法
+    ResponseEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private static final Map<Integer, ResponseEnum> ENUM_MAP = new HashMap<Integer, ResponseEnum>();
+
+    static {
+        for (ResponseEnum item : values()) {
+            ENUM_MAP.put(item.getCode(), item);
+        }
+    }
+
+    public Integer getCode() {
+        return  this.code ;
+    }
+    public String getMessage() {
+        return  this.message ;
+    }
+
+    public static ResponseEnum getModelByKey(Integer code) {
+        if (code != null) {
+            return ENUM_MAP.get(code);
+        }
+        return null;
+    }
+
+}

fx-common/src/main/java/com/miaxis/common/core/domain/TreeEntity.java

@@ -0,0 +1,90 @@
+package com.miaxis.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tree基类
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "TreeEntity", description = "Tree基类")
+@Data
+public class TreeEntity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 父菜单名称 */
+    @ApiModelProperty(value = "父菜单名称")
+    private String parentName;
+
+    /** 父菜单ID */
+    @ApiModelProperty(value = "父菜单ID")
+    private Long parentId;
+
+    /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
+    private Integer orderNum;
+
+    /** 祖级列表 */
+    @ApiModelProperty(value = "祖级列表")
+    private String ancestors;
+
+    /** 子部门 */
+    @ApiModelProperty(value = "子部门")
+    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;
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/TreeSelect.java

@@ -0,0 +1,86 @@
+package com.miaxis.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.miaxis.common.core.domain.entity.SysDept;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "TreeSelect", description = "Treeselect树结构实体类")
+@Data
+public class TreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    @ApiModelProperty(value = "节点ID")
+    private Long id;
+
+    /** 节点名称 */
+    @ApiModelProperty(value = "节点名称")
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @ApiModelProperty(value = "子节点")
+    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;
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysDept.java

@@ -0,0 +1,220 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 部门表 sys_dept
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysDept", description = "部门表")
+@Data
+public class SysDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 部门ID */
+    @ApiModelProperty(value = "部门ID")
+    private Long deptId;
+
+    /** 父部门ID */
+    @ApiModelProperty(value = "父部门ID")
+    private Long parentId;
+
+    /** 祖级列表 */
+    @ApiModelProperty(value = "祖级列表")
+    private String ancestors;
+
+    /** 部门名称 */
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
+    private String orderNum;
+
+    /** 负责人 */
+    @ApiModelProperty(value = "负责人")
+    private String leader;
+
+    /** 联系电话 */
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    /** 部门状态:0正常,1停用 */
+    @ApiModelProperty(value = "部门状态:0正常,1停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    /** 父部门名称 */
+    @ApiModelProperty(value = "父部门名称")
+    private String parentName;
+
+    /** 子部门 */
+    @ApiModelProperty(value = "子部门")
+    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();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java

@@ -0,0 +1,191 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysDictData", description = "字典数据表")
+@Data
+public class SysDictData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典编码")
+    private Long dictCode;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典排序")
+    private Long dictSort;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    @ApiModelProperty(value = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    @ApiModelProperty(value = "字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    @ApiModelProperty(value = "字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty(value = "样式属性（其他样式扩展）")
+    private String cssClass;
+
+    /** 表格字典样式 */
+    @ApiModelProperty(value = "表格字典样式")
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    @ApiModelProperty(value = "是否默认（Y是 N否）")
+    private String isDefault;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "状态（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();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictType.java

@@ -0,0 +1,104 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典类型表 sys_dict_type
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysDictType", description = "字典类型表")
+@Data
+public class SysDictType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典主键 */
+    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典主键")
+    private Long dictId;
+
+    /** 字典名称 */
+    @ApiModelProperty(value = "字典名称")
+    @Excel(name = "字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    @ApiModelProperty(value = "字典类型")
+    private String dictType;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "状态（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();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysMenu.java

@@ -0,0 +1,266 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysMenu", description = "菜单权限表")
+@Data
+public class SysMenu extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    @ApiModelProperty(value = "菜单ID")
+    private Long menuId;
+
+    /** 菜单名称 */
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    /** 父菜单名称 */
+    @ApiModelProperty(value = "父菜单名称")
+    private String parentName;
+
+    /** 父菜单ID */
+    @ApiModelProperty(value = "父菜单ID")
+    private Long parentId;
+
+    /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
+    private String orderNum;
+
+    /** 路由地址 */
+    @ApiModelProperty(value = "路由地址")
+    private String path;
+
+    /** 组件路径 */
+    @ApiModelProperty(value = "组件路径")
+    private String component;
+
+    /** 是否为外链（0是 1否） */
+    @ApiModelProperty(value = "是否为外链（0是 1否）")
+    private String isFrame;
+
+    /** 是否缓存（0缓存 1不缓存） */
+    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
+    private String isCache;
+
+    /** 类型（M目录 C菜单 F按钮） */
+    @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
+    private String menuType;
+
+    /** 显示状态（0显示 1隐藏） */
+    @ApiModelProperty(value = "显示状态（0显示 1隐藏）")
+    private String visible;
+
+    /** 菜单状态（0显示 1隐藏） */
+    @ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
+    private String status;
+
+    /** 权限字符串 */
+    @ApiModelProperty(value = "权限字符串")
+    private String perms;
+
+    /** 菜单图标 */
+    @ApiModelProperty(value = "菜单图标")
+    private String icon;
+
+    /** 子菜单 */
+    @ApiModelProperty(value = "子菜单")
+    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();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysRole.java

@@ -0,0 +1,244 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysRole", description = "角色表")
+@Data
+public class SysRole extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "角色ID")
+    private Long roleId;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+
+    /** 角色权限 */
+    @Excel(name = "角色权限")
+    @ApiModelProperty(value = "角色权限")
+    private String roleKey;
+
+    /** 角色排序 */
+    @Excel(name = "角色排序")
+    @ApiModelProperty(value = "角色排序")
+    private String roleSort;
+
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
+    @ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
+    private String dataScope;
+
+    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
+    private boolean menuCheckStrictly;
+
+    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
+    private boolean deptCheckStrictly;
+
+    /** 角色状态（0正常 1停用） */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "角色状态（0正常 1停用）")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    /** 用户是否存在此角色标识 默认不存在 */
+    @ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
+    private boolean flag = false;
+
+    /** 菜单组 */
+    @ApiModelProperty(value = "菜单组")
+    private Long[] menuIds;
+
+    /** 部门组（数据权限） */
+    @ApiModelProperty(value = "部门组（数据权限）")
+    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();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/SysUser.java

@@ -0,0 +1,352 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.annotation.Excel.Type;
+import com.miaxis.common.annotation.Excels;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "SysUser", description = "用户对象")
+@Data
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    @ApiModelProperty(value = "用户序号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Type.IMPORT)
+    @ApiModelProperty(value = "部门编号")
+    private String deptId;
+
+    /** 用户账号 */
+    @Excel(name = "登录名称")
+    @ApiModelProperty(value = "登录名称")
+    private String userName;
+
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    @ApiModelProperty(value = "用户名称")
+    private String nickName;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    @ApiModelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    @ApiModelProperty(value = "用户性别")
+    private String sex;
+
+    /** 用户头像 */
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    /** 密码 */
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    /** 盐加密 */
+    @ApiModelProperty(value = "盐加密")
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "帐号状态（0正常 1停用） ")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Type.EXPORT)
+    @ApiModelProperty(value = "最后登录IP")
+    private String loginIp;
+
+    /** 最后登录时间 */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    @ApiModelProperty(value = "最后登录时间")
+    private Date loginDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+    })
+    @ApiModelProperty(value = "部门对象")
+    private SysDept dept;
+
+    /** 角色对象 */
+    @ApiModelProperty(value = "角色对象")
+    private List<SysRole> roles;
+
+    /** 角色组 */
+    @ApiModelProperty(value = "角色组")
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    @ApiModelProperty(value = "岗位组")
+    private Long[] postIds;
+
+    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 String getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(String 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;
+    }
+
+    @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())
+            .toString();
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -0,0 +1,127 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+/**
+ * 用户对象 user_info
+ *
+ * @author miaxis
+ * @date 2021-01-11
+ */
+@Data
+@TableName("user_info")
+@ApiModel(value = "UserInfo", description = "用户对象 user_info")
+public class UserInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    @TableField("phone")
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+
+    /** 微信号码 */
+    @Excel(name = "微信号码")
+    @TableField("wechar")
+    @ApiModelProperty(value = "微信号码")
+    private String wechar;
+
+    /** app头像地址 */
+    @Excel(name = "app头像地址")
+    @TableField("head_image")
+    @ApiModelProperty(value = "app头像地址")
+    private String headImage;
+
+    /** app昵称 */
+    @Excel(name = "app昵称")
+    @TableField("nick_name")
+    @ApiModelProperty(value = "app昵称")
+    private String nickName;
+
+    /** app昵称 */
+    @Excel(name = "真实姓名")
+    @TableField("real_name")
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+
+    /** 微信openid */
+    @Excel(name = "公众号openid")
+    @TableField("openid")
+    @ApiModelProperty(value = "微信openid")
+    private String openid;
+
+    /** 微信openid */
+    @Excel(name = "小程序openid")
+    @TableField("xcx_openid")
+    @ApiModelProperty(value = "小程序openid")
+    private String xcxOpenid;
+
+
+
+    /** 0 启用 1禁用 */
+    @Excel(name = "0 启用 1禁用")
+    @TableField("status")
+    @ApiModelProperty(value = "0 启用 1禁用")
+    private Integer status;
+
+//    /** 0 否 1是 */
+//    @Excel(name = "是否是vip 0 否 1")
+//    @TableField("is_vip")
+//    @ApiModelProperty(value = "是否是vip 0 否 1是")
+//    private Integer isVip;
+
+
+    /** 驾校班型Id */
+    @Excel(name = "联合id")
+    @TableField("union_id")
+    @ApiModelProperty(value = "联合id")
+    private String unionId;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    @ApiModelProperty(value = "过期时间")
+    private Date expireTime;
+
+
+
+    @ApiModelProperty(value = "销售类型0- 非销售1- 个人销售2- 团队销售")
+    private Integer saleType;
+
+    @ApiModelProperty(value = "所属城市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "所属区名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "所属驾校名称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "直接收益金额,单位分")
+    private Integer profitPrice;
+
+
+    @ApiModelProperty(value = "未结算推广积分")
+    private Integer achievement;
+
+    @ApiModelProperty(value = "已结算推广积分")
+    private Integer achievementSettled;
+
+
+}

fx-common/src/main/java/com/miaxis/common/core/domain/model/LoginBody.java

@@ -0,0 +1,79 @@
+package com.miaxis.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户登录对象
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "LoginBody", description = "用户登录对象")
+@Data
+public class LoginBody
+{
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码")
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    @ApiModelProperty(value = "唯一标识")
+    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;
+    }
+}

fx-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyMobleCode.java

@@ -0,0 +1,29 @@
+package com.miaxis.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 学员手机验证码登录
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "LoginBodyMobleCode", description = "学员手机验证码登录")
+@Data
+public class LoginBodyMobleCode
+{
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码")
+    private String code;
+
+
+}

fx-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyNoCode.java

@@ -0,0 +1,29 @@
+package com.miaxis.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户登录对象（免验证码）
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "LoginBodyNoCode", description = "用户登录对象（免验证码）")
+@Data
+public class LoginBodyNoCode
+{
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+
+
+}

fx-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -0,0 +1,287 @@
+package com.miaxis.common.core.domain.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.*;
+
+/**
+ * 登录用户身份权限
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "LoginUser", description = "登录用户身份权限")
+public class LoginUser implements UserDetails
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户唯一标识
+     */
+    @ApiModelProperty(value = "用户唯一标识")
+    private String token;
+
+    /**
+     * 登录时间
+     */
+    @ApiModelProperty(value = "登录时间")
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    @ApiModelProperty(value = "过期时间")
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    @ApiModelProperty(value = "登录IP地址")
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    @ApiModelProperty(value = "登录地点")
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    @ApiModelProperty(value = "浏览器类型")
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    @ApiModelProperty(value = "操作系统")
+    private String os;
+
+    /**
+     * 权限列表
+     */
+    @ApiModelProperty(value = "权限列表")
+    private Set<String> permissions;
+
+    /**
+     * 用户信息
+     */
+    @ApiModelProperty(value = "用户信息")
+    private SysUser user;
+
+    /**
+     * 学员信息
+     */
+    @ApiModelProperty(value = "学员信息")
+    private UserInfo student;
+
+    public LoginUser(UserInfo student) {
+        this.student = student;
+    }
+
+    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;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getPassword()
+    {
+        if (user != null){
+            return user.getPassword();
+        }else{
+            return null;
+        }
+
+    }
+
+    @Override
+    public String getUsername()
+    {
+        if (user != null){
+            return user.getUserName();
+        }else{
+            return student.getPhone();
+        }
+    }
+
+    /**
+     * 账户是否未过期,过期无法验证
+     */
+    @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;
+    }
+    public UserInfo getStudent()
+    {
+        return this.student;
+    }
+
+    public void setStudent(UserInfo student)
+    {
+        this.student = student;
+    }
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities()
+    {
+        if (this.getStudent() != null){
+            List<SimpleGrantedAuthority> roleList = new ArrayList<SimpleGrantedAuthority>();
+            roleList.add(new SimpleGrantedAuthority("ROLE_STUDENT"));
+            //如果已激活，是vip的话
+            Date expireTime = this.getStudent().getExpireTime();
+            if (expireTime != null && expireTime.getTime() > System.currentTimeMillis()){
+                roleList.add(new SimpleGrantedAuthority("ROLE_VIP"));
+            }
+            return roleList;
+        }else {
+            return null;
+        }
+
+
+    }
+    public void setAuthorities(Collection<? extends GrantedAuthority> collection){
+
+    }
+
+}