F

.gitignore

@@ -0,0 +1,38 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+
+logs
+*.log
+

admin/pom.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>demo</artifactId>
+        <groupId>com.njyunzhi</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yz_admin</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.njyunzhi</groupId>
+            <artifactId>yz_common</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.njyunzhi</groupId>
+            <artifactId>yz_repository</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.njyunzhi</groupId>
+            <artifactId>yz_framework</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <layout>ZIP</layout>
+                    <includeSystemScope>true</includeSystemScope>
+                    <mainClass>com.njyunzhi.YZCrmAdminApplication</mainClass>
+                    <includes>
+                        <include>
+                            <groupId>com.njyunzhi</groupId>
+                            <artifactId>yz_admin</artifactId>
+                        </include>
+                        <include>
+                            <groupId>com.njyunzhi</groupId>
+                            <artifactId>yz_common</artifactId>
+                        </include>
+                        <include>
+                            <groupId>com.njyunzhi</groupId>
+                            <artifactId>yz_framework</artifactId>
+                        </include>
+                        <include>
+                            <groupId>com.njyunzhi</groupId>
+                            <artifactId>yz_repository</artifactId>
+                        </include>
+                    </includes>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- 打包发布时，跳过单元测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/lib</outputDirectory>
+                            <stripVersion>false</stripVersion>
+                            <!-- 不包含哪些jar包 -->
+                            <excludeGroupIds>
+                                <!-- 只排除业务模块相关的jar包，多个用英文逗号分割-->
+                                com.njyunzhi
+                            </excludeGroupIds>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/config</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>./src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

admin/src/main/java/com/njyunzhi/YZCrmAdminApplication.java

@@ -0,0 +1,24 @@
+package com.njyunzhi;
+
+import com.njyunzhi.framework.util.SpringContextUtil;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableAsync
+@EnableScheduling
+@EnableTransactionManagement
+@EnableConfigurationProperties
+@MapperScan({"com.njyunzhi.**.mapper"})
+@SpringBootApplication(scanBasePackages = {"com.njyunzhi"})
+public class YZCrmAdminApplication {
+    public static void main(String[] args) {
+        ConfigurableApplicationContext ac = SpringApplication.run(YZCrmAdminApplication.class, args);
+        SpringContextUtil.setAc(ac);
+    }
+}

admin/src/main/java/com/njyunzhi/admin/common/Constants.java

@@ -0,0 +1,21 @@
+package com.njyunzhi.admin.common;
+
+//import com.njyunzhi.repository.entity.TaOrder;
+
+public class Constants {
+    public final static String ROOT_ID = "1";    // 超级管理员ID
+    public final static String ROOT_TREE = "-1";  // 树根
+    public final static String ROOT_ORG = "1";   // 顶级机构
+
+    public final static int STATUS_READY = 0;
+    public final static int STATUS_NORMAL = 1;
+
+//    TaOrder 表中的  bill_type 字段值
+    public final static String TA_ORDER_CONSUME = "consume";    //消费
+    public final static String TA_ORDER_REFUND = "refund";      //退款
+    public final static String TA_ORDER_RECHARGE = "recharge";  //充值-开卡
+    public final static String TA_ORDER_WITHDRAW = "withdraw";  //提现
+
+    // 账户登录
+    public final static String LOGIN_TYPE_ACCOUNT = "account";
+}

admin/src/main/java/com/njyunzhi/admin/controller/CommController.java

@@ -0,0 +1,41 @@
+package com.njyunzhi.admin.controller;
+
+
+import cn.dev33.satoken.util.SaResult;
+import com.njyunzhi.common.util.FileUtil;
+import com.njyunzhi.common.util.aliyun.oss.OssUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.repository.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@Api(tags = "部分通用接口")
+@RestController
+@RequestMapping("/")
+public class CommController extends BaseController {
+
+    @Autowired
+    FileUtil fileUtil;
+
+    @Autowired
+    OssUtil ossUtil;
+
+
+    @AccessLimit()
+    @ApiOperation("上传文件")
+    @GetMapping("/{client}/upload/policy")
+    public SaResult getUploadPolicy() throws IOException {
+
+        OssUtil.PolicyResponse policy = ossUtil.getPolicy();
+
+        return SaResult.data(policy);
+    }
+
+
+}

admin/src/main/java/com/njyunzhi/admin/controller/FxTenantController.java

@@ -0,0 +1,135 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.FxTenantService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.FxTenant;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 租户表;(fx_tenant)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-11-15
+ */
+@Api(tags = "租户表对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class FxTenantController extends BaseController {
+
+    @Autowired
+    private FxTenantService fxTenantService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "租户表", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/fxTenant/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(fxTenantService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "租户表", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/fxTenant")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("状态") @RequestParam(value = "status", required = false) String status,
+                         @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone,
+                         @ApiParam("租户名称") @RequestParam(value = "tenantName", required = false) String tenantName,
+                         @ApiParam("租户编号") @RequestParam(value = "tenantCode", required = false) String tenantCode,
+                         @ApiParam("开始时间") @RequestParam(value = "startTime", required = false) String startTime,
+                         @ApiParam("结束时间") @RequestParam(value = "endTime", required = false) String endTime,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<FxTenant> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<FxTenant> queryWrapper = new QueryWrapper<>();
+        String tenantId = getTenantId();
+//        queryWrapper.ge(StringUtil.isNotEmpty(startTime),"start_time",startTime).
+        queryWrapper.eq("tenant_id",tenantId);
+        queryWrapper.ge(!StringUtil.isEmpty(startTime), "DATE_FORMAT(start_time,'%Y-%m-%d')", startTime)
+                .le(!StringUtil.isEmpty(endTime), "DATE_FORMAT(end_time,'%Y-%m-%d')", endTime);
+        queryWrapper.eq(StringUtil.isNotEmpty(status), "status", status);
+        queryWrapper.like(StringUtil.isNotEmpty(phone), "phone", phone);
+        queryWrapper.like(StringUtil.isNotEmpty(tenantName), "tenant_name", tenantName);
+        queryWrapper.like(StringUtil.isNotEmpty(tenantCode), "tenant_code", tenantCode);
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<FxTenant> result = fxTenantService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param fxTenant 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "租户表", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/fxTenant")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody FxTenant fxTenant) throws Exception {
+        String tenantId = getTenantId();
+        fxTenant.setTenantId(tenantId);
+        fxTenantService.save(fxTenant);
+        return SaResult.data(fxTenant);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param fxTenant 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "租户表", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/fxTenant/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody FxTenant fxTenant,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        fxTenantService.updateById(fxTenant);
+        return SaResult.data(fxTenant);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "租户表", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/fxTenant/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        fxTenantService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysDeptController.java

@@ -0,0 +1,118 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysDeptService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysDept;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 部门表;(sys_dept)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-26
+ */
+@Api(tags = "部门表对象功能接口")
+@RestController
+@RequestMapping("/")
+public class SysDeptController extends BaseController {
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "部门表", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/sysDept/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(sysDeptService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "部门表", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/sysDept")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<SysDept> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<SysDept> result = sysDeptService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param sysDept 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "部门表", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/sysDept")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysDept sysDept) throws Exception {
+        sysDeptService.save(sysDept);
+        return SaResult.data(sysDept);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param sysDept 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "部门表", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/sysDept/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody SysDept sysDept,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        sysDeptService.updateById(sysDept);
+        return SaResult.data(sysDept);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "部门表", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/sysDept/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        sysDeptService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysLogController.java

@@ -0,0 +1,71 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysLogService;
+import com.njyunzhi.common.util.DateUtil;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysLog;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+ /**
+ * 系统日志;(sys_log)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "系统日志对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysLogController extends BaseController {
+
+     @Autowired
+     private SysLogService sysLogService;
+
+     /**
+      * 分页查询
+      *
+      * @param pageNum  当前页码
+      * @param pageSize 每页条数
+      * @return 查询结果
+      */
+     @ApiOperation("分页查询")
+     @GetMapping("/sysLog")
+     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                          @ApiParam("终端类型") @RequestParam(value = "clientType", required = false) String clientType,
+                          @ApiParam("开始日期") @RequestParam(value = "startDate", required = false) String startDate,
+                          @ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate,
+                          @ApiParam("模块") @RequestParam(value = "moduleName", required = false) String moduleName,
+                          @ApiParam("操作人") @RequestParam(value = "userName", required = false) String userName) throws Exception {
+
+         LocalDateTime start = null;
+         LocalDateTime end = null;
+         if (StringUtil.isNotEmpty(startDate)) {
+             start = DateUtil.day2LocalDateime(startDate);
+             end = DateUtil.day2LocalDateime(endDate).withHour(23).withMinute(59).withSecond(59);
+         }
+
+         IPage<SysLog> pg = new Page<>(pageNum, pageSize);
+         QueryWrapper<SysLog> queryWrapper = new QueryWrapper<>();
+         queryWrapper.eq(StringUtil.isNotEmpty(clientType), "client_type", clientType);
+         queryWrapper.like(StringUtil.isNotEmpty(moduleName), "module_name", moduleName);
+         queryWrapper.like(StringUtil.isNotEmpty(userName), "user_name", userName);
+         queryWrapper.between(null != start, "created_at", start, end);
+         queryWrapper.orderByDesc("created_at");
+         IPage<SysLog> result = sysLogService.page(pg, queryWrapper);
+
+         return SaResult.data(result);
+     }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysLoginController.java

@@ -0,0 +1,102 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.njyunzhi.admin.dto.ChangePasswordDTO;
+import com.njyunzhi.admin.dto.LoginDTO;
+import com.njyunzhi.admin.service.FxTenantService;
+import com.njyunzhi.admin.service.SysLoginService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.FxTenant;
+import com.njyunzhi.repository.entity.SysUser;
+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.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 登录信息表;(sys_login)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "登录信息表对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysLoginController extends BaseController {
+
+    @Autowired
+    private SysLoginService sysLoginService;
+    @Autowired
+    private FxTenantService fxTenantService;
+
+    @PostMapping("/login")
+    @ApiOperation(value = "后台登录", notes = "后台登录", httpMethod = "POST", response = SaResult.class)
+    public SaResult login(@ApiParam("登录参数") @RequestBody LoginDTO loginParm) throws Exception {
+        FxTenant fxTenant = fxTenantService.getById(loginParm.getTenantId());
+        if (fxTenant == null) {
+            throw new Exception("沒有此租戶");
+        }
+        if (fxTenant.getStatus().equals(0)) {
+            throw new Exception("未激活");
+
+        }
+
+        if (fxTenant.getStatus().equals(2)) {
+            throw new Exception("停用");
+
+        }
+
+
+        if (StringUtil.isEmpty(loginParm.getTenantId())) {
+            throw new Exception("所属租户不能为空");
+        }
+
+        if (StringUtil.isEmpty(loginParm.getLoginName()) || StringUtil.isEmpty(loginParm.getPassword())) {
+            return SaResult.error("登录用户或者密码不能为空");
+        }
+
+        SysUser sysUser = sysLoginService.login(loginParm,fxTenant.getTenantId());
+
+        StpUtil.login(sysUser.getUserId());
+        String tokenValue = StpUtil.getTokenValue();
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("user", sysUser);
+        result.put("token", tokenValue);
+
+        return SaResult.data(result);
+    }
+
+    @PostMapping("/logout")
+    @ApiOperation(value = "登出", notes = "登出", httpMethod = "POST", response = SaResult.class)
+    public SaResult logout() throws Exception {
+        SysUser sysUser = (SysUser) currentUser();
+        StpUtil.logout(sysUser.getUserId());
+        return SaResult.ok();
+    }
+
+
+    @PutMapping("/change-password")
+    @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "PUT", response = SaResult.class)
+    public SaResult changePassword(@ApiParam("修改密码参数") @RequestBody ChangePasswordDTO param) throws Exception {
+        if (StringUtil.isEmpty(param.getOriginPassword()) || StringUtil.isEmpty(param.getNewPassword())) {
+            return SaResult.error("原始密码或新密码不能为空");
+        }
+
+        SysUser sysUser = (SysUser) currentUser();
+
+        boolean isOk = sysLoginService.changePassword(sysUser, param);
+        if (!isOk) {
+            SaResult.error("修改失败, 请重试");
+        }
+
+        return SaResult.ok("密码修改成功");
+    }
+
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysMenuController.java

@@ -0,0 +1,54 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysMenuService;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysMenu;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+ /**
+ * 菜单表;(sys_menu)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "菜单表对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysMenuController extends BaseController {
+
+     @Autowired
+     private SysMenuService sysMenuService;
+
+     /**
+      * 分页查询
+      *
+      * @param pageNum  当前页码
+      * @param pageSize 每页条数
+      * @return 查询结果
+      */
+     @OpLog(module = "菜单管理", action = "查询列表")
+     @ApiOperation("分页查询")
+     @GetMapping("/sysMenu")
+     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
+         IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
+         QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+         queryWrapper.orderByAsc("sort_no");
+
+         IPage<SysMenu> result = sysMenuService.page(pg, queryWrapper);
+
+         return SaResult.data(result);
+     }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysRoleController.java

@@ -0,0 +1,122 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysRoleService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysRole;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 系统角色;(sys_role)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "系统角色对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysRoleController extends BaseController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "系统角色", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/sysRole/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(sysRoleService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "系统角色", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/sysRole")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+        String tenantId = getTenantId();
+        IPage<SysRole> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tenant_id", tenantId);
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<SysRole> result = sysRoleService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param sysRole 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "系统角色", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/sysRole")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysRole sysRole) throws Exception {
+        String tenantId = getTenantId();
+        sysRole.setTenantId(tenantId);
+        sysRoleService.save(sysRole);
+        return SaResult.data(sysRole);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param sysRole 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "系统角色", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/sysRole/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody SysRole sysRole,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        sysRole.setRoleId(id);
+        sysRoleService.updateById(sysRole);
+        return SaResult.data(sysRole);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "系统角色", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/sysRole/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        sysRoleService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysRoleResourceController.java

@@ -0,0 +1,158 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysRoleResourceService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysRoleResource;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+ /**
+ * 角色资源;(sys_role_resource)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "角色资源对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysRoleResourceController extends BaseController {
+    
+    @Autowired
+    private SysRoleResourceService sysRoleResourceService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "角色资源", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/sysRoleResource/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(sysRoleResourceService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "角色资源", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/sysRoleResource")
+    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+        
+        IPage<SysRoleResource> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysRoleResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<SysRoleResource> result = sysRoleResourceService.page(pg, queryWrapper);
+        
+        return SaResult.data(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param sysRoleResource 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "角色资源", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/sysRoleResource")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysRoleResource sysRoleResource) throws Exception {
+        sysRoleResourceService.save(sysRoleResource);
+        return SaResult.data(sysRoleResource);
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param sysRoleResource 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "角色资源", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/sysRoleResource/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody SysRoleResource sysRoleResource,
+                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        sysRoleResourceService.updateById(sysRoleResource);
+        return SaResult.data(sysRoleResource);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "角色资源", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/sysRoleResource/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+        sysRoleResourceService.removeById(id);
+        return SaResult.data("success");
+    }
+
+
+     /**
+      * 授权资源
+      *
+      * @param roleId            角色ID
+      * @param roleResourcesList 授权列表
+      * @return 实例对象
+      */
+     @OpLog(module = "角色管理", action = "授权资源")
+     @ApiOperation("授权资源, 包含编辑")
+     @PostMapping("/role/{roleId}/resources")
+     public SaResult authResource(@ApiParam("角色ID") @PathVariable String roleId,
+                                  @ApiParam("授权列表") @RequestBody List<SysRoleResource> roleResourcesList) throws Exception {
+         if (null == roleResourcesList) {
+             return SaResult.error("未找到授权对象");
+         }
+
+         sysRoleResourceService.mergeData(roleId, roleResourcesList);
+         return SaResult.data(roleResourcesList);
+     }
+
+     /**
+      * 获取授权资源
+      *
+      * @param roleId            角色ID
+      * @return 实例对象
+      */
+     @OpLog(module = "角色管理", action = "获取授权资源")
+     @ApiOperation("获取授权资源")
+     @GetMapping("/role/{roleId}/resources")
+     public SaResult getAuthResource(@ApiParam("角色ID") @PathVariable String roleId) throws Exception {
+         List<SysRoleResource> roleResourcesList = sysRoleResourceService.getListByRole(roleId);
+         return SaResult.data(roleResourcesList);
+     }
+
+
+
+
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysUserController.java

@@ -0,0 +1,223 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.common.Constants;
+import com.njyunzhi.admin.dto.ResetPasswordDTO;
+import com.njyunzhi.admin.service.*;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysMenu;
+import com.njyunzhi.repository.entity.SysRole;
+import com.njyunzhi.repository.entity.SysUser;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户管理;(sys_user)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+@Api(tags = "用户管理对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysUserController extends BaseController {
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Autowired
+    SysRoleService sysRoleService;
+
+    @Autowired
+    SysUserRoleService sysUserRoleService;
+
+    @Autowired
+    SysMenuService sysMenuService;
+
+    @Autowired
+    SysLoginService sysLoginService;
+
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "人员管理", action = "查询详情")
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/sysUser/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        SysUser sysUser = sysUserService.getById(id);
+        if (null == sysUser) {
+            return SaResult.error("用户不存在");
+        }
+
+        List<SysRole> roleList = sysRoleService.getByUser(id);
+        sysUser.setRoleList(roleList);
+
+        return SaResult.data(sysUser);
+    }
+
+    @AccessLimit()
+    @ApiOperation("获取当前用户")
+    @GetMapping("/current")
+    public SaResult getCurrentUser() throws Exception {
+        boolean isLogin = StpUtil.isLogin();
+        if (!isLogin) {
+            return SaResult.error("请先登录系统");
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        SysUser sysUser = (SysUser) currentUser();
+        List<SysMenu> menuList = sysUserService.getMneusByUser(sysUser);
+//         List<SysMenuButton> buttonList = sysUserService.getMenuButtonsByUser(sysUser);
+
+        result.put("user", sysUser);
+        result.put("menuList", menuList);
+//         result.put("buttonList", buttonList);
+        return SaResult.data(result);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "人员管理", action = "查询列表")
+    @ApiOperation("分页查询")
+    @GetMapping("/sysUser")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("姓名") @RequestParam(value = "userName", required = false) String userName,
+                         @ApiParam("机构") @RequestParam(value = "deptId", required = false) String deptId,
+                         @ApiParam("展馆") @RequestParam(value = "hallUniqueId", required = false) String hallUniqueId,
+                         @ApiParam("岗位ID") @RequestParam(value = "positionId", required = false) String positionId,
+                         @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone,
+                         @ApiParam("身份") @RequestParam(value = "identityType", required = false) Integer identityType) throws Exception {
+        String tenantId = getTenantId();
+        IPage<SysUser> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tenant_id", tenantId);
+        queryWrapper.like(!StringUtil.isEmpty(userName), "user_name", userName);
+        queryWrapper.eq(!StringUtil.isEmpty(deptId), "dept_id", deptId);
+        queryWrapper.eq(!StringUtil.isEmpty(hallUniqueId), "hall_unique_id", hallUniqueId);
+        queryWrapper.eq(!StringUtil.isEmpty(positionId), "position_id", positionId);
+        queryWrapper.like(!StringUtil.isEmpty(phone), "phone", phone);
+        queryWrapper.gt(null != identityType, " (identity_type & " + identityType + ") ", 0);
+        queryWrapper.ne("user_id", Constants.ROOT_ID);
+        queryWrapper.orderByDesc("created_at");
+        IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param sysUser 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "人员管理", action = "新增数据")
+    @ApiOperation("新增数据")
+    @PostMapping("/sysUser")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysUser sysUser) throws Exception {
+        String tenantId = getTenantId();
+
+        if (null == sysUser.getUserId()) {
+            long count = sysUserService.countBy("phone", sysUser.getPhone());
+            if (count > 0) {
+                return SaResult.error("手机号码已存在");
+            }
+        }
+        sysUser.setTenantId(tenantId);
+        sysUserService.mergeData(sysUser);
+
+        return SaResult.data(sysUserService.getById(sysUser.getUserId()));
+    }
+
+
+    /**
+     * 更新状态
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @OpLog(module = "人员管理", action = "更新状态")
+    @ApiOperation("更新状态")
+    @PutMapping("/sysUser/{id}/status")
+    public SaResult edit(@ApiParam("对象ID") @PathVariable String id,
+                         @ApiParam("页码") @RequestParam(value = "status") Integer status) throws Exception {
+
+        SysUser sysUser = sysUserService.getById(id);
+        sysUser.setStatus(status);
+
+        sysUserService.updateById(sysUser);
+
+        return SaResult.data(sysUser);
+    }
+
+
+    /**
+     * 重置密码
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @OpLog(module = "人员管理", action = "重置密码", desc = "人员ID: {{#id}}")
+    @ApiOperation("重置密码")
+    @PutMapping("/sysUser/{id}/password")
+    public SaResult resetPassword(@ApiParam("对象ID") @PathVariable String id,
+                                  @ApiParam("页码") @Validated @RequestBody ResetPasswordDTO newPassword) throws Exception {
+
+        SysUser sysUser = sysUserService.getById(id);
+        if (null == sysUser) {
+            return SaResult.error("人员不存在");
+        }
+
+        sysLoginService.resetPassword(sysUser, newPassword);
+        return SaResult.data(sysUser);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "人员管理", action = "删除数据")
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/sysUser/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        SysUser sysUser = sysUserService.getById(id);
+        if (null != sysUser && sysUser.getIsAdmin() == 1) {
+            return SaResult.error("不能对管理员进行此操作");
+        }
+
+        sysUserService.removeById(id);
+
+        // 授权角色
+        sysUserRoleService.removeByMap(new HashMap<String, Object>() {{
+            put("user_id", id);
+        }});
+
+        return SaResult.ok("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/SysUserRoleController.java

@@ -0,0 +1,117 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysUserRoleService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.SysUserRole;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+ /**
+ * 角色授权;(sys_user_role)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-26
+ */
+@Api(tags = "角色授权对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class SysUserRoleController extends BaseController {
+    
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "角色授权", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/sysUserRole/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(sysUserRoleService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "角色授权", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/sysUserRole")
+    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+        
+        IPage<SysUserRole> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<SysUserRole> result = sysUserRoleService.page(pg, queryWrapper);
+        
+        return SaResult.data(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param sysUserRole 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "角色授权", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/sysUserRole")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysUserRole sysUserRole) throws Exception {
+        sysUserRoleService.save(sysUserRole);
+        return SaResult.data(sysUserRole);
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param sysUserRole 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "角色授权", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/sysUserRole/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody SysUserRole sysUserRole,
+                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        sysUserRoleService.updateById(sysUserRole);
+        return SaResult.data(sysUserRole);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "角色授权", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/sysUserRole/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+        sysUserRoleService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/TaPersonController.java

@@ -0,0 +1,99 @@
+package com.njyunzhi.admin.controller;
+
+import com.njyunzhi.admin.service.TaPersonService;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaPerson;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员表;(ta_person)表控制层
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-26
+ */
+@Api(tags = "人员表对象功能接口")
+@RestController
+@RequestMapping("/taPerson")
+public class TaPersonController extends BaseController {
+    @Autowired
+    private TaPersonService taPersonService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param personId 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("{personid}")
+    public ResponseEntity<TaPerson> queryById(String personId) {
+        return ResponseEntity.ok(taPersonService.queryById(personId));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param taPerson    筛选条件
+     * @param pageRequest 分页对象
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping
+    public ResponseEntity<PageImpl<TaPerson>> paginQuery(TaPerson taPerson, PageRequest pageRequest) {
+        //1.分页参数
+        long current = pageRequest.getPageNumber();
+        long size = pageRequest.getPageSize();
+        //2.分页查询
+        /*把Mybatis的分页对象做封装转换，MP的分页对象上有一些SQL敏感信息，还是通过spring的分页模型来封装数据吧*/
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<TaPerson> pageResult = taPersonService.paginQuery(taPerson, current, size);
+        //3. 分页结果组装
+        List<TaPerson> dataList = pageResult.getRecords();
+        long total = pageResult.getTotal();
+        PageImpl<TaPerson> retPage = new PageImpl<TaPerson>(dataList, pageRequest, total);
+        return ResponseEntity.ok(retPage);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping
+    public ResponseEntity<TaPerson> add(TaPerson taPerson) {
+        return ResponseEntity.ok(taPersonService.insert(taPerson));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping
+    public ResponseEntity<TaPerson> edit(TaPerson taPerson) {
+        return ResponseEntity.ok(taPersonService.update(taPerson));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param personId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping
+    public ResponseEntity<Boolean> deleteById(String personId) {
+        return ResponseEntity.ok(taPersonService.deleteById(personId));
+    }
+}

admin/src/main/java/com/njyunzhi/admin/dto/ChangePasswordDTO.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.admin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "修改密码参数")
+public class ChangePasswordDTO {
+
+    @ApiModelProperty("原始密码")
+    String originPassword;
+
+    @ApiModelProperty("新密码")
+    String newPassword;
+}

admin/src/main/java/com/njyunzhi/admin/dto/LoginDTO.java

@@ -0,0 +1,22 @@
+package com.njyunzhi.admin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("登录信息")
+public class LoginDTO {
+
+    @ApiModelProperty("登录类型")
+    String loginType;
+
+    @ApiModelProperty("登录名")
+    String loginName;
+
+    @ApiModelProperty("登录密码")
+    String password;
+
+    @ApiModelProperty("租户ID")
+    String tenantId;
+}

admin/src/main/java/com/njyunzhi/admin/dto/PersonDTO.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序人员表登录信息")
+public class PersonDTO {
+    @ApiModelProperty("登录openid")
+    String openid;
+
+}

admin/src/main/java/com/njyunzhi/admin/dto/ResetPasswordDTO.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.admin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel("重置密码")
+public class ResetPasswordDTO {
+
+    @ApiModelProperty("用户ID")
+    String userId;
+
+    @NotBlank(message = "密码不能为空")
+    @ApiModelProperty("用户新密码, MD5加密数据")
+    String password;
+}

admin/src/main/java/com/njyunzhi/admin/service/FxTenantService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.FxTenant;
+
+/**
+ * 租户表;(fx_tenant)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-11-15
+ */
+public interface FxTenantService extends IBaseService<FxTenant> {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/SysDeptService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysDept;
+
+/**
+ * 部门表;(sys_dept)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-26
+ */
+public interface SysDeptService extends IBaseService<SysDept> {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/SysLogService.java

@@ -0,0 +1,13 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysLog;
+
+ /**
+ * 系统日志;(sys_log)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysLogService extends IBaseService<SysLog> {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/SysLoginService.java

@@ -0,0 +1,22 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.admin.dto.ChangePasswordDTO;
+import com.njyunzhi.admin.dto.LoginDTO;
+import com.njyunzhi.admin.dto.ResetPasswordDTO;
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysLogin;
+import com.njyunzhi.repository.entity.SysUser;
+
+/**
+ * 登录信息表;(sys_login)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysLoginService extends IBaseService<SysLogin> {
+
+     SysUser login(LoginDTO loginParm,String tenantId) throws Exception;
+
+    boolean changePassword(SysUser sysUser, ChangePasswordDTO param) throws Exception;
+
+    void resetPassword(SysUser sysUser, ResetPasswordDTO newPassword);
+}

admin/src/main/java/com/njyunzhi/admin/service/SysMenuService.java

@@ -0,0 +1,13 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysMenu;
+
+ /**
+ * 菜单表;(sys_menu)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysMenuService extends IBaseService<SysMenu> {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/SysRoleResourceService.java

@@ -0,0 +1,22 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysRoleResource;
+
+import java.util.List;
+
+/**
+ * 角色资源;(sys_role_resource)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysRoleResourceService extends IBaseService<SysRoleResource> {
+
+
+    void mergeData(String roleId, List<SysRoleResource> roleResourcesList);
+
+    SysRoleResource getByRoleAndResource(String roleId, String resourceId, String resourceType);
+
+    List<SysRoleResource> getListByRole(String roleId);
+}

admin/src/main/java/com/njyunzhi/admin/service/SysRoleService.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.admin.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysRole;
+import com.njyunzhi.repository.entity.SysUser;
+
+import java.util.List;
+
+/**
+ * 系统角色;(sys_role)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysRoleService extends IBaseService<SysRole> {
+
+    List<SysRole> getByUser(String userId);
+
+    IPage<SysRole> getPageBy(IPage<SysRole> pg, SysUser sysUser);
+ }

admin/src/main/java/com/njyunzhi/admin/service/SysUserRoleService.java

@@ -0,0 +1,13 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.SysUserRole;
+
+ /**
+ * 角色授权;(sys_user_role)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-26
+ */
+public interface SysUserRoleService extends IBaseService<SysUserRole> {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/SysUserService.java

@@ -0,0 +1,31 @@
+package com.njyunzhi.admin.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.FxTenant;
+import com.njyunzhi.repository.entity.SysMenu;
+import com.njyunzhi.repository.entity.SysUser;
+
+import java.util.List;
+
+/**
+ * 用户管理;(sys_user)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-10-25
+ */
+public interface SysUserService extends IBaseService<SysUser> {
+
+    void mergeData(SysUser sysUser) throws Exception;
+
+    List<SysMenu> getMneusByUser(SysUser sysUser);
+
+    List<SysUser> getTaPerson(String phone);
+
+    SysUser getSysuser(String phone, String tenantId);
+
+    SysUser getSysuserTan(String tenantId);
+
+    IPage<FxTenant>  getTenantList(IPage<FxTenant> pg, String phone ,QueryWrapper<FxTenant> queryWrapper);
+
+}

admin/src/main/java/com/njyunzhi/admin/service/TaPersonService.java

@@ -0,0 +1,56 @@
+package com.njyunzhi.admin.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaPerson;
+
+/**
+ * 人员表;(ta_person)表服务接口
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-26
+ */
+public interface TaPersonService extends IBaseService<TaPerson> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param personId 主键
+     * @return 实例对象
+     */
+    TaPerson queryById(String personId);
+
+    /**
+     * 分页查询
+     *
+     * @param taPerson 筛选条件
+     * @param current  当前页码
+     * @param size     每页大小
+     * @return
+     */
+    Page<TaPerson> paginQuery(TaPerson taPerson, long current, long size);
+
+    /**
+     * 新增数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    TaPerson insert(TaPerson taPerson);
+
+    /**
+     * 更新数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    TaPerson update(TaPerson taPerson);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param personId 主键
+     * @return 是否成功
+     */
+    boolean deleteById(String personId);
+}

admin/src/main/java/com/njyunzhi/admin/service/framework/OpLogService.java

@@ -0,0 +1,41 @@
+package com.njyunzhi.admin.service.framework;
+
+import com.njyunzhi.admin.service.SysLogService;
+import com.njyunzhi.framework.service.IOpLogService;
+import com.njyunzhi.repository.entity.SysLog;
+import com.njyunzhi.repository.entity.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class OpLogService implements IOpLogService {
+
+    @Autowired
+    @Lazy
+    SysLogService sysLogService;
+
+    @Override
+    public void save(Map data) {
+        if (null == data) return ;
+
+        SysUser sysUser = (SysUser) data.get("user");
+        SysLog sysLog = new SysLog();
+        sysLog.setClientType("pc.admin");
+        sysLog.setModuleName((String) data.get("moduleName"));
+        sysLog.setIp((String) data.get("ip"));
+        sysLog.setUa((String) data.get("ua"));
+        sysLog.setUri((String) data.get("uri"));
+        sysLog.setDesc((String) data.get("desc"));
+        sysLog.setAction((String) data.get("action"));
+
+        if (null != sysUser) {
+            sysLog.setLoginId(sysUser.getUserId());
+            sysLog.setUserName(sysUser.getUserName());
+        }
+
+        sysLogService.save(sysLog);
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/framework/StpInterfaceImpl.java

@@ -0,0 +1,28 @@
+package com.njyunzhi.admin.service.framework;
+
+import cn.dev33.satoken.stp.StpInterface;
+import com.njyunzhi.admin.service.SysUserService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Component
+public class StpInterfaceImpl implements StpInterface {
+    @Lazy
+    HttpServletRequest request;
+
+    @Lazy
+    SysUserService sysUserService;
+
+    @Override
+    public List<String> getPermissionList(Object o, String s) {
+        return null;
+    }
+
+    @Override
+    public List<String> getRoleList(Object o, String s) {
+        return null;
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/framework/UserService.java

@@ -0,0 +1,88 @@
+package com.njyunzhi.admin.service.framework;
+
+import com.njyunzhi.admin.service.SysUserService;
+import com.njyunzhi.admin.service.TaPersonService;
+import com.njyunzhi.framework.service.IUserService;
+import com.njyunzhi.repository.entity.SysUser;
+import com.njyunzhi.repository.entity.TaPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Component
+public class UserService implements IUserService {
+    @Autowired
+    @Lazy
+    SysUserService sysUserService;
+
+    @Autowired
+    @Lazy
+    HttpServletRequest request;
+
+
+    @Autowired
+    @Lazy
+    TaPersonService taPersonService;
+
+    @Override
+    public Object getUserBy(Object loginId) throws Exception {
+        if (null == loginId) return null;
+        String clientType = request.getHeader("x-client-type");
+        String tenantId = request.getHeader("x-tenant-id");
+        System.out.println("---------head--------------");
+        System.out.println(clientType);
+
+        //h5租户端
+        if (clientType.equals("h5.admin")) {
+            TaPerson taPerson = taPersonService.getById((String) loginId);
+            if (taPerson != null && taPerson.getPhone() != null) {
+                return sysUserService.getSysuser(taPerson.getPhone(), tenantId);
+            } else {
+                return null;
+            }
+        }
+        //h5用户端
+        if (clientType.equals("h5.member")) {
+            return null;
+        }
+
+        //PC租户端
+//  if (clientType.equals("pc.admin")) {
+//            // loginId 就是 userId
+//            return sysUserService.getById((String) loginId);
+//        }
+        // loginId 就是 userId
+        return sysUserService.getById((String) loginId);
+    }
+
+    @Override
+    public String getTenantIdBy(Object user) {
+        if (null == user) {
+            return request.getHeader("x-tenant-id");
+        }
+
+        SysUser sysUser = (SysUser) user;
+
+        return sysUser.getTenantId();
+    }
+
+    @Override
+    public String getUserIdBy(Object user) {
+        if (null == user) return null;
+
+        SysUser sysUser = (SysUser) user;
+
+        return sysUser.getUserId();
+    }
+
+    @Override
+    public String getUserNameBy(Object user) {
+        if (null == user) return null;
+
+        SysUser sysUser = (SysUser) user;
+
+        return sysUser.getUserName();
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/FxTenantServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.FxTenantService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.FxTenant;
+import com.njyunzhi.repository.mapper.FxTenantMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 租户表;(fx_tenant)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-11-15
+ */
+@Service
+public class FxTenantServiceImpl extends BaseServiceImpl<FxTenantMapper, FxTenant> implements FxTenantService {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysDeptServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.SysDeptService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysDept;
+import com.njyunzhi.repository.mapper.SysDeptMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 部门表;(sys_dept)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-26
+ */
+@Service
+public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysLogServiceImpl.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.SysLogService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysLog;
+import com.njyunzhi.repository.mapper.SysLogMapper;
+import org.springframework.stereotype.Service;
+
+ /**
+ * 系统日志;(sys_log)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysLogServiceImpl extends BaseServiceImpl<SysLogMapper, SysLog> implements SysLogService {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysLoginServiceImpl.java

@@ -0,0 +1,91 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.common.Constants;
+import com.njyunzhi.admin.dto.ChangePasswordDTO;
+import com.njyunzhi.admin.dto.LoginDTO;
+import com.njyunzhi.admin.dto.ResetPasswordDTO;
+import com.njyunzhi.admin.service.SysLoginService;
+import com.njyunzhi.common.util.EncryptUtil;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysLogin;
+import com.njyunzhi.repository.entity.SysUser;
+import com.njyunzhi.repository.mapper.SysLoginMapper;
+import com.njyunzhi.repository.mapper.SysUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录信息表;(sys_login)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogin> implements SysLoginService {
+
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    private boolean checkPassword(String src, String targ, String salt) {
+        String newPass = EncryptUtil.md5(src, salt);
+        return targ.equals(newPass);
+    }
+
+    @Override
+    public SysUser login(LoginDTO loginParm, String tenantId) throws Exception {
+
+        SysLogin sysLogin = baseMapper.getInfoBy(loginParm.getLoginType(), loginParm.getLoginName());
+        if (null == sysLogin) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        String userId = sysLogin.getUserId();
+        if (StringUtil.isEmpty(userId)) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        boolean isRight = checkPassword(loginParm.getPassword(), sysLogin.getPassword(), userId);
+        if (!isRight) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        SysUser user = sysUserMapper.selectById(userId);
+        if (null == user) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        if (Constants.STATUS_NORMAL != user.getStatus()) {
+            throw new Exception("用户状态异常, 请联系管理员");
+        }
+
+        if (user.getTenantId() == null) {
+            throw new Exception("该账户的租户信息异常");
+        }
+        if (!user.getTenantId().equals(tenantId)) {
+            throw new Exception("该账户的租户信息错误");
+
+        }
+
+        return user;
+    }
+
+    @Override
+    public boolean changePassword(SysUser user, ChangePasswordDTO param) throws Exception {
+        String passwordEncrypted = EncryptUtil.md5(param.getOriginPassword(), user.getUserId());
+        Long cnt = baseMapper.countByUserAndPassword(user.getUserId(), passwordEncrypted);
+
+        if (null == cnt || cnt < 1) {
+            throw new Exception("原始密码不正确");
+        }
+
+        String newPassword = EncryptUtil.md5(param.getNewPassword(), user.getUserId());
+        return baseMapper.updateUserPassword(user.getUserId(), newPassword) > 0;
+    }
+
+    @Override
+    public void resetPassword(SysUser sysUser, ResetPasswordDTO newPassword) {
+        String newPasswordStr = EncryptUtil.md5(newPassword.getPassword(), sysUser.getUserId());
+        baseMapper.updateUserPassword(sysUser.getUserId(), newPasswordStr);
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysMenuServiceImpl.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.SysMenuService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysMenu;
+import com.njyunzhi.repository.mapper.SysMenuMapper;
+import org.springframework.stereotype.Service;
+
+ /**
+ * 菜单表;(sys_menu)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysRoleResourceServiceImpl.java

@@ -0,0 +1,61 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.SysRoleResourceService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysRoleResource;
+import com.njyunzhi.repository.mapper.SysRoleResourceMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 角色资源;(sys_role_resource)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysRoleResourceServiceImpl extends BaseServiceImpl<SysRoleResourceMapper, SysRoleResource> implements SysRoleResourceService {
+
+    @Override
+    public void mergeData(String roleId, List<SysRoleResource> roleResourcesList) {
+        // 如果是空 list, 代表取消授权
+        if (roleResourcesList.size() == 0) {
+            removeByMap(new HashMap<String, Object>() {{
+                put("role_id", roleId);
+            }});
+            return;
+        }
+
+        //
+        List<String> idList = new ArrayList<>();
+        for (SysRoleResource item : roleResourcesList) {
+            item.setRoleId(roleId);
+
+            SysRoleResource origin = baseMapper.getByRoleAndResource(roleId, item.getResourceId(), item.getResourceType());
+            if (null != origin) {
+                item.setId(origin.getId());
+            } else {
+                baseMapper.insert(item);
+            }
+
+            idList.add(item.getId());
+        }
+
+        // 删除多余的数据
+        baseMapper.deleteNotIn(roleId, idList);
+
+    }
+
+    @Override
+    public SysRoleResource getByRoleAndResource(String roleId, String resourceId, String resourceType) {
+        return baseMapper.getByRoleAndResource(roleId, resourceId, resourceType);
+    }
+
+    @Override
+    public List<SysRoleResource> getListByRole(String roleId) {
+        return baseMapper.getListByRole(roleId);
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,38 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njyunzhi.admin.common.Constants;
+import com.njyunzhi.admin.service.SysRoleService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysRole;
+import com.njyunzhi.repository.entity.SysUser;
+import com.njyunzhi.repository.mapper.SysRoleMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 系统角色;(sys_role)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
+
+    @Override
+    public List<SysRole> getByUser(String userId) {
+        if (Constants.ROOT_ID.equals(userId)) {
+            QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+            return list(queryWrapper);
+        }
+
+        return baseMapper.getByUser(userId);
+    }
+
+    @Override
+    public IPage<SysRole> getPageBy(IPage<SysRole> pg, SysUser sysUser) {
+        return baseMapper.getPageBy(pg, sysUser.getUserId());
+    }
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysUserRoleServiceImpl.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.SysUserRoleService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysUserRole;
+import com.njyunzhi.repository.mapper.SysUserRoleMapper;
+import org.springframework.stereotype.Service;
+
+ /**
+ * 角色授权;(sys_user_role)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-26
+ */
+@Service
+public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, SysUserRole> implements SysUserRoleService {
+    
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,124 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njyunzhi.admin.common.Constants;
+import com.njyunzhi.admin.service.SysUserService;
+import com.njyunzhi.common.util.EncryptUtil;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.*;
+import com.njyunzhi.repository.mapper.SysLoginMapper;
+import com.njyunzhi.repository.mapper.SysUserMapper;
+import com.njyunzhi.repository.mapper.SysUserRoleMapper;
+import com.njyunzhi.repository.repo.SysMenuRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 用户管理;(sys_user)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-10-25
+ */
+@Service
+public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+
+    @Autowired
+    SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
+    SysLoginMapper sysLoginMapper;
+
+    @Autowired
+    SysMenuRepo sysMenuRepo;
+
+    @Override
+    public void mergeData(SysUser sysUser) throws Exception {
+        //
+        SysUser origin = getById(sysUser.getUserId());
+        LocalDateTime now = LocalDateTime.now();
+
+        // 用户表
+        if (null == origin) {
+            if (null == sysUser.getStatus()) {
+                sysUser.setStatus(Constants.STATUS_NORMAL);
+            }
+            save(sysUser);
+        } else {
+            sysUser.setStatus(Constants.STATUS_NORMAL);
+            updateById(sysUser);
+        }
+
+        // 登录账号
+        SysLogin sysLogin = sysLoginMapper.getInfoBy(Constants.LOGIN_TYPE_ACCOUNT, sysUser.getPhone());
+        if (null == sysLogin) {
+            sysLogin = new SysLogin();
+            sysLogin.setUserId(sysUser.getUserId());
+            sysLogin.setLoginType(Constants.LOGIN_TYPE_ACCOUNT);
+            sysLogin.setLoginName(sysUser.getPhone());
+            sysLogin.setPassword(EncryptUtil.md5(EncryptUtil.md5("123456"), sysUser.getUserId()));
+            sysLogin.setStatus(Constants.STATUS_NORMAL);
+            sysLoginMapper.insert(sysLogin);
+        }
+
+
+        // 授权角色
+        List<SysRole> rolesList = sysUser.getRoleList();
+        if (null == rolesList || rolesList.size() == 0) {
+            sysUserRoleMapper.deleteByMap(new HashMap<String, Object>() {{
+                put("user_id", sysUser.getUserId());
+            }});
+        } else {
+            List<String> idList = new ArrayList<>();
+            for (SysRole role : rolesList) {
+                SysUserRole item = new SysUserRole();
+                item.setUserId(sysUser.getUserId());
+                item.setRoleId(role.getRoleId());
+
+                SysUserRole exists = sysUserRoleMapper.getByUserAndRole(sysUser.getUserId(), role.getRoleId());
+                if (null != exists) {
+                    item.setId(exists.getId());
+                } else {
+                    sysUserRoleMapper.insert(item);
+                }
+
+                idList.add(item.getId());
+            }
+
+            // 去除垃圾数据
+            sysUserRoleMapper.deleteNotIn(sysUser.getUserId(), idList);
+        }
+    }
+
+    @Override
+    public List<SysMenu> getMneusByUser(SysUser sysUser) {
+        return sysMenuRepo.getMenusByUser(sysUser);
+    }
+
+    @Override
+    public List<SysUser> getTaPerson(String phone) {
+        return baseMapper.getTaPerson(phone);
+
+    }
+
+    @Override
+    public SysUser getSysuser(String phone, String tenantId) {
+        return baseMapper.getSysuser(phone, tenantId);
+    }
+
+    @Override
+    public SysUser getSysuserTan(String tenantId) {
+        return baseMapper.getSysuserTan(tenantId);
+    }
+
+    @Override
+    public IPage<FxTenant>  getTenantList(IPage<FxTenant> pg, String phone, QueryWrapper<FxTenant> queryWrapper) {
+        return baseMapper.getTenantList(pg, phone,queryWrapper);
+    }
+
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/TaPersonServiceImpl.java

@@ -0,0 +1,143 @@
+package com.njyunzhi.admin.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njyunzhi.admin.service.SysUserService;
+import com.njyunzhi.admin.service.TaPersonService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.SysUser;
+import com.njyunzhi.repository.entity.TaPerson;
+import com.njyunzhi.repository.mapper.SysUserMapper;
+import com.njyunzhi.repository.mapper.TaPersonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 人员表;(ta_person)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-26
+ */
+@Service
+public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements TaPersonService {
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param personId 主键
+     * @return 实例对象
+     */
+    public TaPerson queryById(String personId) {
+        return taPersonMapper.selectById(personId);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param taPerson 筛选条件
+     * @param current  当前页码
+     * @param size     每页大小
+     * @return
+     */
+    public Page<TaPerson> paginQuery(TaPerson taPerson, long current, long size) {
+        //1. 构建动态查询条件
+        LambdaQueryWrapper<TaPerson> queryWrapper = new LambdaQueryWrapper<>();
+        if (StrUtil.isNotBlank(taPerson.getPersonName())) {
+            queryWrapper.eq(TaPerson::getPersonName, taPerson.getPersonName());
+        }
+        if (StrUtil.isNotBlank(taPerson.getAvatar())) {
+            queryWrapper.eq(TaPerson::getAvatar, taPerson.getAvatar());
+        }
+        if (StrUtil.isNotBlank(taPerson.getPhone())) {
+            queryWrapper.eq(TaPerson::getPhone, taPerson.getPhone());
+        }
+        if (StrUtil.isNotBlank(taPerson.getEmail())) {
+            queryWrapper.eq(TaPerson::getEmail, taPerson.getEmail());
+        }
+        if (StrUtil.isNotBlank(taPerson.getOpenId())) {
+            queryWrapper.eq(TaPerson::getOpenId, taPerson.getOpenId());
+        }
+        if (StrUtil.isNotBlank(taPerson.getCreatedBy())) {
+            queryWrapper.eq(TaPerson::getCreatedBy, taPerson.getCreatedBy());
+        }
+        if (StrUtil.isNotBlank(taPerson.getUpdatedBy())) {
+            queryWrapper.eq(TaPerson::getUpdatedBy, taPerson.getUpdatedBy());
+        }
+        //2. 执行分页查询
+        Page<TaPerson> pagin = new Page<>(current, size, true);
+        IPage<TaPerson> selectResult = taPersonMapper.selectByPage(pagin, queryWrapper);
+        pagin.setPages(selectResult.getPages());
+        pagin.setTotal(selectResult.getTotal());
+        pagin.setRecords(selectResult.getRecords());
+        //3. 返回结果
+        return pagin;
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    public TaPerson insert(TaPerson taPerson) {
+        taPersonMapper.insert(taPerson);
+        return taPerson;
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taPerson 实例对象
+     * @return 实例对象
+     */
+    public TaPerson update(TaPerson taPerson) {
+        //1. 根据条件动态更新
+        LambdaUpdateChainWrapper<TaPerson> chainWrapper = new LambdaUpdateChainWrapper<TaPerson>(taPersonMapper);
+        if (StrUtil.isNotBlank(taPerson.getPersonName())) {
+            chainWrapper.eq(TaPerson::getPersonName, taPerson.getPersonName());
+        }
+        if (StrUtil.isNotBlank(taPerson.getAvatar())) {
+            chainWrapper.eq(TaPerson::getAvatar, taPerson.getAvatar());
+        }
+        if (StrUtil.isNotBlank(taPerson.getPhone())) {
+            chainWrapper.eq(TaPerson::getPhone, taPerson.getPhone());
+        }
+        if (StrUtil.isNotBlank(taPerson.getEmail())) {
+            chainWrapper.eq(TaPerson::getEmail, taPerson.getEmail());
+        }
+        if (StrUtil.isNotBlank(taPerson.getOpenId())) {
+            chainWrapper.eq(TaPerson::getOpenId, taPerson.getOpenId());
+        }
+        if (StrUtil.isNotBlank(taPerson.getCreatedBy())) {
+            chainWrapper.eq(TaPerson::getCreatedBy, taPerson.getCreatedBy());
+        }
+        if (StrUtil.isNotBlank(taPerson.getUpdatedBy())) {
+            chainWrapper.eq(TaPerson::getUpdatedBy, taPerson.getUpdatedBy());
+        }
+        //2. 设置主键，并更新
+        chainWrapper.set(TaPerson::getPersonId, taPerson.getPersonId());
+        boolean ret = chainWrapper.update();
+        //3. 更新成功了，查询最最对象返回
+        if (ret) {
+            return queryById(taPerson.getPersonId());
+        } else {
+            return taPerson;
+        }
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param personId 主键
+     * @return 是否成功
+     */
+    public boolean deleteById(String personId) {
+        int total = taPersonMapper.deleteById(personId);
+        return total > 0;
+    }
+}

admin/src/main/java/com/njyunzhi/admin/util/CommonUtil.java

@@ -0,0 +1,11 @@
+package com.njyunzhi.admin.util;
+
+import java.util.Map;
+
+public class CommonUtil {
+
+    public static void put(Map mp, String key, Object value) {
+        if (null == value) return;
+        mp.put(key, value);
+    }
+}

admin/src/main/resources/aliyun.yml

@@ -0,0 +1,20 @@
+
+
+enable: true
+accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
+accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
+
+oss:
+  enable: true
+  # Endpoint以华东1（杭州）为例，其他Region请按实际情况填写。
+  endpoint: oss-cn-nanjing.aliyuncs.com
+  # 填写Bucket名称，例如examplebucket。
+  bucket: yz-crm
+  # 填写Host地址，格式为https://bucketname.endpoint。
+  host: https://yz-crm.oss-cn-nanjing.aliyuncs.com
+  # 设置上传回调URL，即回调服务器地址，
+  callbackUrL:
+  # 自定义域名
+  customDomain: http://static.yz-crm.njyunzhi.com
+  # 过期时间 单位秒
+  expireTime: 300

admin/src/main/resources/application.yml

@@ -0,0 +1,134 @@
+
+# 端口
+server:
+  port: 9111
+  servlet:
+    context-path: /api
+
+logging:
+  level:
+    org:
+      springframework:
+        web:
+          servlet:
+            # 每次请求的详情打印出来
+            DispatchServlet: trace
+
+spring:
+  mvc:
+    log-request-details: true
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  servlet:
+    multipart:
+      max-file-size: 1024MB
+      max-request-size: 1024MB
+  datasource:
+    url: jdbc:mysql://192.168.89.10:3306/global_funding?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: global_funding
+    password: global_funding@ABCD1234
+    hikari:
+      maximum-pool-size: 3
+
+  # 配置 Redis 连接
+  redis:
+    # Redis数据库索引
+    database: 3
+    # Redis服务器地址
+    host: 192.168.89.147
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: yansen@123
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池最大连接数
+        max-active: 200
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+        # 连接池中的最大空闲连接
+        max-idle: 10
+        # 连接池中的最小空闲连接
+        min-idle: 0
+
+sa-token:
+  # jwt秘钥
+  jwt-secret-key: d4d778d279cf11ed9b1d525400e8554f
+  # token名称 (同时也是cookie名称)
+  token-name: Authorization
+  # token有效期，单位s 默认30天, -1代表永不过期
+  timeout: 2592000
+  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+  activity-timeout: -1
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: true
+  # token风格
+  token-style: uuid
+  # 是否输出操作日志
+  is-log: false
+  # 是否尝试从 cookie 里读取 Token
+  is-read-cookie: false
+
+
+forest:
+  # 关闭 forest 请求日志打印
+  log-enabled: false
+
+###
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  global-config:
+    db-config:
+      logic-delete-field: deleted # 全局逻辑删除的实体字段名(since 3.3.0)
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  mapper-locations: classpath*:mapper/**/*.xml
+  type-aliases-package: com.njyunzhi.*.entity
+
+### swagger
+springfox:
+  documentation:
+    auto-startup: true
+
+access-limit:
+  enabled: true
+
+###
+yz:
+  # 文件上传
+  upload:
+    # 上传目录
+    path: E:/work/public-upload
+    # 文件服务前缀
+#    server-prefix: http://192.168.89.25:7777
+    server-prefix: http://112.2.2.154:9081
+  filter:
+    # 接口列表, 可以不校验 token
+    annList:
+      - /swagger-ui/**
+      - /swagger-resources/**
+      - /v2/**
+      - /static/**
+      - /h5/**
+      - /admin/login
+  # 租户系统
+  tenant:
+    # 默认不启用
+    enabled: false
+    # no-tenantId
+    default-id: 7f16d7c4544041649fc20e39839582cc
+    # 不启用租户系统的表
+    white-list:
+      - sys_role_resource
+      - sys_user_role
+      - sys_role_auth
+      - sys_role_auth_custom

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+
+    <!-- 日志文件的存储地址 -->
+    <property name="LOG_PATH" value="./logs" />
+
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) --- [%15.15(%thread)] %cyan(%-40.40(%logger{40})) : %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 文件输出 INFO -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 文件名称 -->
+        <file>${LOG_PATH}/admin-info.log</file>
+
+        <!-- 滚动规则 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每天生成代码 -->
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.admin-info.log</fileNamePattern>
+            <!-- 日志文件保留天数, 0 不删除 -->
+            <maxHistory>0</maxHistory>
+            <maxFileSize>500MB</maxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- [%t] %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 文件输出 ERROR -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+
+        <!-- 文件名称 -->
+        <file>${LOG_PATH}/admin-error.log</file>
+
+        <!-- 滚动规则 -->s
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每天生成代码 -->
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.admin-error.log</fileNamePattern>
+            <!-- 日志文件保留天数, 0 不删除 -->
+            <maxHistory>0</maxHistory>
+            <maxFileSize>500MB</maxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- [%t] %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+    </root>
+</configuration>

common/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>demo</artifactId>
+        <groupId>com.njyunzhi</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yz_common</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- fastjson2 -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+
+
+        <!-- Http请求工具 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp-log.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>${easyexcel.version}</version>
+        </dependency>
+
+        <!--        图片分辨率压缩-->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>${thumbnailator.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun-oss.version}</version>
+        </dependency>
+    </dependencies>
+</project>

common/src/main/java/com/njyunzhi/common/util/DateUtil.java

@@ -0,0 +1,177 @@
+package com.njyunzhi.common.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.regex.Pattern;
+
+public class DateUtil {
+
+    public static String toString(LocalDateTime dt, String pattern) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        return dt.format(formatter);
+    }
+
+    public static LocalDateTime date2LocalDateTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zone);
+    }
+
+    public static boolean sameDay(LocalDateTime d1, LocalDateTime d2) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return d1.format(formatter).equals(d2.format(formatter));
+    }
+
+    public static String cutSecond(LocalDateTime dt) {
+        if (null == dt) return null;
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        return dt.format(formatter);
+    }
+
+    public static String today() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDateTime.now().format(formatter);
+    }
+
+    public static String todayCompact() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        return LocalDateTime.now().format(formatter);
+    }
+
+    public static String localDateTimeToString(LocalDateTime d) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return d.format(formatter);
+    }
+
+    public static LocalDateTime fromString(String str, String formatter) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern(formatter);
+
+        return LocalDateTime.parse(str, df);
+    }
+
+
+    public static LocalDateTime from(int year, int month, int date, String hms) {
+        String m = (month > 9 ? "" : "0") + month;
+        String d = (date > 9 ? "" : "0") + date;
+        String str = String.format("%d-%s-%s %s", year, m, d, hms);
+
+        return dayToLocalDateime(str);
+    }
+
+    public static LocalDateTime day2LocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day + " 00:00:00", df);
+    }
+
+    public static LocalDateTime dayToLocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day, df);
+    }
+
+    public static boolean checkTimeRange(LocalDateTime start, LocalDateTime end, LocalDateTime dt) {
+        if (dt == null) {
+            dt = LocalDateTime.now();
+        }
+
+        if (dt.isAfter(start) && dt.isBefore(end)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否早于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isBefore(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isBefore(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否晚于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isAfter(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isAfter(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取时间差
+     *
+     * @param dt1
+     * @param dt2 目标时间
+     * @return
+     */
+    public static String diffTime(LocalDateTime dt1, LocalDateTime dt2) {
+        Duration duration = Duration.between(dt1, dt2);
+        long minutes = duration.toMinutes();
+        int hours = (int) Math.floor(minutes / 60);
+        int minute = (int) minutes % 60;
+        int day = (int) Math.floor(hours / 24);
+        int hour = hours % 24;
+
+        return day + "天" + hour + "小时" + minute + "分钟";
+    }
+
+    public static LocalDateTime timeToLocalDateTime(String target){
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(target, df);
+    }
+
+    public static LocalDateTime now() {
+        return LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+    }
+
+    public static boolean isDayStr(String str) {
+        return Pattern.matches("^\\d{4}-\\d{2}-\\d{2}$", str);
+    }
+
+    public static Date day2Date(String str) throws ParseException {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        return df.parse(str);
+    }
+
+    /**
+     * 获取两个日期之间差值
+     * @param date1
+     * @param date2
+     * @param type
+     * @return
+     */
+    public static int between(LocalDateTime date1, LocalDateTime date2, String type) {
+        if ("year".equals(type)) {
+            long num = Math.abs(ChronoUnit.YEARS.between(date1.toLocalDate(), date2.toLocalDate()));
+            return (int) num;
+        } else if ("month".equals(type)) {
+            long num = Math.abs(ChronoUnit.MONTHS.between(date1.toLocalDate(), date2.toLocalDate()));
+            return (int) num;
+        } else {
+            long num = Math.abs(ChronoUnit.DAYS.between(date1.toLocalDate(), date2.toLocalDate()));
+            return (int) num;
+        }
+    }
+}

common/src/main/java/com/njyunzhi/common/util/EncryptUtil.java

@@ -0,0 +1,23 @@
+package com.njyunzhi.common.util;
+
+import org.springframework.util.DigestUtils;
+
+import java.util.Base64;
+
+public class EncryptUtil {
+
+    public static String md5(String str, String ...slats) {
+        String slat = "";
+        if (null != slats && slats.length > 0) {
+            slat = slats[0];
+        }
+
+        String base = str + slat;
+        String md5 = DigestUtils.md5DigestAsHex(base.getBytes());
+        return md5;
+    }
+
+    public static String base64(byte[] src) {
+        return Base64.getEncoder().encodeToString(src);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/FileUtil.java

@@ -0,0 +1,132 @@
+package com.njyunzhi.common.util;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Component
+public class FileUtil {
+
+    @Value("${yz.upload.path}")
+    String uploadPath;
+
+    @Value("${yz.upload.server-prefix}")
+    String serverPrefix;
+
+    public String getServerPrefix() {
+        return serverPrefix;
+    }
+
+    public String getUploadPath() {
+        File tmp = new File(uploadPath);
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        return uploadPath;
+    }
+
+    public String getMonth() {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        return now.format(formatter);
+    }
+
+    public String encodeFileName(String fname) {
+        return fname;
+//        if (null == fname) return null;
+//
+//        int pos = fname.lastIndexOf(".");
+//
+//        String name = pos > -1 ? fname.substring(0, pos) : fname;
+//        String ext = pos > -1 ? fname.substring(pos + 1) : "";
+//
+//        return StringUtil.encodeURIComponent(name) + "." + ext;
+    }
+
+    /**
+     * 上传图片
+     * @param multipartFile
+     * @param fileName
+     * @return
+     * @throws IOException
+     */
+    public String saveMultipartFile(MultipartFile multipartFile, String fileName) throws IOException {
+        String fName = null == fileName ? multipartFile.getOriginalFilename() : fileName;
+        fName = encodeFileName(fName);
+        String nfName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fName);
+
+        // 上传目录以日期分类
+        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        File file = new File(String.format("%s/%s", getUploadPath(), nfName));
+        multipartFile.transferTo(file);
+        String url = String.format("%s/%s", serverPrefix, nfName);
+        return url;
+    }
+
+    // 保存文件
+    public String saveFile(File file, String fileName) throws Exception {
+        fileName = encodeFileName(fileName);
+        String uploadRootPath = getUploadPath();
+        String monthStr = getMonth();
+
+        // 上传目录
+        String upPath = String.format("%s/%s", uploadRootPath, monthStr);
+        File tmp = new File(upPath);
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        String newFileName = String.format("%d-%s", System.currentTimeMillis(), fileName);
+        String newFilePath = String.format("%s/%s", upPath, newFileName);
+        if (!file.renameTo(new File(newFilePath))) {
+            throw new Exception("保存文件失败");
+        };
+
+        // 返回值 去掉根目录
+        return String.format("%s/%s", monthStr, newFileName);
+    }
+
+    // 保存文件
+    public String saveFile(byte[] bytes, String fileName) throws Exception {
+        fileName = encodeFileName(fileName);
+        String uploadRootPath = getUploadPath();
+        String monthStr = getMonth();
+
+        // 上传目录
+        String upPath = String.format("%s/%s", uploadRootPath, monthStr);
+        File tmp = new File(upPath);
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        String newFileName = String.format("%d-%s", System.currentTimeMillis(), fileName);
+        String newFilePath = String.format("%s/%s", upPath, newFileName);
+
+        Files.write(Paths.get(newFilePath), bytes, StandardOpenOption.CREATE);
+
+        // 返回值 去掉根目录
+        return String.format("%s/%s", monthStr, newFileName);
+    }
+
+    public String transPath(String localPath) {
+        if (null == localPath) return null;
+
+        String uploadPath = getUploadPath().replaceAll("\\\\", "/");
+        String urlStr = localPath.replaceAll("\\\\", "/").replace(uploadPath, getServerPrefix());
+
+        return urlStr;
+    }
+}

common/src/main/java/com/njyunzhi/common/util/FileUtilCompression.java

@@ -0,0 +1,63 @@
+package com.njyunzhi.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.stereotype.Component;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Slf4j
+@Component
+public class FileUtilCompression {
+    public static InputStream compressMultipartFile(InputStream inputStream, int targetSize) throws IOException {
+        BufferedImage image = ImageIO.read(inputStream);
+        float quality = 0.6f;
+        int originalWidth = image.getWidth();
+        int originalHeight = image.getHeight();
+
+        int targetWidth = originalWidth;
+        int targetHeight = originalHeight;
+
+        if (originalWidth > targetSize || originalHeight > targetSize) {
+            double scaleFactor = Math.min((double) targetSize / originalWidth, (double) targetSize / originalHeight);
+            targetWidth = (int) (originalWidth * scaleFactor);
+            targetHeight = (int) (originalHeight * scaleFactor);
+        }
+
+        BufferedImage resizedImage = Thumbnails.of(image)
+                .size(targetWidth, targetHeight)
+                .outputQuality(quality)
+                .asBufferedImage();
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ImageIO.write(resizedImage, "jpg", outputStream);
+
+        return new ByteArrayInputStream(outputStream.toByteArray());
+    }
+
+    public static byte[] compressSize(byte[] imageBytes, long targetSize, float quality) throws IOException {
+        if (imageBytes == null || imageBytes.length <= 0 || imageBytes.length < targetSize) {
+            return imageBytes;
+        }
+
+        long srcSize = imageBytes.length;
+        try {
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
+            ByteArrayOutputStream outputStream= new ByteArrayOutputStream(imageBytes.length);
+            Thumbnails.of(inputStream).scale(1f).outputQuality(quality).toOutputStream(outputStream);
+            imageBytes = outputStream.toByteArray();
+            log.info(
+                    "【图片压缩】图片原大小={}kb | 压缩后大小={}kb",
+                    srcSize / 1024,
+                    imageBytes.length / 1024);
+        } catch (Exception e) {
+            log.error("【图片压缩】msg=图片压缩失败!", e);
+        }
+        return imageBytes;
+    }
+}

common/src/main/java/com/njyunzhi/common/util/HttpUtil.java

@@ -0,0 +1,117 @@
+package com.njyunzhi.common.util;
+
+import com.alibaba.fastjson2.JSON;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import okhttp3.logging.HttpLoggingInterceptor;
+
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+public class HttpUtil {
+
+    private static OkHttpClient client = createClient();
+
+    public static OkHttpClient createClient() {
+        X509TrustManager manager = SSLSocketClient.getX509TrustManager();
+        ConnectionSpec spec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                .tlsVersions(TlsVersion.TLS_1_0, TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
+                .build();
+        List<ConnectionSpec> specList = new ArrayList<>();
+        specList.add(spec);
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .connectionSpecs(specList)
+                .sslSocketFactory(SSLSocketClient.getSocketFactory(manager), manager)
+                .hostnameVerifier(SSLSocketClient.getHostnameVerifier())
+                ;
+
+        HttpLoggingInterceptor.Logger logInterceptor = log::info;
+        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(logInterceptor);
+        httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+        builder.addInterceptor(httpLoggingInterceptor);
+
+        return builder.build();
+    }
+
+    public static Request.Builder getRequestBuilder() {
+        return new Request.Builder();
+    }
+
+    public static HttpUrl buildURL(String url, Map<String, Object> params) {
+        HttpUrl.Builder queryUrlBuilder = HttpUrl.get(url).newBuilder();
+
+        if (null != params && !params.isEmpty()) {
+            params.forEach((key, value) -> {
+                if (null == value || StringUtil.isEmpty(value.toString())) {
+                    queryUrlBuilder.addQueryParameter(key, "");
+                } else {
+                    queryUrlBuilder.addQueryParameter(key, value.toString());
+                }
+            });
+        }
+
+        return queryUrlBuilder.build();
+    }
+
+    public static RequestBody buildJSONBody(Object data) {
+        if (null == data) {
+            return null;
+        }
+
+        String jsonString = JSON.toJSONString(data);
+
+        return RequestBody.create(
+                jsonString,
+                MediaType.parse("application/json") // application/json
+        );
+    }
+
+    public static Headers buildHeaders(Map<String, Object> headers) {
+        Headers.Builder headersBuilder = new Headers.Builder();
+
+        if (null != headers && !headers.isEmpty()) {
+            for (Map.Entry<String, Object> entry : headers.entrySet()) {
+                headersBuilder.add(entry.getKey(), entry.getValue().toString());
+            }
+        }
+
+        return headersBuilder.build();
+    }
+
+
+    public static Response request(String url, Map<String, Object> params, Object data, Map<String, Object> headers, String method) throws IOException {
+        if (null == method) method = "GET";
+
+        Request.Builder requestBuilder = HttpUtil.getRequestBuilder();
+        requestBuilder.url(HttpUtil.buildURL(url, params));
+        requestBuilder.headers(buildHeaders(headers));
+        requestBuilder.method(method, HttpUtil.buildJSONBody(data));
+
+        Request request = requestBuilder.build();
+        return client.newCall(request).execute();
+    }
+
+    public static Response get(String url, Map<String, Object> params) throws IOException {
+        return request(url, params, null, null, null);
+    }
+
+    public static Response post(String url, Object data, Map<String, Object> params) throws IOException {
+        return request(url, params, data, null, "POST");
+    }
+
+    public static String download(String url, String fileName, FileUtil fileUtil) throws Exception {
+        Request.Builder requestBuilder = getRequestBuilder();
+        requestBuilder.url(url);
+
+        Request request = requestBuilder.build();
+        Response response = client.newCall(request).execute();
+        ResponseBody responseBody = response.body();
+        byte[] bytes = responseBody.bytes();
+
+        return fileUtil.saveFile(bytes, fileName);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/IpUtil.java

@@ -0,0 +1,72 @@
+package com.njyunzhi.common.util;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public class IpUtil {
+
+    private static final String IP_UTILS_FLAG = ",";
+    private static final String UNKNOWN = "unknown";
+    private static final String LOCALHOST_IP = "0:0:0:0:0:0:0:1";
+    private static final String LOCALHOST_IP1 = "127.0.0.1";
+
+    /**
+     * 获取IP公网地址
+     * <p>
+     * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+     * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+     */
+    public static String getIpAddr(HttpServletRequest request) {
+        String ip = null;
+        try {
+            //以下两个获取在k8s中，将真实的客户端IP，放到了x-Original-Forwarded-For。而将WAF的回源地址放到了 x-Forwarded-For了。
+            ip = request.getHeader("X-Original-Forwarded-For");
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("X-Forwarded-For");
+            }
+            //获取nginx等代理的ip
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("x-forwarded-for");
+            }
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("Proxy-Client-IP");
+            }
+            if (isEmpty(ip) || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_CLIENT_IP");
+            }
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+            }
+            //兼容k8s集群获取ip
+            if (isEmpty(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddr();
+                if (LOCALHOST_IP1.equalsIgnoreCase(ip) || LOCALHOST_IP.equalsIgnoreCase(ip)) {
+                    //根据网卡取本机配置的IP
+                    InetAddress iNet = null;
+                    try {
+                        iNet = InetAddress.getLocalHost();
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                    }
+                    ip = iNet.getHostAddress();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //使用代理，则获取第一个IP地址
+        if (!isEmpty(ip) && ip.indexOf(IP_UTILS_FLAG) > 0) {
+            ip = ip.substring(0, ip.indexOf(IP_UTILS_FLAG));
+        }
+
+        return ip;
+    }
+
+    public static boolean isEmpty(String s) {
+        return s == null || "".equals(s.trim());
+    }
+}

common/src/main/java/com/njyunzhi/common/util/MimeType.java

@@ -0,0 +1,31 @@
+package com.njyunzhi.common.util;
+
+public enum MimeType {
+    JPG("image/jpg"),
+    JPEG("image/jpeg"),
+    GIF("image/gif"),
+    PNG("image/png"),
+    PDF("application/pdf"),
+    PPT("application/vnd.ms-powerpoint"),
+    PPTX("application/vnd.openxmlformats-officedocument.presentationml.presentation"),
+    ;
+
+    final String type;
+
+    private MimeType(String type) {
+        this.type = type;
+    }
+
+    public static boolean isPdf(String type) {
+        return MimeType.PDF.type.equals(type);
+    }
+    public static boolean isPpt(String type) {
+        return MimeType.PPT.type.equals(type) || MimeType.PPTX.type.equals(type);
+    }
+    public static boolean isImage(String type) {
+        return MimeType.JPG.type.equals(type)
+                || MimeType.JPEG.type.equals(type)
+                || MimeType.GIF.type.equals(type)
+                || MimeType.PNG.type.equals(type);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/MyPropertySourceFactory.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.common.util;
+
+import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.io.IOException;
+
+/**
+ * 自定义读取 yml 配置文件
+ * 使用方式 @PropertySource
+ */
+public class MyPropertySourceFactory implements PropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
+        return new YamlPropertySourceLoader().load(name, resource.getResource()).get(0);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/SSLSocketClient.java

@@ -0,0 +1,54 @@
+package com.njyunzhi.common.util;
+
+import javax.net.ssl.*;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class SSLSocketClient {
+
+    public static SSLSocketFactory getSocketFactory(TrustManager manager) {
+        SSLSocketFactory socketFactory = null;
+        try {
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, new TrustManager[]{manager}, new SecureRandom());
+            socketFactory = sslContext.getSocketFactory();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (KeyManagementException e) {
+            e.printStackTrace();
+        }
+        return socketFactory;
+    }
+
+    public static X509TrustManager getX509TrustManager() {
+        return new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[0];
+            }
+        };
+    }
+
+    public static HostnameVerifier getHostnameVerifier() {
+        HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+            @Override
+            public boolean verify(String s, SSLSession sslSession) {
+                return true;
+            }
+        };
+        return hostnameVerifier;
+    }
+}

common/src/main/java/com/njyunzhi/common/util/StringUtil.java

@@ -0,0 +1,226 @@
+package com.njyunzhi.common.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtil {
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
+    public static boolean isEmpty(String str) {
+        return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
+    }
+
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    public static String trim(String src, String...st) {
+        if (null == src) return src;
+        if (null == st || st.length == 0) return src.trim();
+
+        String start = st[0];
+        if (!src.startsWith(start)) {
+            return src;
+        }
+
+        return src.substring(start.length());
+    }
+
+
+
+
+    public static String UUID() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
+    public static String trimEnd(String src, String str) {
+        if (null == src || null == str) {
+            return src;
+        }
+
+        if (src.endsWith(str)) {
+            return src.substring(0, src.length() - str.length());
+        }
+
+        return src;
+    }
+
+    public static String ifNull(String src, String defaultVal) {
+        return isEmpty(src) ? defaultVal : src;
+    }
+
+    public static String random(int length) {
+        String str="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<length;i++){
+            int number=random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    public static String urlEncode(String str) {
+        if (isEmpty(str)) return str;
+
+        try {
+            return URLEncoder.encode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    public static String urlDecode(String str) {
+        if (isEmpty(str)) return str;
+
+        try {
+            return URLDecoder.decode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    public static String encodeURIComponent(String str) {
+        String result = urlEncode(str);
+
+        return result.replaceAll("\\+", "%20")
+                .replaceAll("\\%21", "!")
+                .replaceAll("\\%27", "'")
+                .replaceAll("\\%28", "(")
+                .replaceAll("\\%29", ")")
+                .replaceAll("\\%7E", "~");
+    }
+
+    public static String humpToLine(String str) {
+        if (null == str || "".equals(str)) return "";
+
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static String strToUnicode(String str) {
+        char[] chars = str.toCharArray();
+        String returnStr = "";
+        for (int i = 0; i < chars.length; i++) {
+            returnStr += "\\u" + Integer.toString(chars[i], 16);
+        }
+        return returnStr;
+    }
+
+    public static String repeat(String src, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0) {
+            return src;
+        }
+
+        String res = "";
+        for (int i = 0; i < len; i ++) {
+            res += src;
+        }
+
+        return res;
+    }
+
+    public static String lpad(String src, String padStr, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0 || src.length() >= len) {
+            return src;
+        }
+
+        if (null == padStr) {
+            padStr = "";
+        }
+
+        int padLen = len - src.length();
+        String prefix = repeat(padStr, padLen);
+        prefix = prefix.substring(0, padLen);
+        return prefix + src;
+    }
+
+    /**
+     * 解析 QueryString
+     * @param queryStr
+     * @return
+     */
+    public static Map<String, String> parseQueryString(String queryStr) {
+        if (isEmpty(queryStr)) {
+            return null;
+        }
+        Map<String, String> result = new HashMap<String, String>();
+
+        String[] fields = queryStr.split("&");
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                result.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Map 转 QueryString
+     * @param params
+     * @return
+     */
+    public static String buildQueryString(Map<String, Object> params) {
+        if (null == params) {
+            return null;
+        }
+
+        List<String> lst = new ArrayList<>();
+        for (Map.Entry<String, Object> entry : params.entrySet()) {
+            String key = urlEncode(entry.getKey());
+            Object o = entry.getValue();
+            if (null == o) {
+                continue;
+            }
+            String val = o.toString();
+            if (isEmpty(val)) {
+                continue;
+            }
+            String queryStr = key + "=" + urlEncode(val);
+            lst.add(queryStr);
+        }
+        return String.join("&", lst);
+    }
+
+    public static String random12(int NUM_LENGTH) {
+        final char[] NUM_CHARS = "0123456789".toCharArray();
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder(NUM_LENGTH);
+        for (int i = 0; i < NUM_LENGTH; i++) {
+            sb.append(NUM_CHARS[random.nextInt(NUM_CHARS.length)]);
+        }
+        String randomNumber = sb.toString();
+        return randomNumber;
+    }
+
+}

common/src/main/java/com/njyunzhi/common/util/aliyun/AliyunConfig.java

@@ -0,0 +1,22 @@
+package com.njyunzhi.common.util.aliyun;
+
+import com.njyunzhi.common.util.MyPropertySourceFactory;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Data
+@PropertySource(value = {"aliyun.yml"}, factory = MyPropertySourceFactory.class)
+@Configuration
+public class AliyunConfig {
+
+    @Value("${enable}")
+    Boolean enable;
+
+    @Value("${accessKeyId}")
+    String accessKeyId;
+
+    @Value("${accessKeySecret}")
+    String accessKeySecret;
+}

common/src/main/java/com/njyunzhi/common/util/aliyun/oss/OssConfig.java

@@ -0,0 +1,21 @@
+package com.njyunzhi.common.util.aliyun.oss;
+
+import com.njyunzhi.common.util.MyPropertySourceFactory;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@PropertySource(value = {"aliyun.yml"}, factory = MyPropertySourceFactory.class)
+@ConfigurationProperties(prefix = "oss")
+public class OssConfig {
+    Boolean enable;
+    String endpoint;
+    String bucket;
+    String host;
+    String callbackUrL;
+    String customDomain;
+    Integer expireTime;
+}

common/src/main/java/com/njyunzhi/common/util/aliyun/oss/OssUtil.java

@@ -0,0 +1,93 @@
+package com.njyunzhi.common.util.aliyun.oss;
+
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.common.auth.CredentialsProvider;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import com.aliyun.oss.common.utils.BinaryUtil;
+import com.aliyun.oss.model.MatchMode;
+import com.aliyun.oss.model.PolicyConditions;
+import com.njyunzhi.common.util.aliyun.AliyunConfig;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+@Component
+public class OssUtil {
+
+    AliyunConfig aliyunConfig;
+    OssConfig ossConfig;
+    CredentialsProvider credentialsProvider;
+    Boolean enable;
+
+    @Autowired
+    public OssUtil(AliyunConfig aliyunConfig, OssConfig ossConfig) {
+        enable = !(null == aliyunConfig || !aliyunConfig.getEnable() || null == ossConfig || !ossConfig.getEnable());
+        if (!enable) {
+            return;
+        }
+
+        this.aliyunConfig = aliyunConfig;
+        this.ossConfig = ossConfig;
+
+        credentialsProvider = new DefaultCredentialProvider(aliyunConfig.getAccessKeyId(), aliyunConfig.getAccessKeySecret());
+    }
+
+    /**
+     * 获取 WEB 直传 用到的参数
+     * @return
+     * @throws IOException
+     */
+    public PolicyResponse getPolicy() throws IOException {
+        if (!enable) {
+            throw new IOException("请启用 OSS 设置");
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        // 上传目录按月份
+        String dir = now.format(DateTimeFormatter.ofPattern("yyyyMM")) + "/";
+        // 过期时间
+        long expireEndTime = System.currentTimeMillis() + ossConfig.getExpireTime() * 1000;
+        Date expireDate = new Date(expireEndTime);
+
+        // PostObject请求最大可支持的文件大小为5 GB，即CONTENT_LENGTH_RANGE为5*1024*1024*1024。
+        PolicyConditions policyConds = new PolicyConditions();
+        policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000);
+        policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir);
+
+        OSS ossClient = new OSSClientBuilder().build(ossConfig.getEndpoint(), credentialsProvider);
+        String postPolicy = ossClient.generatePostPolicy(expireDate, policyConds);
+        byte[] binaryData = postPolicy.getBytes(StandardCharsets.UTF_8);
+        String policy = BinaryUtil.toBase64String(binaryData);
+        String signature = ossClient.calculatePostSignature(postPolicy);
+
+        PolicyResponse res = new PolicyResponse();
+        res.setAccessId(credentialsProvider.getCredentials().getAccessKeyId());
+        res.setPolicy(policy);
+        res.setSignature(signature);
+        res.setDir(dir);
+        res.setHost(ossConfig.getHost());
+        res.setExpire(expireEndTime);
+        res.setCustomDomain(ossConfig.getCustomDomain());
+
+        return res;
+    }
+
+    @Data
+    public static class PolicyResponse {
+        String accessId;
+        String policy;
+        String signature;
+        String dir;
+        String host;
+        Long expire;
+        String customDomain;
+    }
+}

common/src/main/java/com/njyunzhi/common/util/excel/CellWidthWriteHandler.java

@@ -0,0 +1,70 @@
+package com.njyunzhi.common.util.excel;
+
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.CellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CellWidthWriteHandler extends AbstractColumnWidthStyleStrategy {
+    private static final int MAX_COLUMN_WIDTH = 255;
+    private  Map<Integer, Map<Integer, Integer>> CACHE = new HashMap(8);
+
+    public void CustomCellWriteHandler() {
+    }
+
+    protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+        boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+        if (needSetWidth) {
+            Map<Integer, Integer> maxColumnWidthMap = (Map)CACHE.get(writeSheetHolder.getSheetNo());
+            if (maxColumnWidthMap == null) {
+                maxColumnWidthMap = new HashMap(16);
+                CACHE.put(writeSheetHolder.getSheetNo(), maxColumnWidthMap);
+            }
+
+            Integer columnWidth = this.dataLength(cellDataList, cell, isHead);
+            if (columnWidth >= 0) {
+                if (columnWidth > MAX_COLUMN_WIDTH) {
+                    columnWidth = MAX_COLUMN_WIDTH;
+                }
+
+                Integer maxColumnWidth = (Integer)((Map)maxColumnWidthMap).get(cell.getColumnIndex());
+                if (maxColumnWidth == null || columnWidth > maxColumnWidth) {
+                    ((Map)maxColumnWidthMap).put(cell.getColumnIndex(), columnWidth);
+                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 384); // 256 * 1.5
+                }
+
+            }
+        }
+    }
+
+    private Integer dataLength(List<WriteCellData<?>> cellDataList, Cell cell, Boolean isHead) {
+        if (isHead) {
+            return cell.getStringCellValue().getBytes().length;
+        } else {
+            CellData cellData = (CellData)cellDataList.get(0);
+            CellDataTypeEnum type = cellData.getType();
+            if (type == null) {
+                return -1;
+            } else {
+                switch(type) {
+                    case STRING:
+                        return cellData.getStringValue().getBytes().length;
+                    case BOOLEAN:
+                        return cellData.getBooleanValue().toString().getBytes().length;
+                    case NUMBER:
+                        return cellData.getNumberValue().toString().getBytes().length;
+                    default:
+                        return -1;
+                }
+            }
+        }
+    }
+}

common/src/main/java/com/njyunzhi/common/util/excel/DateConverter.java

@@ -0,0 +1,40 @@
+package com.njyunzhi.common.util.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateConverter implements Converter<Date> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Date.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(Date value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String val = dateFormat.format(value);
+
+        return new WriteCellData(val);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/excel/ExcelUtil.java

@@ -0,0 +1,88 @@
+package com.njyunzhi.common.util.excel;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.njyunzhi.common.util.StringUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+public class ExcelUtil {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+ StringUtil.urlEncode(fileName)+".xlsx");
+
+        EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
+    }
+
+    public static void flush(HttpServletResponse response, List<List<String>> head, List<List<Object>> data, String fileName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+ StringUtil.urlEncode(fileName)+".xlsx");
+
+        ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream());
+        writerBuilder.head(head);
+        writerBuilder.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .sheet("sheet")
+                .doWrite(data);
+    }
+
+//    public static void flush(HttpServletResponse response, List<List<Map<String, Object>>> data, List<List<String>> customHead, String fileName) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+//        response.setCharacterEncoding("utf-8");
+//        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+//        response.setHeader("Content-Disposition", "attachment;filename="+ StringUtil.urlEncode(fileName)+".xlsx");
+//
+//        boolean noCustomHeads = null == customHead || customHead.size() == 0;
+//
+//        List<List<String>> head = new ArrayList<>();
+//        List<List<Object>> contents = new ArrayList<>();
+//        if (null != data && data.size() > 0) {
+//            int row = 0;
+//            for (List<Map<String, Object>> fields: data) {
+//
+//                List<Object> item = new ArrayList<>();
+//                for (Map<String, Object> field: fields) {
+//                    if (row == 0 && noCustomHeads) {
+//                        List<String> keys = new ArrayList<>();
+//                        keys.add(field.get("name").toString());
+//                        head.add(keys);
+//                    }
+//
+//                    item.add(field.get("value"));
+//                }
+//
+//                contents.add(item);
+//                row += 1;
+//            }
+//        }
+//
+//        ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream());
+//        if (noCustomHeads) {
+//            writerBuilder.head(head);
+//        } else {
+//            writerBuilder.head(customHead);
+//        }
+//
+//        writerBuilder.registerWriteHandler(new CellWidthWriteHandler())
+//                .sheet("sheet")
+//                .registerConverter(new TimestampConverter())
+//                .registerConverter(new DateConverter())
+//                .doWrite(contents);
+//    }
+
+}

common/src/main/java/com/njyunzhi/common/util/excel/LocalDateTimeConverter.java

@@ -0,0 +1,39 @@
+package com.njyunzhi.common.util.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.njyunzhi.common.util.DateUtil;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = DateUtil.toString(value, "yyyy-MM-dd HH:mm:ss");
+
+        return new WriteCellData(val);
+    }
+}

common/src/main/java/com/njyunzhi/common/util/excel/TimestampConverter.java

@@ -0,0 +1,40 @@
+package com.njyunzhi.common.util.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+
+public class TimestampConverter implements Converter<Timestamp> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Timestamp.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(Timestamp value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String val = dateFormat.format(value);
+
+        return new WriteCellData(val);
+    }
+}

framework/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>demo</artifactId>
+        <groupId>com.njyunzhi</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yz_framework</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.njyunzhi</groupId>
+            <artifactId>yz_common</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>${sa-token.version}</version>
+        </dependency>
+
+        <!-- Sa-Token 整合redis (使用jackson序列化方式) -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <version>${sa-token.version}</version>
+        </dependency>
+
+        <!-- 提供Redis连接池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!--mybatis-plus start-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+        <!--mybatis-plus end-->
+    </dependencies>
+</project>

framework/src/main/java/com/njyunzhi/framework/accesslimit/AccessLimit.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.framework.accesslimit;
+
+import java.lang.annotation.*;
+
+@Inherited
+@Documented
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AccessLimit {
+
+    /**
+     * 指定 second 时间内 API请求次数
+     */
+    int maxCount() default 999;
+
+    /**
+     * 请求次数的指定时间范围 秒数(redis数据过期时间)
+     */
+    int second() default 60;
+}

framework/src/main/java/com/njyunzhi/framework/accesslimit/AccessLimitInterceptor.java

@@ -0,0 +1,79 @@
+package com.njyunzhi.framework.accesslimit;
+
+import cn.dev33.satoken.util.SaResult;
+import com.njyunzhi.common.util.IpUtil;
+import com.njyunzhi.framework.util.RedisTool;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+@Slf4j
+@Component
+public class AccessLimitInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        try {// Handler 是否为 HandlerMethod 实例
+            if (handler instanceof HandlerMethod) {
+                // 强转
+                HandlerMethod handlerMethod = (HandlerMethod) handler;
+                // 获取方法
+                Method method = handlerMethod.getMethod();
+                // 是否有AccessLimit注解
+                if (!method.isAnnotationPresent(AccessLimit.class)) {
+                    return true;
+                }
+                // 获取注解内容信息
+                AccessLimit accessLimit = method.getAnnotation(AccessLimit.class);
+                if (accessLimit == null) {
+                    return true;
+                }
+                int seconds = accessLimit.second();
+                int maxCount = accessLimit.maxCount();
+
+                // 存储key
+                String ip = IpUtil.getIpAddr(request);
+                String key = ip + ":" + request.getRequestURI();
+
+                // 已经访问的次数
+                Integer count = (Integer) RedisTool.get(key);
+//                System.out.println("已经访问的次数:" + count);
+                if (null == count || -1 == count) {
+                    RedisTool.set(key, 1, seconds);
+                    return true;
+                }
+
+                if (count < maxCount) {
+                    count += 1;
+                    RedisTool.update(key, count);
+                    return true;
+                }
+                String tenantId = request.getHeader("x-tenant-id");
+
+
+
+                SaResult result = new SaResult().setCode(500).setMsg("请求过于频繁请稍后再试");
+                sendJSON(result, response);
+                return false;
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    private void sendJSON(SaResult result, HttpServletResponse response) throws IOException {
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/json");
+        response.getWriter().append(result.toString());
+    }
+}

framework/src/main/java/com/njyunzhi/framework/accesslimit/InterCepTerConfig.java

@@ -0,0 +1,25 @@
+package com.njyunzhi.framework.accesslimit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class InterCepTerConfig implements WebMvcConfigurer {
+
+    @Value("${access-limit.enabled}")
+    Boolean enabled;
+    @Autowired
+    private AccessLimitInterceptor accessLimitInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        if (null != enabled && enabled) {
+            registry.addInterceptor(accessLimitInterceptor)
+                    .addPathPatterns("/**");
+        }
+
+    }
+}

framework/src/main/java/com/njyunzhi/framework/config/FilterConfig.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.framework.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "yz.filter")
+public class FilterConfig {
+    List<String> annList;
+}

framework/src/main/java/com/njyunzhi/framework/config/LocalDateTimeSerializerConfig.java

@@ -0,0 +1,31 @@
+package com.njyunzhi.framework.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+// 解决 request body 不能接收 日期问题
+
+@Configuration
+public class LocalDateTimeSerializerConfig {
+
+    @Value("${spring.jackson.date-format}")
+    private String pattern;
+
+    @Bean
+    public ObjectMapper serializingObjectMapper() {
+        JavaTimeModule module = new JavaTimeModule();
+        LocalDateTimeDeserializer dateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(pattern));
+        module.addDeserializer(LocalDateTime.class, dateTimeDeserializer);
+        return Jackson2ObjectMapperBuilder.json().modules(module)
+                .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build();
+    }
+}

framework/src/main/java/com/njyunzhi/framework/config/SwaggerConfig.java

@@ -0,0 +1,25 @@
+package com.njyunzhi.framework.config;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket docket() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+                .paths(PathSelectors.any())
+                .build();
+
+    }
+}

framework/src/main/java/com/njyunzhi/framework/config/TenantConfig.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.framework.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "yz.tenant")
+public class TenantConfig {
+    Boolean enabled;
+    String defaultId;
+    List<String> whiteList;
+}

framework/src/main/java/com/njyunzhi/framework/datascope/DataScopeConfigure.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.framework.datascope;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 业务操作需要依赖 Sa-Token
+ * Sa-Token 通过 Filter 注入相关业务
+ * 当前数据权限的业务，必须在其之后, 因此使用了 拦截器
+ */
+@Configuration
+public class DataScopeConfigure implements WebMvcConfigurer {
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册 Sa-Token 拦截器，打开注解式鉴权功能
+        registry.addInterceptor(new DataScopeInterceptor()).addPathPatterns("/**");
+    }
+}

framework/src/main/java/com/njyunzhi/framework/datascope/DataScopeInterceptor.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.framework.datascope;
+
+import cn.dev33.satoken.stp.StpUtil;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class DataScopeInterceptor implements HandlerInterceptor {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        // 只有登录成功才可以
+        if (StpUtil.isLogin()) {
+            // TODO
+            request.setAttribute("dataScopeSqlHandler", new SqlHandlerImpl());
+        }
+
+        return true;
+    }
+}

framework/src/main/java/com/njyunzhi/framework/datascope/DataScopeType.java

@@ -0,0 +1,45 @@
+package com.njyunzhi.framework.datascope;
+
+import java.util.Objects;
+
+public enum DataScopeType {
+    ALL(1, "全部"),
+    SELF(2, "仅本人"),
+    DEPT(4, "仅当前部门"),
+    DEPT_AND_CHILDREN(8, "当前部门及以下"),
+    CUSTOM(16, "自定义"),
+    ;
+
+    private Integer code;
+    private String name;
+
+    DataScopeType(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static DataScopeType of(Integer code) {
+
+        Objects.requireNonNull(code, "数据范围权限类型不允许为空");
+
+        for (DataScopeType dataScopeType : DataScopeType.values()) {
+            if (dataScopeType.getCode().equals(code)) {
+                return dataScopeType;
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("未识别的数据范围权限类型值[%s]", code));
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean eq(DataScopeType target) {
+        return Objects.equals(code, target.getCode());
+    }
+}

framework/src/main/java/com/njyunzhi/framework/datascope/DataScopeUtil.java

@@ -0,0 +1,26 @@
+package com.njyunzhi.framework.datascope;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+public class DataScopeUtil {
+    public static ISQLHandler getSQLHandler() {
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        return (ISQLHandler) request.getAttribute("dataScopeSqlHandler");
+    }
+
+    public static String getSQL1(String resourceCode, String tableAlias) {
+        return getSQLHandler().getSQL1(resourceCode, tableAlias);
+    }
+
+    public static String getSQL2(String resourceCode, String tableAlias) {
+        return getSQLHandler().getSQL2(resourceCode, tableAlias);
+    }
+
+    public static String getSQL3(String resourceCode, String tableAlias) {
+        return getSQLHandler().getSQL3(resourceCode, tableAlias);
+    }
+}

framework/src/main/java/com/njyunzhi/framework/datascope/ISQLHandler.java

@@ -0,0 +1,28 @@
+package com.njyunzhi.framework.datascope;
+
+public interface ISQLHandler {
+
+    /**
+     * 获取 WHERE 权限拼接语句
+     * @param resourceCode
+     * @param tableAlias
+     * @return
+     */
+    String getSQL1(String resourceCode, String tableAlias);
+
+    /**
+     * 获取 WHERE 权限拼接语句 - 预留
+     * @param resourceCode
+     * @param tableAlias
+     * @return
+     */
+    String getSQL2(String resourceCode, String tableAlias);
+
+    /**
+     * 获取 WHERE 权限拼接语句 - 预留
+     * @param resourceCode
+     * @param tableAlias
+     * @return
+     */
+    String getSQL3(String resourceCode, String tableAlias);
+}

framework/src/main/java/com/njyunzhi/framework/datascope/SqlHandlerImpl.java

@@ -0,0 +1,59 @@
+package com.njyunzhi.framework.datascope;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.njyunzhi.framework.util.SpringContextUtil;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
+
+public class SqlHandlerImpl implements ISQLHandler {
+
+//    private HttpServletRequest getRequest() {
+//        return ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+//    }
+//
+//    private SysUserMapper getUserMapper() {
+//        return SpringContextUtil.getBean("sysUserMapper", SysUserMapper.class);
+//    }
+//
+//    private SysModuleMapper getModuleMapper() {
+//        return SpringContextUtil.getBean("sysModuleMapper", SysModuleMapper.class);
+//    }
+
+    @Override
+    public String getSQL1(String resourceCode, String tableAlias) {
+//        HttpServletRequest request = getRequest();
+//        String loginType = (String) request.getAttribute("loginType");
+//
+//        if (Constants.TENANT_USER.equals(loginType)) {
+//            String userId = (String) StpUtil.getLoginId();
+//            SysModuleMapper sysModuleMapper = getModuleMapper();
+//
+//            SysModule sysModule = sysModuleMapper.getByCode(resourceCode);
+//            if (null == sysModule) return null;
+//
+//            String key = resourceCode + "-" + userId;
+//            List<String> authList = (List<String>) request.getAttribute(key);
+//            if (null == authList) return null;
+//
+//            // 最后组装方式 t.fieldId IN ( '1', '2', '3' )
+//            String inSql = String.format(" %s.%s IN ( %s ) ", tableAlias, sysModule.getPrimaryKey(), String.join("','", authList));
+//            return inSql;
+//        }
+//
+        return null;
+    }
+
+    @Override
+    public String getSQL2(String resourceCode, String tableAlias) {
+        return null;
+    }
+
+    @Override
+    public String getSQL3(String resourceCode, String tableAlias) {
+        return null;
+    }
+}

framework/src/main/java/com/njyunzhi/framework/exception/GlobalExceptionHandler.java

@@ -0,0 +1,42 @@
+package com.njyunzhi.framework.exception;
+
+import cn.dev33.satoken.exception.SaTokenException;
+import cn.dev33.satoken.util.SaResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.List;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ResponseBody
+    @ExceptionHandler(SaTokenException.class)
+    public SaResult handleSaTokenException(Exception e){
+        e.printStackTrace();
+        return SaResult.error(e.getMessage());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(Exception.class)
+    public SaResult handleException(Exception e){
+        e.printStackTrace();
+        return SaResult.error(e.getMessage());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public SaResult handleValidException(MethodArgumentNotValidException e) {
+        e.printStackTrace();
+
+        List<ObjectError> allErrors = e.getBindingResult().getAllErrors();
+        ObjectError err = allErrors.get(0);
+
+        return SaResult.error(err.getDefaultMessage());
+    }
+}

framework/src/main/java/com/njyunzhi/framework/log/OpLog.java

@@ -0,0 +1,27 @@
+package com.njyunzhi.framework.log;
+
+import java.lang.annotation.*;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface OpLog {
+
+    /**
+     * 模块
+     * @return
+     */
+    String module() default "";
+
+    /**
+     * 动作
+     * @return
+     */
+    String action() default "";
+
+    /**
+     * 详细描述
+     * @return
+     */
+    String desc() default "";
+}

framework/src/main/java/com/njyunzhi/framework/log/OpLogAspect.java

@@ -0,0 +1,108 @@
+package com.njyunzhi.framework.log;
+
+import com.njyunzhi.common.util.IpUtil;
+import com.njyunzhi.framework.service.IOpLogService;
+import com.njyunzhi.framework.service.IUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.common.TemplateParserContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+@Aspect
+@Component
+@Slf4j
+public class OpLogAspect {
+
+    @Autowired
+    IOpLogService opLogService;
+
+    @Autowired
+    IUserService userService;
+
+    @Autowired
+    HttpServletRequest request;
+
+    /**
+     * 用于SpEL表达式解析.
+     */
+    private static SpelExpressionParser parser = new SpelExpressionParser();
+    /**
+     * 用于获取方法参数定义名字.  能根据你传入的方法 获取该方法的参数名
+     */
+    private static DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
+    // 需要被SpEl解析的模板前缀和后缀 {{ expression  }}
+    private static final TemplateParserContext TEMPLATE_PARSER_CONTEXT = new TemplateParserContext("{{", "}}");
+
+    /**
+     * 切点
+     */
+    @Pointcut("@annotation(com.njyunzhi.framework.log.OpLog)")
+    public void opLogPointCut() {}
+
+    @AfterReturning(value = "opLogPointCut()", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult) {
+        try {
+            Object user = request.getAttribute("user");
+            String ip = IpUtil.getIpAddr(request);
+            String ua = request.getHeader("User-Agent");
+//            String tenantId = (String) request.getAttribute("tenantId");
+
+            Map<String, Object> data = new HashMap<>();
+            data.put("uri", request.getRequestURI());
+            data.put("ip", ip);
+            data.put("ua", ua);
+            data.put("user", user);
+            //
+            MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
+            Method method = methodSignature.getMethod();
+            OpLog opLog = method.getAnnotation(OpLog.class);
+            if (opLog != null) {
+                data.put("module", opLog.module());
+                data.put("action", opLog.action());
+                if (null != opLog.desc() && !"".equals(opLog.desc())) {
+                    data.put("desc", generateKeyBySpEL(opLog.desc(), joinPoint));
+                }
+            }
+
+            opLogService.save(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String generateKeyBySpEL(String spELString, JoinPoint joinPoint) {
+        // 通过joinPoint获取被注解方法
+        MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
+        Method method = methodSignature.getMethod();
+        // 使用spring的DefaultParameterNameDiscoverer获取方法形参名数组
+        String[] paramNames = nameDiscoverer.getParameterNames(method);
+        // 解析过后的Spring表达式对象
+        Expression expression = parser.parseExpression(spELString, TEMPLATE_PARSER_CONTEXT);
+        // spring的表达式上下文对象
+        EvaluationContext context = new StandardEvaluationContext();
+        // 通过joinPoint获取被注解方法的形参
+        Object[] args = joinPoint.getArgs();
+        // 给上下文赋值
+        for (int i = 0; i < args.length; i++) {
+            context.setVariable(paramNames[i], args[i]);
+        }
+        // 表达式从上下文中计算出实际参数值
+        return expression.getValue(context).toString();
+    }
+
+}

framework/src/main/java/com/njyunzhi/framework/mybatisplus/MyMetaObjectHandler.java

@@ -0,0 +1,68 @@
+package com.njyunzhi.framework.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.njyunzhi.framework.service.IUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Resource
+    HttpServletRequest request;
+
+    @Resource
+    IUserService userService;
+
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+//        String loginType = (String) request.getAttribute("loginType");
+
+        try {
+            Object user = request.getAttribute("user");
+            String tenantId = (String) request.getAttribute("tenantId");
+            String userId = userService.getUserIdBy(user);
+
+            if (user != null) {
+                this.strictInsertFill(metaObject, "createdAt", LocalDateTime::now, LocalDateTime.class);
+                this.strictInsertFill(metaObject, "createdBy", () -> userId, String.class);
+                this.strictInsertFill(metaObject, "updatedAt", LocalDateTime::now, LocalDateTime.class);
+                this.strictInsertFill(metaObject, "updatedBy", () -> userId, String.class);
+            }
+            if (null != tenantId) {
+                this.strictInsertFill(metaObject, "tenantId", () -> tenantId, String.class);
+            }
+
+            this.strictInsertFill(metaObject, "deleted", () -> 0, Integer.class);
+//            metaObject.setValue("deleted",0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+//        String loginType = (String) request.getAttribute("loginType");
+
+        try {
+            Object user = request.getAttribute("user");
+//            String tenantId = (String) request.getAttribute("tenantId");
+            String userId = userService.getUserIdBy(user);
+            String userName = userService.getUserNameBy(user);
+
+//            if (user != null) {
+                this.strictInsertFill(metaObject, "updatedAt", LocalDateTime::now, LocalDateTime.class);
+                this.strictInsertFill(metaObject, "updatedBy", () -> userId, String.class);
+//            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

framework/src/main/java/com/njyunzhi/framework/mybatisplus/MybatisPlusConfig.java

@@ -0,0 +1,61 @@
+package com.njyunzhi.framework.mybatisplus;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import com.njyunzhi.framework.config.TenantConfig;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.StringValue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class MybatisPlusConfig {
+    @Resource
+    HttpServletRequest request;
+
+    @Resource
+    TenantConfig tenantConfig;
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+        // 分页插件
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+
+        if (tenantConfig.getEnabled()) {
+            // 多租户插件
+            interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
+                @Override
+                public Expression getTenantId() {
+                    // request 中的 tenantId 是在 sa-token 中设置的
+                    String tenantId = (String) request.getAttribute("tenantId");
+                    return new StringValue(tenantId == null ? tenantConfig.getDefaultId() : tenantId);
+                }
+
+                @Override
+                public String getTenantIdColumn() {
+                    return "tenant_id";
+                }
+
+                // 设置不用添加租户查询条件的表
+                @Override
+                public boolean ignoreTable(String tableName) {
+                    return tenantConfig.getWhiteList().contains(tableName);
+                }
+            }));
+        }
+
+        return interceptor;
+    }
+
+
+
+
+}

framework/src/main/java/com/njyunzhi/framework/satoken/SaServletFilter2.java

@@ -0,0 +1,44 @@
+package com.njyunzhi.framework.satoken;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.njyunzhi.framework.service.IUserService;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+/**
+ * 比 SaServletFilter 的排序大即可
+     * SaServletFilter 的默认排序是负数
+ * 主要作用附加当前用户信息
+ */
+@Order(1)
+@Component
+public class SaServletFilter2 implements Filter {
+
+    @Autowired
+    IUserService userService;
+
+    @SneakyThrows
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        // 只有登录之后才行
+        if (StpUtil.isLogin()) {
+            appendUser(servletRequest);
+        }
+
+        //
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    private void appendUser(ServletRequest request) throws Exception{
+        Object user = userService.getUserBy(StpUtil.getLoginId());
+        if (null != user) {
+            request.setAttribute("user", user);
+        }
+        request.setAttribute("tenantId", userService.getTenantIdBy(user));
+    }
+}

framework/src/main/java/com/njyunzhi/framework/satoken/SaTokenConfigure.java

@@ -0,0 +1,55 @@
+package com.njyunzhi.framework.satoken;
+
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.exception.SaTokenException;
+import cn.dev33.satoken.filter.SaServletFilter;
+import cn.dev33.satoken.router.SaHttpMethod;
+import cn.dev33.satoken.router.SaRouter;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.njyunzhi.framework.config.FilterConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+@Configuration
+public class SaTokenConfigure {
+
+    @Resource
+    FilterConfig filterConfig;
+
+    @Bean
+    public SaServletFilter getSaServletFilter() {
+        SaServletFilter saServletFilter = new SaServletFilter();
+        saServletFilter.addInclude("/**");
+        saServletFilter.addExclude(filterConfig.getAnnList().toArray(new String[0]));
+        saServletFilter.setAuth(auth -> {
+            // OPTIONS 请求不校验, 主要是为了解决跨域问题
+            SaRouter.notMatch(SaHttpMethod.OPTIONS).check(r -> {
+//                SaHolder.getRequest()
+//
+//                System.out.println("----------------------TOKEN--------------");
+//                System.out.println(StpUtil.isLogin());
+//System.out.println(StpUtil.getTokenValue());
+                // 平台账户或者租户必须登录一个
+                if (!StpUtil.isLogin()) {
+                    throw new SaTokenException("请登录后再访问接口");
+                }
+            });
+        });
+
+        saServletFilter.setError(err -> {
+            SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
+            SaHolder.getResponse().setStatus(200);
+            return SaResult.error(err.getMessage()).setCode(401);
+        });
+
+        return saServletFilter;
+    }
+
+    @Bean
+    public SaServletFilter2 getSaServletFilter2() {
+        return new SaServletFilter2();
+    }
+}

framework/src/main/java/com/njyunzhi/framework/satoken/SaTokenInterceptor.java

@@ -0,0 +1,15 @@
+package com.njyunzhi.framework.satoken;
+
+        import cn.dev33.satoken.interceptor.SaInterceptor;
+        import org.springframework.context.annotation.Configuration;
+        import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+        import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class SaTokenInterceptor implements WebMvcConfigurer {
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册 Sa-Token 拦截器，打开注解式鉴权功能
+        registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**");
+    }
+}

framework/src/main/java/com/njyunzhi/framework/service/IOpLogService.java

@@ -0,0 +1,7 @@
+package com.njyunzhi.framework.service;
+
+import java.util.Map;
+
+public interface IOpLogService {
+    void save(Map data);
+}

framework/src/main/java/com/njyunzhi/framework/service/IUserService.java

@@ -0,0 +1,35 @@
+package com.njyunzhi.framework.service;
+
+/**
+ * 人员接口
+ */
+
+public interface IUserService {
+    /**
+     * 依据登录ID查询当前登录用户
+     * @param loginId
+     * @return
+     */
+    Object getUserBy(Object loginId)throws Exception;
+
+    /**
+     * 返回 user 所属租户
+     * @param user
+     * @return
+     */
+    String getTenantIdBy(Object user);
+
+    /**
+     * 返回 userId
+     * @param user
+     * @return
+     */
+    String getUserIdBy(Object user);
+
+    /**
+     * 返回 userName
+     * @param user
+     * @return
+     */
+    String getUserNameBy(Object user);
+}

framework/src/main/java/com/njyunzhi/framework/util/RedisTool.java

@@ -0,0 +1,47 @@
+package com.njyunzhi.framework.util;
+
+import cn.dev33.satoken.SaManager;
+
+/**
+ * 简易版本的 Redis 客户端工具
+ * 借用了 Sa-token 工具
+ */
+public class RedisTool {
+
+    /**
+     * 获取 Value，如无返空
+     * @param key
+     * @return
+     */
+    public static Object get(String key) {
+        return SaManager.getSaTokenDao().getObject(key);
+    }
+
+    /**
+     * 写入 value .
+     * @param key
+     * @param value
+     * @param sec 存活时间 (单位: 秒)
+     */
+    public static void set(String key, Object value, long sec) {
+        SaManager.getSaTokenDao().setObject(key, value, sec);
+    }
+
+    /**
+     * 更新 value
+     * @param key
+     * @param value
+     */
+    public static void update(String key, Object value) {
+        SaManager.getSaTokenDao().updateObject(key, value);
+    }
+
+    /**
+     * 删除对象
+     * @param key
+     */
+    public static void remove(String key) {
+        SaManager.getSaTokenDao().deleteObject(key);
+    }
+
+}

framework/src/main/java/com/njyunzhi/framework/util/SpringContextUtil.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.framework.util;
+
+import org.springframework.context.ApplicationContext;
+
+public class SpringContextUtil {
+    private static ApplicationContext ac;
+
+    public static <T>  T getBean(String beanName, Class<T> clazz) {
+        T bean = ac.getBean(beanName, clazz);
+        return bean;
+    }
+
+    public static ApplicationContext getAc() {
+        return ac;
+    }
+
+    public static void setAc(ApplicationContext applicationContext){
+        ac = applicationContext;
+    }
+}

mvnw

@@ -0,0 +1,308 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.2.0
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "$(uname)" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
+    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+      if $darwin ; then
+        javaHome="$(dirname "\"$javaExecutable\"")"
+        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
+      fi
+      javaHome="$(dirname "\"$javaExecutable\"")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(cd "$wdir/.." || exit 1; pwd)
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' < "$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+    log "Found $wrapperJarPath"
+else
+    log "Couldn't find $wrapperJarPath, downloading it ..."
+
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    fi
+    while IFS="=" read -r key value; do
+      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+      safeValue=$(echo "$value" | tr -d '\r')
+      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
+      esac
+    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+    log "Downloading from: $wrapperUrl"
+
+    if $cygwin; then
+      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+    fi
+
+    if command -v wget > /dev/null; then
+        log "Found wget ... using wget"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        log "Found curl ... using curl"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        fi
+    else
+        log "Falling back to using Java to download"
+        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=$(cygpath --path --windows "$javaSource")
+          javaClass=$(cygpath --path --windows "$javaClass")
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                log " - Compiling MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                log " - Running MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+  esac
+done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# shellcheck disable=SC2086 # safe args
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"