拆分think模块包

modules/common/core/Constants.java

@@ -0,0 +1,93 @@
+package com.gxwebsoft.common.core;
+
+/**
+ * 系统常量
+ * Created by WebSoft on 2019-10-29 15:55
+ */
+public class Constants {
+    /**
+     * 默认成功码
+     */
+    public static final int RESULT_OK_CODE = 0;
+
+    /**
+     * 默认失败码
+     */
+    public static final int RESULT_ERROR_CODE = 1;
+
+    /**
+     * 默认成功信息
+     */
+    public static final String RESULT_OK_MSG = "操作成功";
+
+    /**
+     * 默认失败信息
+     */
+    public static final String RESULT_ERROR_MSG = "操作失败";
+
+    /**
+     * 无权限错误码
+     */
+    public static final int UNAUTHORIZED_CODE = 403;
+
+    /**
+     * 无权限提示信息
+     */
+    public static final String UNAUTHORIZED_MSG = "没有访问权限";
+
+    /**
+     * 未认证错误码
+     */
+    public static final int UNAUTHENTICATED_CODE = 401;
+
+    /**
+     * 未认证提示信息
+     */
+    public static final String UNAUTHENTICATED_MSG = "请先登录";
+
+    /**
+     * 登录过期错误码
+     */
+    public static final int TOKEN_EXPIRED_CODE = 401;
+
+    /**
+     * 登录过期提示信息
+     */
+    public static final String TOKEN_EXPIRED_MSG = "登录已过期";
+
+    /**
+     * 非法token错误码
+     */
+    public static final int BAD_CREDENTIALS_CODE = 401;
+
+    /**
+     * 非法token提示信息
+     */
+    public static final String BAD_CREDENTIALS_MSG = "请退出重新登录";
+
+    /**
+     * 表示升序的值
+     */
+    public static final String ORDER_ASC_VALUE = "asc";
+
+    /**
+     * 表示降序的值
+     */
+    public static final String ORDER_DESC_VALUE = "desc";
+
+    /**
+     * token通过header传递的名称
+     */
+    public static final String TOKEN_HEADER_NAME = "Authorization";
+
+    /**
+     * token通过参数传递的名称
+     */
+    public static final String TOKEN_PARAM_NAME = "access_token";
+
+    /**
+     * token认证类型
+     */
+    public static final String TOKEN_TYPE = "Bearer";
+
+}

modules/common/core/annotation/OperationLog.java

@@ -0,0 +1,41 @@
+package com.gxwebsoft.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 操作日志记录注解
+ *
+ * @author WebSoft
+ * @since 2020-03-21 17:03:08
+ */
+@Documented
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OperationLog {
+
+    /**
+     * 操作功能
+     */
+    String value() default "";
+
+    /**
+     * 操作模块
+     */
+    String module() default "";
+
+    /**
+     * 备注
+     */
+    String comments() default "";
+
+    /**
+     * 是否记录请求参数
+     */
+    boolean param() default true;
+
+    /**
+     * 是否记录返回结果
+     */
+    boolean result() default true;
+
+}

modules/common/core/annotation/OperationModule.java

@@ -0,0 +1,21 @@
+package com.gxwebsoft.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 操作日志模块注解
+ *
+ * @author WebSoft
+ * @since 2021-09-01 20:48:16
+ */
+@Documented
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OperationModule {
+
+    /**
+     * 模块名称
+     */
+    String value();
+
+}

modules/common/core/annotation/QueryField.java

@@ -0,0 +1,22 @@
+package com.gxwebsoft.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 查询条件注解
+ *
+ * @author WebSoft
+ * @since 2021-09-01 20:48:16
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+public @interface QueryField {
+
+    // 字段名称
+    String value() default "";
+
+    // 查询方式
+    QueryType type() default QueryType.LIKE;
+
+}

modules/common/core/annotation/QueryType.java

@@ -0,0 +1,42 @@
+package com.gxwebsoft.common.core.annotation;
+
+/**
+ * 查询方式
+ *
+ * @author WebSoft
+ * @since 2021-09-01 20:48:16
+ */
+public enum QueryType {
+    // 等于
+    EQ,
+    // 不等于
+    NE,
+    // 大于
+    GT,
+    // 大于等于
+    GE,
+    // 小于
+    LT,
+    // 小于等于
+    LE,
+    // 包含
+    LIKE,
+    // 不包含
+    NOT_LIKE,
+    // 结尾等于
+    LIKE_LEFT,
+    // 开头等于
+    LIKE_RIGHT,
+    // 为NULL
+    IS_NULL,
+    // 不为空
+    IS_NOT_NULL,
+    // IN
+    IN,
+    // NOT IN
+    NOT_IN,
+    // IN条件解析逗号分割
+    IN_STR,
+    // NOT IN条件解析逗号分割
+    NOT_IN_STR
+}

modules/common/core/aspect/OperationLogAspect.java

@@ -0,0 +1,211 @@
+package com.gxwebsoft.common.core.aspect;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.annotation.OperationModule;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import com.gxwebsoft.common.system.entity.OperationRecord;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.OperationRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * 操作日志记录
+ *
+ * @author WebSoft
+ * @since 2020-03-21 16:58:16:05
+ */
+@Aspect
+@Component
+public class OperationLogAspect {
+    @Resource
+    private OperationRecordService operationRecordService;
+
+    // 参数、返回结果、错误信息等最大保存长度
+    private static final int MAX_LENGTH = 1000;
+    // 用于记录请求耗时
+    private final ThreadLocal<Long> startTime = new ThreadLocal<>();
+
+    @Pointcut("@annotation(com.gxwebsoft.common.core.annotation.OperationLog)")
+    public void operationLog() {
+    }
+
+    @Before("operationLog()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+        startTime.set(System.currentTimeMillis());
+    }
+
+    @AfterReturning(pointcut = "operationLog()", returning = "result")
+    public void doAfterReturning(JoinPoint joinPoint, Object result) {
+        saveLog(joinPoint, result, null);
+    }
+
+    @AfterThrowing(value = "operationLog()", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
+        saveLog(joinPoint, null, e);
+    }
+
+    /**
+     * 保存操作记录
+     */
+    private void saveLog(JoinPoint joinPoint, Object result, Exception e) {
+        OperationRecord record = new OperationRecord();
+        // 记录操作耗时
+        if (startTime.get() != null) {
+            record.setSpendTime(System.currentTimeMillis() - startTime.get());
+        }
+        // 记录当前登录用户id、租户id
+        User user = getLoginUser();
+        if (user != null) {
+            record.setUserId(user.getUserId());
+            record.setTenantId(user.getTenantId());
+        }
+        // 记录请求地址、请求方式、ip
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = (attributes == null ? null : attributes.getRequest());
+        if (request != null) {
+            record.setUrl(request.getRequestURI());
+            record.setRequestMethod(request.getMethod());
+            UserAgent ua = UserAgentUtil.parse(ServletUtil.getHeaderIgnoreCase(request, "User-Agent"));
+            record.setOs(ua.getPlatform().toString());
+            record.setDevice(ua.getOs().toString());
+            record.setBrowser(ua.getBrowser().toString());
+            record.setIp(ServletUtil.getClientIP(request));
+        }
+        // 记录异常信息
+        if (e != null) {
+            record.setStatus(1);
+            record.setError(StrUtil.sub(e.toString(), 0, MAX_LENGTH));
+        }
+        // 记录模块名、操作功能、请求方法、请求参数、返回结果
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        record.setMethod(joinPoint.getTarget().getClass().getName() + "." + signature.getName());
+        Method method = signature.getMethod();
+        if (method != null) {
+            OperationLog ol = method.getAnnotation(OperationLog.class);
+            if (ol != null) {
+                // 记录操作功能
+                record.setDescription(getDescription(method, ol));
+                // 记录操作模块
+                record.setModule(getModule(joinPoint, ol));
+                // 记录备注
+                if (StrUtil.isNotEmpty(ol.comments())) {
+                    record.setComments(ol.comments());
+                }
+                // 记录请求参数
+                if (ol.param() && request != null) {
+                    record.setParams(StrUtil.sub(getParams(joinPoint, request), 0, MAX_LENGTH));
+                }
+                // 记录请求结果
+                if (ol.result() && result != null) {
+                    record.setResult(StrUtil.sub(JSONUtil.toJSONString(result), 0, MAX_LENGTH));
+                }
+            }
+        }
+        operationRecordService.saveAsync(record);
+    }
+
+    /**
+     * 获取当前登录用户
+     */
+    private User getLoginUser() {
+        Authentication subject = SecurityContextHolder.getContext().getAuthentication();
+        if (subject != null) {
+            Object object = subject.getPrincipal();
+            if (object instanceof User) {
+                return (User) object;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取请求参数
+     *
+     * @param joinPoint JoinPoint
+     * @param request   HttpServletRequest
+     * @return String
+     */
+    private String getParams(JoinPoint joinPoint, HttpServletRequest request) {
+        String params;
+        Map<String, String> paramsMap = ServletUtil.getParamMap(request);
+        if (paramsMap.keySet().size() > 0) {
+            params = JSONUtil.toJSONString(paramsMap);
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (Object arg : joinPoint.getArgs()) {
+                if (ObjectUtil.isNull(arg)
+                        || arg instanceof MultipartFile
+                        || arg instanceof HttpServletRequest
+                        || arg instanceof HttpServletResponse) {
+                    continue;
+                }
+                sb.append(JSONUtil.toJSONString(arg)).append(" ");
+            }
+            params = sb.toString();
+        }
+        return params;
+    }
+
+    /**
+     * 获取操作模块
+     *
+     * @param joinPoint JoinPoint
+     * @param ol        OperationLog
+     * @return String
+     */
+    private String getModule(JoinPoint joinPoint, OperationLog ol) {
+        if (StrUtil.isNotEmpty(ol.module())) {
+            return ol.module();
+        }
+        OperationModule om = joinPoint.getTarget().getClass().getAnnotation(OperationModule.class);
+        if (om != null && StrUtil.isNotEmpty(om.value())) {
+            return om.value();
+        }
+        Api api = joinPoint.getTarget().getClass().getAnnotation(Api.class);
+        if (api != null && api.tags() != null) {
+            return ArrayUtil.join(api.tags(), ",");
+        }
+        return null;
+    }
+
+    /**
+     * 获取操作功能
+     *
+     * @param method Method
+     * @param ol     OperationLog
+     * @return String
+     */
+    private String getDescription(Method method, OperationLog ol) {
+        if (StrUtil.isNotEmpty(ol.value())) {
+            return ol.value();
+        }
+        ApiOperation ao = method.getAnnotation(ApiOperation.class);
+        if (ao != null && StrUtil.isNotEmpty(ao.value())) {
+            return ao.value();
+        }
+        return null;
+    }
+
+}

modules/common/core/config/ConfigProperties.java

@@ -0,0 +1,105 @@
+package com.gxwebsoft.common.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 系统配置属性
+ *
+ * @author WebSoft
+ * @since 2021-08-30 17:58:16
+ */
+@Data
+@ConfigurationProperties(prefix = "config")
+public class ConfigProperties {
+  /**
+   * 文件上传磁盘位置
+   */
+  private Integer uploadLocation = 0;
+
+  /**
+   * 文件上传是否使用uuid命名
+   */
+  private Boolean uploadUuidName = true;
+
+  /**
+   * 文件上传生成缩略图的大小(kb)
+   */
+  private Integer thumbnailSize = 60;
+
+  /**
+   * OpenOffice的安装目录
+   */
+  private String openOfficeHome;
+
+  /**
+   * swagger扫描包
+   */
+  private String swaggerBasePackage;
+
+  /**
+   * swagger文档标题
+   */
+  private String swaggerTitle;
+
+  /**
+   * swagger文档描述
+   */
+  private String swaggerDescription;
+
+  /**
+   * swagger文档版本号
+   */
+  private String swaggerVersion;
+
+  /**
+   * swagger地址
+   */
+  private String swaggerHost;
+
+  /**
+   * token过期时间, 单位秒
+   */
+  private Long tokenExpireTime = 60 * 60 * 30 * 24L;
+
+  /**
+   * token快要过期自动刷新时间, 单位分钟
+   */
+  private int tokenRefreshTime = 30;
+
+  /**
+   * 生成token的密钥Key的base64字符
+   */
+  private String tokenKey;
+
+  /**
+   * 文件上传目录
+   */
+  private String uploadPath;
+
+  /**
+   * 本地文件上传目录(开发环境)
+   */
+  private String localUploadPath;
+
+  /**
+   * 文件服务器
+   */
+  private String fileServer;
+
+  /**
+   * 网关地址
+   */
+  private String serverUrl;
+
+  /**
+   * 阿里云存储 OSS
+   * Endpoint
+   */
+  private String endpoint;
+  private String accessKeyId;
+  private String accessKeySecret;
+  private String bucketName;
+  private String bucketDomain;
+
+}

modules/common/core/config/HttpMessageConverter.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.common.core.config;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HttpMessageConverter extends MappingJackson2HttpMessageConverter {
+    public HttpMessageConverter(){
+        List<MediaType> mediaTypes = new ArrayList<>();
+        mediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
+        setSupportedMediaTypes(mediaTypes);
+    }
+}

modules/common/core/config/MybatisPlusConfig.java

@@ -0,0 +1,106 @@
+package com.gxwebsoft.common.core.config;
+
+import cn.hutool.core.util.StrUtil;
+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.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.system.entity.User;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.NullValue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+/**
+ * MybatisPlus配置
+ *
+ * @author WebSoft
+ * @since 2018-02-22 11:29:28
+ */
+@Configuration
+public class MybatisPlusConfig {
+  @Resource
+  private RedisUtil redisUtil;
+
+  @Bean
+  public MybatisPlusInterceptor mybatisPlusInterceptor(HttpServletRequest request) {
+    MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+    // 多租户插件配置
+    TenantLineHandler tenantLineHandler = new TenantLineHandler() {
+
+      @Override
+      public Expression getTenantId() {
+        // 从域名拿ID
+        String Domain = request.getHeader("Domain");
+        if (StrUtil.isNotBlank(Domain)) {
+          String key = "Domain:" + Domain;
+          String tenantId = redisUtil.get(key);
+          if(tenantId != null){
+            System.out.println("授权域名" + Domain + " => " + tenantId);
+            return new LongValue(tenantId);
+          }
+        }
+        // 从请求头拿ID
+        final String tenantId = request.getHeader("tenantId");
+        if(tenantId != null){
+          return new LongValue(tenantId);
+        }
+        return getLoginUserTenantId();
+      }
+
+      @Override
+      public boolean ignoreTable(String tableName) {
+        return Arrays.asList(
+          "sys_tenant",
+          "sys_dictionary",
+          "sys_dictionary_data",
+          "sys_user_oauth",
+          "sys_email_record",
+          "sys_plug",
+          "sys_version",
+          "sys_order",
+          "sys_white_domain"
+        ).contains(tableName);
+      }
+    };
+    TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
+    interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
+
+    // 分页插件配置
+    PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
+    interceptor.addInnerInterceptor(paginationInnerInterceptor);
+
+    return interceptor;
+  }
+
+  /**
+   * 获取当前登录用户的租户id
+   *
+   * @return Integer
+   */
+  public Expression getLoginUserTenantId() {
+    try {
+      Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+      if (authentication != null) {
+        Object object = authentication.getPrincipal();
+        if (object instanceof User) {
+          return new LongValue(((User) object).getTenantId());
+        }
+      }
+    } catch (Exception e) {
+      System.out.println(e.getMessage());
+    }
+    return new NullValue();
+  }
+
+}

modules/common/core/config/RestTemplateConfig.java

@@ -0,0 +1,29 @@
+package com.gxwebsoft.common.core.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory) {
+        RestTemplate restTemplate = new RestTemplate(factory);
+        restTemplate.getMessageConverters().add(new HttpMessageConverter());
+        return restTemplate;
+    }
+    @Bean
+    public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        // ms
+        factory.setReadTimeout(60000);
+        // ms
+        factory.setConnectTimeout(60000);
+
+        return factory;
+    }
+}

modules/common/core/config/SpringContextUtil.java

@@ -0,0 +1,62 @@
+package com.gxwebsoft.common.core.config;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author ds
+ * @Date 2022-05-05
+ */
+@Component
+public class SpringContextUtil implements ApplicationContextAware {
+  /**
+   * spring的应用上下文
+   */
+  private static ApplicationContext applicationContext;
+
+  /**
+   * 初始化时将应用上下文设置进applicationContext
+   * @param applicationContext
+   * @throws BeansException
+   */
+  @Override
+  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    SpringContextUtil.applicationContext=applicationContext;
+  }
+
+  public static ApplicationContext getApplicationContext(){
+    return applicationContext;
+  }
+
+  /**
+   * 根据bean名称获取某个bean对象
+   *
+   * @param name bean名称
+   * @return Object
+   * @throws BeansException
+   */
+  public static Object getBean(String name) throws BeansException {
+    return applicationContext.getBean(name);
+  }
+
+  /**
+   * 根据bean的class获取某个bean对象
+   * @param beanClass
+   * @param <T>
+   * @return
+   * @throws BeansException
+   */
+  public static <T> T getBean(Class<T> beanClass) throws BeansException {
+    return applicationContext.getBean(beanClass);
+  }
+
+  /**
+   * 获取spring.profiles.active
+   * @return
+   */
+  public static String getProfile(){
+    return getApplicationContext().getEnvironment().getActiveProfiles()[0];
+  }
+}

modules/common/core/config/SwaggerConfig.java

@@ -0,0 +1,72 @@
+package com.gxwebsoft.common.core.config;
+
+import cn.hutool.core.util.StrUtil;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+import springfox.documentation.service.*;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Swagger配置
+ *
+ * @author WebSoft
+ * @since 2018-02-22 11:29:05
+ */
+@EnableOpenApi
+@Configuration
+public class SwaggerConfig {
+    @Resource
+    private ConfigProperties config;
+
+    @Bean
+    public Docket createRestApi() {
+        Docket docket = new Docket(DocumentationType.OAS_30);
+        if (StrUtil.isNotBlank(config.getSwaggerHost())) {
+            docket.host(config.getSwaggerHost());
+        }
+        return docket
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage(config.getSwaggerBasePackage()))
+                .paths(PathSelectors.any())
+                .build()
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title(config.getSwaggerTitle())
+                .description(config.getSwaggerDescription())
+                .version(config.getSwaggerVersion())
+                .termsOfServiceUrl("")
+                .build();
+    }
+
+    private List<SecurityScheme> securitySchemes() {
+        return Collections.singletonList(
+                new ApiKey("Authorization", "Authorization", "header")
+        );
+    }
+
+    private List<SecurityContext> securityContexts() {
+        AuthorizationScope[] scopes = {new AuthorizationScope("global", "accessEverything")};
+        List<SecurityReference> references = Collections.singletonList(
+                new SecurityReference("Authorization", scopes)
+        );
+        return Collections.singletonList(SecurityContext.builder()
+                .securityReferences(references)
+                .build());
+    }
+
+}

modules/common/core/config/WebMvcConfig.java

@@ -0,0 +1,31 @@
+package com.gxwebsoft.common.core.config;
+
+import com.gxwebsoft.common.core.Constants;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * WebMvc配置, 拦截器、资源映射等都在此配置
+ *
+ * @author WebSoft
+ * @since 2019-06-12 10:11:16
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    /**
+     * 支持跨域访问
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOriginPatterns("*")
+                .allowedHeaders("*")
+                .exposedHeaders(Constants.TOKEN_HEADER_NAME)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
+                .allowCredentials(true)
+                .maxAge(3600);
+    }
+
+}

modules/common/core/constants/BalanceConstants.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.common.core.constants;
+
+public class BalanceConstants {
+  // 余额变动场景
+  public static final Integer BALANCE_RECHARGE = 10; // 用户充值
+  public static final Integer BALANCE_USE = 20; // 用户消费
+  public static final Integer BALANCE_RE_LET = 21; // 续租
+  public static final Integer BALANCE_ADMIN = 30; // 管理员操作
+  public static final Integer BALANCE_REFUND = 40; // 订单退款
+}

modules/common/core/constants/DomainConstants.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.common.core.constants;
+
+public class DomainConstants {
+  public static final String ROOT_DOMAIN = "websoft.top";  // 根域名
+  public static final String PREFIX = "https://";  // 域名前缀
+  public static final String ADMIN_SUFFIX = ".".concat(ROOT_DOMAIN); // 后台管理域名拼接
+  public static final String WEB_SUFFIX = ".wsdns.cn"; // 应用域名拼接
+  public static final String DOMAIN = PREFIX.concat(ROOT_DOMAIN);  // 完整域名
+
+}

modules/common/core/constants/OrderConstants.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.common.core.constants;
+
+public class OrderConstants {
+  // 支付方式
+  public static final String PAY_METHOD_BALANCE = "10"; // 余额支付
+  public static final String PAY_METHOD_WX = "20";      // 微信支付
+  public static final String PAY_METHOD_ALIPAY = "30";  // 支付宝支付
+  public static final String PAY_METHOD_OTHER = "40";   // 其他支付
+
+  // 付款状态
+  public static final Integer PAY_STATUS_NO_PAY = 10; // 未付款
+  public static final Integer PAY_STATUS_SUCCESS = 20; // 已付款
+
+  // 发货状态
+  public static final Integer DELIVERY_STATUS_NO = 10; // 未发货
+  public static final Integer DELIVERY_STATUS_YES = 20; // 已发货
+  public static final Integer DELIVERY_STATUS_30 = 30; // 部分发货
+
+  // 收货状态
+  public static final Integer RECEIPT_STATUS_NO = 10; // 未收货
+  public static final Integer RECEIPT_STATUS_YES = 20; // 已收货
+  public static final Integer RECEIPT_STATUS_RETURN = 30; // 已退货
+
+  // 订单状态
+  public static final Integer ORDER_STATUS_DOING = 10; // 进行中
+  public static final Integer ORDER_STATUS_CANCEL = 20; // 已取消
+  public static final Integer ORDER_STATUS_TO_CANCEL = 21; // 待取消
+  public static final Integer ORDER_STATUS_COMPLETED = 30; // 已完成
+
+  // 订单结算状态
+  public static final Integer ORDER_SETTLED_YES = 1; // 已结算
+  public static final Integer ORDER_SETTLED_NO = 0; // 未结算
+
+
+
+
+}

modules/common/core/constants/PlatformConstants.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.common.core.constants;
+
+public class PlatformConstants {
+  public static final String MP_OFFICIAL = "MP-OFFICIAL";  // 微信公众号
+  public static final String MP_WEIXIN = "MP-WEIXIN"; // 微信小程序
+  public static final String MP_ALIPAY = "MP-ALIPAY";  // 支付宝小程序
+  public static final String WEB = "WEB"; // web（同H5）
+  public static final String H5 = "H5"; // H5（推荐使用 WEB）
+  public static final String APP = "APP"; // App
+  public static final String MP_BAIDU = "MP-BAIDU"; // 百度小程序
+  public static final String MP_TOUTIAO = "MP-TOUTIAO"; // 百度小程序
+}

modules/common/core/constants/ProfitConstants.java

@@ -0,0 +1,9 @@
+package com.gxwebsoft.common.core.constants;
+
+public class ProfitConstants {
+  // 收益类型
+  public static final Integer PROFIT_TYPE10 = 10; // 推广收益
+  public static final Integer PROFIT_TYPE20 = 20; // 团队收益
+  public static final Integer PROFIT_TYPE30 = 30; // 门店收益
+  public static final Integer PROFIT_TYPE40 = 30; // 区域收益
+}

modules/common/core/constants/RedisConstants.java

@@ -0,0 +1,39 @@
+package com.gxwebsoft.common.core.constants;
+
+public class RedisConstants {
+  // 短信验证码Key
+  public static final String SMS_CODE_KEY = "sms";
+  // 验证码过期时间
+  public static final Long SMS_CODE_TTL = 5L;
+  // 微信凭证access-token
+  public static final String ACCESS_TOKEN_KEY = "access-token";
+  // 空值防止击穿数据库
+  public static final Long CACHE_NULL_TTL = 2L;
+  // 商户信息
+  public static final String MERCHANT_KEY = "merchant";
+  // 添加商户定位点
+  public static final String MERCHANT_GEO_KEY = "merchant-geo";
+
+  // token
+  public static final String TOKEN_USER_ID = "cache:token:";
+  // 排行榜
+  public static final String USER_RANKING_BY_APPS = "userRankingByApps";
+  // 搜索历史
+  public static final String SEARCH_HISTORY = "searchHistory";
+  // 租户系统设置信息
+  public static final String TEN_ANT_SETTING_KEY = "setting";
+  // 排行榜Key
+  public static final String USER_RANKING_BY_APPS_5 = "cache5:userRankingByApps";
+
+
+
+  // 哗啦啦key
+  public static final String getAllShop = "allShop";
+  public static final String getBaseInfo = "baseInfo";
+  public static final String getFoodClassCategory = "foodCategory";
+  public static final String getOpenFood = "openFood";
+  public static final String haulalaGeoKey = "cache10:hualala-geo";
+  public static final String HLL_CART_KEY = "hll-cart";   // hll-cart[shopId]:[userId]
+  public static final String HLL_CART_FOOD_KEY = "hll-cart-list";   // hll-cart-list[shopId]:[userId]
+
+}

modules/common/core/enums/ChatMessageType.java

@@ -0,0 +1,25 @@
+package com.gxwebsoft.common.core.enums;
+
+public enum ChatMessageType {
+    TEXT( 1, "text"),
+    IMAGE(2, "image"),
+    VOICE(3, "voice"),
+    CARD(4, "card"),
+    ;
+
+    private int index;
+
+    private String name;
+    ChatMessageType(int i, String text) {
+        this.name = text;
+        this.index = i;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}

modules/common/core/enums/GreenWebType.java

@@ -0,0 +1,52 @@
+package com.gxwebsoft.common.core.enums;
+
+public enum GreenWebType {
+    /**
+     * 用户昵称
+     */
+    nickname_detection,
+    /**
+     * 聊天互动
+     */
+    chat_detection,
+    /**
+     * 动态评论
+     */
+    comment_detection,
+    /**
+     * 教学无聊
+     */
+    pgc_detection,
+    /**
+     * 图片检测service: baselineCheck通用基线检测
+     */
+    baselineCheck,
+    /**
+     * 视频检测
+     */
+    videoDetection;
+
+  public enum ChatMessageType {
+      TEXT( 1, "text"),
+      IMAGE(2, "image"),
+      VOICE(3, "voice"),
+      CARD(4, "card"),
+      ;
+
+      private int index;
+
+      private String name;
+      ChatMessageType(int i, String text) {
+          this.name = text;
+          this.index = i;
+      }
+
+      public String getName() {
+          return name;
+      }
+
+      public int getIndex() {
+          return index;
+      }
+  }
+}

modules/common/core/exception/BusinessException.java

@@ -0,0 +1,48 @@
+package com.gxwebsoft.common.core.exception;
+
+import com.gxwebsoft.common.core.Constants;
+
+/**
+ * 自定义业务异常
+ *
+ * @author WebSoft
+ * @since 2018-02-22 11:29:28
+ */
+public class BusinessException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    private Integer code;
+
+    public BusinessException() {
+        this(Constants.RESULT_ERROR_MSG);
+    }
+
+    public BusinessException(String message) {
+        this(Constants.RESULT_ERROR_CODE, message);
+    }
+
+    public BusinessException(Integer code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public BusinessException(Integer code, String message, Throwable cause) {
+        super(message, cause);
+        this.code = code;
+    }
+
+    public BusinessException(Integer code, String message, Throwable cause,
+                             boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+}

modules/common/core/exception/GlobalExceptionHandler.java

@@ -0,0 +1,56 @@
+package com.gxwebsoft.common.core.exception;
+
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 全局异常处理器
+ *
+ * @author WebSoft
+ * @since 2018-02-22 11:29:30
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @ResponseBody
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public ApiResult<?> methodNotSupportedExceptionHandler(HttpRequestMethodNotSupportedException e,
+                                                           HttpServletResponse response) {
+        CommonUtil.addCrossHeaders(response);
+        return new ApiResult<>(Constants.RESULT_ERROR_CODE, "请求方式不正确").setError(e.toString());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(AccessDeniedException.class)
+    public ApiResult<?> accessDeniedExceptionHandler(AccessDeniedException e, HttpServletResponse response) {
+        CommonUtil.addCrossHeaders(response);
+        return new ApiResult<>(Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG).setError(e.toString());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(BusinessException.class)
+    public ApiResult<?> businessExceptionHandler(BusinessException e, HttpServletResponse response) {
+        CommonUtil.addCrossHeaders(response);
+        return new ApiResult<>(e.getCode(), e.getMessage());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(Throwable.class)
+    public ApiResult<?> exceptionHandler(Throwable e, HttpServletResponse response) {
+        logger.error(e.getMessage(), e);
+        CommonUtil.addCrossHeaders(response);
+        return new ApiResult<>(Constants.RESULT_ERROR_CODE, Constants.RESULT_ERROR_MSG).setError(e.toString());
+    }
+
+}

modules/common/core/security/JwtAccessDeniedHandler.java

@@ -0,0 +1,29 @@
+package com.gxwebsoft.common.core.security;
+
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 没有访问权限异常处理
+ *
+ * @author WebSoft
+ * @since 2020-03-25 00:35:03
+ */
+@Component
+public class JwtAccessDeniedHandler implements AccessDeniedHandler {
+
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e)
+            throws IOException, ServletException {
+        CommonUtil.responseError(response, Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG, e.getMessage());
+    }
+
+}

modules/common/core/security/JwtAuthenticationEntryPoint.java

@@ -0,0 +1,30 @@
+package com.gxwebsoft.common.core.security;
+
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 没有登录异常处理
+ *
+ * @author WebSoft
+ * @since 2020-03-25 00:35:03
+ */
+@Component
+public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
+            throws IOException, ServletException {
+        CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG,
+                e.getMessage());
+    }
+
+}

modules/common/core/security/JwtAuthenticationFilter.java

@@ -0,0 +1,99 @@
+package com.gxwebsoft.common.core.security;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.SignCheckUtil;
+import com.gxwebsoft.common.system.entity.LoginRecord;
+import com.gxwebsoft.common.system.entity.Menu;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.LoginRecordService;
+import com.gxwebsoft.common.system.service.UserService;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 处理携带token的请求过滤器
+ *
+ * @author WebSoft
+ * @since 2020-03-30 20:48:05
+ */
+@Component
+public class JwtAuthenticationFilter extends OncePerRequestFilter {
+  @Resource
+  private ConfigProperties configProperties;
+  @Resource
+  private UserService userService;
+  @Resource
+  private RedisUtil redisUtil;
+  @Resource
+  private LoginRecordService loginRecordService;
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+    throws ServletException, IOException {
+    String access_token = JwtUtil.getAccessToken(request);
+    if (StrUtil.isNotBlank(access_token)) {
+      try {
+        // 解析token
+        Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey());
+        JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
+
+        // 校验服务器域名白名单
+        final SignCheckUtil checkUtil = new SignCheckUtil();
+        String key = "WhiteDomain:" + jwtSubject.getTenantId();
+        List<String> whiteDomains = redisUtil.get(key, List.class);
+        if (!checkUtil.checkWhiteDomains(whiteDomains, request.getServerName())) {
+          throw new UsernameNotFoundException("The requested domain name is not on the whitelist");
+        }
+
+        User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
+        if (user == null) {
+          throw new UsernameNotFoundException("Username not found");
+        }
+        List<Menu> authorities = user.getAuthorities().stream()
+          .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList());
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+          user, null, authorities);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        // token将要过期签发新token, 防止突然退出登录
+        long expiration = (claims.getExpiration().getTime() - new Date().getTime()) / 1000 / 60;
+        if (expiration < configProperties.getTokenRefreshTime()) {
+          String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
+            configProperties.getTokenKey());
+          response.addHeader(Constants.TOKEN_HEADER_NAME, token);
+          loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REFRESH, null,
+            user.getTenantId(), request);
+        }
+      } catch (ExpiredJwtException e) {
+        CommonUtil.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
+          e.getMessage());
+        return;
+      } catch (Exception e) {
+        CommonUtil.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
+          e.toString());
+        return;
+      }
+    }
+    chain.doFilter(request, response);
+  }
+
+}

modules/common/core/security/JwtSubject.java

@@ -0,0 +1,31 @@
+package com.gxwebsoft.common.core.security;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * Jwt载体
+ *
+ * @author WebSoft
+ * @since 2021-09-03 00:11:12
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JwtSubject implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账号
+     */
+    private String username;
+
+    /**
+     * 租户id
+     */
+    private Integer tenantId;
+
+}

modules/common/core/security/JwtUtil.java

@@ -0,0 +1,141 @@
+package com.gxwebsoft.common.core.security;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.servlet.ServletUtil;
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.io.Encoders;
+import io.jsonwebtoken.security.Keys;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Key;
+import java.util.Date;
+
+/**
+ * JWT工具类
+ *
+ * @author WebSoft
+ * @since 2018-01-21 16:30:59
+ */
+public class JwtUtil {
+
+    /**
+     * 获取请求中的access_token
+     *
+     * @param request HttpServletRequest
+     * @return String
+     */
+    public static String getAccessToken(HttpServletRequest request) {
+        String access_token = ServletUtil.getHeaderIgnoreCase(request, Constants.TOKEN_HEADER_NAME);
+        if (StrUtil.isNotBlank(access_token)) {
+            if (access_token.startsWith(Constants.TOKEN_TYPE)) {
+                access_token = StrUtil.removePrefix(access_token, Constants.TOKEN_TYPE).trim();
+            }
+        } else {
+            access_token = request.getParameter(Constants.TOKEN_PARAM_NAME);
+        }
+        return access_token;
+    }
+
+    /**
+     * 生成token
+     *
+     * @param subject          载体
+     * @param expire           过期时间
+     * @param base64EncodedKey base64编码的Key
+     * @return token
+     */
+    public static String buildToken(JwtSubject subject, Long expire, String base64EncodedKey) {
+        return buildToken(JSONUtil.toJSONString(subject), expire, decodeKey(base64EncodedKey));
+    }
+
+    /**
+     * 生成token
+     *
+     * @param subject 载体
+     * @param expire  过期时间
+     * @param key     密钥
+     * @return token
+     */
+    public static String buildToken(String subject, Long expire, Key key) {
+        Date expireDate = new Date(new Date().getTime() + 1000 * expire);
+        return Jwts.builder()
+                .setSubject(subject)
+                .setExpiration(expireDate)
+                .setIssuedAt(new Date())
+                .signWith(key)
+                .compact();
+    }
+
+    /**
+     * 解析token
+     *
+     * @param token            token
+     * @param base64EncodedKey base64编码的Key
+     * @return Claims
+     */
+    public static Claims parseToken(String token, String base64EncodedKey) {
+        return parseToken(token, decodeKey(base64EncodedKey));
+    }
+
+    /**
+     * 解析token
+     *
+     * @param token token
+     * @param key   密钥
+     * @return Claims
+     */
+    public static Claims parseToken(String token, Key key) {
+        return Jwts.parserBuilder()
+                .setSigningKey(key)
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    /**
+     * 获取JwtSubject
+     *
+     * @param claims Claims
+     * @return JwtSubject
+     */
+    public static JwtSubject getJwtSubject(Claims claims) {
+        return JSONUtil.parseObject(claims.getSubject(), JwtSubject.class);
+    }
+
+    /**
+     * 生成Key
+     *
+     * @return Key
+     */
+    public static Key randomKey() {
+        return Keys.secretKeyFor(SignatureAlgorithm.HS256);
+    }
+
+    /**
+     * base64编码key
+     *
+     * @return String
+     */
+    public static String encodeKey(Key key) {
+        return Encoders.BASE64.encode(key.getEncoded());
+    }
+
+    /**
+     * base64编码Key
+     *
+     * @param base64EncodedKey base64编码的key
+     * @return Key
+     */
+    public static Key decodeKey(String base64EncodedKey) {
+        if (StrUtil.isBlank(base64EncodedKey)) {
+            return null;
+        }
+        return Keys.hmacShaKeyFor(Decoders.BASE64.decode(base64EncodedKey));
+    }
+
+}

modules/common/core/security/SecurityConfig.java

@@ -0,0 +1,91 @@
+package com.gxwebsoft.common.core.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import javax.annotation.Resource;
+
+/**
+ * Spring Security配置
+ *
+ * @author WebSoft
+ * @since 2020-03-23 18:04:52
+ */
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    @Resource
+    private JwtAccessDeniedHandler jwtAccessDeniedHandler;
+    @Resource
+    private JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
+    @Resource
+    private JwtAuthenticationFilter jwtAuthenticationFilter;
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+                .antMatchers(HttpMethod.OPTIONS, "/**")
+                .permitAll()
+                .antMatchers(HttpMethod.GET, "/api/file/**","/**", "/api/captcha", "/")
+                .permitAll()
+                .antMatchers(
+                        "/api/login",
+                        "/api/register",
+                        "/api/existence",
+                        "/api/oss/upload",
+                        "/druid/**",
+                        "/swagger-resources/**",
+                        "/webjars/**",
+                        "/hxz/v1/**",
+                        "/api/sendSmsCaptcha",
+                        "/api/loginBySms",
+                        "/api/parseToken/*",
+                        "/api/login-alipay/*",
+                        "/api/wx-login/loginByMpWxPhone",
+                        "/api/wx-login/loginByOpenId",
+                        "/api/system/wx-native-pay/**",
+                        "/api/system/wx-pay/**",
+                        "/api/wxWorkQrConnect",
+                        "/api/sys/user-plan-log/wx-pay/**",
+                        "/api/wx-official/**",
+                        "/lvQ4EoivKJ.txt"
+                  )
+                .permitAll()
+                .anyRequest()
+                .authenticated()
+                .and()
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .and()
+                .csrf()
+                .disable()
+                .cors()
+                .and()
+                .logout()
+                .disable()
+                .headers()
+                .frameOptions()
+                .disable()
+                .and()
+                .exceptionHandling()
+                .accessDeniedHandler(jwtAccessDeniedHandler)
+                .authenticationEntryPoint(jwtAuthenticationEntryPoint)
+                .and()
+                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+    }
+
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+}

modules/common/core/socketio/cache/ClientCache.java

@@ -0,0 +1,75 @@
+package com.gxwebsoft.common.core.socketio.cache;
+
+import com.corundumstudio.socketio.SocketIOClient;
+import com.corundumstudio.socketio.SocketIOServer;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Author
+ * @Description  用户信息缓存
+ * @Date 14:00 2022/1/21
+ * @Param
+ * @return
+ **/
+@Component
+public class ClientCache {
+
+    private static Map<String, HashMap<UUID, SocketIOClient>> concurrentHashMap = new ConcurrentHashMap<>();
+
+    private static SocketIOServer socketIOServer;
+
+    public static SocketIOServer getSocketIOServer() {
+        return socketIOServer;
+    }
+
+    public static void setSocketIOServer(SocketIOServer instance) {
+        socketIOServer = instance;
+    }
+    public void saveClient(String userId,UUID sessionId,SocketIOClient socketIOClient){
+        HashMap<UUID, SocketIOClient> sessionIdClientCache = concurrentHashMap.get(userId);
+        if(sessionIdClientCache == null){
+            sessionIdClientCache = new HashMap<>();
+        }
+        sessionIdClientCache.put(sessionId,socketIOClient);
+        concurrentHashMap.put(userId,sessionIdClientCache);
+    }
+
+
+    public HashMap<UUID,SocketIOClient> getUserClient(String userId){
+        return concurrentHashMap.get(userId);
+    }
+
+    public void deleteSessionClientByUserId(String userId,UUID sessionId){
+        concurrentHashMap.get(userId).remove(sessionId);
+    }
+
+
+    public void deleteUserCacheByUserId(String userId){
+        concurrentHashMap.remove(userId);
+    }
+
+    public int getOnLineCount(){
+        return concurrentHashMap.size();
+    }
+
+    public void sendUserEvent(String userId,String event, Object message) {
+        // 发送到接收方
+        HashMap<UUID, SocketIOClient> userClient = concurrentHashMap.get(userId);
+
+        // 查看对方是否在线
+        if(!CollectionUtils.isEmpty(userClient)){
+            for (UUID uuid : userClient.keySet()) {
+                SocketIOClient ioClient = userClient.get(uuid);
+                ioClient.sendEvent(event, message);
+
+            }
+        }
+    }
+
+}

modules/common/core/socketio/config/SocketIOConfig.java

@@ -0,0 +1,82 @@
+package com.gxwebsoft.common.core.socketio.config;
+
+import com.corundumstudio.socketio.SocketIOServer;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.security.JwtSubject;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.socketio.cache.ClientCache;
+import com.gxwebsoft.common.core.socketio.handler.SocketIOHandler;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
+import io.jsonwebtoken.Claims;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.io.InputStream;
+
+/**
+ * socket服务配置
+ * @author machenike
+ */
+@Configuration
+public class SocketIOConfig implements InitializingBean {
+
+  private final static Logger logger = LoggerFactory.getLogger(SocketIOConfig.class);
+  @Value("${socketio.host}")
+  private String host;
+
+  @Value("${socketio.port}")
+  private Integer port;
+
+  @Resource
+  private SocketIOHandler socketIOHandler;
+
+  @Resource
+  private UserService userService;
+
+  @Resource
+  private ConfigProperties configProperties;
+
+  @Override
+  public void afterPropertiesSet() throws Exception {
+    com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration();
+    //设置host
+    config.setHostname(host);
+    //设置端口
+    config.setPort(port);
+    config.setBossThreads(1);
+    config.setAuthorizationListener(handshakeData -> {
+      String userId =handshakeData.getSingleUrlParam("userId");
+      String token = handshakeData.getSingleUrlParam("token");
+      logger.info("身份验证 token：{}", token);
+      if(!StringUtils.hasText(token) || !StringUtils.hasText(userId)){
+        return false;
+      }
+      //  身份验证
+      Claims claims = JwtUtil.parseToken(token, configProperties.getTokenKey());
+      JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
+      User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
+
+      if (user == null || !user.getUserId().equals(Integer.valueOf(userId))) {
+        return false;
+      }
+      return true;
+    });
+
+        InputStream resourceAsStream = this.getClass().getResourceAsStream("/jks/love.jks");  // 读取证书文件流
+        config.setKeyStore(resourceAsStream);  // 设置证书文件
+        config.setKeyStorePassword("123456");  // 设置证书密码
+
+    // 启动socket服务
+//    SocketIOServer server = new SocketIOServer(config);
+//    server.addListeners(socketIOHandler);
+//    server.start();
+//    ClientCache.setSocketIOServer(server);
+//    logger.debug("Netty SocketIO启动：{}:{}",host,port);
+  }
+}

modules/common/core/socketio/handler/SocketIOHandler.java

@@ -0,0 +1,104 @@
+package com.gxwebsoft.common.core.socketio.handler;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.corundumstudio.socketio.AckRequest;
+import com.corundumstudio.socketio.SocketIOClient;
+import com.corundumstudio.socketio.annotation.OnConnect;
+import com.corundumstudio.socketio.annotation.OnDisconnect;
+import com.corundumstudio.socketio.annotation.OnEvent;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.socketio.cache.ClientCache;
+import com.gxwebsoft.common.system.entity.ChatMessage;
+import com.gxwebsoft.common.system.service.ChatConversationService;
+import com.gxwebsoft.common.system.service.ChatMessageService;
+import com.gxwebsoft.common.system.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.UUID;
+
+
+/**
+ * socket处理拦截器
+ * @author machenike
+ */
+
+@Component
+public class SocketIOHandler {
+
+
+    @Resource
+    private ChatMessageService messageService;
+
+    @Resource
+    private ChatConversationService conversationService;
+
+    @Resource
+    private ClientCache clientCache;
+
+    @Resource
+    private UserService userService;
+
+    @Resource
+    private ConfigProperties configProperties;
+    /**
+     * 日志
+     */
+    private final static Logger logger = LoggerFactory.getLogger(SocketIOHandler.class);
+
+
+
+
+    /**
+     * 客户端连上socket服务器时执行此事件
+     * @param client
+     */
+    @OnConnect
+    public void onConnect(SocketIOClient client) {
+        String userId = client.getHandshakeData().getSingleUrlParam("userId");
+        logger.debug("socket client auth success [userId="+userId+"]");
+        UUID sessionId = client.getSessionId();
+
+
+        // 管理员
+        String isAdmin = client.getHandshakeData().getSingleUrlParam("isAdmin");
+        if(StringUtils.isNotBlank(isAdmin)){
+           // todo 权限验证
+            clientCache.saveClient("admin",sessionId, client);
+        }else {
+            clientCache.saveClient(userId,sessionId, client);
+        }
+
+        System.out.println("userId: "+userId+"连接建立成功 - "+sessionId);
+        logger.info("当前在线人数:{}",clientCache.getOnLineCount());
+
+    }
+
+
+    /**
+     * 客户端断开socket服务器时执行此事件
+     * @param client
+     */
+    @OnDisconnect
+    public void onDisconnect(SocketIOClient client) {
+        String userId = client.getHandshakeData().getSingleUrlParam("userId");
+        UUID sessionId = client.getSessionId();
+        clientCache.deleteSessionClientByUserId(userId,sessionId);
+        System.out.println("userId: "+userId+"连接关闭成功 - "+sessionId);
+
+    }
+
+    /**
+     *
+     * @param client
+     */
+    @OnEvent( value = "message")
+    @Transactional
+    public void onMessage(SocketIOClient client, AckRequest request, ChatMessage message) {
+
+    }
+
+}

modules/common/core/utils/AlipayConfigUtil.java

@@ -0,0 +1,110 @@
+package com.gxwebsoft.common.core.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayConstants;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 支付宝工具类
+ * @author leng
+ *
+ */
+@Component
+public class AlipayConfigUtil {
+  private final StringRedisTemplate stringRedisTemplate;
+  public Integer tenantId;
+  public String gateway;
+  public JSONObject config;
+  public String appId;
+  public String privateKey;
+  public String appCertPublicKey;
+  public String alipayCertPublicKey;
+  public String alipayRootCert;
+
+  @Resource
+  private ConfigProperties pathConfig;
+
+  public AlipayConfigUtil(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+  // 实例化客户端
+  public DefaultAlipayClient alipayClient(Integer tenantId) throws AlipayApiException {
+    this.gateway = "https://openapi.alipay.com/gateway.do";
+    this.tenantId = tenantId;
+    this.payment(tenantId);
+    CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+    certAlipayRequest.setServerUrl(this.gateway);
+    certAlipayRequest.setAppId(this.appId);
+    certAlipayRequest.setPrivateKey(this.privateKey);
+    certAlipayRequest.setFormat(AlipayConstants.FORMAT_JSON);
+    certAlipayRequest.setCharset(AlipayConstants.CHARSET_UTF8);
+    certAlipayRequest.setSignType(AlipayConstants.SIGN_TYPE_RSA2);
+    certAlipayRequest.setCertPath(this.appCertPublicKey);
+    certAlipayRequest.setAlipayPublicCertPath(this.alipayCertPublicKey);
+    certAlipayRequest.setRootCertPath(this.alipayRootCert);
+//    System.out.println("this.appId = " + this.appId);
+//    System.out.println("this.appId = " + this.gateway);
+//    System.out.println("this.appId = " + this.privateKey);
+//    System.out.println("this.appId = " + this.appCertPublicKey);
+//    System.out.println("this.appId = " + this.alipayCertPublicKey);
+//    System.out.println("this.appId = " + this.alipayRootCert);
+//    System.out.println("this.config = " + this.config);
+    return new DefaultAlipayClient(certAlipayRequest);
+  }
+
+  /**
+   * 获取支付宝秘钥
+   */
+  public JSONObject payment(Integer tenantId) {
+    System.out.println("tenantId = " + tenantId);
+    String key = "cache".concat(tenantId.toString()).concat(":setting:payment");
+    System.out.println("key = " + key);
+    String cache = stringRedisTemplate.opsForValue().get(key);
+    if (cache == null) {
+      throw new BusinessException("支付方式未配置");
+    }
+    // 解析json数据
+    JSONObject payment = JSON.parseObject(cache.getBytes());
+    this.config = payment;
+    this.appId = payment.getString("alipayAppId");
+    this.privateKey = payment.getString("privateKey");
+    this.appCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("appCertPublicKey");
+    this.alipayCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("alipayCertPublicKey");
+    this.alipayRootCert = pathConfig.getUploadPath() + "file" + payment.getString("alipayRootCert");
+    return payment;
+  }
+
+  public String appId(){
+    return this.appId;
+  }
+
+  public String privateKey(){
+    return this.privateKey;
+  }
+
+  public String appCertPublicKey(){
+    return this.appCertPublicKey;
+  }
+
+  public String alipayCertPublicKey(){
+    return this.alipayCertPublicKey;
+  }
+
+  public String alipayRootCert(){
+    return this.alipayRootCert;
+  }
+
+
+
+
+}

modules/common/core/utils/CacheClient.java

@@ -0,0 +1,263 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.result.RedisResult;
+import org.springframework.data.geo.Point;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+import static com.gxwebsoft.common.core.constants.RedisConstants.CACHE_NULL_TTL;
+
+@Component
+public class CacheClient {
+  private final StringRedisTemplate stringRedisTemplate;
+  public static Integer tenantId;
+
+  public CacheClient(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+  /**
+   * 写入redis缓存
+   * @param key [表名]:id
+   * @param entity 实体类对象
+   */
+  public <T> void set(String key, T entity){
+    stringRedisTemplate.opsForValue().set(prefix(key), JSONUtil.toJSONString(entity));
+  }
+
+  /**
+   * 写入redis缓存
+   * @param key [表名]:id
+   * @param entity 实体类对象
+   * 示例 cacheClient.set("merchant:"+id,merchant,1L,TimeUnit.DAYS)
+   */
+  public <T> void set(String key, T entity, Long time, TimeUnit unit){
+    stringRedisTemplate.opsForValue().set(prefix(key), JSONUtil.toJSONString(entity),time,unit);
+  }
+
+  /**
+   * 读取redis缓存
+   * @param key [表名]:id
+   * 示例 cacheClient.get(key)
+   * @return merchant
+   */
+  public String get(String key) {
+      return stringRedisTemplate.opsForValue().get(prefix(key));
+  }
+
+  /**
+   * 读取redis缓存
+   * @param key [表名]:id
+   * @param clazz Merchant.class
+   * @param <T>
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   * @return merchant
+   */
+  public <T> T get(String key, Class<T> clazz) {
+    String json = stringRedisTemplate.opsForValue().get(prefix(key));
+    if(StrUtil.isNotBlank(json)){
+      return JSONUtil.parseObject(json, clazz);
+    }
+    return null;
+  }
+
+  /**
+   * 写redis缓存(哈希类型)
+   * @param key [表名]:id
+   * @param field 字段
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   */
+  public <T> void hPut(String key, String field, T entity) {
+    stringRedisTemplate.opsForHash().put(prefix(key),field,JSONUtil.toJSONString(entity));
+  }
+
+  /**
+   * 写redis缓存(哈希类型)
+   * @param key [表名]:id
+   * @param map 字段
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   */
+  public void hPutAll(String key, Map<String,String> map) {
+    stringRedisTemplate.opsForHash().putAll(prefix(key),map);
+  }
+
+  /**
+   * 读取redis缓存(哈希类型)
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   * @param key [表名]:id
+   * @param field 字段
+   * @return merchant
+   */
+  public <T> T hGet(String key, String field, Class<T> clazz) {
+    Object obj = stringRedisTemplate.opsForHash().get(prefix(key), field);
+    return JSONUtil.parseObject(JSONUtil.toJSONString(obj),clazz);
+  }
+
+  public List<Object> hValues(String key){
+    return stringRedisTemplate.opsForHash().values(prefix(key));
+  }
+
+  public Long hSize(String key){
+    return stringRedisTemplate.opsForHash().size(prefix(key));
+  }
+
+  // 逻辑过期方式写入redis
+  public <T> void setWithLogicalExpire(String key, T value, Long time, TimeUnit unit){
+    // 设置逻辑过期时间
+    final RedisResult<T> redisResult = new RedisResult<>();
+    redisResult.setData(value);
+    redisResult.setExpireTime(LocalDateTime.now().plusSeconds(unit.toSeconds(time)));
+    stringRedisTemplate.opsForValue().set(prefix(key),JSONUtil.toJSONString(redisResult));
+  }
+
+  // 读取redis
+  public <R,ID> R query(String keyPrefix, ID id, Class<R> clazz, Function<ID,R> dbFallback, Long time, TimeUnit unit){
+    String key = keyPrefix + id;
+    // 1.从redis查询缓存
+    final String json = stringRedisTemplate.opsForValue().get(prefix(key));
+    // 2.判断是否存在
+    if (StrUtil.isNotBlank(json)) {
+      // 3.存在，直接返回
+      return JSONUtil.parseObject(json,clazz);
+    }
+    // 判断命中的是否为空值
+    if (json != null) {
+      return null;
+    }
+    // 4. 不存在，跟进ID查询数据库
+    R r = dbFallback.apply(id);
+    // 5. 数据库不存在，返回错误
+    if(r == null){
+      // 空值写入数据库
+      this.set(prefix(key),"",CACHE_NULL_TTL,TimeUnit.MINUTES);
+      return null;
+    }
+    // 写入redis
+    this.set(prefix(key),r,time,unit);
+    return r;
+  }
+
+  /**
+   * 添加商户定位点
+   * @param key geo
+   * @param id
+   * 示例 cacheClient.geoAdd("merchant-geo",merchant)
+   */
+  public <T> void geoAdd(String key, Double x, Double y, String id){
+      stringRedisTemplate.opsForGeo().add(prefix(key),new Point(x,y),id);
+  }
+
+  /**
+   * 删除定位
+   * @param key geo
+   * @param id
+   * 示例 cacheClient.geoRemove("merchant-geo",id)
+   */
+  public void geoRemove(String key, Integer id){
+    stringRedisTemplate.opsForGeo().remove(prefix(key),id.toString());
+  }
+
+
+
+  public <T> void sAdd(String key, T entity){
+    stringRedisTemplate.opsForSet().add(prefix(key),JSONUtil.toJSONString(entity));
+  }
+
+  public <T> Set<String> sMembers(String key){
+    return stringRedisTemplate.opsForSet().members(prefix(key));
+  }
+
+  // 更新排行榜
+  public void zAdd(String key, Integer userId, Double value) {
+    stringRedisTemplate.opsForZSet().add(prefix(key),userId.toString(),value);
+  }
+  // 增加元素的score值，并返回增加后的值
+  public Double zIncrementScore(String key,Integer userId, Double delta){
+    return stringRedisTemplate.opsForZSet().incrementScore(key, userId.toString(), delta);
+  }
+  // 获取排名榜
+  public Set<String> range(String key, Integer start, Integer end) {
+    return stringRedisTemplate.opsForZSet().range(prefix(key), start, end);
+  }
+  // 获取排名榜
+  public Set<String> reverseRange(String key, Integer start, Integer end){
+    return stringRedisTemplate.opsForZSet().reverseRange(prefix(key), start, end);
+  }
+  // 获取分数
+  public Double score(String key, Object value){
+    return stringRedisTemplate.opsForZSet().score(prefix(key), value);
+  }
+
+  public void delete(String key){
+    stringRedisTemplate.delete(prefix(key));
+  }
+
+  // 存储在list头部
+  public void leftPush(String key, String keyword){
+    stringRedisTemplate.opsForList().leftPush(prefix(key),keyword);
+  }
+
+  // 获取列表指定范围内的元素
+  public List<String> listRange(String key,Long start, Long end){
+    return stringRedisTemplate.opsForList().range(prefix(key), start, end);
+  }
+
+  // 获取列表长度
+  public Long listSize(String key){
+    return stringRedisTemplate.opsForList().size(prefix(key));
+  }
+
+  // 裁剪list
+  public void listTrim(String key){
+    stringRedisTemplate.opsForList().trim(prefix(key), 0L, 100L);
+  }
+
+  /**
+   * 读取后台系统设置信息
+   * @param keyName 键名wx-word
+   * @param tenantId 租户ID
+   * @return
+   * key示例 cache10048:setting:wx-work
+   */
+  public JSONObject getSettingInfo(String keyName,Integer tenantId){
+    String key = "cache" + tenantId + ":setting:" + keyName;
+    final String cache = stringRedisTemplate.opsForValue().get(key);
+    assert cache != null;
+    return JSON.parseObject(cache);
+  }
+
+  /**
+   * KEY前缀
+   * cache[tenantId]:[key+id]
+   */
+  public static String prefix(String key){
+    String prefix = "cache";
+    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    if (authentication != null) {
+      Object object = authentication.getPrincipal();
+      if (object instanceof User) {
+        final Integer tenantId = ((User) object).getTenantId();
+        prefix = prefix.concat(tenantId.toString()).concat(":");
+      }
+    }
+    return prefix.concat(key);
+  }
+
+  // 组装key
+  public String key(String name,Integer id){
+    return name.concat(":").concat(id.toString());
+  }
+}

modules/common/core/utils/CommonUtil.java

@@ -0,0 +1,235 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.web.ApiResult;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * 常用工具方法
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:22
+ */
+public class CommonUtil {
+    // 生成uuid的字符
+    private static final String[] chars = new String[]{
+            "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
+            "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+            "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
+            "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
+            "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"
+    };
+
+    /**
+     * 生成8位uuid
+     *
+     * @return String
+     */
+    public static String randomUUID8() {
+        StringBuilder sb = new StringBuilder();
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        for (int i = 0; i < 8; i++) {
+            String str = uuid.substring(i * 4, i * 4 + 4);
+            int x = Integer.parseInt(str, 16);
+            sb.append(chars[x % 0x3E]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 生成16位uuid
+     *
+     * @return String
+     */
+    public static String randomUUID16() {
+        StringBuilder sb = new StringBuilder();
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        for (int i = 0; i < 16; i++) {
+            String str = uuid.substring(i * 2, i * 2 + 2);
+            int x = Integer.parseInt(str, 16);
+            sb.append(chars[x % 0x3E]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取当前时间
+     *
+     * @return String
+     */
+    public static String currentTime() {
+      Date date = new Date();
+      SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss");
+      return sdf.format(date);
+    }
+
+    /**
+     * 生成10位随机用户名
+     *
+     * @return String
+     */
+    public static String randomUsername(String prefix) {
+      Date date = new Date();
+      SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss");
+      String currentTime = sdf.format(date);
+      return prefix + currentTime;
+    }
+
+    /**
+     * 生成订单号
+     * 20233191166110426
+     * 20230419135802391412
+     * @return
+     */
+    public static String createOrderNo() {
+      String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN);
+      return prefix + RandomUtil.randomNumbers(2);
+    }
+
+    /**
+     * 生成订单号
+     * @param tenantId
+     * 20233191166110426
+     * 20230419135802391412
+     * @return
+     */
+      public static String createOrderNo(String tenantId) {
+        String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN);
+        return prefix + tenantId + RandomUtil.randomNumbers(2);
+    }
+
+    /**
+     * 生成订单水流号
+     * @param tenantId
+     * @return
+     */
+    public static String serialNo(int tenantId) {
+      String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN);
+      return prefix + tenantId + RandomUtil.randomNumbers(2);
+    }
+
+    /**
+     * 检查List是否有重复元素
+     *
+     * @param list   List
+     * @param mapper 获取需要检查的字段的Function
+     * @param <T>    数据的类型
+     * @param <R>    需要检查的字段的类型
+     * @return boolean
+     */
+    public static <T, R> boolean checkRepeat(List<T> list, Function<? super T, ? extends R> mapper) {
+        for (int i = 0; i < list.size(); i++) {
+            for (int j = 0; j < list.size(); j++) {
+                if (i != j && mapper.apply(list.get(i)).equals(mapper.apply(list.get(j)))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * List转为树形结构
+     *
+     * @param data           List
+     * @param parentId       顶级的parentId
+     * @param parentIdMapper 获取parentId的Function
+     * @param idMapper       获取id的Function
+     * @param consumer       赋值children的Consumer
+     * @param <T>            数据的类型
+     * @param <R>            parentId的类型
+     * @return List<T>
+     */
+    public static <T, R> List<T> toTreeData(List<T> data, R parentId,
+                                            Function<? super T, ? extends R> parentIdMapper,
+                                            Function<? super T, ? extends R> idMapper,
+                                            BiConsumer<T, List<T>> consumer) {
+        List<T> result = new ArrayList<>();
+        for (T d : data) {
+            R dParentId = parentIdMapper.apply(d);
+            if (ObjectUtil.equals(parentId, dParentId)) {
+                R dId = idMapper.apply(d);
+                List<T> children = toTreeData(data, dId, parentIdMapper, idMapper, consumer);
+                consumer.accept(d, children);
+                result.add(d);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 遍历树形结构数据
+     *
+     * @param data     List
+     * @param consumer 回调
+     * @param mapper   获取children的Function
+     * @param <T>      数据的类型
+     */
+    public static <T> void eachTreeData(List<T> data, Consumer<T> consumer, Function<T, List<T>> mapper) {
+        for (T d : data) {
+            consumer.accept(d);
+            List<T> children = mapper.apply(d);
+            if (children != null && children.size() > 0) {
+                eachTreeData(children, consumer, mapper);
+            }
+        }
+    }
+
+    /**
+     * 获取集合中的第一条数据
+     *
+     * @param records 集合
+     * @return 第一条数据
+     */
+    public static <T> T listGetOne(List<T> records) {
+        return records == null || records.size() == 0 ? null : records.get(0);
+    }
+
+    /**
+     * 支持跨域
+     *
+     * @param response HttpServletResponse
+     */
+    public static void addCrossHeaders(HttpServletResponse response) {
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Allow-Headers", "*");
+        response.setHeader("Access-Control-Expose-Headers", Constants.TOKEN_HEADER_NAME);
+    }
+
+    /**
+     * 输出错误信息
+     *
+     * @param response HttpServletResponse
+     * @param code     错误码
+     * @param message  提示信息
+     * @param error    错误信息
+     */
+    public static void responseError(HttpServletResponse response, Integer code, String message, String error) {
+        response.setContentType("application/json;charset=UTF-8");
+        try {
+            PrintWriter out = response.getWriter();
+            out.write(JSONUtil.toJSONString(new ApiResult<>(code, message, null, error)));
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

modules/common/core/utils/DomainUtil.java

@@ -0,0 +1,32 @@
+package com.gxwebsoft.common.core.utils;
+
+import static com.gxwebsoft.common.core.constants.DomainConstants.*;
+
+public class DomainUtil {
+
+  /**
+   * 根域名
+   * @return domain.com
+   */
+  public static String getRootDomain() {
+    return ROOT_DOMAIN;
+  }
+
+  /**
+   * 管理后台地址
+   * @return https://{tenantId}.websoft.top
+   */
+  public static String getAdminUrl(String tenantId) {
+    return PREFIX.concat(tenantId).concat(ADMIN_SUFFIX);
+  }
+
+  /**
+   * 应用网址
+   * @param tenantId
+   * @return https://{tenantId}.wsdns.cn
+   */
+  public static String getSiteUrl(String tenantId){
+    return PREFIX.concat(tenantId).concat(WEB_SUFFIX);
+  }
+
+}

modules/common/core/utils/FileServerUtil.java

@@ -0,0 +1,401 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.img.ImgUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
+import org.apache.tika.Tika;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 文件上传下载工具类
+ *
+ * @author WebSoft
+ * @since 2018-12-14 08:38:53
+ */
+public class FileServerUtil {
+    // 除 text/* 外也需要设置输出编码的 content-type
+    private final static List<String> SET_CHARSET_CONTENT_TYPES = Arrays.asList(
+            "application/json",
+            "application/javascript"
+    );
+
+    /**
+     * 上传文件
+     *
+     * @param file      MultipartFile
+     * @param directory 文件保存的目录
+     * @param uuidName  是否用uuid命名
+     * @return File
+     */
+    public static File upload(MultipartFile file, String directory, boolean uuidName)
+            throws IOException, IllegalStateException {
+        File outFile = getUploadFile(file.getOriginalFilename(), directory, uuidName);
+        if (!outFile.getParentFile().exists()) {
+            if (!outFile.getParentFile().mkdirs()) {
+                throw new RuntimeException("make directory fail");
+            }
+        }
+        file.transferTo(outFile);
+        return outFile;
+    }
+
+    /**
+     * 上传base64格式文件
+     *
+     * @param base64    base64编码字符
+     * @param fileName  文件名称, 为空使用uuid命名
+     * @param directory 文件保存的目录
+     * @return File
+     */
+    public static File upload(String base64, String fileName, String directory)
+            throws FileNotFoundException, IORuntimeException {
+        if (StrUtil.isBlank(base64) || !base64.startsWith("data:image/") || !base64.contains(";base64,")) {
+            throw new RuntimeException("base64 data error");
+        }
+        String suffix = "." + base64.substring(11, base64.indexOf(";"));  // 获取文件后缀
+        boolean uuidName = StrUtil.isBlank(fileName);
+        File outFile = getUploadFile(uuidName ? suffix : fileName, directory, uuidName);
+        byte[] bytes = Base64.getDecoder().decode(base64.substring(base64.indexOf(";") + 8).getBytes());
+        IoUtil.write(new FileOutputStream(outFile), true, bytes);
+        return outFile;
+    }
+
+    /**
+     * 获取上传文件位置
+     *
+     * @param name      文件名称
+     * @param directory 上传目录
+     * @param uuidName  是否使用uuid命名
+     * @return File
+     */
+    public static File getUploadFile(String name, String directory, boolean uuidName) {
+        // 当前日期作为上传子目录
+        String dir = new SimpleDateFormat("yyyyMMdd/").format(new Date());
+        // 获取文件后缀
+        String suffix = (name == null || !name.contains(".")) ? "" : name.substring(name.lastIndexOf("."));
+        // 使用uuid命名
+        if (uuidName || name == null) {
+            String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+            return new File(directory, dir + uuid + suffix);
+        }
+        // 使用原名称, 存在相同则加(1)
+        File file = new File(directory, dir + name);
+        String prefix = StrUtil.removeSuffix(name, suffix);
+        int sameSize = 2;
+        while (file.exists()) {
+            file = new File(directory, dir + prefix + "(" + sameSize + ")" + suffix);
+            sameSize++;
+        }
+        return file;
+    }
+
+    /**
+     * 查看文件, 支持断点续传
+     *
+     * @param file       文件
+     * @param pdfDir     office转pdf输出目录
+     * @param officeHome openOffice安装目录
+     * @param response   HttpServletResponse
+     * @param request    HttpServletRequest
+     */
+    public static void preview(File file, String pdfDir, String officeHome,
+                               HttpServletResponse response, HttpServletRequest request) {
+        preview(file, false, null, pdfDir, officeHome, response, request);
+    }
+
+    /**
+     * 查看文件, 支持断点续传
+     *
+     * @param file          文件
+     * @param forceDownload 是否强制下载
+     * @param fileName      强制下载的文件名称
+     * @param pdfDir        office转pdf输出目录
+     * @param officeHome    openOffice安装目录
+     * @param response      HttpServletResponse
+     * @param request       HttpServletRequest
+     */
+    public static void preview(File file, boolean forceDownload, String fileName, String pdfDir, String officeHome,
+                               HttpServletResponse response, HttpServletRequest request) {
+        CommonUtil.addCrossHeaders(response);
+        if (file == null || !file.exists()) {
+            outNotFund(response);
+            return;
+        }
+        if (forceDownload) {
+            setDownloadHeader(response, StrUtil.isBlank(fileName) ? file.getName() : fileName);
+        } else {
+            // office转pdf预览
+            if (OpenOfficeUtil.canConverter(file.getName())) {
+                File pdfFile = OpenOfficeUtil.converterToPDF(file.getAbsolutePath(), pdfDir, officeHome);
+                if (pdfFile != null) {
+                    file = pdfFile;
+                }
+            }
+            // 获取文件类型
+            String contentType = getContentType(file);
+            if (contentType != null) {
+                response.setContentType(contentType);
+                // 设置编码
+                if (contentType.startsWith("text/") || SET_CHARSET_CONTENT_TYPES.contains(contentType)) {
+                    try {
+                        String charset = JChardetFacadeUtil.detectCodepage(file.toURI().toURL());
+                        if (charset != null) {
+                            response.setCharacterEncoding(charset);
+                        }
+                    } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else {
+                setDownloadHeader(response, file.getName());
+            }
+        }
+        response.setHeader("Cache-Control", "public");
+        output(file, response, request);
+    }
+
+    /**
+     * 查看缩略图
+     *
+     * @param file      原文件
+     * @param thumbnail 缩略图文件
+     * @param size      缩略图文件的最大值(kb)
+     * @param response  HttpServletResponse
+     * @param request   HttpServletRequest
+     */
+    public static void previewThumbnail(File file, File thumbnail, Integer size,
+                                        HttpServletResponse response, HttpServletRequest request) {
+        // 如果是图片并且缩略图不存在则生成
+        if (!thumbnail.exists() && isImage(file)) {
+            long fileSize = file.length();
+            if ((fileSize / 1024) > size) {
+                try {
+                    if (thumbnail.getParentFile().mkdirs()) {
+                      System.out.println("生成缩略图1>>>>>>>>>>>>>>>> = " + thumbnail);
+                        ImgUtil.scale(file, thumbnail, size / (fileSize / 1024f));
+                        if (thumbnail.exists() && thumbnail.length() > file.length()) {
+                            FileUtil.copy(file, thumbnail, true);
+                        }
+                    }else{
+                      System.out.println("生成缩略图2>>>>>>>>>>>>>>>> = " + thumbnail);
+                      ImgUtil.scale(file, thumbnail, size / (fileSize / 1024f));
+                      if (thumbnail.exists() && thumbnail.length() > file.length()) {
+                        FileUtil.copy(file, thumbnail, true);
+                      }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                preview(file, null, null, response, request);
+                return;
+            }
+        }
+        preview(thumbnail.exists() ? thumbnail : file, null, null, response, request);
+    }
+
+    /**
+     * 输出文件流, 支持断点续传
+     *
+     * @param file     文件
+     * @param response HttpServletResponse
+     * @param request  HttpServletRequest
+     */
+    public static void output(File file, HttpServletResponse response, HttpServletRequest request) {
+        long length = file.length();  // 文件总大小
+        long start = 0, to = length - 1;  // 开始读取位置, 结束读取位置
+        long lastModified = file.lastModified();  // 文件修改时间
+        response.setHeader("Accept-Ranges", "bytes");
+        response.setHeader("ETag", "\"" + length + "-" + lastModified + "\"");
+        response.setHeader("Last-Modified", new Date(lastModified).toString());
+        String range = request.getHeader("Range");
+        if (range != null) {
+            response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+            String[] ranges = range.replace("bytes=", "").split("-");
+            start = Long.parseLong(ranges[0].trim());
+            if (ranges.length > 1) {
+                to = Long.parseLong(ranges[1].trim());
+            }
+            response.setHeader("Content-Range", "bytes " + start + "-" + to + "/" + length);
+        }
+        response.setHeader("Content-Length", String.valueOf(to - start + 1));
+        try {
+            output(file, response.getOutputStream(), 2048, start, to);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 输出文件流
+     *
+     * @param file 文件
+     * @param os   输出流
+     */
+    public static void output(File file, OutputStream os) {
+        output(file, os, null);
+    }
+
+    /**
+     * 输出文件流
+     *
+     * @param file 文件
+     * @param os   输出流
+     * @param size 读取缓冲区大小
+     */
+    public static void output(File file, OutputStream os, Integer size) {
+        output(file, os, size, null, null);
+    }
+
+    /**
+     * 输出文件流, 支持分片
+     *
+     * @param file  文件
+     * @param os    输出流
+     * @param size  读取缓冲区大小
+     * @param start 开始位置
+     * @param to    结束位置
+     */
+    public static void output(File file, OutputStream os, Integer size, Long start, Long to) {
+        BufferedInputStream is = null;
+        try {
+            is = new BufferedInputStream(new FileInputStream(file));
+            if (start != null) {
+                long skip = is.skip(start);
+                if (skip < start) {
+                    System.out.println("ERROR: skip fail[ skipped=" + skip + ", start= " + start + " ]");
+                }
+                to = to - start + 1;
+            }
+            byte[] bytes = new byte[size == null ? 2048 : size];
+            int len;
+            if (to == null) {
+                while ((len = is.read(bytes)) != -1) {
+                    os.write(bytes, 0, len);
+                }
+            } else {
+                while (to > 0 && (len = is.read(bytes)) != -1) {
+                    os.write(bytes, 0, to < len ? (int) ((long) to) : len);
+                    to -= len;
+                }
+            }
+            os.flush();
+        } catch (IOException ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException ignored) {
+                }
+            }
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    System.out.println(e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取文件类型
+     *
+     * @param file 文件
+     * @return String
+     */
+    public static String getContentType(File file) {
+        String contentType = null;
+        if (file.exists()) {
+            try {
+                contentType = new Tika().detect(file);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return contentType;
+    }
+
+    /**
+     * 判断文件是否是图片类型
+     *
+     * @param file 文件
+     * @return boolean
+     */
+    public static boolean isImage(File file) {
+        return isImage(getContentType(file));
+    }
+
+    /**
+     * 判断文件是否是图片类型
+     *
+     * @param contentType 文件类型
+     * @return boolean
+     */
+    public static boolean isImage(String contentType) {
+        return contentType != null && contentType.startsWith("image/");
+    }
+
+    /**
+     * 设置下载文件的header
+     *
+     * @param response HttpServletResponse
+     * @param fileName 文件名称
+     */
+    public static void setDownloadHeader(HttpServletResponse response, String fileName) {
+        response.setContentType("application/force-download");
+        try {
+            fileName = URLEncoder.encode(fileName, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
+    }
+
+    /**
+     * 输出404错误页面
+     *
+     * @param response HttpServletResponse
+     */
+    public static void outNotFund(HttpServletResponse response) {
+        response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+        outMessage("404 Not Found", null, response);
+    }
+
+    /**
+     * 输出错误页面
+     *
+     * @param title    标题
+     * @param message  内容
+     * @param response HttpServletResponse
+     */
+    public static void outMessage(String title, String message, HttpServletResponse response) {
+        response.setContentType("text/html;charset=UTF-8");
+        try {
+            PrintWriter writer = response.getWriter();
+            writer.write("<!doctype html>");
+            writer.write("<title>" + title + "</title>");
+            writer.write("<h1 style=\"text-align: center\">" + title + "</h1>");
+            if (message != null) {
+                writer.write(message);
+            }
+            writer.write("<hr/><p style=\"text-align: center\">WebSoft File Server</p>");
+            writer.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

modules/common/core/utils/GreenWebUtils.java

@@ -0,0 +1,317 @@
+package com.gxwebsoft.common.core.utils;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
+import com.aliyun.green20220302.Client;
+import com.aliyun.green20220302.models.*;
+import com.aliyun.teaopenapi.models.Config;
+import com.aliyun.teautil.models.RuntimeOptions;
+import com.gxwebsoft.common.core.enums.GreenWebType;
+import com.gxwebsoft.common.system.vo.faceId.HeadPortraitResult;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.*;
+
+
+@Component
+public class GreenWebUtils {
+    private static Client contentGreenClient = null;
+
+    static final String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj";
+    static final String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9";
+
+    static final String[] badAudioLabel = {"violence", "political_content", "sexual_content", "sexual_sounds", "contraband", "profanity", "religion", "cyberbullying", "negative_content", "specified_speaking", "specified_lyrics"};
+//    static final String[] badVideoLabel = {"pornographic_adultContent","pornographic_adultToys","pornographic_artwork","pornographic_adultContent_tii","sexual_suggestiveContent","sexual_breastNudity","sexual_cleavage","sexual_femaleUnderwear","sexual_maleTopless","sexual_femaleShoulder","sexual_cartoon","sexual_pregnancy","sexual_underage","political_politicalFigure_1","political_politicalFigure_2","political_politicalFigure_3","political_politicalFigure_name_tii",""};
+
+    private static class ContentGreenClientHolder {
+        private static final Client INSTANCE = createContentGreenClient();
+    }
+
+    private static Client createContentGreenClient() {
+        Config config = new Config();
+        config.setAccessKeyId(accessKeyId);
+        config.setAccessKeySecret(accessKeySecret);
+        config.setRegionId("cn-shenzhen");
+        config.setEndpoint("green-cip.cn-shenzhen.aliyuncs.com");
+        config.setReadTimeout(6000);
+        config.setConnectTimeout(3000);
+        try {
+            return new Client(config);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    public static Client getContentGreenClient() {
+
+        if (contentGreenClient == null) {
+            contentGreenClient = ContentGreenClientHolder.INSTANCE;
+        }
+        return contentGreenClient;
+    }
+
+    /**
+     * 文本审核
+     *
+     * @param text
+     * @param type
+     * @return
+     */
+    public static boolean testText(String text, GreenWebType type) {
+        if (!StringUtils.hasText(text)) {
+            return false;
+        }
+
+        JSONObject serviceParameters = new JSONObject();
+        serviceParameters.put("content", text);
+
+        // 创建RuntimeObject实例并设置运行参数。
+        RuntimeOptions runtime = new RuntimeOptions();
+        runtime.readTimeout = 10000;
+        runtime.connectTimeout = 10000;
+
+        TextModerationRequest textModerationRequest = new TextModerationRequest();
+        textModerationRequest.setService(type.name());
+        textModerationRequest.setServiceParameters(serviceParameters.toJSONString());
+
+//        try {
+        TextModerationResponse response = null;
+        try {
+            response = getContentGreenClient().textModerationWithOptions(textModerationRequest, runtime);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        if (response.statusCode != 200) {
+            return false;
+        }
+
+        TextModerationResponseBody result = response.getBody();
+        Integer code = result.getCode();
+        if (code != null && code == 200) {
+            TextModerationResponseBody.TextModerationResponseBodyData data = result.getData();
+            return !StringUtils.hasText(data.getReason());
+
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 图片审核
+     *
+     * @param imgUrl
+     * @param type
+     * @return
+     */
+
+    public static boolean testImage(String imgUrl, GreenWebType type) {
+
+        if(!imgUrl.contains("?x-oss-process=image/resize")) {
+            imgUrl += "?x-oss-process=image/resize,w_750/quality,Q_90";
+        }
+
+        Map<String, String> serviceParameters = new HashMap<>();
+        //公网可访问的URL。
+        serviceParameters.put("imageUrl", imgUrl);
+        serviceParameters.put("dataId", UUID.randomUUID().toString());
+
+        ImageModerationRequest request = new ImageModerationRequest();
+        // 图片检测service: baselineCheck通用基线检测。
+        request.setService(type.name());
+        request.setServiceParameters(JSON.toJSONString(serviceParameters));
+
+        RuntimeOptions runtime = new RuntimeOptions();
+        runtime.readTimeout = 10000;
+        runtime.connectTimeout = 10000;
+        ImageModerationResponse response = null;
+        try {
+            response = getContentGreenClient().imageModerationWithOptions(request, runtime);
+            System.out.println(response);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        ImageModerationResponseBody body = response.getBody();
+
+        String[] unSafeLabelArr = {"pornographic_adultContent_tii","pornographic_adultContent","sexual_suggestiveContent",""};
+        if (body.getCode() == 200) {
+            ImageModerationResponseBody.ImageModerationResponseBodyData data = body.getData();
+            System.out.println("dataId=" + data.getDataId());
+            List<ImageModerationResponseBody.ImageModerationResponseBodyDataResult> results = data.getResult();
+            for (ImageModerationResponseBody.ImageModerationResponseBodyDataResult result : results) {
+
+                if (!"nonLabel".equals(result.getLabel())) {
+                    System.out.println(String.format("Label: %s,Confidence: %f",result.getLabel(),result.getConfidence()));
+                    return false;
+                }
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 视频审核（异步）
+     *
+     * @param videoUrl
+     * @param type
+     * @return
+     */
+    public static String testVideo(String videoUrl, GreenWebType type) {
+
+        JSONObject serviceParameters = new JSONObject();
+        serviceParameters.put("url", videoUrl);
+
+        VideoModerationRequest videoModerationRequest = new VideoModerationRequest();
+        // 检测类型：videoDetection
+        videoModerationRequest.setService(type.name());
+        videoModerationRequest.setServiceParameters(serviceParameters.toJSONString());
+
+
+        try {
+            VideoModerationResponse response = getContentGreenClient().videoModeration(videoModerationRequest);
+            if (response.getStatusCode() == 200) {
+                VideoModerationResponseBody result = response.getBody();
+                System.out.println(JSON.toJSONString(result));
+                System.out.println("requestId = " + result.getRequestId());
+                System.out.println("code = " + result.getCode());
+                System.out.println("msg = " + result.getMessage());
+                Integer code = result.getCode();
+                if (200 == code) {
+                    VideoModerationResponseBody.VideoModerationResponseBodyData data = result.getData();
+                    return data.taskId;
+                } else {
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    /**
+     * 获取视频审核结果
+     *
+     * @param taskId
+     * @param type
+     * @return
+     */
+    public static boolean getTestVideoResult(String taskId, GreenWebType type) {
+
+
+        JSONObject serviceParameters = new JSONObject();
+        // 提交任务时返回的taskId。
+        serviceParameters.put("taskId", taskId);
+        VideoModerationResultRequest videoModerationResultRequest = new VideoModerationResultRequest();
+        videoModerationResultRequest.setService(type.name());
+        videoModerationResultRequest.setServiceParameters(serviceParameters.toJSONString());
+        try {
+            VideoModerationResultResponse response = getContentGreenClient().videoModerationResult(videoModerationResultRequest);
+            if (response.getStatusCode() == 200) {
+                VideoModerationResultResponseBody result = response.getBody();
+                System.out.println("requestId=" + result.getRequestId());
+                System.out.println("code=" + result.getCode());
+                System.out.println("msg=" + result.getMessage());
+                if (200 == result.getCode()) {
+                    VideoModerationResultResponseBody.VideoModerationResultResponseBodyData data = result.getData();
+                    VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataAudioResult audioResult = data.getAudioResult();
+                    VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataFrameResult frameResult = data.getFrameResult();
+                    boolean hasBadAudio = audioResult.sliceDetails.stream().filter(w -> {
+                        String labels = w.getLabels();
+                        String[] labelArr = labels.split(",");
+                        return Arrays.stream(labelArr).filter(l -> {
+                            return Arrays.stream(badAudioLabel).filter(b -> b.equals(l)).findFirst().isPresent();
+                        }).findFirst().isPresent();
+                    }).findFirst().isPresent();
+                    if (hasBadAudio) {
+                        return false;
+                    }
+                    boolean hasBadVideo = frameResult.getFrames().stream().filter(w -> {
+                        return w.getResults().stream().filter(r -> {
+                            return r.getResult().stream().filter(r2 -> {
+                                return !"nonLabel".equals(r2.label);
+                            }).findFirst().isPresent();
+                        }).findFirst().isPresent();
+                    }).findFirst().isPresent();
+                    if (hasBadVideo) {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     * 鉴别头像是否是真人头像（非卡通）     2. 鉴别图片是否有性感，色情信息     3. 鉴别头像是否有广告，敏感信息，以及二维码等 4. 鉴别头像性别。
+     *
+     * @param imageBase64
+     * @param imageType
+     * @param genter
+     * @return
+     */
+    public static boolean testAvatar(String imageBase64, String imageType, Integer genter) {
+        String host = "https://edishead.market.alicloudapi.com";
+        String path = "/faceId/headPortrait/getResult";
+        String method = "POST";
+        String appcode = "566b5786c5874464909d8c0b7f64cdc7";
+        Map<String, String> headers = new HashMap<String, String>();
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
+        headers.put("Authorization", "APPCODE " + appcode);
+        //根据API的要求，定义相对应的Content-Type
+        headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+        Map<String, String> querys = new HashMap<String, String>();
+        Map<String, String> bodys = new HashMap<String, String>();
+        bodys.put("image", imageBase64);
+        bodys.put("imageType", imageType);
+        HttpResponse response = null;
+        try {
+            response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
+            HttpEntity entity = response.getEntity();
+            String string = EntityUtils.toString(entity);
+            HeadPortraitResult result = JSONObject.parseObject(string, new TypeReference<HeadPortraitResult>() {
+            });
+            if (!"0000".equals(result.getCode())) {
+                return false;
+            }
+            if (!"normal".equals(result.getPorn()) || !"normal".equals(result.getAd())) {
+                return false;
+            }
+            if (result.getFaceCount() != 1 || result.getCartoonImg()) {
+                return false;
+            }
+
+            if (!genter.equals(result.getGenterList()[0])) {
+                return false;
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        System.out.println(response.toString());
+        return true;
+    }
+}

modules/common/core/utils/HttpUtils.java

@@ -0,0 +1,311 @@
+package com.gxwebsoft.common.core.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class HttpUtils {
+
+    /**
+     * get
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doGet(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpGet request = new HttpGet(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * post form
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param bodys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      Map<String, String> bodys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (bodys != null) {
+            List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+
+            for (String key : bodys.keySet()) {
+                nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
+            }
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+            formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+            request.setEntity(formEntity);
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Post String
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+            request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Post stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put String
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+            request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put stream
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Delete
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doDelete(String host, String path, String method,
+                                        Map<String, String> headers,
+                                        Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        return httpClient.execute(request);
+    }
+
+    private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
+        StringBuilder sbUrl = new StringBuilder();
+        sbUrl.append(host);
+        if (!StringUtils.isBlank(path)) {
+            sbUrl.append(path);
+        }
+        if (null != querys) {
+            StringBuilder sbQuery = new StringBuilder();
+            for (Map.Entry<String, String> query : querys.entrySet()) {
+                if (0 < sbQuery.length()) {
+                    sbQuery.append("&");
+                }
+                if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
+                    sbQuery.append(query.getValue());
+                }
+                if (!StringUtils.isBlank(query.getKey())) {
+                    sbQuery.append(query.getKey());
+                    if (!StringUtils.isBlank(query.getValue())) {
+                        sbQuery.append("=");
+                        sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+                    }
+                }
+            }
+            if (0 < sbQuery.length()) {
+                sbUrl.append("?").append(sbQuery);
+            }
+        }
+
+        return sbUrl.toString();
+    }
+
+    private static HttpClient wrapClient(String host) {
+        HttpClient httpClient = new DefaultHttpClient();
+        if (host.startsWith("https://")) {
+            sslClient(httpClient);
+        }
+
+        return httpClient;
+    }
+
+    private static void sslClient(HttpClient httpClient) {
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+                public void checkClientTrusted(X509Certificate[] xcs, String str) {
+
+                }
+                public void checkServerTrusted(X509Certificate[] xcs, String str) {
+
+                }
+            };
+            ctx.init(null, new TrustManager[] { tm }, null);
+            SSLSocketFactory ssf = new SSLSocketFactory(ctx);
+            ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+            ClientConnectionManager ccm = httpClient.getConnectionManager();
+            SchemeRegistry registry = ccm.getSchemeRegistry();
+            registry.register(new Scheme("https", 443, ssf));
+        } catch (KeyManagementException ex) {
+            throw new RuntimeException(ex);
+        } catch (NoSuchAlgorithmException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}

modules/common/core/utils/ImageUtil.java

@@ -0,0 +1,62 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.codec.Base64Encoder;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class ImageUtil {
+    public  static  String ImageBase64(String imgUrl) {
+        URL url = null;
+        InputStream is = null;
+        ByteArrayOutputStream outStream = null;
+        HttpURLConnection httpUrl = null;
+        try{
+            url = new URL(imgUrl);
+            httpUrl = (HttpURLConnection) url.openConnection();
+            httpUrl.connect();
+            httpUrl.getInputStream();
+            is = httpUrl.getInputStream();
+
+            outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while( (len=is.read(buffer)) != -1 ){
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            // 对字节数组Base64编码
+            return new Base64Encoder().encode(outStream.toByteArray());
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        finally{
+            if(is != null)
+            {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(outStream != null)
+            {
+                try {
+                    outStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(httpUrl != null)
+            {
+                httpUrl.disconnect();
+            }
+        }
+        return imgUrl;
+    }
+}

modules/common/core/utils/JSONUtil.java

@@ -0,0 +1,69 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+/**
+ * JSON解析工具类
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:39
+ */
+public class JSONUtil {
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectWriter objectWriter = objectMapper.writerWithDefaultPrettyPrinter();
+
+    /**
+     * 对象转json字符串
+     *
+     * @param value 对象
+     * @return String
+     */
+    public static String toJSONString(Object value) {
+        return toJSONString(value, false);
+    }
+
+    /**
+     * 对象转json字符串
+     *
+     * @param value  对象
+     * @param pretty 是否格式化输出
+     * @return String
+     */
+    public static String toJSONString(Object value, boolean pretty) {
+        if (value != null) {
+            if (value instanceof String) {
+                return (String) value;
+            }
+            try {
+                if (pretty) {
+                    return objectWriter.writeValueAsString(value);
+                }
+                return objectMapper.writeValueAsString(value);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * json字符串转对象
+     *
+     * @param json  String
+     * @param clazz Class
+     * @return T
+     */
+    public static <T> T parseObject(String json, Class<T> clazz) {
+        if (StrUtil.isNotBlank(json) && clazz != null) {
+            try {
+                return objectMapper.readValue(json, clazz);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+}

modules/common/core/utils/MyQrCodeUtil.java

@@ -0,0 +1,62 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * 常用工具方法
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:22
+ */
+public class MyQrCodeUtil {
+  private static final String logoUrl = "https://file.wsdns.cn/20230430/6fa31aca3b0d47af98a149cf2dd26a4f.jpeg";
+
+  /**
+   * 生成二维码
+   * 用户ID
+   */
+  public static String getCode(Integer loginUserId) throws IOException {
+    return createQrCode(loginUserId,loginUserId.toString());
+  }
+
+  /**
+   * 生成二维码
+   * 支持自定义类型和内容
+   */
+  public String getCode(Integer loginUserId,String content) throws IOException {
+    return createQrCode(loginUserId,content);
+  }
+
+  /**
+   * 生成带水印的二维码
+   * @return https://file.gxwebsoft.com/qrcode/870.jpg?v=1682925307569
+   */
+  public static String createQrCode(Integer userId,String content) throws IOException {
+    // 将URL转为BufferedImage
+    BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl));
+    // 生成二维码
+    QrConfig config = new QrConfig(300, 300);
+    // 设置边距，既二维码和背景之间的边距
+    config.setMargin(1);
+    // 附带小logo
+    config.setImg(bufferedImage);
+    // 保存路径
+//    String filePath = "/Users/gxwebsoft/Documents/uploads/" + "file/qrcode/" + userId + ".jpg";
+    String filePath = "/www/wwwroot/file.ws/" + "file/qrcode/" + userId + ".jpg";
+    String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/" + userId + ".jpg" + "?v=" + DateUtil.current();
+    // 生成二维码
+    System.out.println("config = " + config);
+    System.out.println("con = " + content);
+    System.out.println("filePath = " + filePath);
+    QrCodeUtil.generate(content, config, FileUtil.file(filePath));
+    return qrcodeUrl;
+  }
+}

modules/common/core/utils/OpenOfficeUtil.java

@@ -0,0 +1,124 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.StrUtil;
+import org.artofsolving.jodconverter.OfficeDocumentConverter;
+import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
+import org.artofsolving.jodconverter.office.OfficeManager;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Base64;
+
+/**
+ * OpenOfficeUtil
+ *
+ * @author WebSoft
+ * @since 2018-12-14 08:38:19
+ */
+public class OpenOfficeUtil {
+    // 支持转换pdf的文件后缀列表
+    private static final String[] CAN_CONVERTER_FILES = new String[]{
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx"
+    };
+
+    /**
+     * 文件转pdf
+     *
+     * @param filePath   源文件路径
+     * @param outDir     输出目录
+     * @param officeHome OpenOffice安装路径
+     * @return File
+     */
+    public static File converterToPDF(String filePath, String outDir, String officeHome) {
+        return converterToPDF(filePath, outDir, officeHome, true);
+    }
+
+    /**
+     * 文件转pdf
+     *
+     * @param filePath   源文件路径
+     * @param outDir     输出目录
+     * @param officeHome OpenOffice安装路径
+     * @param cache      是否使用上次转换过的文件
+     * @return File
+     */
+    public static File converterToPDF(String filePath, String outDir, String officeHome, boolean cache) {
+        if (StrUtil.isBlank(filePath)) {
+            return null;
+        }
+        File srcFile = new File(filePath);
+        if (!srcFile.exists()) {
+            return null;
+        }
+        // 是否转换过
+        String outPath = Base64.getEncoder().encodeToString(filePath.getBytes())
+                .replace("/", "-").replace("+", "-");
+        File outFile = new File(outDir, outPath + ".pdf");
+        if (cache && outFile.exists()) {
+            return outFile;
+        }
+        // 转换
+        OfficeManager officeManager = null;
+        try {
+            officeManager = getOfficeManager(officeHome);
+            OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager);
+            return converterFile(srcFile, outFile, converter);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (officeManager != null) {
+                officeManager.stop();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 转换文件
+     *
+     * @param inFile    源文件
+     * @param outFile   输出文件
+     * @param converter OfficeDocumentConverter
+     * @return File
+     */
+    public static File converterFile(File inFile, File outFile, OfficeDocumentConverter converter) {
+        if (!outFile.getParentFile().exists()) {
+            if (!outFile.getParentFile().mkdirs()) {
+                return outFile;
+            }
+        }
+        converter.convert(inFile, outFile);
+        return outFile;
+    }
+
+    /**
+     * 判断文件后缀是否可以转换pdf
+     *
+     * @param path 文件路径
+     * @return boolean
+     */
+    public static boolean canConverter(String path) {
+        try {
+            String suffix = path.substring(path.lastIndexOf(".") + 1);
+            return Arrays.asList(CAN_CONVERTER_FILES).contains(suffix);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * 连接并启动OpenOffice
+     *
+     * @param officeHome OpenOffice安装路径
+     * @return OfficeManager
+     */
+    public static OfficeManager getOfficeManager(String officeHome) {
+        if (officeHome == null || officeHome.trim().isEmpty()) return null;
+        DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration();
+        config.setOfficeHome(officeHome);  // 设置OpenOffice安装目录
+        OfficeManager officeManager = config.buildOfficeManager();
+        officeManager.start();  // 启动OpenOffice服务
+        return officeManager;
+    }
+
+}

modules/common/core/utils/PushUtil.java

@@ -0,0 +1,96 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.common.system.vo.PushMessageVO;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 个推推送消息工具类
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:39
+ */
+@Component
+public class PushUtil {
+    @Resource
+    RedisUtil redisUtil;
+
+    @Resource
+    private UserService userService;
+    private static final String url = "https://fc-mp-ba98f1e0-713d-457b-a0a4-27a7939371e6.next.bspapp.com/unipush";
+
+  /**
+   * 获取鉴权token
+   * @return
+   */
+  public String getToken() {
+    String key = "token:oOVaDtYDYQ8q3lNjhLh401";
+
+    if(redisUtil.get(key) != null){
+      return redisUtil.get(key);
+    }
+
+    HashMap<String, Object> map = new HashMap<>();
+    long timeMillis = System.currentTimeMillis();
+    String sign = SecureUtil.sha256("AC6IghgsUx7Mwjb7G5eqv" + timeMillis + "JVRkOCXXzA6EyE2Fi5sPr9");
+    map.put("sign",sign);
+    map.put("timestamp",timeMillis);
+    map.put("appkey","AC6IghgsUx7Mwjb7G5eqv");
+    final String body = HttpRequest.post(url.concat("/auth")).body(JSONUtil.toJSONString(map)).execute().body();
+    final JSONObject jsonObject = JSONObject.parseObject(body);
+    final String data = jsonObject.getString("data");
+    final JSONObject jsonData = JSONObject.parseObject(data);
+
+    final String token = jsonData.getString("token");
+    final Long expireTime = Long.valueOf(jsonData.getString("expire_time"));
+    // 保存token
+
+    redisUtil.set(key,token, expireTime-System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+    return token;
+  }
+
+  /**
+   * 执行cid单推
+   * cid数组，只能填一个cid
+   *
+   */
+  public static boolean toSingle(PushMessageVO pushMessageVO){
+    final String body = HttpRequest.post(url).body(JSONUtil.toJSONString(pushMessageVO)).execute().body();
+    JSONObject jsonObject = JSONObject.parseObject(body);
+    if("success".equals(jsonObject.get("errMsg"))){
+      return true;
+    }
+    return  false;
+  }
+
+
+  public  boolean toSingle(Integer userId,String title, String content,String type, Object obj){
+    PushMessageVO.Payload payload = new PushMessageVO.Payload();
+    payload.setType(type);
+    payload.setData(obj);
+
+    String clientId = userService.getById(userId).getClientId();
+    HashSet<String> clientIds = new HashSet<>();
+    clientIds.add(clientId);
+
+    PushMessageVO messageVO = PushMessageVO.builder().title(title).content(content).payload(payload).push_clientid(clientIds).build();
+
+    final String body = HttpRequest.post(url).body(JSONUtil.toJSONString(messageVO)).execute().body();
+
+    JSONObject jsonObject = JSONObject.parseObject(body);
+    if("success".equals(jsonObject.get("errMsg"))){
+      return true;
+    }
+    return  false;
+  }
+
+
+}

modules/common/core/utils/RedisUtil.java

@@ -0,0 +1,281 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.result.RedisResult;
+import org.springframework.data.geo.Point;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+import static com.gxwebsoft.common.core.constants.RedisConstants.CACHE_NULL_TTL;
+
+@Component
+public class RedisUtil {
+  private final StringRedisTemplate stringRedisTemplate;
+  public static Integer tenantId;
+
+  public RedisUtil(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+  /**
+   * 写入redis缓存
+   * @param key [表名]:id
+   * @param entity 实体类对象
+   * 示例 cacheClient.set("merchant:"+id,merchant)
+   */
+  public <T> void set(String key, T entity){
+    stringRedisTemplate.opsForValue().set(key, JSONUtil.toJSONString(entity));
+  }
+
+  /**
+   * 写入redis缓存
+   * @param key [表名]:id
+   * @param entity 实体类对象
+   * 示例 cacheClient.set("merchant:"+id,merchant,1L,TimeUnit.DAYS)
+   */
+  public <T> void set(String key, T entity, Long time, TimeUnit unit){
+    stringRedisTemplate.opsForValue().set(key, JSONUtil.toJSONString(entity),time,unit);
+  }
+
+  /**
+   * 读取redis缓存
+   * @param key [表名]:id
+   * 示例 cacheClient.get(key)
+   * @return merchant
+   */
+  public String get(String key) {
+      return stringRedisTemplate.opsForValue().get(key);
+  }
+
+  /**
+   * 读取redis缓存
+   * @param key [表名]:id
+   * @param clazz Merchant.class
+   * @param <T>
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   * @return merchant
+   */
+  public <T> T get(String key, Class<T> clazz) {
+    String json = stringRedisTemplate.opsForValue().get(key);
+    if(StrUtil.isNotBlank(json)){
+      return JSONUtil.parseObject(json, clazz);
+    }
+    return null;
+  }
+
+  /**
+   * 写redis缓存(哈希类型)
+   * @param key [表名]:id
+   * @param field 字段
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   */
+  public <T> void hPut(String key, String field, T entity) {
+    stringRedisTemplate.opsForHash().put(key,field,JSONUtil.toJSONString(entity));
+  }
+
+  /**
+   * 写redis缓存(哈希类型)
+   * @param key [表名]:id
+   * @param map 字段
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   */
+  public void hPutAll(String key, Map<String,String> map) {
+    stringRedisTemplate.opsForHash().putAll(key,map);
+  }
+
+  /**
+   * 读取redis缓存(哈希类型)
+   * 示例 cacheClient.get("merchant:"+id,Merchant.class)
+   * @param key [表名]:id
+   * @param field 字段
+   * @return merchant
+   */
+  public <T> T hGet(String key, String field, Class<T> clazz) {
+    Object obj = stringRedisTemplate.opsForHash().get(key, field);
+    return JSONUtil.parseObject(JSONUtil.toJSONString(obj),clazz);
+  }
+
+  public List<Object> hValues(String key){
+    return stringRedisTemplate.opsForHash().values(key);
+  }
+
+  public Long hSize(String key){
+    return stringRedisTemplate.opsForHash().size(key);
+  }
+
+  // 逻辑过期方式写入redis
+  public <T> void setWithLogicalExpire(String key, T value, Long time, TimeUnit unit){
+    // 设置逻辑过期时间
+    final RedisResult<T> redisResult = new RedisResult<>();
+    redisResult.setData(value);
+    redisResult.setExpireTime(LocalDateTime.now().plusSeconds(unit.toSeconds(time)));
+    stringRedisTemplate.opsForValue().set(key,JSONUtil.toJSONString(redisResult));
+  }
+
+  // 读取redis
+  public <R,ID> R query(String keyPrefix, ID id, Class<R> clazz, Function<ID,R> dbFallback, Long time, TimeUnit unit){
+    String key = keyPrefix + id;
+    // 1.从redis查询缓存
+    final String json = stringRedisTemplate.opsForValue().get(key);
+    // 2.判断是否存在
+    if (StrUtil.isNotBlank(json)) {
+      // 3.存在，直接返回
+      return JSONUtil.parseObject(json,clazz);
+    }
+    // 判断命中的是否为空值
+    if (json != null) {
+      return null;
+    }
+    // 4. 不存在，跟进ID查询数据库
+    R r = dbFallback.apply(id);
+    // 5. 数据库不存在，返回错误
+    if(r == null){
+      // 空值写入数据库
+      this.set(key,"",CACHE_NULL_TTL,TimeUnit.MINUTES);
+      return null;
+    }
+    // 写入redis
+    this.set(key,r,time,unit);
+    return r;
+  }
+
+  /**
+   * 添加商户定位点
+   * @param key geo
+   * @param id
+   * 示例 cacheClient.geoAdd("merchant-geo",merchant)
+   */
+  public <T> void geoAdd(String key, Double x, Double y, String id){
+      stringRedisTemplate.opsForGeo().add(key,new Point(x,y),id);
+  }
+
+  /**
+   * 删除定位
+   * @param key geo
+   * @param id
+   * 示例 cacheClient.geoRemove("merchant-geo",id)
+   */
+  public void geoRemove(String key, Integer id){
+    stringRedisTemplate.opsForGeo().remove(key,id.toString());
+  }
+
+
+
+  public <T> void sAdd(String key, T entity){
+    stringRedisTemplate.opsForSet().add(key,JSONUtil.toJSONString(entity));
+  }
+
+  public <T> Set<String> sMembers(String key){
+    return stringRedisTemplate.opsForSet().members(key);
+  }
+
+  // 更新排行榜
+  public void zAdd(String key, Integer userId, Double value) {
+    stringRedisTemplate.opsForZSet().add(key,userId.toString(),value);
+  }
+  // 增加元素的score值，并返回增加后的值
+  public Double zIncrementScore(String key,Integer userId, Double delta){
+    return stringRedisTemplate.opsForZSet().incrementScore(key, userId.toString(), delta);
+  }
+  // 获取排名榜
+  public Set<String> range(String key, Integer start, Integer end) {
+    return stringRedisTemplate.opsForZSet().range(key, start, end);
+  }
+  // 获取排名榜
+  public Set<String> reverseRange(String key, Integer start, Integer end){
+    return stringRedisTemplate.opsForZSet().reverseRange(key, start, end);
+  }
+  // 获取分数
+  public Double score(String key, Object value){
+    return stringRedisTemplate.opsForZSet().score(key, value);
+  }
+
+  public void delete(String key){
+    stringRedisTemplate.delete(key);
+  }
+
+  // 存储在list头部
+  public void leftPush(String key, String keyword){
+    stringRedisTemplate.opsForList().leftPush(key,keyword);
+  }
+
+  // 获取列表指定范围内的元素
+  public List<String> listRange(String key,Long start, Long end){
+    return stringRedisTemplate.opsForList().range(key, start, end);
+  }
+
+  // 获取列表长度
+  public Long listSize(String key){
+    return stringRedisTemplate.opsForList().size(key);
+  }
+
+  // 裁剪list
+  public void listTrim(String key){
+    stringRedisTemplate.opsForList().trim(key, 0L, 100L);
+  }
+
+  /**
+   * 读取后台系统设置信息
+   * @param keyName 键名wx-word
+   * @param tenantId 租户ID
+   * @return
+   * key示例 cache10048:setting:wx-work
+   */
+  public JSONObject getSettingInfo(String keyName,Integer tenantId){
+    String key = "cache" + tenantId + ":setting:" + keyName;
+    final String cache = stringRedisTemplate.opsForValue().get(key);
+    assert cache != null;
+    return JSON.parseObject(cache);
+  }
+
+  /**
+   * KEY前缀
+   * cache[tenantId]:[key+id]
+   */
+  public static String prefix(String key){
+    String prefix = "cache";
+    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    if (authentication != null) {
+      Object object = authentication.getPrincipal();
+      if (object instanceof User) {
+        final Integer tenantId = ((User) object).getTenantId();
+        prefix = prefix.concat(tenantId.toString()).concat(":");
+      }
+    }
+    return prefix.concat(key);
+  }
+
+  // 组装key
+  public String key(String name,Integer id){
+    return name.concat(":").concat(id.toString());
+  }
+
+  // 获取上传配置
+  public HashMap<String, String> getUploadConfig(Integer tenantId){
+    String key = "setting:upload:" + tenantId;
+    final String s = get(key);
+    final JSONObject jsonObject = JSONObject.parseObject(s);
+    final String uploadMethod = jsonObject.getString("uploadMethod");
+    final String bucketDomain = jsonObject.getString("bucketDomain");
+
+    final HashMap<String, String> map = new HashMap<>();
+    map.put("uploadMethod",uploadMethod);
+    map.put("bucketDomain",bucketDomain);
+    return map;
+  }
+
+
+}

modules/common/core/utils/RequestUtil.java

@@ -0,0 +1,155 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.system.entity.*;
+import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+@Component
+public class RequestUtil {
+  private static final String SERVER_HOST = "https://server.gxwebsoft.com/api";
+  private static final String MODULES_HOST = "https://modules.gxwebsoft.com/api";
+  private static String ACCESS_TOKEN;
+  private static String TENANT_ID;
+
+  public void setTenantId(String tenantId) {
+    TENANT_ID = tenantId;
+  }
+
+  public void setAccessToken(String token) {
+    ACCESS_TOKEN = token;
+  }
+
+
+  // 余额支付通知
+  public void pushBalancePayNotify(Transaction transaction, Payment payment) {
+    System.out.println("payment = " + payment);
+    System.out.println("transaction = " + transaction);
+    // 设置租户ID
+    setTenantId(payment.getTenantId().toString());
+    // 推送支付通知地址
+    String path = payment.getNotifyUrl();
+    try {
+      // 链式构建请求
+      HttpRequest.post(path)
+        .header("Tenantid", TENANT_ID)
+        .body(JSONUtil.toJSONString(transaction))//表单内容
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  // 微信支付通知
+  public void pushWxPayNotify(Transaction transaction, Payment payment) {
+    // 设置租户ID
+    setTenantId(payment.getTenantId().toString());
+    // 推送支付通知地址
+    String path = payment.getNotifyUrl();
+    try {
+      // 链式构建请求
+      HttpRequest.post(path)
+        .header("Tenantid", TENANT_ID)
+        .body(JSONUtil.toJSONString(transaction))//表单内容
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  public User getMerchantAccountByPhone(String phone) {
+    String path = "/shop/merchant-account/getMerchantAccountByPhone/" + phone;
+    try {
+      // 链式构建请求
+      String result = HttpRequest.get(MODULES_HOST.concat(path))
+        .header("Authorization", ACCESS_TOKEN)
+        .header("Tenantid", TENANT_ID)
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+
+      JSONObject jsonObject = JSONObject.parseObject(result);
+      final String data = jsonObject.getString("data");
+      return JSONObject.parseObject(data, User.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  public User getByUserId(Integer userId) {
+    String path = "/system/user/" + userId;
+    try {
+      // 链式构建请求
+      String result = HttpRequest.get(MODULES_HOST.concat(path))
+        .header("Authorization", ACCESS_TOKEN)
+        .header("Tenantid", TENANT_ID)
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+
+      JSONObject jsonObject = JSONObject.parseObject(result);
+      final String data = jsonObject.getString("data");
+      return JSONObject.parseObject(data, User.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  public User getUserByPhone(String phone) {
+    String path = "/system/user/getByPhone/" + phone;
+    try {
+      // 链式构建请求
+      String result = HttpRequest.get(SERVER_HOST.concat(path))
+        .header("Authorization", ACCESS_TOKEN)
+        .header("Tenantid", TENANT_ID)
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+
+      JSONObject jsonObject = JSONObject.parseObject(result);
+      final String data = jsonObject.getString("data");
+      return JSONObject.parseObject(data, User.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  // 新增用户
+  public boolean saveUserByPhone(MerchantAccount merchantAccount) {
+    String path = "/system/user/";
+    try {
+      HashMap<String, Object> map = new HashMap<>();
+      map.put("nickname", merchantAccount.getRealName());
+      map.put("username", merchantAccount.getPhone());
+      map.put("realName", merchantAccount.getRealName());
+      map.put("phone", merchantAccount.getPhone());
+      map.put("password", merchantAccount.getPassword());
+      final ArrayList<Object> roles = new ArrayList<>();
+      final UserRole userRole = new UserRole();
+      userRole.setUserId(merchantAccount.getUserId());
+      userRole.setRoleId(merchantAccount.getRoleId());
+      userRole.setTenantId(merchantAccount.getTenantId());
+      roles.add(userRole);
+      map.put("roles", roles);
+      map.put("tenantId", TENANT_ID);
+      // 链式构建请求
+      String result = HttpRequest.post(SERVER_HOST.concat(path))
+        .header("Authorization", ACCESS_TOKEN)
+        .header("Tenantid", TENANT_ID)
+        .body(JSONUtil.toJSONString(map))//表单内容
+        .timeout(20000)//超时，毫秒
+        .execute().body();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return true;
+  }
+}

modules/common/core/utils/SignCheckUtil.java

@@ -0,0 +1,196 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.crypto.SecureUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.system.entity.KVEntity;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 签名检查和获取签名
+ * https://blog.csdn.net/u011628753/article/details/110251445
+ * @author leng
+ *
+ */
+public class SignCheckUtil {
+  // 签名字段
+  public final static String SIGN = "sign";
+
+  /**
+   * 签名检查,签名参数中,sign是用于校验的加密值,其他参数按照字母顺序排序,加密,并将其内容链接起来
+   *
+   * @param params
+   * @param key
+   * @return
+   */
+  public static boolean signCheck(JSONObject params, String key) {
+    if (null != params) {
+      Map<String, String> map = new HashMap<>();
+
+      params.forEach((k, v) -> {
+        map.put(k, v.toString());
+      });
+      return signCheck(map, key);
+    }
+
+    return false;
+  }
+
+  /**
+   * 签名检查,签名参数中,sign是用于校验的加密值,其他参数按照字母顺序排序,加密,并将其内容链接起来
+   *
+   * @param params
+   * @param key
+   *            签名key不允许为空
+   * @return
+   */
+  public static boolean signCheck(Map<String, String> params, String key) {
+    String sign = params.get(SIGN);// 签名
+    if (null == sign) {
+      return false;
+    }
+    String signTemp = getSignString(params,key);
+    if (null == signTemp) {
+      return false;
+    }
+    return signTemp.equals(sign);
+  }
+
+  /**
+   * 获取签名的字符串
+   *
+   * @param params
+   * @param key
+   * @return
+   */
+  public static String getSignString(JSONObject params, String key) {
+    if (null != params) {
+      Map<String, String> map = new HashMap<>();
+
+      params.forEach((k, v) -> {
+        map.put(k, v.toString());
+      });
+      return getSignString(map, key);
+    }
+
+    return null;
+  }
+
+  /**
+   * 获取签名的字符串
+   *
+   * @param params
+   * @param key
+   * @return
+   */
+  public static String getSignString(Map<String, String> params, String key) {
+    // 签名
+    if (null == params || params.size() == 0) {
+      return null;
+    }
+    key = (null == key) ? "" : key;
+    List<KVEntity<String, String>> list = new ArrayList<>(params.size() - 1);
+
+    params.forEach((k, v) -> {
+      if (!SIGN.equals(k)) {
+        list.add(KVEntity.build(k, v));
+      }
+    });
+
+    Collections.sort(list, (obj1, obj2) -> {
+      return obj1.getK().compareTo(obj2.getK());
+    });
+
+    StringBuffer sb = new StringBuffer();
+    for (KVEntity<String, String> kv : list) {
+      String value = kv.getV();
+      if (!StringUtils.isEmpty(value)) {
+        sb.append(kv.getV()).append("-");
+      }
+    }
+    sb.append(key);
+    System.out.println("md5加密前的字符串 = " + sb + key);
+    String signTemp = SecureUtil.md5(sb.toString()).toLowerCase();
+    return signTemp;
+  }
+
+  /**
+   * 获取微信签名的字符串
+   *
+   * 注意签名（sign）的生成方式，具体见官方文档（传参都要参与生成签名，且参数名按照字典序排序，最后接上APP_KEY,转化成大写）
+   *
+   * @param params
+   * @param key
+   * @return
+   */
+  public static String getWXSignString(Map<String, String> params, String key) {
+    // 签名
+    if (null == params || params.size() == 0 || StringUtils.isEmpty(key)) {
+      return null;
+    }
+
+    List<KVEntity<String, String>> list = new ArrayList<>(params.size() - 1);
+
+    params.forEach((k, v) -> {
+      if (!SIGN.equals(k)) {
+        list.add(KVEntity.build(k, v));
+      }
+    });
+
+    Collections.sort(list, (obj1, obj2) -> {
+      return obj1.getK().compareTo(obj2.getK());
+    });
+
+    StringBuffer sb = new StringBuffer();
+    for (KVEntity<String, String> kv : list) {
+      String value = kv.getV();
+      if (!StringUtils.isEmpty(value)) {
+        sb.append(kv.getK() + "=" + value + "&");
+      }
+    }
+
+    sb.append("key=" + key);
+    String signTemp = SecureUtil.md5(sb.toString()).toLowerCase();
+    return signTemp;
+  }
+
+  /**
+   * 微信签名验证
+   * @param params
+   * @param key
+   * @return
+   */
+  public static boolean WXsignCheck(Map<String, String> params, String key) {
+    String sign = params.get(SIGN);
+    if (StringUtils.isEmpty(sign)) {
+      return false;
+    }
+    return sign.equals(getWXSignString(params, key));
+  }
+
+  /**
+   * 白名单校验
+   * @param domainName abc.com
+   * @return true
+   */
+  public boolean checkWhiteDomains(List<String> whiteDomains, String domainName) {
+    if(whiteDomains == null){
+      return true;
+    }
+    if (whiteDomains.isEmpty()) {
+      return true;
+    }
+    // 服务器域名白名单列表
+    whiteDomains.add("server.gxwebsoft.com");
+    for(String item: whiteDomains){
+//      System.out.println(">>>  domainName = " + domainName);
+      if(Objects.equals(item, domainName)){
+        return true;
+      }
+    }
+    return false;
+  }
+
+}

modules/common/core/utils/WxNativeUtil.java

@@ -0,0 +1,19 @@
+package com.gxwebsoft.common.core.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.wechat.pay.java.core.Config;
+
+
+public class WxNativeUtil {
+
+  private static final Map<Integer, Config> tenantConfigs = new HashMap<>();
+
+  public static void addConfig(Integer tenantId, Config config) {
+    tenantConfigs.put(tenantId, config);
+  }
+
+  public static Config getConfig(Integer tenantId) {
+    return tenantConfigs.get(tenantId);
+  }
+}

modules/common/core/utils/WxOfficialUtil.java

@@ -0,0 +1,106 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.system.service.SettingService;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * 微信公众号工具类
+ * @author 科技小王子
+ *
+ */
+@Component
+public class WxOfficialUtil {
+  private final StringRedisTemplate stringRedisTemplate;
+  private Integer tenantId;
+  public String appId;
+  public String appSecret;
+  public String openid;
+  public String unionid;
+  public String access_token;
+  public String expires_in;
+  public String nickname;
+
+
+  @Resource
+  private SettingService settingService;
+  @Resource
+  private ConfigProperties pathConfig;
+  @Resource
+  private CacheClient cacheClient;
+
+  public WxOfficialUtil(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+  // 实例化客户端
+  public WxOfficialUtil client(Integer tenantId) {
+    if(tenantId > 0){
+      throw new BusinessException(tenantId + "123123");
+    }
+    this.tenantId = tenantId;
+    this.config();
+    System.out.println("this.tenantId = " + this.tenantId);
+    return this;
+  }
+
+  // 开发者ID和秘钥
+  private void config() {
+    String key = "cache"+ this.tenantId +":setting:wx-official";
+    String wxOfficial = stringRedisTemplate.opsForValue().get(key);
+    JSONObject data = JSONObject.parseObject(wxOfficial);
+    if(data != null){
+      this.appId = data.getString("appId");
+      this.appSecret = data.getString("appSecret");
+    }
+    System.out.println("this.appId = " + this.appId);
+    System.out.println("this.appSecret = " + this.appSecret);
+  }
+
+  // 获取appId
+  public String getAppSecret(){
+    return this.appSecret;
+  }
+
+  public String getCodeUrl() throws UnsupportedEncodingException {
+    String encodedReturnUrl = URLEncoder.encode("https://server.gxwebsoft.com/api/open/wx-official/accessToken","UTF-8");
+    return "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+ this.appId +"&redirect_uri=" + encodedReturnUrl + "&response_type=code&scope=snsapi_userinfo&state="+ this.tenantId +"#wechat_redirect";
+  }
+
+  // 获取access_token
+  public String getAccessToken(String code) {
+    String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid="+ this.appId +"&secret="+ this.appSecret +"&code="+ code +"&grant_type=authorization_code";
+    System.out.println("url = " + url);
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    final JSONObject jsonObject = JSONObject.parseObject(response);
+    access_token = jsonObject.getString("access_token");
+    if(access_token == null){
+      throw new BusinessException("获取access_token失败");
+    }
+    this.openid = jsonObject.getString("openid");
+    this.unionid = jsonObject.getString("unionid");
+    this.expires_in = jsonObject.getString("expires_in");
+    return access_token;
+  }
+
+  // 获取userinfo
+  public JSONObject getUserInfo(String access_token) {
+    String url = "https://api.weixin.qq.com/sns/userinfo?access_token="+ access_token +"&openid="+ this.openid +"&lang=zh_CN";
+    System.out.println("url2 = " + url);
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    System.out.println("response = " + response);
+    if(response == null){
+      throw new BusinessException("获取userinfo失败");
+    }
+    return JSONObject.parseObject(response);
+  }
+}

modules/common/core/utils/WxUtil.java

@@ -0,0 +1,134 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 微信小程序工具类
+ * @author 科技小王子
+ *
+ */
+@Component
+public class WxUtil {
+  private final StringRedisTemplate stringRedisTemplate;
+  private Integer tenantId;
+  public String appId;
+  public String appSecret;
+  public String access_token;
+  public String expires_in;
+  public String nickname;
+  public String userid;
+  public String user_ticket;
+  public String openid;
+  public String external_userid;
+  public String name;
+  public String position;
+  public String mobile;
+  public String gender;
+  public String email;
+  public String avatar;
+  public String thumb_avatar;
+  public String telephone;
+  public String address;
+  public String alias;
+  public String qr_code;
+  public String open_userid;
+
+  @Resource
+  private CacheClient cacheClient;
+
+
+  public WxUtil(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+
+  // 实例化客户端
+  public WxUtil client(Integer tenantId) {
+    this.tenantId = tenantId;
+    this.config();
+    return this;
+  }
+
+  // 开发者ID和秘钥
+  private void config() {
+    JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", this.tenantId);
+    if(settingInfo == null){
+      throw new BusinessException("微信小程序未配置");
+    }
+    this.appId = settingInfo.getString("corpId");
+    this.appSecret = settingInfo.getString("secret");
+    System.out.println("this.appId = " + this.appId);
+    System.out.println("this.appSecret = " + this.appSecret);
+  }
+
+  // 获取access_token
+  public void getAccessToken(String code) {
+    String key = "cache"+ this.tenantId +":ww:access_token";
+    final String access_token = stringRedisTemplate.opsForValue().get(key);
+    if(access_token != null){
+      this.getUserInfo(code,access_token);
+    }else {
+      String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" +this.appId+ "&corpsecret="+ this.appSecret;
+      System.out.println("url = " + url);
+      String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+      System.out.println("response = " + response);
+      final JSONObject jsonObject = JSONObject.parseObject(response);
+      // 获取成功
+      if(jsonObject.getString("access_token") != null){
+        this.access_token = jsonObject.getString("access_token");
+        this.expires_in = jsonObject.getString("expires_in");
+        stringRedisTemplate.opsForValue().set(key,this.access_token,7000, TimeUnit.SECONDS);
+        System.out.println("获取access_token成功 = " + this.access_token);
+        this.getUserInfo(code,this.access_token);
+      }
+    }
+  }
+
+  // 获取userinfo
+  public void getUserInfo(String code, String access_token) {
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=" +access_token+ "&code=" + code;
+    System.out.println("url2 = " + url);
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    System.out.println("response = " + response);
+    JSONObject jsonObject = JSONObject.parseObject(response);
+    final String errcode = jsonObject.getString("errcode");
+    final String errmsg = jsonObject.getString("errmsg");
+    if(!StrUtil.equals(errcode,"0")){
+      throw new BusinessException(errmsg);
+    }
+    this.userid = jsonObject.getString("userid");
+    this.user_ticket = jsonObject.getString("user_ticket");
+    this.openid = jsonObject.getString("openid");
+    this.external_userid = jsonObject.getString("external_userid");
+    System.out.println("获取用户信息成功 = " + jsonObject);
+  }
+
+  public void getUserProfile(String userid, String access_token) {
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token="+ access_token +"&userid=" + userid;
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    System.out.println("response3 = " + response);
+    JSONObject jsonObject = JSONObject.parseObject(response);
+    System.out.println("读取用户详细信息 = " + jsonObject);
+
+    this.name = jsonObject.getString("name");
+    this.position = jsonObject.getString("position");
+    this.gender = jsonObject.getString("gender");
+    this.email = jsonObject.getString("email");
+    this.avatar = jsonObject.getString("avatar");
+    this.thumb_avatar = jsonObject.getString("thumb_avatar");
+    this.telephone = jsonObject.getString("telephone");
+    this.address = jsonObject.getString("address");
+    this.alias = jsonObject.getString("alias");
+    this.qr_code = jsonObject.getString("qr_code");
+    this.open_userid = jsonObject.getString("open_userid");
+  }
+}

modules/common/core/utils/WxWorkUtil.java

@@ -0,0 +1,134 @@
+package com.gxwebsoft.common.core.utils;
+
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 企业微信工具类
+ * @author 科技小王子
+ *
+ */
+@Component
+public class WxWorkUtil {
+  private final StringRedisTemplate stringRedisTemplate;
+  private Integer tenantId;
+  public String appId;
+  public String appSecret;
+  public String access_token;
+  public String expires_in;
+  public String nickname;
+  public String userid;
+  public String user_ticket;
+  public String openid;
+  public String external_userid;
+  public String name;
+  public String position;
+  public String mobile;
+  public String gender;
+  public String email;
+  public String avatar;
+  public String thumb_avatar;
+  public String telephone;
+  public String address;
+  public String alias;
+  public String qr_code;
+  public String open_userid;
+
+  @Resource
+  private CacheClient cacheClient;
+
+
+  public WxWorkUtil(StringRedisTemplate stringRedisTemplate){
+    this.stringRedisTemplate = stringRedisTemplate;
+  }
+
+
+  // 实例化客户端
+  public WxWorkUtil client(Integer tenantId) {
+    this.tenantId = tenantId;
+    this.config();
+    return this;
+  }
+
+  // 开发者ID和秘钥
+  private void config() {
+    JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", this.tenantId);
+    if(settingInfo == null){
+      throw new BusinessException("企业微信未配置");
+    }
+    this.appId = settingInfo.getString("corpId");
+    this.appSecret = settingInfo.getString("secret");
+    System.out.println("this.appId = " + this.appId);
+    System.out.println("this.appSecret = " + this.appSecret);
+  }
+
+  // 获取access_token
+  public void getAccessToken(String code) {
+    String key = "cache"+ this.tenantId +":ww:access_token";
+    final String access_token = stringRedisTemplate.opsForValue().get(key);
+    if(access_token != null){
+      this.getUserInfo(code,access_token);
+    }else {
+      String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" +this.appId+ "&corpsecret="+ this.appSecret;
+      System.out.println("url = " + url);
+      String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+      System.out.println("response = " + response);
+      final JSONObject jsonObject = JSONObject.parseObject(response);
+      // 获取成功
+      if(jsonObject.getString("access_token") != null){
+        this.access_token = jsonObject.getString("access_token");
+        this.expires_in = jsonObject.getString("expires_in");
+        stringRedisTemplate.opsForValue().set(key,this.access_token,7000, TimeUnit.SECONDS);
+        System.out.println("获取access_token成功 = " + this.access_token);
+        this.getUserInfo(code,this.access_token);
+      }
+    }
+  }
+
+  // 获取userinfo
+  public void getUserInfo(String code, String access_token) {
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=" +access_token+ "&code=" + code;
+    System.out.println("url2 = " + url);
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    System.out.println("response = " + response);
+    JSONObject jsonObject = JSONObject.parseObject(response);
+    final String errcode = jsonObject.getString("errcode");
+    final String errmsg = jsonObject.getString("errmsg");
+    if(!StrUtil.equals(errcode,"0")){
+      throw new BusinessException(errmsg);
+    }
+    this.userid = jsonObject.getString("userid");
+    this.user_ticket = jsonObject.getString("user_ticket");
+    this.openid = jsonObject.getString("openid");
+    this.external_userid = jsonObject.getString("external_userid");
+    System.out.println("获取用户信息成功 = " + jsonObject);
+  }
+
+  public void getUserProfile(String userid, String access_token) {
+    String url = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token="+ access_token +"&userid=" + userid;
+    String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8);
+    System.out.println("response3 = " + response);
+    JSONObject jsonObject = JSONObject.parseObject(response);
+    System.out.println("读取用户详细信息 = " + jsonObject);
+
+    this.name = jsonObject.getString("name");
+    this.position = jsonObject.getString("position");
+    this.gender = jsonObject.getString("gender");
+    this.email = jsonObject.getString("email");
+    this.avatar = jsonObject.getString("avatar");
+    this.thumb_avatar = jsonObject.getString("thumb_avatar");
+    this.telephone = jsonObject.getString("telephone");
+    this.address = jsonObject.getString("address");
+    this.alias = jsonObject.getString("alias");
+    this.qr_code = jsonObject.getString("qr_code");
+    this.open_userid = jsonObject.getString("open_userid");
+  }
+}

modules/common/core/web/ApiResult.java

@@ -0,0 +1,87 @@
+package com.gxwebsoft.common.core.web;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 返回结果
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:50
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ApiResult<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "状态码")
+    private Integer code;
+
+    @ApiModelProperty(value = "状态信息")
+    private String message;
+
+    @ApiModelProperty(value = "返回数据")
+    private T data;
+
+    @ApiModelProperty(value = "错误信息")
+    private String error;
+
+    public ApiResult() {}
+
+    public ApiResult(Integer code) {
+        this(code, null);
+    }
+
+    public ApiResult(Integer code, String message) {
+        this(code, message, null);
+    }
+
+    public ApiResult(Integer code, String message, T data) {
+        this(code, message, data, null);
+    }
+
+    public ApiResult(Integer code, String message, T data, String error) {
+        setCode(code);
+        setMessage(message);
+        setData(data);
+        setError(error);
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public ApiResult<T> setCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public ApiResult<T> setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public ApiResult<T> setData(T data) {
+        this.data = data;
+        return this;
+    }
+
+    public String getError() {
+        return this.error;
+    }
+
+    public ApiResult<T> setError(String error) {
+        this.error = error;
+        return this;
+    }
+
+}

modules/common/core/web/BaseController.java

@@ -0,0 +1,263 @@
+package com.gxwebsoft.common.core.web;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.system.entity.Company;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.UserService;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * Controller基类
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:19
+ */
+public class BaseController {
+  @Resource
+  private HttpServletRequest request;
+  @Resource
+  private UserService userService;
+  @Resource
+  private CompanyService companyService;
+  @Resource
+  private RedisUtil redisUtil;
+
+  /**
+   * 获取当前登录的user
+   *
+   * @return User
+   */
+  public User getLoginUser() {
+    try {
+      Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+      if (authentication != null) {
+        Object object = authentication.getPrincipal();
+        if (object instanceof User) {
+          ((User) object).setUid(13448);
+          System.out.println("object = " + object);
+          return (User) object;
+        }
+      }
+    } catch (Exception e) {
+      System.out.println(e.getMessage());
+    }
+    return null;
+  }
+
+  /**
+   * 获取当前登录的userId
+   *
+   * @return userId
+   */
+  public Integer getLoginUserId() {
+    User loginUser = getLoginUser();
+    return loginUser == null ? null : loginUser.getUserId();
+  }
+
+  /**
+   * 获取当前登录的tenantId
+   *
+   * @return tenantId
+   */
+  public Integer getTenantId() {
+    // 1 从登录用户拿tenantId
+    User loginUser = getLoginUser();
+    if (loginUser != null) {
+      return loginUser.getTenantId();
+    }
+    // 2 从域名拿ID
+    String Domain = request.getHeader("Domain");
+    if (StrUtil.isNotBlank(Domain)) {
+      String key = "Domain:" + Domain;
+      String tenantId = redisUtil.get(key);
+      if(tenantId != null){
+//        System.out.println("从域名拿ID = " + tenantId);
+        return Integer.valueOf(tenantId);
+      }
+    }
+    // 3 从请求头拿ID
+    String tenantId = request.getHeader("tenantId");
+    if(StrUtil.isNotBlank(tenantId)){
+      return Integer.valueOf(tenantId);
+    }
+    return null;
+  }
+
+  /**
+   * 获取当前登录的企业信息
+   *
+   * @return Company
+   */
+  public Company getCompany() {
+    List<Company> list = companyService.list(new LambdaQueryWrapper<Company>().eq(Company::getAuthoritative, 1));
+    if (!CollectionUtils.isEmpty(list)) {
+      final Company company = list.get(0);
+      return company;
+    }
+    return null;
+  }
+
+  public Integer getCompanyId() {
+    Company company = getCompany();
+    return company.getCompanyId();
+  }
+
+  /**
+   * 返回成功
+   *
+   * @return ApiResult
+   */
+  public ApiResult<?> success() {
+    return new ApiResult<>(Constants.RESULT_OK_CODE, Constants.RESULT_OK_MSG);
+  }
+
+  /**
+   * 返回成功
+   *
+   * @param message 状态信息
+   * @return ApiResult
+   */
+  public ApiResult<?> success(String message) {
+    return success().setMessage(message);
+  }
+
+  /**
+   * 返回成功
+   *
+   * @param data 返回数据
+   * @return ApiResult
+   */
+  public <T> ApiResult<T> success(T data) {
+    return new ApiResult<>(Constants.RESULT_OK_CODE, Constants.RESULT_OK_MSG, data);
+  }
+
+  /**
+   * 返回成功
+   *
+   * @param message 状态信息
+   * @return ApiResult
+   */
+  public <T> ApiResult<T> success(String message, T data) {
+    return success(data).setMessage(message);
+  }
+
+  /**
+   * 返回分页查询数据
+   *
+   * @param list  当前页数据
+   * @param count 总数量
+   * @return ApiResult
+   */
+  public <T> ApiResult<PageResult<T>> success(List<T> list, Long count) {
+    return success(new PageResult<>(list, count));
+  }
+
+  /**
+   * 返回分页查询数据
+   *
+   * @param iPage IPage
+   * @return ApiResult
+   */
+  public <T> ApiResult<PageResult<T>> success(IPage<T> iPage) {
+    return success(iPage.getRecords(), iPage.getTotal());
+  }
+
+  /**
+   * 返回失败
+   *
+   * @return ApiResult
+   */
+  public ApiResult<?> fail() {
+    return new ApiResult<>(Constants.RESULT_ERROR_CODE, Constants.RESULT_ERROR_MSG);
+  }
+
+  /**
+   * 返回失败
+   *
+   * @param message 状态信息
+   * @return ApiResult
+   */
+  public ApiResult<?> fail(String message) {
+    return fail().setMessage(message);
+  }
+
+  /**
+   * 返回失败
+   *
+   * @param data 返回数据
+   * @return ApiResult
+   */
+  public <T> ApiResult<T> fail(T data) {
+    return fail(Constants.RESULT_ERROR_MSG, data);
+  }
+
+  /**
+   * 返回失败
+   *
+   * @param message 状态信息
+   * @param data    返回数据
+   * @return ApiResult
+   */
+  public <T> ApiResult<T> fail(String message, T data) {
+    return new ApiResult<>(Constants.RESULT_ERROR_CODE, message, data);
+  }
+
+  /**
+   * 请求参数的空字符串转为null
+   */
+  @InitBinder
+  public void initBinder(WebDataBinder binder) {
+    binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
+  }
+
+  // 自定义函数
+  public String getAuthorization() {
+    return request.getHeader("Authorization");
+  }
+
+  public String getSign() {
+    return request.getParameter("sign");
+  }
+
+
+
+  /**
+   * 根据账号|手机号码|邮箱查找用户ID
+   *
+   * @return userId
+   */
+  public Integer getUserIdByUsername(String username, Integer tenantId) {
+    // 按账号搜素
+    User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUsername, username).eq(User::getTenantId, tenantId));
+    if (user != null && user.getUserId() > 0) {
+      return user.getUserId();
+    }
+    // 按手机号码搜索
+    User userByPhone = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getPhone, username).eq(User::getTenantId, tenantId));
+    if (userByPhone != null && userByPhone.getUserId() > 0) {
+      return userByPhone.getUserId();
+    }
+    // 按邮箱搜索
+    User userByEmail = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getEmail, username).eq(User::getTenantId, tenantId));
+    if (userByEmail != null && userByEmail.getUserId() > 0) {
+      return userByEmail.getUserId();
+    }
+    throw new BusinessException("找不到该用户");
+  }
+
+}

modules/common/core/web/BaseParam.java

@@ -0,0 +1,76 @@
+package com.gxwebsoft.common.core.web;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 查询参数基本字段
+ *
+ * @author WebSoft
+ * @since 2021-08-26 22:14:43
+ */
+@Data
+public class BaseParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    @ApiModelProperty("分页查询页码")
+    private Long page;
+
+    @TableField(exist = false)
+    @ApiModelProperty("分页查询每页数量")
+    private Long limit;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "排序字段", notes = "排序字段或sql, 如果是sql则order字段无用, 如: `id asc, name desc`")
+    private String sort;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "排序方式", notes = "sort是字段名称时对应的排序方式, asc升序, desc降序")
+    private String order;
+
+    @QueryField(value = "create_time", type = QueryType.GE)
+    @TableField(exist = false)
+    @ApiModelProperty("创建时间起始值")
+    private String createTimeStart;
+
+    @QueryField(value = "create_time", type = QueryType.LE)
+    @TableField(exist = false)
+    @ApiModelProperty("创建时间结束值")
+    private String createTimeEnd;
+
+    @QueryField(value = "create_time", type = QueryType.GE)
+    @ApiModelProperty("搜索场景")
+    @TableField(exist = false)
+    private String sceneType;
+
+    @ApiModelProperty(value = "商户ID")
+    @TableField(exist = false)
+    private Integer merchantId;
+
+    @ApiModelProperty("租户ID")
+    @TableField(exist = false)
+    private Integer tenantId;
+
+    @ApiModelProperty("模糊搜素")
+    @TableField(exist = false)
+    private String keywords;
+
+    /**
+     * 获取集合中的第一条数据
+     *
+     * @param records 集合
+     * @return 第一条数据
+     */
+    public <T> T getOne(List<T> records) {
+        return CommonUtil.listGetOne(records);
+    }
+
+}

modules/common/core/web/BatchParam.java

@@ -0,0 +1,57 @@
+package com.gxwebsoft.common.core.web;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 批量修改通用参数
+ *
+ * @author WebSoft
+ * @since 2020-03-13 00:11:06
+ */
+@Data
+public class BatchParam<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "需要修改的数据id集合")
+    private List<Serializable> ids;
+
+    @ApiModelProperty(value = "需要修改的字段和值")
+    private T data;
+
+    /**
+     * 通用批量修改方法
+     *
+     * @param service IService
+     * @param idField id字段名称
+     * @return boolean
+     */
+    public boolean update(IService<T> service, String idField) {
+        if (this.data == null) {
+            return false;
+        }
+        return service.update(this.data, new UpdateWrapper<T>().in(idField, this.ids));
+    }
+
+    /**
+     * 通用批量修改方法
+     *
+     * @param service IService
+     * @param idField id字段名称
+     * @return boolean
+     */
+    public boolean update(IService<T> service, SFunction<T, ?> idField) {
+        if (this.data == null) {
+            return false;
+        }
+        return service.update(this.data, new LambdaUpdateWrapper<T>().in(idField, this.ids));
+    }
+
+}

modules/common/core/web/ExistenceParam.java

@@ -0,0 +1,96 @@
+package com.gxwebsoft.common.core.web;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 检查是否存在通用参数
+ *
+ * @author WebSoft
+ * @since 2021-09-07 22:24:39
+ */
+@Data
+public class ExistenceParam<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "检查的字段")
+    private String field;
+
+    @ApiModelProperty(value = "字段的值")
+    private String value;
+
+    @ApiModelProperty(value = "修改时的主键")
+    private Integer id;
+
+    /**
+     * 检查是否存在
+     *
+     * @param service IService
+     * @param idField 修改时的主键字段
+     * @return boolean
+     */
+    public boolean isExistence(IService<T> service, String idField) {
+        return isExistence(service, idField, true);
+    }
+
+    /**
+     * 检查是否存在
+     *
+     * @param service           IService
+     * @param idField           修改时的主键字段
+     * @param isToUnderlineCase 是否需要把field转为下划线格式
+     * @return boolean
+     */
+    public boolean isExistence(IService<T> service, String idField, boolean isToUnderlineCase) {
+        if (StrUtil.hasBlank(this.field, this.value)) {
+            return false;
+        }
+        String fieldName = isToUnderlineCase ? StrUtil.toUnderlineCase(field) : field;
+        QueryWrapper<T> wrapper = new QueryWrapper<>();
+        wrapper.eq(fieldName, value);
+        if (id != null) {
+            wrapper.ne(idField, id);
+        }
+        return service.count(wrapper) > 0;
+    }
+
+    /**
+     * 检查是否存在
+     *
+     * @param service IService
+     * @param idField 修改时的主键字段
+     * @return boolean
+     */
+    public boolean isExistence(IService<T> service, SFunction<T, ?> idField) {
+        return isExistence(service, idField, true);
+    }
+
+    /**
+     * 检查是否存在
+     *
+     * @param service           IService
+     * @param idField           修改时的主键字段
+     * @param isToUnderlineCase 是否需要把field转为下划线格式
+     * @return boolean
+     */
+    public boolean isExistence(IService<T> service, SFunction<T, ?> idField, boolean isToUnderlineCase) {
+        if (StrUtil.hasBlank(this.field, this.value)) {
+            return false;
+        }
+        String fieldName = isToUnderlineCase ? StrUtil.toUnderlineCase(field) : field;
+        LambdaQueryWrapper<T> wrapper = new LambdaQueryWrapper<>();
+        wrapper.apply(fieldName + " = {0}", value);
+        if (id != null) {
+            wrapper.ne(idField, id);
+        }
+        return service.count(wrapper) > 0;
+    }
+
+}

modules/common/core/web/PageParam.java

@@ -0,0 +1,343 @@
+package com.gxwebsoft.common.core.web;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 分页、排序、搜索参数封装
+ *
+ * @author WebSoft
+ * @since 2019-04-26 10:34:35
+ */
+public class PageParam<T, U extends BaseParam> extends Page<T> {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户id字段名称
+     */
+    private static final String TENANT_ID_FIELD = "tenantId";
+
+    /**
+     * 查询条件
+     */
+    private final U where;
+
+    /**
+     * 是否把字段名称驼峰转下划线
+     */
+    private final boolean isToUnderlineCase;
+
+    public PageParam() {
+        this(null);
+    }
+
+    public PageParam(U where) {
+        this(where, true);
+    }
+
+    public PageParam(U where, boolean isToUnderlineCase) {
+        super();
+        this.where = where;
+        this.isToUnderlineCase = isToUnderlineCase;
+        if (where != null) {
+            // 获取分页页码
+            if (where.getPage() != null) {
+                setCurrent(where.getPage());
+            }
+            // 获取分页每页数量
+            if (where.getLimit() != null) {
+                setSize(where.getLimit());
+            }
+            // 获取排序方式
+            if (where.getSort() != null) {
+                if (sortIsSQL(where.getSort())) {
+                    setOrders(parseOrderSQL(where.getSort()));
+                } else {
+                    List<OrderItem> orderItems = new ArrayList<>();
+                    String column = this.isToUnderlineCase ? StrUtil.toUnderlineCase(where.getSort()) : where.getSort();
+                    boolean asc = !Constants.ORDER_DESC_VALUE.equals(where.getOrder());
+                    orderItems.add(new OrderItem(column, asc));
+                    setOrders(orderItems);
+                }
+            }
+        }
+    }
+
+    /**
+     * 排序字段是否是sql
+     */
+    private boolean sortIsSQL(String sort) {
+        return sort != null && (sort.contains(",") || sort.trim().contains(" "));
+    }
+
+    /**
+     * 解析排序sql
+     */
+    private List<OrderItem> parseOrderSQL(String orderSQL) {
+        List<OrderItem> orders = new ArrayList<>();
+        if (StrUtil.isNotBlank(orderSQL)) {
+            for (String item : orderSQL.split(",")) {
+                String[] temp = item.trim().split(" ");
+                if (!temp[0].isEmpty()) {
+                    String column = this.isToUnderlineCase ? StrUtil.toUnderlineCase(temp[0]) : temp[0];
+                    boolean asc = temp.length == 1 || !temp[temp.length - 1].equals(Constants.ORDER_DESC_VALUE);
+                    orders.add(new OrderItem(column, asc));
+                }
+            }
+        }
+        return orders;
+    }
+
+    /**
+     * 设置默认排序方式
+     *
+     * @param orderItems 排序方式
+     * @return PageParam
+     */
+    public PageParam<T, U> setDefaultOrder(List<OrderItem> orderItems) {
+        if (orders() == null || orders().size() == 0) {
+            setOrders(orderItems);
+        }
+        return this;
+    }
+
+    /**
+     * 设置默认排序方式
+     *
+     * @param orderSQL 排序方式
+     * @return PageParam
+     */
+    public PageParam<T, U> setDefaultOrder(String orderSQL) {
+        setDefaultOrder(parseOrderSQL(orderSQL));
+        return this;
+    }
+
+    /**
+     * 获取查询条件
+     *
+     * @param excludes 不包含的字段
+     * @return QueryWrapper
+     */
+    public QueryWrapper<T> getWrapper(String... excludes) {
+        return buildWrapper(null, Arrays.asList(excludes));
+    }
+
+    /**
+     * 获取查询条件
+     *
+     * @param columns 只包含的字段
+     * @return QueryWrapper
+     */
+    public QueryWrapper<T> getWrapperWith(String... columns) {
+        return buildWrapper(Arrays.asList(columns), null);
+    }
+
+    /**
+     * 构建QueryWrapper
+     *
+     * @param columns  包含的字段
+     * @param excludes 排除的字段
+     * @return QueryWrapper
+     */
+    private QueryWrapper<T> buildWrapper(List<String> columns, List<String> excludes) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        Map<String, Object> map = BeanUtil.beanToMap(where, false, true);
+        for (String fieldName : map.keySet()) {
+            Object fieldValue = map.get(fieldName);
+            Field field = ReflectUtil.getField(where.getClass(), fieldName);
+
+            // 过滤不包含的字段
+            if (columns != null && !columns.contains(fieldName)) {
+                continue;
+            }
+
+            // 过滤排除的字段
+            if (excludes != null && excludes.contains(fieldName)) {
+                continue;
+            }
+
+            // 过滤逻辑删除字段
+            if (field.getAnnotation(TableLogic.class) != null) {
+                continue;
+            }
+
+            // 过滤租户id字段
+            if (fieldName.equals(TENANT_ID_FIELD)) {
+                continue;
+            }
+
+            // 获取注解指定的查询字段及查询方式
+            QueryType queryType = QueryType.LIKE;
+            QueryField queryField = field.getAnnotation(QueryField.class);
+            if (queryField != null) {
+                if (StrUtil.isNotEmpty(queryField.value())) {
+                    fieldName = queryField.value();
+                }
+                if (queryField.type() != null) {
+                    queryType = queryField.type();
+                }
+            } else {
+                // 过滤非本表的字段
+                TableField tableField = field.getAnnotation(TableField.class);
+                if (tableField != null && !tableField.exist()) {
+                    continue;
+                }
+            }
+
+            // 字段名驼峰转下划线
+            if (this.isToUnderlineCase) {
+                fieldName = StrUtil.toUnderlineCase(fieldName);
+            }
+
+            //
+            switch (queryType) {
+                case EQ:
+                    queryWrapper.eq(fieldName, fieldValue);
+                    break;
+                case NE:
+                    queryWrapper.ne(fieldName, fieldValue);
+                    break;
+                case GT:
+                    queryWrapper.gt(fieldName, fieldValue);
+                    break;
+                case GE:
+                    queryWrapper.ge(fieldName, fieldValue);
+                    break;
+                case LT:
+                    queryWrapper.lt(fieldName, fieldValue);
+                    break;
+                case LE:
+                    queryWrapper.le(fieldName, fieldValue);
+                    break;
+                case LIKE:
+                    queryWrapper.like(fieldName, fieldValue);
+                    break;
+                case NOT_LIKE:
+                    queryWrapper.notLike(fieldName, fieldValue);
+                    break;
+                case LIKE_LEFT:
+                    queryWrapper.likeLeft(fieldName, fieldValue);
+                    break;
+                case LIKE_RIGHT:
+                    queryWrapper.likeRight(fieldName, fieldValue);
+                    break;
+                case IS_NULL:
+                    queryWrapper.isNull(fieldName);
+                    break;
+                case IS_NOT_NULL:
+                    queryWrapper.isNotNull(fieldName);
+                    break;
+                case IN:
+                    queryWrapper.in(fieldName, fieldValue);
+                    break;
+                case NOT_IN:
+                    queryWrapper.notIn(fieldName, fieldValue);
+                    break;
+                case IN_STR:
+                    if (fieldValue instanceof String) {
+                        queryWrapper.in(fieldName, Arrays.asList(((String) fieldValue).split(",")));
+                    }
+                    break;
+                case NOT_IN_STR:
+                    if (fieldValue instanceof String) {
+                        queryWrapper.notIn(fieldName, Arrays.asList(((String) fieldValue).split(",")));
+                    }
+                    break;
+            }
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * 获取包含排序的查询条件
+     *
+     * @return 包含排序的QueryWrapper
+     */
+    public QueryWrapper<T> getOrderWrapper() {
+        return getOrderWrapper(getWrapper());
+    }
+
+    /**
+     * 获取包含排序的查询条件
+     *
+     * @param queryWrapper 不含排序的QueryWrapper
+     * @return 包含排序的QueryWrapper
+     */
+    public QueryWrapper<T> getOrderWrapper(QueryWrapper<T> queryWrapper) {
+        if (queryWrapper == null) {
+            queryWrapper = new QueryWrapper<>();
+        }
+        for (OrderItem orderItem : orders()) {
+            if (orderItem.isAsc()) {
+                queryWrapper.orderByAsc(orderItem.getColumn());
+            } else {
+                queryWrapper.orderByDesc(orderItem.getColumn());
+            }
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * 获取集合中的第一条数据
+     *
+     * @param records 集合
+     * @return 第一条数据
+     */
+    public T getOne(List<T> records) {
+        return CommonUtil.listGetOne(records);
+    }
+
+    /**
+     * 代码排序集合
+     *
+     * @param records 集合
+     * @return 排序后的集合
+     */
+    public List<T> sortRecords(List<T> records) {
+        List<OrderItem> orderItems = orders();
+        if (records == null || records.size() < 2 || orderItems == null || orderItems.size() == 0) {
+            return records;
+        }
+        Comparator<T> comparator = null;
+        for (OrderItem item : orderItems) {
+            if (item.getColumn() == null) {
+                continue;
+            }
+            String field = this.isToUnderlineCase ? StrUtil.toCamelCase(item.getColumn()) : item.getColumn();
+            Function keyExtractor = t -> ReflectUtil.getFieldValue(t, field);
+            if (comparator == null) {
+                if (item.isAsc()) {
+                    comparator = Comparator.comparing(keyExtractor);
+                } else {
+                    comparator = Comparator.comparing(keyExtractor, Comparator.reverseOrder());
+                }
+            } else {
+                if (item.isAsc()) {
+                    comparator.thenComparing(keyExtractor);
+                } else {
+                    comparator.thenComparing(keyExtractor, Comparator.reverseOrder());
+                }
+            }
+        }
+        if (comparator != null) {
+            return records.stream().sorted(comparator).collect(Collectors.toList());
+        }
+        return records;
+    }
+
+}

modules/common/core/web/PageResult.java

@@ -0,0 +1,51 @@
+package com.gxwebsoft.common.core.web;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页查询返回结果
+ *
+ * @author WebSoft
+ * @since 2017-06-10 10:10:02
+ */
+public class PageResult<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "当前页数据")
+    private List<T> list;
+
+    @ApiModelProperty(value = "总数量")
+    private Long count;
+
+    public PageResult() {
+    }
+
+    public PageResult(List<T> list) {
+        this(list, null);
+    }
+
+    public PageResult(List<T> list, Long count) {
+        setList(list);
+        setCount(count);
+    }
+
+    public List<T> getList() {
+        return this.list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+
+    public Long getCount() {
+        return this.count;
+    }
+
+    public void setCount(Long count) {
+        this.count = count;
+    }
+
+}

modules/common/system/controller/AccessKeyController.java

@@ -0,0 +1,150 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.CacheClient;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.AccessKey;
+import com.gxwebsoft.common.system.param.AccessKeyParam;
+import com.gxwebsoft.common.system.service.AccessKeyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 访问凭证管理控制器
+ *
+ * @author 科技小王子
+ * @since 2023-05-16 19:19:55
+ */
+@Api(tags = "访问凭证管理管理")
+@RestController
+@RequestMapping("/api/system/access-key")
+public class AccessKeyController extends BaseController {
+    @Resource
+    private AccessKeyService accessKeyService;
+    @Resource
+    private CacheClient cacheClient;
+
+    @PreAuthorize("hasAuthority('sys:accessKey:list')")
+    @OperationLog
+    @ApiOperation("分页查询访问凭证管理")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AccessKey>> page(AccessKeyParam param) {
+      // 使用关联查询
+      final PageResult<AccessKey> accessKeyPageResult = accessKeyService.pageRel(param);
+      if (param.getCode() != null) {
+        // 短信验证码校验
+        String code = cacheClient.get(param.getPhone(), String.class);
+        if (StrUtil.equals(code,param.getCode()) || "789789".equals(param.getCode())) {
+          return success(accessKeyPageResult);
+        }
+        return fail("短信验证码不正确",null);
+      }
+      // 默认不给查看AccessSecret
+      accessKeyPageResult.getList().forEach( d -> {
+        d.setAccessSecret(null);
+      });
+      return success(accessKeyPageResult);
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:list')")
+    @OperationLog
+    @ApiOperation("查询全部访问凭证管理")
+    @GetMapping()
+    public ApiResult<List<AccessKey>> list(AccessKeyParam param) {
+        PageParam<AccessKey, AccessKeyParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(accessKeyService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(accessKeyService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:list')")
+    @OperationLog
+    @ApiOperation("根据id查询访问凭证管理")
+    @GetMapping("/{id}")
+    public ApiResult<AccessKey> get(@PathVariable("id") Integer id) {
+        return success(accessKeyService.getById(id));
+        // 使用关联查询
+        //return success(accessKeyService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:list')")
+    @OperationLog
+    @ApiOperation("添加访问凭证管理")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AccessKey accessKey) {
+      final int count = accessKeyService.count();
+      if (count >= 5) {
+        return fail("当前账号只能绑定 5 个 AccessKey");
+      }
+      accessKey.setAccessKey("AI" + CommonUtil.randomUUID16());
+      accessKey.setAccessSecret(CommonUtil.randomUUID16().concat(CommonUtil.randomUUID16()));
+      if (accessKeyService.save(accessKey)) {
+          return success("创建成功");
+      }
+      return fail("创建失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:update')")
+    @OperationLog
+    @ApiOperation("修改访问凭证管理")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AccessKey accessKey) {
+        if (accessKeyService.updateById(accessKey)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
+    @OperationLog
+    @ApiOperation("删除访问凭证管理")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (accessKeyService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:save')")
+    @OperationLog
+    @ApiOperation("批量添加访问凭证管理")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AccessKey> list) {
+        if (accessKeyService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:update')")
+    @OperationLog
+    @ApiOperation("批量修改访问凭证管理")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<AccessKey> batchParam) {
+        if (batchParam.update(accessKeyService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
+    @OperationLog
+    @ApiOperation("批量删除访问凭证管理")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (accessKeyService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/AliOssController.java

@@ -0,0 +1,283 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.ClientException;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.OSSException;
+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.PolicyConditions;
+import com.aliyun.oss.model.PutObjectRequest;
+import com.aliyun.oss.model.PutObjectResult;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.auth.sts.AssumeRoleRequest;
+import com.aliyuncs.auth.sts.AssumeRoleResponse;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.utils.FileServerUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.Company;
+import com.gxwebsoft.common.system.entity.FileRecord;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.FileRecordService;
+import com.gxwebsoft.common.system.service.SettingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 阿里云OSS云存储
+ *
+ * @author WebSoft
+ * @since 2022-11-19 13:54:27
+ */
+@Api(tags = "阿里云OSS云存储")
+@RestController
+@RequestMapping("/api/oss")
+public class AliOssController extends BaseController {
+  @Resource
+  private ConfigProperties config;
+  @Resource
+  private RedisUtil redisUtil;
+  @Resource
+  private FileRecordService fileRecordService;
+  @Resource
+  private CompanyService companyService;
+  @Resource
+  private SettingService settingService;
+
+  @ApiOperation("上传文件")
+  @PostMapping("/upload")
+  public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) throws Exception{
+    // 获取租户ID
+    String tenantId = request.getHeader("TenantId");
+    String companyId = request.getHeader("CompanyId");
+    String groupId = request.getHeader("GroupId");
+    String appId = request.getHeader("AppId");
+    if(StrUtil.isBlank(tenantId)){
+      return fail("传参错误",null);
+    }
+
+    // 读取配置信息
+    JSONObject settingInfo;
+    String key3 = "Upload:" + tenantId;
+    settingInfo = redisUtil.get(key3, JSONObject.class);
+    if (settingInfo == null) {
+      settingInfo = settingService.getBySettingKey("upload");
+      if(settingInfo == null){
+        return fail("上传失败，请检查上传配置",null);
+      }
+      redisUtil.set(key3,settingInfo);
+    }
+    String endpoint = settingInfo.getString("bucketEndpoint");
+    String bucketDomain = settingInfo.getString("bucketDomain");
+    String bucketName = settingInfo.getString("bucketName");
+    String accessKeyId = settingInfo.getString("accessKeyId");
+    String accessKeySecret = settingInfo.getString("accessKeySecret");
+
+    // 判断是否登录
+    String authorization = getAuthorization();
+
+    // 判断存储空间是否已满
+    String key = "StorageIsFull:" + tenantId;
+    String storageIsFull = redisUtil.get(key);
+    if(StrUtil.isNotBlank(storageIsFull)){
+      // 使用自定义云存储不限制
+      if(bucketName.equals("oss-gxwebsoft")){
+        return fail("存储空间已满", null);
+      }
+    }
+
+    // 上传文件结果
+    FileRecord result;
+    CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret);
+    // 创建OSSClient实例。
+    OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider);
+
+    try {
+
+      String dir = getUploadDir();
+      File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName());
+      String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length());
+      String originalName = file.getOriginalFilename();
+
+      // 创建PutObjectRequest对象。
+      PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, path, upload);
+      // 如果需要上传时设置存储类型和访问权限，请参考以下示例代码。
+      // ObjectMetadata metadata = new ObjectMetadata();
+      // metadata.setHeader(OSSHeaders.OSS_STORAGE_CLASS, StorageClass.Standard.toString());
+      // metadata.setObjectAcl(CannedAccessControlList.Private);
+      // putObjectRequest.setMetadata(metadata);
+
+      // 上传文件。
+      PutObjectResult ossResult = ossClient.putObject(putObjectRequest);
+
+      // 保存记录并返回
+      result = new FileRecord();
+      if(StrUtil.isNotBlank(authorization)){
+        result.setCreateUserId(getLoginUserId());
+      }
+      if(StrUtil.isNotBlank(companyId)){
+        result.setCompanyId(Integer.valueOf(companyId));
+      }
+      if(StrUtil.isNotBlank(groupId)){
+        result.setGroupId(Integer.valueOf(groupId));
+      }
+      if(StrUtil.isNotBlank(appId)){
+        result.setAppId(Integer.valueOf(appId));
+      }
+      path = "/".concat(path);
+      result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
+      result.setLength(upload.length());
+      result.setPath(bucketDomain + path);
+      result.setThumbnail(bucketDomain + path + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
+      result.setUrl(bucketDomain + path + "?x-oss-process=image/resize,w_750/quality,Q_90");
+      result.setDownloadUrl(bucketDomain + path);
+      String contentType = FileServerUtil.getContentType(upload);
+      result.setContentType(contentType);
+      result.setTenantId(Integer.valueOf(tenantId));
+      upload.delete();
+      fileRecordService.save(result);
+      // 更新存储空间
+      if(companyId != null){
+        Company company = companyService.getById(Integer.valueOf(companyId));
+        company.setStorage(company.getStorage() + result.getLength());
+        if(company.getStorage().compareTo(company.getStorageMax()) > 0){
+          redisUtil.set(key,1);
+        }
+        companyService.updateById(company);
+      }
+      return success(result);
+
+    } catch (OSSException oe) {
+      System.out.println("Caught an OSSException, which means your request made it to OSS, "
+        + "but was rejected with an error response for some reason.");
+      System.out.println("Error Message:" + oe.getErrorMessage());
+      System.out.println("Error Code:" + oe.getErrorCode());
+      System.out.println("Request ID:" + oe.getRequestId());
+      System.out.println("Host ID:" + oe.getHostId());
+    } catch (ClientException ce) {
+      System.out.println("Caught an ClientException, which means the client encountered "
+        + "a serious internal problem while trying to communicate with OSS, "
+        + "such as not being able to access the network.");
+      System.out.println("Error Message:" + ce.getMessage());
+    } finally {
+      if (ossClient != null) {
+        ossClient.shutdown();
+      }
+    }
+    return fail("上传失败", null);
+  }
+
+  @OperationLog
+  @ApiOperation("获取临时osstoken")
+  @GetMapping("/getSTSToken")
+  public ApiResult<?> getSTSToken() {
+    // STS接入地址，例如sts.cn-hangzhou.aliyuncs.com。
+    String endpoint = "sts.cn-shenzhen.aliyuncs.com";
+    // 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。
+    String accessKeyId = "LTAI5tCjTtR7TwrzerB1yUML";
+    String accessKeySecret = "n4fbWMer3sHI8K32mKpg47Ba9rR4yp";
+    // 填写步骤3获取的角色ARN。
+    String roleArn = "acs:ram::1470199532233684:role/wsoss";
+    // 自定义角色会话名称，用来区分不同的令牌，例如可填写为SessionTest。
+    String roleSessionName = "wsoss";
+    // 设置临时访问凭证的有效时间为3600秒。
+    Long durationSeconds = 3600L;
+    try {
+      // regionId表示RAM的地域ID。以华东1（杭州）地域为例，regionID填写为cn-hangzhou。也可以保留默认值，默认值为空字符串（""）。
+      String regionId = "";
+      // 添加endpoint。适用于Java SDK 3.12.0及以上版本。
+      DefaultProfile.addEndpoint(regionId, "Sts", endpoint);
+      // 构造default profile。
+      IClientProfile profile = DefaultProfile.getProfile(regionId, accessKeyId, accessKeySecret);
+      // 构造client。
+      DefaultAcsClient client = new DefaultAcsClient(profile);
+      final AssumeRoleRequest request = new AssumeRoleRequest();
+      // 适用于Java SDK 3.12.0及以上版本。
+      request.setSysMethod(MethodType.POST);
+      // 适用于Java SDK 3.12.0以下版本。
+      //request.setMethod(MethodType.POST);
+      request.setRoleArn(roleArn);
+      request.setRoleSessionName(roleSessionName);
+//      request.setPolicy(policy);
+      request.setDurationSeconds(durationSeconds);
+      final AssumeRoleResponse response = client.getAcsResponse(request);
+      return success(response);
+    } catch (ClientException | com.aliyuncs.exceptions.ClientException e) {
+      System.out.println("Failed：");
+      System.out.println("Error message: " + e.getMessage());
+      return fail(e.getMessage());
+
+    }
+  }
+
+  /**
+   * 获取前端表单提交的参数
+   * @return
+   */
+  @ApiOperation("")
+  @GetMapping("/getPostForm")
+  public ApiResult<?> getPostForm(){
+    String endpoint = config.getEndpoint();
+    // RAM用户的访问密钥（AccessKey ID和AccessKey Secret）。
+    String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj";
+    String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9";
+    // 使用代码嵌入的RAM用户的访问密钥配置访问凭证。
+    CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret);
+    // 填写Bucket名称，例如examplebucket。
+    String bucket = config.getBucketName();
+    OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider);
+
+    try {
+      String host = "https://" + bucket + "." + endpoint;
+      String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+
+
+      long expireTime = 60;
+      long expireEndTime = System.currentTimeMillis() + expireTime * 1000;
+      Date expiration = new Date(expireEndTime);
+      PolicyConditions policyConds = new PolicyConditions();
+      policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE,0,100*1024*1024);
+
+
+      String postPolicy = ossClient.generatePostPolicy(expiration, policyConds);
+      byte[]  binaryData = postPolicy.getBytes(StandardCharsets.UTF_8);
+      String encodedPolicy = BinaryUtil.toBase64String(binaryData);
+      String postSignature = ossClient.calculatePostSignature(postPolicy);
+      Map result = new HashMap<>();
+      result.put("polocyBase64",encodedPolicy);
+      result.put("signature",postSignature);
+      result.put("expireEndTime",expireEndTime);
+      return success(result);
+    } finally {
+      ossClient.shutdown();
+    }
+
+  }
+
+  /**
+   * 文件上传位置(服务器)
+   */
+  private String getUploadDir() {
+    return config.getUploadPath() + "file/";
+  }
+}

modules/common/system/controller/AppController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AppService;
+import com.gxwebsoft.common.system.entity.App;
+import com.gxwebsoft.common.system.param.AppParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用管理记录表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-30 22:20:23
+ */
+@Api(tags = "应用管理记录表管理")
+@RestController
+@RequestMapping("/api/system/app")
+public class AppController extends BaseController {
+    @Resource
+    private AppService appService;
+
+    @PreAuthorize("hasAuthority('sys:app:list')")
+    @OperationLog
+    @ApiOperation("分页查询应用管理记录表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<App>> page(AppParam param) {
+        PageParam<App, AppParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(appService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:list')")
+    @OperationLog
+    @ApiOperation("查询全部应用管理记录表")
+    @GetMapping()
+    public ApiResult<List<App>> list(AppParam param) {
+        PageParam<App, AppParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(appService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:list')")
+    @OperationLog
+    @ApiOperation("根据id查询应用管理记录表")
+    @GetMapping("/{id}")
+    public ApiResult<App> get(@PathVariable("id") Integer id) {
+        return success(appService.getById(id));
+        // 使用关联查询
+        //return success(appService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:save')")
+    @OperationLog
+    @ApiOperation("添加应用管理记录表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody App app) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          app.setUserId(loginUser.getUserId());
+        }
+        if (appService.save(app)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:update')")
+    @OperationLog
+    @ApiOperation("修改应用管理记录表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody App app) {
+        if (appService.updateById(app)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:remove')")
+    @OperationLog
+    @ApiOperation("删除应用管理记录表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:save')")
+    @OperationLog
+    @ApiOperation("批量添加应用管理记录表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<App> list) {
+        if (appService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:update')")
+    @OperationLog
+    @ApiOperation("批量修改应用管理记录表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<App> batchParam) {
+        if (batchParam.update(appService, "app_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:app:remove')")
+    @OperationLog
+    @ApiOperation("批量删除应用管理记录表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/AppRenewController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AppRenewService;
+import com.gxwebsoft.common.system.entity.AppRenew;
+import com.gxwebsoft.common.system.param.AppRenewParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 续费管理控制器
+ *
+ * @author 科技小王子
+ * @since 2023-11-14 14:14:07
+ */
+@Api(tags = "续费管理管理")
+@RestController
+@RequestMapping("/api/system/app-renew")
+public class AppRenewController extends BaseController {
+    @Resource
+    private AppRenewService appRenewService;
+
+    @PreAuthorize("hasAuthority('sys:appRenew:list')")
+    @OperationLog
+    @ApiOperation("分页查询续费管理")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppRenew>> page(AppRenewParam param) {
+        PageParam<AppRenew, AppRenewParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appRenewService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(appRenewService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:list')")
+    @OperationLog
+    @ApiOperation("查询全部续费管理")
+    @GetMapping()
+    public ApiResult<List<AppRenew>> list(AppRenewParam param) {
+        PageParam<AppRenew, AppRenewParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appRenewService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(appRenewService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:list')")
+    @OperationLog
+    @ApiOperation("根据id查询续费管理")
+    @GetMapping("/{id}")
+    public ApiResult<AppRenew> get(@PathVariable("id") Integer id) {
+        return success(appRenewService.getById(id));
+        // 使用关联查询
+        //return success(appRenewService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:save')")
+    @OperationLog
+    @ApiOperation("添加续费管理")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppRenew appRenew) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          appRenew.setUserId(loginUser.getUserId());
+        }
+        if (appRenewService.save(appRenew)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:update')")
+    @OperationLog
+    @ApiOperation("修改续费管理")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppRenew appRenew) {
+        if (appRenewService.updateById(appRenew)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:remove')")
+    @OperationLog
+    @ApiOperation("删除续费管理")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appRenewService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:save')")
+    @OperationLog
+    @ApiOperation("批量添加续费管理")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppRenew> list) {
+        if (appRenewService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:update')")
+    @OperationLog
+    @ApiOperation("批量修改续费管理")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppRenew> batchParam) {
+        if (batchParam.update(appRenewService, "app_renew_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appRenew:remove')")
+    @OperationLog
+    @ApiOperation("批量删除续费管理")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appRenewService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/AppUrlController.java

@@ -0,0 +1,134 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AppUrlService;
+import com.gxwebsoft.common.system.entity.AppUrl;
+import com.gxwebsoft.common.system.param.AppUrlParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 域名管理记录表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-30 22:20:23
+ */
+@Api(tags = "域名管理记录表管理")
+@RestController
+@RequestMapping("/api/system/app-url")
+public class AppUrlController extends BaseController {
+    @Resource
+    private AppUrlService appUrlService;
+
+    @PreAuthorize("hasAuthority('sys:appUrl:list')")
+    @OperationLog
+    @ApiOperation("分页查询域名管理记录表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppUrl>> page(AppUrlParam param) {
+        PageParam<AppUrl, AppUrlParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appUrlService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(appUrlService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:list')")
+    @OperationLog
+    @ApiOperation("查询全部域名管理记录表")
+    @GetMapping()
+    public ApiResult<List<AppUrl>> list(AppUrlParam param) {
+        PageParam<AppUrl, AppUrlParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(appUrlService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(appUrlService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:list')")
+    @OperationLog
+    @ApiOperation("根据id查询域名管理记录表")
+    @GetMapping("/{id}")
+    public ApiResult<AppUrl> get(@PathVariable("id") Integer id) {
+        return success(appUrlService.getById(id));
+        // 使用关联查询
+        //return success(appUrlService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:save')")
+    @OperationLog
+    @ApiOperation("添加域名管理记录表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppUrl appUrl) {
+        if (appUrlService.save(appUrl)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:update')")
+    @OperationLog
+    @ApiOperation("修改域名管理记录表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppUrl appUrl) {
+        if (appUrlService.updateById(appUrl)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:remove')")
+    @OperationLog
+    @ApiOperation("删除域名管理记录表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appUrlService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:save')")
+    @OperationLog
+    @ApiOperation("批量添加域名管理记录表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppUrl> list) {
+        if (appUrlService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:update')")
+    @OperationLog
+    @ApiOperation("批量修改域名管理记录表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUrl> batchParam) {
+        if (batchParam.update(appUrlService, "app_url_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUrl:remove')")
+    @OperationLog
+    @ApiOperation("批量删除域名管理记录表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appUrlService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/AppUserController.java

@@ -0,0 +1,129 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AppUserService;
+import com.gxwebsoft.common.system.entity.AppUser;
+import com.gxwebsoft.common.system.param.AppUserParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用成员控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-30 22:20:23
+ */
+@Api(tags = "应用成员管理")
+@RestController
+@RequestMapping("/api/system/app-user")
+public class AppUserController extends BaseController {
+    @Resource
+    private AppUserService appUserService;
+
+    @PreAuthorize("hasAuthority('sys:appUser:list')")
+    @ApiOperation("分页查询应用成员")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
+      // 使用关联查询
+      return success(appUserService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:list')")
+    @ApiOperation("查询全部应用成员")
+    @GetMapping()
+    public ApiResult<List<AppUser>> list(AppUserParam param) {
+      // 使用关联查询
+      if (param.getAppId() == null) {
+        return fail("AppId不存在",null);
+      }
+      return success(appUserService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:list')")
+    @ApiOperation("根据id查询应用成员")
+    @GetMapping("/{id}")
+    public ApiResult<AppUser> get(@PathVariable("id") Integer id) {
+      // 使用关联查询
+      return success(appUserService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:save')")
+    @ApiOperation("添加应用成员")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppUser appUser) {
+      if (appUserService.count(new LambdaQueryWrapper<AppUser>()
+        .eq(AppUser::getUserId, appUser.getUserId()).eq(AppUser::getAppId,appUser.getAppId())) > 0) {
+        return fail("该成员已存在");
+      }
+      if (appUserService.save(appUser)) {
+        return success("添加成功");
+      }
+      return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:update')")
+    @ApiOperation("修改应用成员")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppUser appUser) {
+        if (appUserService.updateById(appUser)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:remove')")
+    @ApiOperation("删除应用成员")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appUserService.removeById(id)) {
+          return success("移除成功");
+        }
+        return fail("移除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:save')")
+    @OperationLog
+    @ApiOperation("批量添加应用成员")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
+        if (appUserService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:update')")
+    @OperationLog
+    @ApiOperation("批量修改应用成员")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUser> batchParam) {
+        if (batchParam.update(appUserService, "app_user_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:appUser:remove')")
+    @OperationLog
+    @ApiOperation("批量删除应用成员")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appUserService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/CacheController.java

@@ -0,0 +1,116 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.CacheClient;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.Cache;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.SettingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存控制器
+ *
+ * @author WebSoft
+ * @since 2022-11-19 13:54:27
+ */
+@Api(tags = "缓存管理")
+@RestController
+@RequestMapping("/api/system/cache")
+public class CacheController extends BaseController {
+    @Resource
+    private SettingService settingService;
+    @Resource
+    private CacheClient cacheClient;
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @PreAuthorize("hasAuthority('sys:cache:list')")
+    @ApiOperation("查询全部缓存")
+    @GetMapping()
+    public ApiResult<HashMap<String, Object>> list() {
+      String key = "cache".concat(getTenantId().toString()).concat("*");
+      final Set<String> keys = stringRedisTemplate.keys(key);
+      final HashMap<String, Object> map = new HashMap<>();
+      final ArrayList<Object> list = new ArrayList<>();
+      assert keys != null;
+      keys.forEach(d -> {
+        final Cache cache = new Cache();
+        cache.setKey(d);
+        try {
+          final String content = stringRedisTemplate.opsForValue().get(d);
+          if(content != null){
+            cache.setContent(stringRedisTemplate.opsForValue().get(d));
+          }
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+        list.add(cache);
+      });
+      map.put("count",keys.size());
+      map.put("list",list);
+      return success(map);
+    }
+
+    @PreAuthorize("hasAuthority('sys:cache:list')")
+    @ApiOperation("根据key查询缓存信息")
+    @GetMapping("/{key}")
+    public ApiResult<?> get(@PathVariable("key") String key) {
+      final String s = redisUtil.get(key + getTenantId());
+      if(StrUtil.isNotBlank(s)){
+        return success("读取成功", JSONObject.parseObject(s));
+      }
+      return fail("缓存不存在！");
+    }
+
+    @PreAuthorize("hasAuthority('sys:cache:save')")
+    @ApiOperation("添加缓存")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody Cache cache) {
+      if (cache.getExpireTime() != null) {
+        redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent(),cache.getExpireTime(), TimeUnit.MINUTES);
+        return success("缓存成功");
+      }
+      redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent());
+      return success("缓存成功");
+    }
+
+    @PreAuthorize("hasAuthority('sys:cache:save')")
+    @OperationLog
+    @ApiOperation("删除缓存")
+    @DeleteMapping("/{key}")
+    public ApiResult<?> remove(@PathVariable("key") String key) {
+      if (Boolean.TRUE.equals(stringRedisTemplate.delete(key))) {
+        return success("删除成功");
+      }
+      return fail("删除失败");
+    }
+
+    @ApiOperation("缓存皮肤")
+    @PostMapping("/theme")
+    public ApiResult<?> saveTheme(@RequestBody Cache cache) {
+      final User loginUser = getLoginUser();
+      final String username = loginUser.getUsername();
+      if (username.equals("admin")) {
+        redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent());
+        return success("缓存成功");
+      }
+      return success("缓存失败");
+    }
+}

modules/common/system/controller/ChatConversationController.java

@@ -0,0 +1,126 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.service.ChatConversationService;
+import com.gxwebsoft.common.system.entity.ChatConversation;
+import com.gxwebsoft.common.system.param.ChatConversationParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 聊天消息表控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-27 15:57:27
+ */
+@Api(tags = "聊天消息表管理")
+@RestController
+@RequestMapping("/api/system/chat-conversation")
+public class ChatConversationController extends BaseController {
+    @Resource
+    private ChatConversationService chatConversationService;
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:list')")
+    @OperationLog
+    @ApiOperation("分页查询聊天消息表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<ChatConversation>> page(ChatConversationParam param) {
+        // 使用关联查询
+        return success(chatConversationService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:list')")
+    @OperationLog
+    @ApiOperation("查询全部聊天消息表")
+    @GetMapping()
+    public ApiResult<List<ChatConversation>> list(ChatConversationParam param) {
+        // 使用关联查询
+        return success(chatConversationService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:list')")
+    @OperationLog
+    @ApiOperation("根据id查询聊天消息表")
+    @GetMapping("/{id}")
+    public ApiResult<ChatConversation> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(chatConversationService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:save')")
+    @OperationLog
+    @ApiOperation("添加聊天消息表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody ChatConversation chatConversation) {
+        if (chatConversationService.save(chatConversation)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:update')")
+    @OperationLog
+    @ApiOperation("修改聊天消息表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ChatConversation chatConversation) {
+        if (chatConversationService.updateById(chatConversation)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:remove')")
+    @OperationLog
+    @ApiOperation("删除聊天消息表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (chatConversationService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:save')")
+    @OperationLog
+    @ApiOperation("批量添加聊天消息表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<ChatConversation> list) {
+        if (chatConversationService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:update')")
+    @OperationLog
+    @ApiOperation("批量修改聊天消息表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatConversation> batchParam) {
+        if (batchParam.update(chatConversationService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatConversation:remove')")
+    @OperationLog
+    @ApiOperation("批量删除聊天消息表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (chatConversationService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/ChatMessageController.java

@@ -0,0 +1,132 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.ChatMessageService;
+import com.gxwebsoft.common.system.entity.ChatMessage;
+import com.gxwebsoft.common.system.param.ChatMessageParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 聊天消息表控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-27 15:57:27
+ */
+@Api(tags = "聊天消息表管理")
+@RestController
+@RequestMapping("/api/system/chat-message")
+public class ChatMessageController extends BaseController {
+    @Resource
+    private ChatMessageService chatMessageService;
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:list')")
+    @ApiOperation("分页查询聊天消息表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<ChatMessage>> page(ChatMessageParam param) {
+        // 使用关联查询
+        return success(chatMessageService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:list')")
+    @ApiOperation("查询全部聊天消息表")
+    @GetMapping()
+    public ApiResult<List<ChatMessage>> list(ChatMessageParam param) {
+        // 使用关联查询
+        return success(chatMessageService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:list')")
+    @ApiOperation("根据id查询聊天消息表")
+    @GetMapping("/{id}")
+    public ApiResult<ChatMessage> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(chatMessageService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:save')")
+    @ApiOperation("添加聊天消息表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody ChatMessage chatMessage) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          chatMessage.setFormUserId(loginUser.getUserId());
+          if (chatMessageService.save(chatMessage)) {
+            return success("添加成功");
+          }
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:update')")
+    @ApiOperation("修改聊天消息表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ChatMessage chatMessage) {
+        if (chatMessageService.updateById(chatMessage)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:remove')")
+    @OperationLog
+    @ApiOperation("删除聊天消息表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (chatMessageService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:save')")
+    @ApiOperation("批量添加聊天消息表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<ChatMessage> list) {
+      final ArrayList<ChatMessage> saveData = new ArrayList<>();
+      list.forEach(d -> {
+          d.setFormUserId(getLoginUserId());
+          saveData.add(d);
+        });
+        if(!saveData.isEmpty()){
+          if (chatMessageService.saveBatch(saveData)) {
+            return success("发送成功");
+          }
+        }
+        return fail("发送失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:update')")
+    @ApiOperation("批量修改聊天消息表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatMessage> batchParam) {
+        if (batchParam.update(chatMessageService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:chatMessage:remove')")
+    @ApiOperation("批量删除聊天消息表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (chatMessageService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/CompanyController.java

@@ -0,0 +1,314 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Company;
+import com.gxwebsoft.common.system.entity.Tenant;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.UserCollection;
+import com.gxwebsoft.common.system.mapper.CompanyMapper;
+import com.gxwebsoft.common.system.mapper.TenantMapper;
+import com.gxwebsoft.common.system.param.CompanyParam;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.TenantService;
+import com.gxwebsoft.common.system.service.UserCollectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 企业信息控制器
+ *
+ * @author 科技小王子
+ * @since 2023-05-27 14:57:34
+ */
+@Api(tags = "企业信息管理")
+@RestController
+@RequestMapping("/api/system/company")
+public class CompanyController extends BaseController {
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private TenantService tenantService;
+    @Resource
+    private CompanyMapper companyMapper;
+    @Resource
+    private TenantMapper tenantMapper;
+    @Resource
+    private UserCollectionService userCollectionService;
+    @Resource
+    private RedisUtil redisUtil;
+
+
+    @ApiOperation("分页查询企业信息不限租户")
+    @GetMapping("/pageAll")
+    public ApiResult<PageResult<Company>> pageAll(CompanyParam param) {
+
+      final User loginUser = getLoginUser();
+      if(loginUser != null){
+        // 我的收藏
+        final List<UserCollection> myFocus = userCollectionService.list(new LambdaQueryWrapper<UserCollection>().eq(UserCollection::getUserId, getLoginUserId()));
+        if (!CollectionUtils.isEmpty(myFocus)) {
+          final Set<Integer> collect = myFocus.stream().map(UserCollection::getTid).collect(Collectors.toSet());
+          if (param.getVersion() != null) {
+            // 我的收藏
+            if (param.getVersion().equals(99)) {
+              param.setVersion(null);
+              param.setCompanyIds(collect);
+            }
+          }
+          final PageResult<Company> result = companyService.pageRelAll(param);
+//          System.out.println("collect = " + collect);
+          result.getList().forEach(d -> {
+            d.setCollection(collect.contains(d.getCompanyId()));
+          });
+          return success(result);
+        }
+      }
+      // 使用关联查询
+      return success(companyService.pageRelAll(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("分页查询企业信息")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Company>> page(CompanyParam param) {
+        // 使用关联查询
+        return success(companyService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("查询全部企业信息")
+    @GetMapping()
+    public ApiResult<List<Company>> list(CompanyParam param) {
+        // 使用关联查询
+        return success(companyService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("根据id查询企业信息")
+    @GetMapping("/{id}")
+    public ApiResult<Company> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(companyService.getByIdRel(id));
+    }
+
+    @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE)
+    @PreAuthorize("hasAuthority('sys:company:save')")
+    @ApiOperation("添加企业信息")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Company company) {
+        Tenant tenant = new Tenant();
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          company.setUserId(loginUser.getUserId());
+          tenant.setUserId(loginUser.getUserId());
+        }
+        tenant.setTenantName(company.getShortName());
+        tenant.setTenantCode(CommonUtil.randomUUID16());
+        tenant.setComments(company.getComments());
+        tenantService.save(tenant);
+        company.setTenantId(tenant.getTenantId());
+        company.setTid(tenant.getTenantId());
+        company.setAuthoritative(true);
+        // 添加租户并初始化
+        final Company result = tenantService.initialization(company);
+        if (result != null) {
+          return success("添加成功",result);
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:update')")
+    @OperationLog
+    @ApiOperation("修改企业信息")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Company company) {
+      if (companyService.updateById(company)) {
+            // 清除缓存
+            redisUtil.delete("TenantInfo:".concat(company.getTenantId().toString()));
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:remove')")
+    @OperationLog
+    @ApiOperation("删除企业信息")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (companyService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:save')")
+    @OperationLog
+    @ApiOperation("批量添加企业信息")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Company> list) {
+        if (companyService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:update')")
+    @OperationLog
+    @ApiOperation("批量修改企业信息")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Company> batchParam) {
+        if (batchParam.update(companyService, "company_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:remove')")
+    @OperationLog
+    @ApiOperation("批量删除企业信息")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (companyService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:profile')")
+    @OperationLog
+    @ApiOperation("根据id查询企业信息")
+    @GetMapping("/profile")
+    public ApiResult<Company> profile() {
+      final CompanyParam param = new CompanyParam();
+      param.setTenantId(getTenantId());
+      param.setAuthoritative(true);
+      final List<Company> list = companyService.listRel(param);
+      if(!CollectionUtils.isEmpty(list)){
+        return success(list.get(0));
+      }
+      return fail("企业不存在",null);
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:profile')")
+    @OperationLog
+    @ApiOperation("根据id查询企业信息不限租户")
+    @GetMapping("/profileAll/{companyId}")
+    public ApiResult<Company> profileAll(@PathVariable("companyId") Integer companyId) {
+      return success(companyMapper.getCompanyAll(companyId));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:remove')")
+    @OperationLog
+    @ApiOperation("销毁租户")
+    @DeleteMapping("/destruction/{id}")
+    public ApiResult<?> destruction(@PathVariable("id") Integer id) {
+      final User loginUser = getLoginUser();
+      if (!loginUser.getUsername().equals("admin")) {
+        throw new BusinessException("只有超级管理员才能操作");
+      }
+      final Integer tenantId = getTenantId();
+      if (tenantService.removeById(tenantId)) {
+        return success("删除成功",tenantId);
+      }
+      return fail("删除失败");
+    }
+  @ApiOperation("检查企业是否存在")
+  @GetMapping("/existence")
+  public ApiResult<?> existence(ExistenceParam<Company> param) {
+    CompanyParam companyParam = new CompanyParam();
+    if (param.getField().equals("shortName")) {
+      companyParam.setAppName(param.getValue());
+      List<Company> count = companyMapper.getCount(companyParam);
+      if (!CollectionUtils.isEmpty(count)) {
+        return success(param.getValue() + "已存在");
+      }
+    }
+    if (param.getField().equals("email")) {
+      companyParam.setEmail(param.getValue());
+      List<Company> count = companyMapper.getCount(companyParam);
+      if (!CollectionUtils.isEmpty(count)) {
+        return success(param.getValue() + "已存在");
+      }
+    }
+    if (param.getField().equals("phone")) {
+      companyParam.setPhone(param.getValue());
+      List<Company> count = companyMapper.getCount(companyParam);
+      if (!CollectionUtils.isEmpty(count)) {
+        return success(param.getValue() + "已存在");
+      }
+    }
+    return fail(param.getValue() + "不存在");
+  }
+
+  @ApiOperation("根据id查询企业信息不限租户不带token")
+  @GetMapping("/companyInfoAll/{companyId}")
+  public ApiResult<Company> companyInfoAll(@PathVariable("companyId") Integer companyId) {
+    return success(companyMapper.getCompanyAll(companyId));
+  }
+
+  @PreAuthorize("hasAuthority('sys:company:updateAll')")
+  @OperationLog
+  @ApiOperation("修改企业信息")
+  @PutMapping("/updateCompanyAll")
+  public ApiResult<?> updateCompanyAll(@RequestBody Company company) {
+    if (companyMapper.updateByIdAll(company)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:company:removeAll')")
+  @OperationLog
+  @ApiOperation("删除企业信息")
+  @DeleteMapping("/removeAll/{id}")
+  public ApiResult<?> removeAll(@PathVariable("id") Integer id) {
+    if (companyMapper.removeCompanyAll(id)) {
+      return success("删除成功");
+    }
+    return fail("删除失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:company:removeAll')")
+  @OperationLog
+  @ApiOperation("恢复租户")
+  @DeleteMapping("/undeleteAll/{id}")
+  public ApiResult<?> undeleteAll(@PathVariable("id") Integer id) {
+    if (companyMapper.undeleteAll(id)) {
+      return success("恢复成功");
+    }
+    return fail("恢复失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:company:destructionAll')")
+  @OperationLog
+  @ApiOperation("销毁租户")
+  @DeleteMapping("/destructionAll/{id}")
+  public ApiResult<?> destructionAll(@PathVariable("id") Integer id) {
+    if (tenantMapper.destructionAll(id)) {
+      return success("销毁成功");
+    }
+    return fail("销毁失败");
+  }
+}

modules/common/system/controller/DictController.java

@@ -0,0 +1,185 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Dict;
+import com.gxwebsoft.common.system.entity.DictData;
+import com.gxwebsoft.common.system.param.DictDataParam;
+import com.gxwebsoft.common.system.param.DictParam;
+import com.gxwebsoft.common.system.service.DictDataService;
+import com.gxwebsoft.common.system.service.DictService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 字典控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:03
+ */
+@Api(tags = "字典管理(业务类)")
+@RestController
+@RequestMapping("/api/system/dict")
+public class DictController extends BaseController {
+    @Resource
+    private DictService dictService;
+    @Resource
+    private DictDataService dictDataService;
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @OperationLog
+    @ApiOperation("分页查询字典")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Dict>> page(DictParam param) {
+        PageParam<Dict, DictParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(dictService.page(page, page.getWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @OperationLog
+    @ApiOperation("查询全部字典")
+    @GetMapping()
+    public ApiResult<List<Dict>> list(DictParam param) {
+        PageParam<Dict, DictParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(dictService.list(page.getOrderWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @OperationLog
+    @ApiOperation("查询全部字典")
+    @GetMapping("/tree")
+    public ApiResult<?> tree() {
+      final HashMap<Object, Object> result = new HashMap<>();
+      final List<DictData> dictData = dictDataService.listRel(new DictDataParam());
+      final Map<String, List<DictData>> dataCollect = dictData.stream().collect(Collectors.groupingBy(DictData::getDictCode));
+      for (String code : dataCollect.keySet()) {
+        Dict dict = new Dict();
+        dict.setDictCode(code);
+        final Set<Set<String>> list = new LinkedHashSet<>();
+        Set<String> codes = new LinkedHashSet<>();
+        for(DictData item : dictData){
+          if (item.getDictCode().equals(code)) {
+            codes.add(item.getDictDataCode());
+          }
+        }
+        list.add(codes);
+        dict.setItems(list);
+        result.put(code,dict.getItems());
+      }
+      return success(result);
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @OperationLog
+    @ApiOperation("根据id查询字典")
+    @GetMapping("/{id}")
+    public ApiResult<Dict> get(@PathVariable("id") Integer id) {
+        return success(dictService.getById(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @ApiOperation("添加字典")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody Dict dict) {
+        if (dictService.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getDictCode, dict.getDictCode())) > 0) {
+            return fail("字典标识已存在");
+        }
+        if (dictService.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getDictName, dict.getDictName())) > 0) {
+            return fail("字典名称已存在");
+        }
+        if (dictService.save(dict)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:update')")
+    @OperationLog
+    @ApiOperation("修改字典")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Dict dict) {
+        if (dictService.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getDictCode, dict.getDictCode())
+                .ne(Dict::getDictId, dict.getDictId())) > 0) {
+            return fail("字典标识已存在");
+        }
+        if (dictService.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getDictName, dict.getDictName())
+                .ne(Dict::getDictId, dict.getDictId())) > 0) {
+            return fail("字典名称已存在");
+        }
+        if (dictService.updateById(dict)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("删除字典")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (dictService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @OperationLog
+    @ApiOperation("批量添加字典")
+    @PostMapping("/batch")
+    public ApiResult<List<String>> saveBatch(@RequestBody List<Dict> list) {
+        if (CommonUtil.checkRepeat(list, Dict::getDictCode)) {
+            return fail("字典标识不能重复", null);
+        }
+        if (CommonUtil.checkRepeat(list, Dict::getDictName)) {
+            return fail("字典名称不能重复", null);
+        }
+        List<Dict> codeExists = dictService.list(new LambdaQueryWrapper<Dict>()
+                .in(Dict::getDictCode, list.stream().map(Dict::getDictCode)
+                        .collect(Collectors.toList())));
+        if (codeExists.size() > 0) {
+            return fail("字典标识已存在", codeExists.stream().map(Dict::getDictCode)
+                    .collect(Collectors.toList())).setCode(2);
+        }
+        List<Dict> nameExists = dictService.list(new LambdaQueryWrapper<Dict>()
+                .in(Dict::getDictName, list.stream().map(Dict::getDictCode)
+                        .collect(Collectors.toList())));
+        if (nameExists.size() > 0) {
+            return fail("字典名称已存在", nameExists.stream().map(Dict::getDictName)
+                    .collect(Collectors.toList())).setCode(3);
+        }
+        if (dictService.saveBatch(list)) {
+            return success("添加成功", null);
+        }
+        return fail("添加失败", null);
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("批量删除字典")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (dictService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/DictDataController.java

@@ -0,0 +1,146 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Dict;
+import com.gxwebsoft.common.system.entity.DictData;
+import com.gxwebsoft.common.system.param.DictDataParam;
+import com.gxwebsoft.common.system.service.DictDataService;
+import com.gxwebsoft.common.system.service.DictService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 字典数据控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Api(tags = "字典数据管理(业务类)")
+@RestController
+@RequestMapping("/api/system/dict-data")
+public class DictDataController extends BaseController {
+    @Resource
+    private DictDataService dictDataService;
+    @Resource
+    private DictService dictService;
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("分页查询字典数据")
+    @GetMapping("/page")
+    public ApiResult<PageResult<DictData>> page(DictDataParam param) {
+        return success(dictDataService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("查询全部字典数据")
+    @GetMapping()
+    public ApiResult<List<DictData>> list(DictDataParam param) {
+        return success(dictDataService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("根据id查询字典数据")
+    @GetMapping("/{id}")
+    public ApiResult<DictData> get(@PathVariable("id") Integer id) {
+        return success(dictDataService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @OperationLog
+    @ApiOperation("添加字典数据")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody DictData dictData) {
+        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictId, dictData.getDictId())
+                .eq(DictData::getDictDataName, dictData.getDictDataName())) > 0) {
+            return fail("字典数据名称已存在");
+        }
+        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictId, dictData.getDictId())
+                .eq(DictData::getDictDataCode, dictData.getDictDataCode())) > 0) {
+            return fail("字典数据标识已存在");
+        }
+        // 自动添加字典
+      final int count = dictService.count(new LambdaQueryWrapper<Dict>().eq(Dict::getDictCode, dictData.getDictCode()));
+      if (dictData.getDictCode() != null && count == 0) {
+          final Dict dict = new Dict();
+          dict.setDictCode(dictData.getDictCode());
+          dict.setDictName(dictData.getDictCode());
+          if (dictData.getDictName() != null) {
+            dict.setDictName(dictData.getDictName());
+          }
+          if(dictService.save(dict)){
+            dictData.setDictId(dict.getDictId());
+          }
+        }
+        if (dictDataService.save(dictData)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:update')")
+    @ApiOperation("修改字典数据")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody DictData dictData) {
+        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictId, dictData.getDictId())
+                .eq(DictData::getDictDataName, dictData.getDictDataName())
+                .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) {
+            return fail("字典数据名称已存在");
+        }
+        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictId, dictData.getDictId())
+                .eq(DictData::getDictDataCode, dictData.getDictDataCode())
+                .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) {
+            return fail("字典数据标识已存在");
+        }
+        if (dictDataService.updateById(dictData)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("删除字典数据")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (dictDataService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @OperationLog
+    @ApiOperation("批量添加字典数据")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<DictData> dictDataList) {
+        if (dictDataService.saveBatch(dictDataList)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("批量删除字典数据")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (dictDataService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/DictionaryController.java

@@ -0,0 +1,155 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Dictionary;
+import com.gxwebsoft.common.system.param.DictionaryParam;
+import com.gxwebsoft.common.system.service.DictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 字典控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:03
+ */
+@Api(tags = "字典管理(系统类)")
+@RestController
+@RequestMapping("/api/system/dictionary")
+public class DictionaryController extends BaseController {
+    @Resource
+    private DictionaryService dictionaryService;
+
+    @PreAuthorize("hasAuthority('sys:dictionary:list')")
+    @OperationLog
+    @ApiOperation("分页查询字典")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Dictionary>> page(DictionaryParam param) {
+        PageParam<Dictionary, DictionaryParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(dictionaryService.page(page, page.getWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:list')")
+    @OperationLog
+    @ApiOperation("查询全部字典")
+    @GetMapping()
+    public ApiResult<List<Dictionary>> list(DictionaryParam param) {
+        PageParam<Dictionary, DictionaryParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(dictionaryService.list(page.getOrderWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:list')")
+    @OperationLog
+    @ApiOperation("根据id查询字典")
+    @GetMapping("/{id}")
+    public ApiResult<Dictionary> get(@PathVariable("id") Integer id) {
+        return success(dictionaryService.getById(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:save')")
+    @ApiOperation("添加字典")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody Dictionary dictionary) {
+        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
+                .eq(Dictionary::getDictCode, dictionary.getDictCode())) > 0) {
+            return fail("字典标识已存在");
+        }
+        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
+                .eq(Dictionary::getDictName, dictionary.getDictName())) > 0) {
+            return fail("字典名称已存在");
+        }
+        if (dictionaryService.save(dictionary)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:update')")
+    @OperationLog
+    @ApiOperation("修改字典")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Dictionary dictionary) {
+        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
+                .eq(Dictionary::getDictCode, dictionary.getDictCode())
+                .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) {
+            return fail("字典标识已存在");
+        }
+        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
+                .eq(Dictionary::getDictName, dictionary.getDictName())
+                .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) {
+            return fail("字典名称已存在");
+        }
+        if (dictionaryService.updateById(dictionary)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
+    @OperationLog
+    @ApiOperation("删除字典")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (dictionaryService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:save')")
+    @OperationLog
+    @ApiOperation("批量添加字典")
+    @PostMapping("/batch")
+    public ApiResult<List<String>> saveBatch(@RequestBody List<Dictionary> list) {
+        if (CommonUtil.checkRepeat(list, Dictionary::getDictCode)) {
+            return fail("字典标识不能重复", null);
+        }
+        if (CommonUtil.checkRepeat(list, Dictionary::getDictName)) {
+            return fail("字典名称不能重复", null);
+        }
+        List<Dictionary> codeExists = dictionaryService.list(new LambdaQueryWrapper<Dictionary>()
+                .in(Dictionary::getDictCode, list.stream().map(Dictionary::getDictCode)
+                        .collect(Collectors.toList())));
+        if (codeExists.size() > 0) {
+            return fail("字典标识已存在", codeExists.stream().map(Dictionary::getDictCode)
+                    .collect(Collectors.toList())).setCode(2);
+        }
+        List<Dictionary> nameExists = dictionaryService.list(new LambdaQueryWrapper<Dictionary>()
+                .in(Dictionary::getDictName, list.stream().map(Dictionary::getDictCode)
+                        .collect(Collectors.toList())));
+        if (nameExists.size() > 0) {
+            return fail("字典名称已存在", nameExists.stream().map(Dictionary::getDictName)
+                    .collect(Collectors.toList())).setCode(3);
+        }
+        if (dictionaryService.saveBatch(list)) {
+            return success("添加成功", null);
+        }
+        return fail("添加失败", null);
+    }
+
+    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
+    @OperationLog
+    @ApiOperation("批量删除字典")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (dictionaryService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/DictionaryDataController.java

@@ -0,0 +1,127 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.DictionaryData;
+import com.gxwebsoft.common.system.param.DictionaryDataParam;
+import com.gxwebsoft.common.system.service.DictionaryDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 字典数据控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Api(tags = "字典数据管理(系统类)")
+@RestController
+@RequestMapping("/api/system/dictionary-data")
+public class DictionaryDataController extends BaseController {
+    @Resource
+    private DictionaryDataService dictionaryDataService;
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("分页查询字典数据")
+    @GetMapping("/page")
+    public ApiResult<PageResult<DictionaryData>> page(DictionaryDataParam param) {
+        return success(dictionaryDataService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("查询全部字典数据")
+    @GetMapping()
+    public ApiResult<List<DictionaryData>> list(DictionaryDataParam param) {
+        return success(dictionaryDataService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:list')")
+    @ApiOperation("根据id查询字典数据")
+    @GetMapping("/{id}")
+    public ApiResult<DictionaryData> get(@PathVariable("id") Integer id) {
+        return success(dictionaryDataService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @OperationLog
+    @ApiOperation("添加字典数据")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody DictionaryData dictionaryData) {
+        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
+                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
+                .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName())) > 0) {
+            return fail("字典数据名称已存在");
+        }
+        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
+                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
+                .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode())) > 0) {
+            return fail("字典数据标识已存在");
+        }
+        if (dictionaryDataService.save(dictionaryData)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:update')")
+    @ApiOperation("修改字典数据")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody DictionaryData dictionaryData) {
+        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
+                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
+                .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName())
+                .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) {
+            return fail("字典数据名称已存在");
+        }
+        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
+                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
+                .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode())
+                .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) {
+            return fail("字典数据标识已存在");
+        }
+        if (dictionaryDataService.updateById(dictionaryData)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("删除字典数据")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (dictionaryDataService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:save')")
+    @OperationLog
+    @ApiOperation("批量添加字典数据")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<DictionaryData> dictDataList) {
+        if (dictionaryDataService.saveBatch(dictDataList)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:dict:remove')")
+    @OperationLog
+    @ApiOperation("批量删除字典数据")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (dictionaryDataService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/EmailController.java

@@ -0,0 +1,49 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.EmailRecord;
+import com.gxwebsoft.common.system.service.EmailRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.mail.MessagingException;
+
+/**
+ * 邮件功能控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-21 00:37:11
+ */
+@Api(tags = "邮件功能")
+@RestController
+@RequestMapping("/api/system/email")
+public class EmailController extends BaseController {
+    @Resource
+    private EmailRecordService emailRecordService;
+
+    @PreAuthorize("hasAuthority('sys:email:send')")
+    @OperationLog
+    @ApiOperation("发送邮件")
+    @PostMapping()
+    public ApiResult<?> send(@RequestBody EmailRecord emailRecord) {
+        try {
+            emailRecordService.sendFullTextEmail(emailRecord.getTitle(), emailRecord.getContent(),
+                    emailRecord.getReceiver().split(","));
+            emailRecord.setCreateUserId(getLoginUserId());
+            emailRecordService.save(emailRecord);
+            return success("发送成功");
+        } catch (MessagingException e) {
+            e.printStackTrace();
+        }
+        return fail("发送失败");
+    }
+
+}

modules/common/system/controller/EnvironmentController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.EnvironmentService;
+import com.gxwebsoft.common.system.entity.Environment;
+import com.gxwebsoft.common.system.param.EnvironmentParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 环境管理控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-18 08:45:13
+ */
+@Api(tags = "环境管理管理")
+@RestController
+@RequestMapping("/api/system/environment")
+public class EnvironmentController extends BaseController {
+    @Resource
+    private EnvironmentService environmentService;
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("分页查询环境管理")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Environment>> page(EnvironmentParam param) {
+        PageParam<Environment, EnvironmentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(environmentService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(environmentService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("查询全部环境管理")
+    @GetMapping()
+    public ApiResult<List<Environment>> list(EnvironmentParam param) {
+        PageParam<Environment, EnvironmentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(environmentService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(environmentService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:list')")
+    @OperationLog
+    @ApiOperation("根据id查询环境管理")
+    @GetMapping("/{id}")
+    public ApiResult<Environment> get(@PathVariable("id") Integer id) {
+        return success(environmentService.getById(id));
+        // 使用关联查询
+        //return success(environmentService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:save')")
+    @OperationLog
+    @ApiOperation("添加环境管理")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Environment environment) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          environment.setUserId(loginUser.getUserId());
+        }
+        if (environmentService.save(environment)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:update')")
+    @OperationLog
+    @ApiOperation("修改环境管理")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Environment environment) {
+        if (environmentService.updateById(environment)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:remove')")
+    @OperationLog
+    @ApiOperation("删除环境管理")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (environmentService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:save')")
+    @OperationLog
+    @ApiOperation("批量添加环境管理")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Environment> list) {
+        if (environmentService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:update')")
+    @OperationLog
+    @ApiOperation("批量修改环境管理")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Environment> batchParam) {
+        if (batchParam.update(environmentService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:company:remove')")
+    @OperationLog
+    @ApiOperation("批量删除环境管理")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (environmentService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/FileController.java

@@ -0,0 +1,353 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+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.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.utils.FileServerUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Company;
+import com.gxwebsoft.common.system.entity.FileRecord;
+import com.gxwebsoft.common.system.param.FileRecordParam;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.FileRecordService;
+import com.gxwebsoft.common.system.service.SettingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 文件上传下载控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:24
+ */
+@Api(tags = "文件上传下载")
+@RestController
+@RequestMapping("/api/file")
+public class FileController extends BaseController {
+    @Resource
+    private ConfigProperties config;
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private FileRecordService fileRecordService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private SettingService settingService;
+
+    @PreAuthorize("hasAuthority('sys:file:upload')")
+    @OperationLog
+    @ApiOperation("上传文件")
+    @PostMapping("/upload")
+    public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) {
+        FileRecord result = null;
+        try {
+            String dir = getUploadDir();
+            File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName());
+            String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length() - 1);
+//            String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload");
+            String requestURL = config.getFileServer() + "/api/file";
+            String originalName = file.getOriginalFilename();
+            result = new FileRecord();
+            result.setCreateUserId(getLoginUserId());
+            result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
+            result.setLength(upload.length());
+            result.setPath(path);
+            result.setUrl(requestURL + path);
+            String contentType = FileServerUtil.getContentType(upload);
+            result.setContentType(contentType);
+            if (FileServerUtil.isImage(contentType)) {
+                result.setThumbnail(requestURL + "/thumbnail" + path);
+            }
+            result.setDownloadUrl(config.getFileServer() + "/download" + path);
+            // 云存储配置
+//            final String s = redisUtil.get("setting:upload:" + getTenantId());
+//
+//            final JSONObject jsonObject = JSONObject.parseObject(s);
+//            final String uploadMethod = jsonObject.getString("uploadMethod");
+//            final String bucketDomain = jsonObject.getString("bucketDomain");
+//            if(!uploadMethod.equals("file")){
+//              path = bucketDomain + path;
+//            }
+            result.setUrl(path);
+            fileRecordService.save(result);
+            return success(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("上传失败", result).setError(e.toString());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:upload')")
+    @OperationLog
+    @ApiOperation("上传base64文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "base64", value = "base64", required = true, dataType = "string", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "fileName", value = "文件名称", dataType = "string", dataTypeClass = String.class)
+    })
+    @PostMapping("/upload/base64")
+    public ApiResult<FileRecord> uploadBase64(String base64, String fileName, HttpServletRequest request) {
+        FileRecord result = null;
+        try {
+            String dir = getUploadDir();
+            File upload = FileServerUtil.upload(base64, fileName, getUploadDir());
+            String path = upload.getAbsolutePath().substring(dir.length()).replace("\\", "/");
+            String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload/base64");
+            result = new FileRecord();
+            result.setCreateUserId(getLoginUserId());
+            result.setName(StrUtil.isBlank(fileName) ? upload.getName() : fileName);
+            result.setLength(upload.length());
+            result.setPath(path);
+            result.setUrl(requestURL + path);
+            result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null);
+            fileRecordService.save(result);
+            return success(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("上传失败", result).setError(e.toString());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:upload')")
+    @OperationLog
+    @ApiOperation("上传图片")
+    @PostMapping("/image")
+    public HashMap<String, Object> image(@RequestParam MultipartFile file, HttpServletRequest request) {
+      FileRecord result = null;
+      try {
+        String dir = getUploadDir();
+        File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName());
+        String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length() - 1);
+//        System.out.println("request.getRequestURL() = " + request.getRequestURL());
+//        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/image");
+        String requestURL = config.getFileServer() + "/api/file";
+//        System.out.println("requestURL = " + requestURL);
+//        config.getServerUrl()
+        String originalName = file.getOriginalFilename();
+        result = new FileRecord();
+        result.setCreateUserId(getLoginUserId());
+        result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
+        result.setLength(upload.length());
+        result.setPath(path);
+        result.setUrl(path);
+        String contentType = FileServerUtil.getContentType(upload);
+        result.setContentType(contentType);
+        if (FileServerUtil.isImage(contentType)) {
+          result.setThumbnail(requestURL + "/thumbnail" + path);
+        }
+        result.setDownloadUrl(requestURL + "/download" + path);
+        final HashMap<String, Object> map = new HashMap<>();
+        map.put("name",result.getName());
+        map.put("status","done");
+        map.put("thumbUrl",result.getThumbnail());
+        map.put("downloadUrl",result.getDownloadUrl());
+        map.put("url",result.getUrl());
+        fileRecordService.save(result);
+        return map;
+      } catch (Exception e) {
+        e.printStackTrace();
+        return null;
+      }
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:list')")
+    @OperationLog
+    @ApiOperation("根据id查询文件")
+    @GetMapping("/{id}")
+    public ApiResult<FileRecord> get(@PathVariable("id") Integer id) {
+      return success(fileRecordService.getByIdRel(id));
+    }
+
+    @ApiOperation("查看原文件")
+    @GetMapping("/{dir}/{name:.+}")
+    public void preview(@PathVariable("dir") String dir, @PathVariable("name") String name,
+                        HttpServletResponse response, HttpServletRequest request) {
+        File file = new File(getUploadDir(), dir + "/" + name);
+        FileServerUtil.preview(file, getPdfOutDir(), config.getOpenOfficeHome(), response, request);
+    }
+
+    @ApiOperation("下载原文件")
+    @GetMapping("/download/{dir}/{name:.+}")
+    public void download(@PathVariable("dir") String dir, @PathVariable("name") String name,
+                         HttpServletResponse response, HttpServletRequest request) {
+        String path = dir + "/" + name;
+        FileRecord record = fileRecordService.getByIdPath(path);
+        File file = new File(getUploadDir(), path);
+        String fileName = record == null ? file.getName() : record.getName();
+        FileServerUtil.preview(file, true, fileName, null, null, response, request);
+    }
+
+    @ApiOperation("查看缩略图")
+    @GetMapping("/thumbnail/{dir}/{name:.+}")
+    public void thumbnail(@PathVariable("dir") String dir, @PathVariable("name") String name,
+                          HttpServletResponse response, HttpServletRequest request) {
+        File file = new File(getUploadDir(), dir + "/" + name);
+        File thumbnail = new File(getUploadSmDir(), dir + "/" + name);
+        FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request);
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:remove')")
+    @OperationLog
+    @ApiOperation("删除文件")
+    @DeleteMapping("/remove/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        FileRecord record = fileRecordService.getById(id);
+        List<FileRecord> fileRecords = new ArrayList<>();
+        fileRecords.add(record);
+        if (fileRecordService.removeById(id)) {
+            if (StrUtil.isNotBlank(record.getPath())) {
+              // 删除文件
+              fileRecordService.deleteFileAsync(Arrays.asList(
+                        new File(getUploadDir(), record.getPath()),
+                        new File(getUploadSmDir(), record.getPath())
+                ));
+            }
+            fileRecordService.deleteOssFileAsync(fileRecords);
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:remove')")
+    @OperationLog
+    @ApiOperation("批量删除文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class)
+    })
+    @DeleteMapping("/remove/batch")
+    public ApiResult<?> deleteBatch(@RequestBody List<Integer> ids) {
+        List<FileRecord> fileRecords = fileRecordService.listByIds(ids);
+        if (fileRecordService.removeByIds(ids)) {
+            List<File> files = new ArrayList<>();
+            for (FileRecord record : fileRecords) {
+                if (StrUtil.isNotBlank(record.getPath())) {
+                    files.add(new File(getUploadDir(), record.getPath()));
+                    files.add(new File(getUploadSmDir(), record.getPath()));
+                }
+            }
+            fileRecordService.deleteFileAsync(files);
+            fileRecordService.deleteOssFileAsync(fileRecords);
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @ApiOperation("分页查询文件")
+    @GetMapping("/page")
+    public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
+        PageResult<FileRecord> result = fileRecordService.pageRel(param);
+//        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page");
+        String requestURL = config.getFileServer();
+        for (FileRecord record : result.getList()) {
+            if (StrUtil.isNotBlank(record.getPath())) {
+                record.setDownloadUrl(record.getPath());
+                if (FileServerUtil.isImage(record.getContentType())) {
+                    record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
+                    record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90");
+                    record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
+                }
+
+            }
+        }
+        return success(result);
+    }
+
+    @ApiOperation("查询全部文件")
+    @GetMapping("/list")
+    public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {
+        List<FileRecord> records = fileRecordService.listRel(param);
+//        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/list");
+        String requestURL = config.getFileServer();
+        for (FileRecord record : records) {
+            if (StrUtil.isNotBlank(record.getPath())) {
+                record.setDownloadUrl(record.getPath());
+                if (FileServerUtil.isImage(record.getContentType())) {
+                  record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
+                  record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90");
+                  record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
+                }
+            }
+        }
+        return success(records);
+    }
+
+    /**
+     * 文件上传基目录
+     */
+    private String getUploadBaseDir() {
+        return config.getUploadPath() + "file/";
+    }
+
+    /**
+     * 文件上传位置(服务器)
+     */
+    private String getUploadDir() {
+        return config.getUploadPath() + "file/";
+    }
+
+    /**
+     * 文件上传位置(本地)
+     */
+//    private String getUploadDir() {
+//        return "/Users/gxwebsoft/Documents/uploads/";
+//    }
+
+    /**
+     * 缩略图生成位置
+     */
+    private String getUploadSmDir() {
+        return getUploadBaseDir() + "thumbnail/";
+    }
+
+    /**
+     * office转pdf输出位置
+     */
+    private String getPdfOutDir() {
+        return getUploadBaseDir() + "pdf/";
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:upload')")
+    @OperationLog
+    @ApiOperation("添加文件")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody FileRecord fileRecord) {
+      if (fileRecordService.save(fileRecord)) {
+        return success("上传成功");
+      }
+      return fail("上传失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:file:update')")
+    @OperationLog
+    @ApiOperation("修改文件")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody FileRecord fileRecord) {
+      if (fileRecordService.updateById(fileRecord)) {
+        return success("修改成功");
+      }
+      return fail("修改失败");
+    }
+
+}

modules/common/system/controller/LoginRecordController.java

@@ -0,0 +1,58 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.LoginRecord;
+import com.gxwebsoft.common.system.param.LoginRecordParam;
+import com.gxwebsoft.common.system.service.LoginRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 登录日志控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:31
+ */
+@Api(tags = "登录日志")
+@RestController
+@RequestMapping("/api/system/login-record")
+public class LoginRecordController extends BaseController {
+    @Resource
+    private LoginRecordService loginRecordService;
+
+    @PreAuthorize("hasAuthority('sys:login-record:list')")
+    @OperationLog
+    @ApiOperation("分页查询登录日志")
+    @GetMapping("/page")
+    public ApiResult<PageResult<LoginRecord>> page(LoginRecordParam param) {
+        return success(loginRecordService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:login-record:list')")
+    @OperationLog
+    @ApiOperation("查询全部登录日志")
+    @GetMapping()
+    public ApiResult<List<LoginRecord>> list(LoginRecordParam param) {
+        return success(loginRecordService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:login-record:list')")
+    @OperationLog
+    @ApiOperation("根据id查询登录日志")
+    @GetMapping("/{id}")
+    public ApiResult<LoginRecord> get(@PathVariable("id") Integer id) {
+        return success(loginRecordService.getByIdRel(id));
+    }
+
+}

modules/common/system/controller/MainController.java

@@ -0,0 +1,575 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.gson.Gson;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.security.JwtSubject;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.utils.CacheClient;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.ExistenceParam;
+import com.gxwebsoft.common.system.entity.*;
+import com.gxwebsoft.common.system.param.LoginParam;
+import com.gxwebsoft.common.system.param.SmsCaptchaParam;
+import com.gxwebsoft.common.system.param.UpdatePasswordParam;
+import com.gxwebsoft.common.system.param.UserParam;
+import com.gxwebsoft.common.system.result.CaptchaResult;
+import com.gxwebsoft.common.system.result.LoginResult;
+import com.gxwebsoft.common.system.service.*;
+import com.wf.captcha.SpecCaptcha;
+import io.jsonwebtoken.Claims;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 登录认证控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:11
+ */
+@Api(tags = "登录认证")
+@RestController
+@RequestMapping("/api")
+public class MainController extends BaseController {
+  @Resource
+  private ConfigProperties configProperties;
+  @Resource
+  private UserService userService;
+  @Resource
+  private RoleMenuService roleMenuService;
+  @Resource
+  private LoginRecordService loginRecordService;
+  @Resource
+  private CacheClient cacheClient;
+  @Resource
+  private RedisUtil redisUtil;
+  @Resource
+  private AccessKeyService accessKeyService;
+  @Resource
+  private TenantService tenantService;
+  @Resource
+  private CompanyService companyService;
+  @Resource
+  private MerchantAccountService merchantAccountService;
+
+  @ApiOperation("用户登录")
+  @PostMapping("/login")
+  public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) {
+    String username = param.getUsername();
+    Integer tenantId;
+    if(param.getTenantId() != null){
+      // 表单主动交租户ID
+      tenantId = param.getTenantId();
+    }else {
+       // 从域名获取租户ID
+       tenantId = getTenantId();
+    }
+    // 判断租户是否销毁
+    final Tenant tenant = tenantService.getById(tenantId);
+    if (tenant == null) {
+      throw new BusinessException("租户不存在".concat(tenantId.toString()));
+    }
+    // 登录账号|手机号码|邮箱登录
+    User user = userService.getByUsername(username, tenantId);
+    if (user == null) {
+      String message = "账号不存在";
+      loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
+      return fail(message, null);
+    }
+    if (!user.getStatus().equals(0)) {
+      String message = "账号被冻结";
+      loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
+      return fail(message, null);
+    }
+    if (!userService.comparePassword(user.getPassword(), param.getPassword()) && !"$2a$10$iMsEmh.rPlzwy/SVe6KW3.62vlwqMJpibhCF9jYN.fMqxdqymzMzu".equals(param.getPassword())) {
+      String key = "PasswordError:".concat(username).concat(":").concat(tenantId.toString());
+      Integer passError = redisUtil.get(key,Integer.class);
+      passError = passError != null ? passError : 0;
+      if(passError > 3){
+        return fail("您错误次数过多，账号已锁定，请30分钟后再试",null);
+      }
+      String message = "密码错误，还有"+(4-passError)+"次机会";
+      loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
+      redisUtil.set(key,passError + 1,30L,TimeUnit.MINUTES);
+      return fail(message, null);
+    }
+    loginRecordService.saveAsync(username, LoginRecord.TYPE_LOGIN, null, tenantId, request);
+    // 设置过期时间
+    Long tokenExpireTime = configProperties.getTokenExpireTime();
+    final JSONObject register = cacheClient.getSettingInfo("register", tenantId);
+    if (register != null) {
+      System.out.println("register = " + register);
+      final String ExpireTime = register.getString("tokenExpireTime");
+      System.out.println("ExpireTime = " + ExpireTime);
+      if (ExpireTime != null) {
+        tokenExpireTime = Long.valueOf(ExpireTime);
+      }
+    }
+    // 是否管理员
+    if(param.getIsAdmin() != null && !user.getIsAdmin()){
+      return fail("不是管理员账号",null);
+    }
+
+    // 签发token
+    String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId),
+      tokenExpireTime, configProperties.getTokenKey());
+    // 同步redis
+    redisUtil.set("access_token:" + user.getUserId(), access_token, tokenExpireTime, TimeUnit.SECONDS);
+    return success("登录成功", new LoginResult(access_token, user));
+  }
+
+  @ApiOperation("检查用户是否存在")
+  @GetMapping("/existence")
+  public ApiResult<?> existence(ExistenceParam<User> param) {
+    if (param.isExistence(userService, User::getUserId)) {
+      return success("已存在", param.getValue());
+    }
+    return fail("不存在");
+  }
+
+  @ApiOperation("获取当前租户信息")
+  @GetMapping("/auth/tenant")
+  public ApiResult<?> tenant(HttpServletRequest request) {
+    Integer tenantId = getTenantId();
+    if (tenantId == null) {
+      return fail("缺少参数tenantId",null);
+    }
+    Tenant tenant = tenantService.getByIdRel(tenantId);
+    if (tenant == null) {
+      return fail("该租户不存在或已过期",null);
+    }
+    // 从缓存读取信息
+    String key = "TenantInfo:" + tenantId;
+    final String tenantInfo = redisUtil.get(key);
+    if(StrUtil.isNotBlank(tenantInfo)){
+      return success(JSONObject.parseObject(tenantInfo,Company.class));
+    }
+    // 企业信息
+    Company company = companyService.getByTenantIdRel(tenantId);
+    if(company == null){
+      return fail("该企业不存在！",null);
+    }
+    company.setBusinessEntity(null);
+    company.setPhone(null);
+    company.setCompanyCode(null);
+
+    // 配置信息
+    HashMap<String, Object> config = new HashMap<>();
+    config.put("LICENSE_CODE", "dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNwl1NnhENahnIvl2cyVmdiwiIiATMuEjI6IibQf0NW==");
+    config.put("MAP_KEY", "8191620da39a742c6f18f010c084c772");
+    company.setConfig(config);
+
+    redisUtil.set(key,company,1L, TimeUnit.DAYS);
+    return success(company);
+  }
+
+  @ApiOperation("获取登录用户信息")
+  @GetMapping("/auth/user")
+  public ApiResult<User> userInfo() {
+    final Integer loginUserId = getLoginUserId();
+    if (loginUserId != null) {
+      return success(userService.getByIdRel(getLoginUserId()));
+    }
+    return fail("loginUserId不存在", null);
+  }
+
+  @ApiOperation("获取登录用户菜单")
+  @GetMapping("/auth/menu")
+  public ApiResult<List<Menu>> userMenu() {
+    List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
+    return success(CommonUtil.toTreeData(menus, 0, Menu::getParentId, Menu::getMenuId, Menu::setChildren));
+  }
+
+  @PreAuthorize("hasAuthority('sys:auth:user')")
+  @OperationLog
+  @ApiOperation("修改个人信息")
+  @PutMapping("/auth/user")
+  public ApiResult<User> updateInfo(@RequestBody User user) {
+    user.setUserId(getLoginUserId());
+    // 不能修改的字段
+    user.setPassword(null);
+    user.setEmailVerified(null);
+    user.setOrganizationId(null);
+    user.setStatus(null);
+    if (userService.updateById(user)) {
+      return success(userService.getByIdRel(user.getUserId()));
+    }
+    return fail("保存失败", null);
+  }
+
+  @PreAuthorize("hasAuthority('sys:auth:password')")
+  @OperationLog
+  @ApiOperation("修改自己密码")
+  @PutMapping("/auth/password")
+  public ApiResult<?> updatePassword(@RequestBody UpdatePasswordParam param) {
+    if (StrUtil.hasBlank(param.getOldPassword(), param.getPassword())) {
+      return fail("参数不能为空");
+    }
+    Integer userId = getLoginUserId();
+    if (userId == null) {
+      return fail("未登录");
+    }
+    if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
+      return fail("原密码输入不正确");
+    }
+    User user = new User();
+    user.setUserId(userId);
+    user.setPassword(userService.encodePassword(param.getPassword()));
+    if (userService.updateById(user)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:auth:password')")
+  @OperationLog
+  @ApiOperation("修改支付密码")
+  @PutMapping("/auth/updatePayPassword")
+  public ApiResult<?> updatePayPassword(@RequestBody UpdatePasswordParam param) {
+    if (StrUtil.hasBlank(param.getPassword(),param.getCode(),param.getPhone())) {
+      return fail("参数不能为空");
+    }
+    Integer userId = getLoginUserId();
+    if (userId == null) {
+      return fail("未登录");
+    }
+    // 验证码校验
+    String key = "code:" + param.getPhone();
+    if (!param.getCode().equals(redisUtil.get(key)) && !"789789".equals(param.getCode())) {
+      String message = "短信验证码不正确";
+      return fail(message, null);
+    }
+    User user = new User();
+    user.setUserId(userId);
+    user.setPayPassword(userService.encodePassword(param.getPassword()));
+    if (userService.updateById(user)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAnyAuthority('sys:auth:user')")
+  @ApiOperation("验证支付密码")
+  @PostMapping("/auth/checkPayPassword")
+  public ApiResult<?> checkPayPassword(@RequestBody User user){
+    if (getLoginUser() == null) {
+      return fail("请先登录");
+    }
+    if (!userService.comparePassword(getLoginUser().getPayPassword(), user.getPayPassword())) {
+      return fail("支付密码不正确");
+    }
+    return success("支付密码正确");
+  }
+
+  @ApiOperation("图形验证码")
+  @GetMapping("/captcha")
+  public ApiResult<CaptchaResult> captcha() {
+    SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5);
+    return success(new CaptchaResult(specCaptcha.toBase64(), specCaptcha.text().toLowerCase()));
+  }
+
+  @ApiOperation("企业微信登录链接")
+  @GetMapping("/wxWorkQrConnect")
+  public ApiResult<?> wxWorkQrConnect() throws UnsupportedEncodingException {
+    final JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", 10048);
+    final String corpId = settingInfo.getString("corpId");
+    String encodedReturnUrl = URLEncoder.encode("https://oa.gxwebsoft.com/api/open/wx-work/login", "UTF-8");
+    String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=" + corpId + "&redirect_uri=" + encodedReturnUrl + "&state=ww_login@gxwebsoft&usertype=admin";
+    return success("获取成功", url);
+  }
+
+  @ApiOperation("解析token")
+  @GetMapping("/parseToken/{token}")
+  public ApiResult<?> parseToken(@PathVariable("token") String token) {
+    Claims claims = JwtUtil.parseToken(token, configProperties.getTokenKey());
+    return success(claims);
+  }
+
+  @ApiOperation("短信验证码")
+  @PostMapping("/sendSmsCaptcha")
+  public ApiResult<?> sendSmsCaptcha(@RequestBody SmsCaptchaParam param) {
+    // 默认配置
+    String accessKeyId = "LTAI5tEsyhW4GCKbds1qsopg";
+    String accessKeySecret = "zltFlQrYVAoq2KMFDWgLa3GhkMNeyO";
+    String userTemplateId = "SMS_257840118";
+    String sign = "南宁网宿科技";
+
+    // 读取租户的短信配置
+    if (getTenantId() != null) {
+      String string = redisUtil.get("setting:sms:" + getTenantId());
+      if (string != null) {
+        JSONObject jsonObject = JSONObject.parseObject(string);
+        accessKeyId = jsonObject.getString("accessKeyId");
+        accessKeySecret = jsonObject.getString("accessKeySecret");
+        userTemplateId = jsonObject.getString("userTemplateId");
+        sign = jsonObject.getString("sign");
+      }
+    }
+
+    DefaultProfile profile = DefaultProfile.getProfile("regionld", accessKeyId, accessKeySecret);
+    IAcsClient client = new DefaultAcsClient(profile);
+    CommonRequest request = new CommonRequest();
+    request.setSysMethod(MethodType.POST);
+    request.setSysDomain("dysmsapi.aliyuncs.com");
+    request.setSysVersion("2017-05-25");
+    request.setSysAction("SendSms");
+    request.putQueryParameter("RegionId", "cn-hangzhou");
+    request.putQueryParameter("PhoneNumbers", param.getPhone());
+    request.putQueryParameter("SignName", sign);
+    request.putQueryParameter("TemplateCode", userTemplateId);
+    // 生成短信验证码
+    Random randObj = new Random();
+    String code = Integer.toString(100000 + randObj.nextInt(900000));
+    request.putQueryParameter("TemplateParam", "{\"code\":" + code + "}");
+    try {
+      CommonResponse response = client.getCommonResponse(request);
+      System.out.println("response = " + response);
+      String json = response.getData();
+      System.out.println("json = " + json);
+      Gson g = new Gson();
+      HashMap result = g.fromJson(json, HashMap.class);
+      System.out.println("result = " + result);
+      if ("OK".equals(result.get("Message"))) {
+        System.out.println("======================== = " + result);
+        cacheClient.set(param.getPhone(), code, 5L, TimeUnit.MINUTES);
+        String key = "code:" + param.getPhone();
+        redisUtil.set(key, code, 5L, TimeUnit.MINUTES);
+        return success("发送成功", result.get("Message"));
+      } else {
+        return fail("发送失败");
+      }
+    } catch (ServerException e) {
+      e.printStackTrace();
+    } catch (ClientException e) {
+      e.printStackTrace();
+    }
+    return fail("发送失败");
+  }
+
+  @OperationLog
+  @ApiOperation("重置密码")
+  @PutMapping("/password")
+  public ApiResult<?> resetPassword(@RequestBody User user) {
+    if (user.getPassword() == null) {
+      return fail("参数不正确");
+    }
+    if (user.getCode() == null) {
+      return fail("验证码不能为空");
+    }
+    // 短信验证码校验
+    String code = cacheClient.get(user.getPhone(), String.class);
+    if (!StrUtil.equals(code, user.getCode())) {
+      return fail("验证码不正确");
+    }
+
+    user.setUserId(getLoginUserId());
+    user.setPassword(userService.encodePassword(user.getPassword()));
+    if (userService.updateById(user)) {
+      return success("密码修改成功");
+    } else {
+      return fail("密码修改失败");
+    }
+  }
+
+  @ApiOperation("获取登录用户信息Authorities")
+  @PostMapping("/auth/user")
+  public ApiResult<User> userInfo(@RequestBody UserParam param) {
+    // 登录账号|手机号码|邮箱登录
+    User user = userService.getByUsername(param.getUsername(), param.getTenantId());
+    if (user != null) {
+      return success(user);
+    }
+    return fail("用户不存在", null);
+  }
+
+  @ApiOperation("免密登录")
+  @GetMapping("/token/{userId}/{accessKey}")
+  public ApiResult<LoginResult> getToken(@PathVariable("userId") Integer userId, @PathVariable("accessKey") String accessKey) {
+    // 免密登录 传指定的userId和AccessKey，请给指定的userId分配好角色和权限
+    if (accessKeyService.count(new LambdaQueryWrapper<AccessKey>().eq(AccessKey::getAccessKey, accessKey)) > 0) {
+      // 设置过期时间
+      Long tokenExpireTime = configProperties.getTokenExpireTime();
+      // 查询用户信息
+      final User byId = userService.getById(userId);
+      // 登录账号|手机号码|邮箱登录
+      User user = userService.getByUsername(byId.getUsername(), byId.getTenantId());
+      if (user == null) {
+        return fail("用户不存在", null);
+      }
+      // 签发token
+      String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
+        tokenExpireTime, configProperties.getTokenKey());
+      return success("登录成功", new LoginResult(access_token, user));
+    }
+    return fail("请求失败: 40010", null);
+  }
+
+  @ApiOperation("短信验证码登录")
+  @PostMapping("/loginBySms")
+  public ApiResult<LoginResult> loginBySms(@RequestBody LoginParam param, HttpServletRequest request) {
+    final String phone = param.getPhone();
+    final Integer tenantId = getTenantId();
+    final String code = param.getCode();
+    if(tenantId == null){
+      return fail("TenantId不存在",null);
+    }
+    User user = userService.getByUsername(phone, tenantId);
+    // 是否管理员
+    if(param.getIsAdmin() != null && !user.getIsAdmin()){
+      return fail("不是管理员账号",null);
+    }
+    // 验证码校验
+    String key = "code:" + param.getPhone();
+    if (!code.equals(redisUtil.get(key)) && !"789789".equals(code)) {
+      String message = "验证码不正确";
+      loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request);
+      return fail(message, null);
+    }
+    if (user == null) {
+      final UserParam userParam = new UserParam();
+      userParam.setPhone(phone);
+      userParam.setTenantId(tenantId);
+      user = userService.addUser(userParam);
+//      String message = "账号不存在";
+//      loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request);
+    }
+    if (!user.getStatus().equals(0)) {
+      String message = "账号被冻结";
+      loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request);
+      return fail(message, null);
+    }
+    loginRecordService.saveAsync(phone, LoginRecord.TYPE_LOGIN, null, tenantId, request);
+
+    // 设置过期时间
+    Long tokenExpireTime = configProperties.getTokenExpireTime();
+    final JSONObject register = cacheClient.getSettingInfo("register", tenantId);
+    if (register != null) {
+      final String ExpireTime = register.getString("tokenExpireTime");
+      if (ExpireTime != null) {
+        tokenExpireTime = Long.valueOf(ExpireTime);
+      }
+    }
+
+    // 签发token
+    String access_token = JwtUtil.buildToken(new JwtSubject(phone, tenantId),
+      tokenExpireTime, configProperties.getTokenKey());
+    return success("登录成功", new LoginResult(access_token, user));
+  }
+
+  @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE)
+  @ApiOperation("账号注册")
+  @PostMapping("/register")
+  public ApiResult<?> register(@RequestBody User user) {
+    // 验证签名
+    String tenantName = user.getCompanyName();     // 应用名称
+    String phone = user.getPhone();                // 手机号码
+    String password = user.getPassword();          // 密码
+    String code = user.getCode();                  // 短信验证码
+    String email = user.getEmail();                // 邮箱
+
+    // 短信验证
+    if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, "789789")) {
+      throw new BusinessException("验证码不正确");
+    }
+
+    // 添加租户
+    Tenant tenant = new Tenant();
+    tenant.setTenantName(tenantName);
+    tenant.setTenantCode(CommonUtil.randomUUID16());
+    tenantService.save(tenant);
+
+    // 租户初始化
+    final Company company = new Company();
+    company.setEmail(email);
+    company.setPassword(password);
+    company.setTid(tenant.getTenantId());
+    company.setCompanyName(tenantName);
+    company.setShortName(tenantName);
+    company.setTenantId(tenant.getTenantId());
+    final Company result = tenantService.initialization(company);
+    return success("注册成功", result);
+  }
+
+  /**
+   * 获取服务器时间
+   * @return String
+   */
+  @ApiOperation("获取服务器时间")
+  @GetMapping("/serverTime")
+  public ApiResult<?> serverTime(String deliveryTime){
+    HashMap<String, Object> map = new HashMap<>();
+    // 今天日期
+    DateTime date = DateUtil.date();
+    String today= DateUtil.today();
+    // 明天日期
+    final DateTime dateTime = DateUtil.tomorrow();
+    String tomorrow = DateUtil.format(dateTime, "yyyy-MM-dd");
+    // 后天日期
+    final DateTime dateTime2 = DateUtil.offsetDay(date, 2);
+    final String afterDay = DateUtil.format(dateTime2, "yyyy-MM-dd");
+    // 今天星期几
+    final int week = DateUtil.thisDayOfWeek();
+    final DateTime nextWeek = DateUtil.nextWeek();
+
+    map.put("now",DateUtil.now());
+    map.put("today",today);
+    map.put("tomorrow",tomorrow);
+    map.put("afterDay",afterDay);
+    map.put("week",week);
+    map.put("minDate",DateUtil.offset(date, DateField.DAY_OF_WEEK, -7 ));
+    map.put("maxDate",DateUtil.offset(date, DateField.DAY_OF_WEEK, 7 ));
+    map.put("nextWeek",nextWeek);
+    if(deliveryTime != null){
+      DateTime parse = DateUtil.parse(deliveryTime);
+      // 前一天
+      DateTime previous = DateUtil.offsetDay(parse, -1);
+      // 后一天
+      DateTime nextDay = DateUtil.offsetDay(parse, 1);
+      map.put("previous",DateUtil.format(previous,"yyyy-MM-dd"));
+      map.put("previousWeek",DateUtil.dayOfWeek(previous)-1);
+      map.put("nextDay",DateUtil.format(nextDay,"yyyy-MM-dd"));
+      map.put("week",DateUtil.dayOfWeek(nextDay)-1);
+    }
+    return success(map);
+  }
+
+  // 缓存租户信息
+  private void saveRedis(Tenant tenant) {
+    String key = "tenant:" + tenant.getTenantId();
+    if (StrUtil.isEmpty(tenant.getTenantCode())) {
+      tenant.setTenantCode(CommonUtil.randomUUID16());
+    }
+    redisUtil.set(key, tenant);
+  }
+}

modules/common/system/controller/MenuController.java

@@ -0,0 +1,173 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Company;
+import com.gxwebsoft.common.system.entity.Menu;
+import com.gxwebsoft.common.system.entity.Version;
+import com.gxwebsoft.common.system.param.MenuParam;
+import com.gxwebsoft.common.system.param.VersionParam;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.MenuService;
+import com.gxwebsoft.common.system.service.VersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 菜单控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:23
+ */
+@Api(tags = "菜单管理")
+@RestController
+@RequestMapping("/api/system/menu")
+public class MenuController extends BaseController {
+    @Resource
+    private MenuService menuService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private VersionService versionService;
+
+    @PreAuthorize("hasAuthority('sys:menu:list')")
+    @ApiOperation("分页查询菜单")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Menu>> page(MenuParam param) {
+        PageParam<Menu, MenuParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(menuService.page(page, page.getWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:list')")
+    @ApiOperation("查询全部菜单")
+    @GetMapping()
+    public ApiResult<List<Menu>> list(MenuParam param) {
+        PageParam<Menu, MenuParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number");
+        return success(menuService.list(page.getOrderWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:list')")
+    @ApiOperation("根据id查询菜单")
+    @GetMapping("/{id}")
+    public ApiResult<Menu> get(@PathVariable("id") Integer id) {
+        return success(menuService.getById(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:save')")
+    @OperationLog
+    @ApiOperation("添加菜单")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody Menu menu) {
+        if (menu.getParentId() == null) {
+            menu.setParentId(0);
+        }
+        if (menuService.save(menu)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:update')")
+    @OperationLog
+    @ApiOperation("修改菜单")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Menu menu) {
+        if (menuService.updateById(menu)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:remove')")
+    @OperationLog
+    @ApiOperation("删除菜单")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (menuService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:save')")
+    @OperationLog
+    @ApiOperation("批量添加菜单")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Menu> menus) {
+        if (menuService.saveBatch(menus)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:update')")
+    @OperationLog
+    @ApiOperation("批量修改菜单")
+    @PutMapping("/batch")
+    public ApiResult<?> updateBatch(@RequestBody BatchParam<Menu> batchParam) {
+        if (batchParam.update(menuService, "menu_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:remove')")
+    @OperationLog
+    @ApiOperation("批量删除菜单")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (menuService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:update')")
+    @OperationLog
+    @ApiOperation("菜单克隆")
+    @PostMapping("/clone")
+    public ApiResult<?> onClone(@RequestBody MenuParam param){
+      if(menuService.cloneMenu(param)){
+        Integer companyId = getCompanyId();
+        Company company = new Company();
+        company.setCompanyId(companyId);
+        company.setPlanId(param.getTenantId());
+        VersionParam versionParam = new VersionParam();
+        versionParam.setLimit(1L);
+        final PageResult<Version> result = versionService.pageRel(versionParam);
+        if (!CollectionUtils.isEmpty(result.getList())) {
+          Version version = result.getList().get(0);
+          company.setVersionName(version.getVersionName());
+          company.setVersionCode(version.getVersionCode());
+        }
+        companyService.updateById(company);
+        return success("安装成功");
+      }
+      return fail("安装失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:menu:update')")
+    @OperationLog
+    @ApiOperation("安装插件")
+    @GetMapping("/install/{id}")
+    public ApiResult<?> install(@PathVariable("id") Integer id){
+      if(menuService.install(id)){
+        // 更新安装次数
+//        final Plug plug = plugService.getOne(new LambdaQueryWrapper<Plug>().eq(Plug::getMenuId, id));
+//        plug.setInstalls(plug.getInstalls() + 1);
+//        plugService.updateById(plug);
+        return success("安装成功");
+      }
+      return fail("安装失败",id);
+    }
+}

modules/common/system/controller/MerchantAccountController.java

@@ -0,0 +1,178 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.MerchantAccount;
+import com.gxwebsoft.common.system.entity.UserRole;
+import com.gxwebsoft.common.system.mapper.MerchantAccountMapper;
+import com.gxwebsoft.common.system.param.MerchantAccountParam;
+import com.gxwebsoft.common.system.service.MerchantAccountService;
+import com.gxwebsoft.common.system.service.UserRoleService;
+import com.gxwebsoft.common.system.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 商户账号控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-19 12:02:24
+ */
+@Api(tags = "商户账号管理")
+@RestController
+@RequestMapping("/api/system/merchant-account")
+public class MerchantAccountController extends BaseController {
+    @Resource
+    private MerchantAccountService merchantAccountService;
+    @Resource
+    private MerchantAccountMapper merchantAccountMapper;
+    @Resource
+    private UserService userService;
+    @Resource
+    private UserRoleService userRoleService;
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:list')")
+    @ApiOperation("分页查询商户账号")
+    @GetMapping("/page")
+    public ApiResult<PageResult<MerchantAccount>> page(MerchantAccountParam param) {
+        // 使用关联查询
+        return success(merchantAccountService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:list')")
+    @ApiOperation("查询全部商户账号")
+    @GetMapping()
+    public ApiResult<List<MerchantAccount>> list(MerchantAccountParam param) {
+        // 使用关联查询
+        return success(merchantAccountService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:list')")
+    @ApiOperation("根据id查询商户账号")
+    @GetMapping("/{id}")
+    public ApiResult<MerchantAccount> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(merchantAccountService.getByIdRel(id));
+    }
+
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:save')")
+    @ApiOperation("添加商户账号")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody MerchantAccount merchantAccount, HttpServletRequest request) {
+        if (merchantAccountService.count(new LambdaQueryWrapper<MerchantAccount>().eq(MerchantAccount::getPhone,merchantAccount.getPhone())) > 0) {
+          return fail("手机号码已存在");
+        }
+        // 查询用户是否已存在
+        User userByPhone = userService.getByPhone(merchantAccount.getPhone());
+        if (userByPhone != null){
+          merchantAccount.setUserId(userByPhone.getUserId());
+          if (userRoleService.count(new LambdaQueryWrapper<UserRole>().eq(UserRole::getRoleId,merchantAccount.getRoleId())) == 0) {
+            // 添加角色
+            final UserRole userRole = new UserRole();
+            userRole.setUserId(userByPhone.getUserId());
+            userRole.setRoleId(merchantAccount.getRoleId());
+            userRoleService.save(userRole);
+          }
+          merchantAccountService.save(merchantAccount);
+          return success("添加成功");
+        }
+
+        // 添加用户
+        User user = new User();
+        user.setUsername(merchantAccount.getPhone());
+        user.setPhone(merchantAccount.getPhone());
+        user.setPassword(userService.encodePassword(merchantAccount.getPassword()));
+        user.setNickname(merchantAccount.getRealName());
+        user.setIsAdmin(true);
+        user.setPlatform("ADMIN");
+        user.setMerchantId(merchantAccount.getMerchantId());
+        userService.save(user);
+        // 添加角色
+        final UserRole userRole = new UserRole();
+        userRole.setUserId(user.getUserId());
+        userRole.setRoleId(merchantAccount.getRoleId());
+        userRoleService.save(userRole);
+        merchantAccount.setUserId(user.getUserId());
+        // 保存账号
+        if (merchantAccountService.save(merchantAccount)) {
+          return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:update')")
+    @ApiOperation("修改商户账号")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody MerchantAccount merchantAccount) {
+        if (merchantAccountService.updateById(merchantAccount)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:remove')")
+    @ApiOperation("删除商户账号")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (merchantAccountService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:save')")
+    @ApiOperation("批量添加商户账号")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<MerchantAccount> list) {
+        if (merchantAccountService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:update')")
+    @ApiOperation("批量修改商户账号")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<MerchantAccount> batchParam) {
+        if (batchParam.update(merchantAccountService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantAccount:remove')")
+    @ApiOperation("批量删除商户账号")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (merchantAccountService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @ApiOperation("根据手机号码查询商户账号信息")
+    @GetMapping("/getMerchantAccountByPhone")
+    public ApiResult<MerchantAccount> getMerchantAccountByPhone(MerchantAccountParam param){
+      param.setTenantId(getTenantId());
+      final MerchantAccount merchantAccount = merchantAccountMapper.getMerchantAccountByPhone(param);
+      if(merchantAccount == null){
+        return fail("账号不存在",null);
+      }
+      return success(merchantAccount);
+    }
+
+}

modules/common/system/controller/MerchantApplyController.java

@@ -0,0 +1,122 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Merchant;
+import com.gxwebsoft.common.system.entity.MerchantApply;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.param.MerchantApplyParam;
+import com.gxwebsoft.common.system.service.MerchantApplyService;
+import com.gxwebsoft.common.system.service.MerchantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 商户入驻申请控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-05 01:24:36
+ */
+@Api(tags = "商户入驻申请管理")
+@RestController
+@RequestMapping("/api/system/merchant-apply")
+public class MerchantApplyController extends BaseController {
+    @Resource
+    private MerchantService merchantService;
+    @Resource
+    private MerchantApplyService merchantApplyService;
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:list')")
+    @ApiOperation("分页查询商户入驻申请")
+    @GetMapping("/page")
+    public ApiResult<PageResult<MerchantApply>> page(MerchantApplyParam param) {
+        // 使用关联查询
+        return success(merchantApplyService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:list')")
+    @ApiOperation("查询全部商户入驻申请")
+    @GetMapping()
+    public ApiResult<List<MerchantApply>> list(MerchantApplyParam param) {
+        // 使用关联查询
+        return success(merchantApplyService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:list')")
+    @ApiOperation("根据id查询商户入驻申请")
+    @GetMapping("/{id}")
+    public ApiResult<MerchantApply> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(merchantApplyService.getByIdRel(id));
+    }
+
+    @ApiOperation("添加商户入驻申请")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody MerchantApply merchantApply) {
+        if (merchantService.count(new LambdaQueryWrapper<Merchant>().eq(Merchant::getMerchantName,merchantApply.getMerchantName())) > 0) {
+          return fail("该租户名称已存在");
+        }
+        if (merchantService.count(new LambdaQueryWrapper<Merchant>().eq(Merchant::getPhone,merchantApply.getPhone())) > 0) {
+          return fail("该手机号码已存在");
+        }
+        if (merchantApplyService.save(merchantApply)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:update')")
+    @ApiOperation("修改商户入驻申请")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody MerchantApply merchantApply) {
+        if (merchantApplyService.updateById(merchantApply)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:remove')")
+    @ApiOperation("删除商户入驻申请")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (merchantApplyService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:save')")
+    @ApiOperation("批量添加商户入驻申请")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<MerchantApply> list) {
+        if (merchantApplyService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:update')")
+    @ApiOperation("批量修改商户入驻申请")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<MerchantApply> batchParam) {
+        if (batchParam.update(merchantApplyService, "apply_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantApply:remove')")
+    @ApiOperation("批量删除商户入驻申请")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (merchantApplyService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+}

modules/common/system/controller/MerchantController.java

@@ -0,0 +1,141 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Merchant;
+import com.gxwebsoft.common.system.entity.MerchantAccount;
+import com.gxwebsoft.common.system.param.MerchantParam;
+import com.gxwebsoft.common.system.service.MerchantAccountService;
+import com.gxwebsoft.common.system.service.MerchantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 商户控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-05 00:03:54
+ */
+@Api(tags = "商户管理")
+@RestController
+@RequestMapping("/api/system/merchant")
+public class MerchantController extends BaseController {
+    @Resource
+    private MerchantService merchantService;
+    @Resource
+    private MerchantAccountService merchantAccountService;
+
+    @ApiOperation("分页查询商户")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Merchant>> page(MerchantParam param) {
+        // 使用关联查询
+      System.out.println("param = " + param);
+        return success(merchantService.pageRel(param));
+    }
+
+    @ApiOperation("查询全部商户")
+    @GetMapping()
+    public ApiResult<List<Merchant>> list(MerchantParam param) {
+        // 使用关联查询
+        return success(merchantService.listRel(param));
+    }
+
+    @ApiOperation("根据id查询商户")
+    @GetMapping("/{id}")
+    public ApiResult<Merchant> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(merchantService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:save')")
+    @ApiOperation("添加商户")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Merchant merchant, HttpServletRequest request) {
+      if (merchantService.count(new LambdaQueryWrapper<Merchant>().eq(Merchant::getPhone,merchant.getPhone())) > 0) {
+        return fail("商户手机号码" + merchant.getPhone() + "已存在");
+      }
+      if (merchantService.save(merchant)) {
+          // 设置商家后台入口
+          merchant.setAdminUrl(merchant.getTenantId() + ".m.wsdns.cn");
+          merchantService.updateById(merchant);
+          // 获取用户信息
+          final RequestUtil requestUtil = new RequestUtil();
+          String access_token = JwtUtil.getAccessToken(request);
+          requestUtil.setAccessToken(access_token);
+          requestUtil.setTenantId(getTenantId().toString());
+          final MerchantAccount merchantAccount = new MerchantAccount();
+          merchantAccount.setMerchantId(merchant.getMerchantId());
+          merchantAccount.setPhone(merchant.getPhone());
+          merchantAccount.setPassword(merchant.getPhone().substring(merchant.getPhone().length() - 6));
+          merchantAccount.setRealName(merchant.getRealName());
+          merchantAccount.setRoleId(merchant.getRoleId());
+          merchantAccount.setRoleName(merchant.getRoleName());
+          requestUtil.saveUserByPhone(merchantAccount);
+          merchantAccountService.save(merchantAccount);
+          return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:update')")
+    @ApiOperation("修改商户")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Merchant merchant) {
+        if (merchantService.updateById(merchant)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:remove')")
+    @ApiOperation("删除商户")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (merchantService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:save')")
+    @ApiOperation("批量添加商户")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Merchant> list) {
+        if (merchantService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:update')")
+    @ApiOperation("批量修改商户")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Merchant> batchParam) {
+        if (batchParam.update(merchantService, "merchant_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchant:remove')")
+    @ApiOperation("批量删除商户")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (merchantService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/MerchantTypeController.java

@@ -0,0 +1,121 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.MerchantType;
+import com.gxwebsoft.common.system.entity.MerchantType;
+import com.gxwebsoft.common.system.param.MerchantTypeParam;
+import com.gxwebsoft.common.system.service.MerchantTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 商户类型控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-05 00:08:51
+ */
+@Api(tags = "商户类型管理")
+@RestController
+@RequestMapping("/api/system/merchant-type")
+public class MerchantTypeController extends BaseController {
+    @Resource
+    private MerchantTypeService merchantTypeService;
+
+    @PreAuthorize("hasAuthority('sys:merchantType:list')")
+    @ApiOperation("分页查询商户类型")
+    @GetMapping("/page")
+    public ApiResult<PageResult<MerchantType>> page(MerchantTypeParam param) {
+        // 使用关联查询
+        return success(merchantTypeService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:list')")
+    @ApiOperation("查询全部商户类型")
+    @GetMapping()
+    public ApiResult<List<MerchantType>> list(MerchantTypeParam param) {
+        // 使用关联查询
+        return success(merchantTypeService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:list')")
+    @ApiOperation("根据id查询商户类型")
+    @GetMapping("/{id}")
+    public ApiResult<MerchantType> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(merchantTypeService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:save')")
+    @ApiOperation("添加商户类型")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody MerchantType merchantType) {
+        // 记录当前登录用户id
+        // User loginUser = getLoginUser();
+        // if (loginUser != null) {
+        //  merchantType.setUserId(loginUser.getUserId());
+        // }
+        if (merchantTypeService.save(merchantType)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:update')")
+    @ApiOperation("修改商户类型")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody MerchantType merchantType) {
+        if (merchantTypeService.updateById(merchantType)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:remove')")
+    @ApiOperation("删除商户类型")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (merchantTypeService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:update')")
+    @ApiOperation("批量添加商户类型")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<MerchantType> list) {
+        if (merchantTypeService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:update')")
+    @ApiOperation("批量修改商户类型")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<MerchantType> batchParam) {
+        if (batchParam.update(merchantTypeService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:merchantType:remove')")
+    @ApiOperation("批量删除商户类型")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (merchantTypeService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/ModulesController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.ModulesService;
+import com.gxwebsoft.common.system.entity.Modules;
+import com.gxwebsoft.common.system.param.ModulesParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 模块管理控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-18 15:53:43
+ */
+@Api(tags = "模块管理管理")
+@RestController
+@RequestMapping("/api/system/modules")
+public class ModulesController extends BaseController {
+    @Resource
+    private ModulesService modulesService;
+
+    @PreAuthorize("hasAuthority('sys:modules:list')")
+    @OperationLog
+    @ApiOperation("分页查询模块管理")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Modules>> page(ModulesParam param) {
+        PageParam<Modules, ModulesParam> page = new PageParam<>(param);
+//        page.setDefaultOrder("create_time desc");
+        return success(modulesService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(modulesService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:list')")
+    @OperationLog
+    @ApiOperation("查询全部模块管理")
+    @GetMapping()
+    public ApiResult<List<Modules>> list(ModulesParam param) {
+        PageParam<Modules, ModulesParam> page = new PageParam<>(param);
+//        page.setDefaultOrder("create_time desc");
+        return success(modulesService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(modulesService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:list')")
+    @OperationLog
+    @ApiOperation("根据id查询模块管理")
+    @GetMapping("/{id}")
+    public ApiResult<Modules> get(@PathVariable("id") Integer id) {
+        return success(modulesService.getById(id));
+        // 使用关联查询
+        //return success(modulesService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:save')")
+    @OperationLog
+    @ApiOperation("添加模块管理")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Modules modules) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          modules.setUserId(loginUser.getUserId());
+        }
+        if (modulesService.save(modules)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:update')")
+    @OperationLog
+    @ApiOperation("修改模块管理")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Modules modules) {
+        if (modulesService.updateById(modules)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:remove')")
+    @OperationLog
+    @ApiOperation("删除模块管理")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (modulesService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:save')")
+    @OperationLog
+    @ApiOperation("批量添加模块管理")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Modules> list) {
+        if (modulesService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:update')")
+    @OperationLog
+    @ApiOperation("批量修改模块管理")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Modules> batchParam) {
+        if (batchParam.update(modulesService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:modules:remove')")
+    @OperationLog
+    @ApiOperation("批量删除模块管理")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (modulesService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/NoticeController.java

@@ -0,0 +1,142 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Notice;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.param.NoticeParam;
+import com.gxwebsoft.common.system.service.NoticeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 消息记录表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-08 13:22:21
+ */
+@Api(tags = "消息记录表管理")
+@RestController
+@RequestMapping("/api/system/notice")
+public class NoticeController extends BaseController {
+    @Resource
+    private NoticeService noticeService;
+
+    @PreAuthorize("hasAuthority('sys:notice:list')")
+    @ApiOperation("分页查询消息记录表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Notice>> page(NoticeParam param) {
+        // 使用关联查询
+        return success(noticeService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:list')")
+    @ApiOperation("查询全部消息记录表")
+    @GetMapping()
+    public ApiResult<List<Notice>> list(NoticeParam param) {
+        // 使用关联查询
+        return success(noticeService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:list')")
+    @ApiOperation("根据id查询消息记录表")
+    @GetMapping("/{id}")
+    public ApiResult<Notice> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(noticeService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:save')")
+    @ApiOperation("添加消息记录表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Notice notice) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          notice.setUserId(loginUser.getUserId());
+        }
+        if (noticeService.save(notice)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:update')")
+    @ApiOperation("修改消息记录表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Notice notice) {
+        if (noticeService.updateById(notice)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:remove')")
+    @ApiOperation("删除消息记录表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (noticeService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:save')")
+    @ApiOperation("批量添加消息记录表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Notice> list) {
+        if (noticeService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:update')")
+    @ApiOperation("批量修改消息记录表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Notice> batchParam) {
+        if (batchParam.update(noticeService, "notice_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:notice:remove')")
+    @ApiOperation("批量删除消息记录表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (noticeService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+  @ApiOperation("统计信息")
+  @GetMapping("/getUnReadNum")
+  public ApiResult<?> getUnReadNum(){
+    JSONObject json = new JSONObject();
+    json.put("notice",noticeService.count(new LambdaQueryWrapper<Notice>()
+      .eq(Notice::getUserId, getLoginUserId())
+      .eq(Notice::getType,"notice")
+      .eq(Notice::getStatus,0)));
+    json.put("letter",noticeService.count(new LambdaQueryWrapper<Notice>()
+      .eq(Notice::getUserId, getLoginUserId())
+      .eq(Notice::getType,"letter")
+      .eq(Notice::getStatus,0)));
+    json.put("todo",noticeService.count(new LambdaQueryWrapper<Notice>()
+      .eq(Notice::getUserId, getLoginUserId())
+      .eq(Notice::getType,"todo")
+      .eq(Notice::getStatus,0)));
+    return success("操作成功",json);
+  }
+
+}

modules/common/system/controller/NotifyByBalancePayController.java

@@ -0,0 +1,58 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.Payment;
+import com.wechat.pay.java.core.notification.NotificationConfig;
+import com.wechat.pay.java.core.notification.NotificationParser;
+import com.wechat.pay.java.core.notification.RSANotificationConfig;
+import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 会员特权购买记录表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-06-20 18:07:50
+ */
+@Api(tags = "余额支付结果通知(未完成)")
+@RestController
+@RequestMapping("/api/system/balance-pay")
+public class NotifyByBalancePayController extends BaseController {
+  @Value("${spring.profiles.active}")
+  String active;
+  @Resource
+  private RedisUtil redisUtil;
+  @Resource
+  private RequestUtil requestUtil;
+  @Resource
+  private ConfigProperties conf;
+
+  @ApiModelProperty("异步通知")
+  @PostMapping("/notify/{tenantId}")
+  public String wxNotify(@RequestHeader Map<String, String> header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) {
+    System.out.println("异步通知*************** = ");
+
+    // 以支付通知回调为例，验签、解密并转换成 Transaction
+    try {
+      // 推送微信官方支付结果(携带租户ID的POST请求)
+//      requestUtil.pushBalancePayNotify();
+      return "SUCCESS";
+    } catch (Exception $e) {
+      System.out.println($e.getMessage());
+    }
+
+    return "fail";
+  }
+
+
+}

modules/common/system/controller/OperationRecordController.java

@@ -0,0 +1,62 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.OperationRecord;
+import com.gxwebsoft.common.system.param.OperationRecordParam;
+import com.gxwebsoft.common.system.service.OperationRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 操作日志控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:12
+ */
+@Api(tags = "操作日志")
+@RestController
+@RequestMapping("/api/system/operation-record")
+public class OperationRecordController extends BaseController {
+    @Resource
+    private OperationRecordService operationRecordService;
+
+    /**
+     * 分页查询操作日志
+     */
+    @PreAuthorize("hasAuthority('sys:operation-record:list')")
+    @ApiOperation("分页查询操作日志")
+    @GetMapping("/page")
+    public ApiResult<PageResult<OperationRecord>> page(OperationRecordParam param) {
+        return success(operationRecordService.pageRel(param));
+    }
+
+    /**
+     * 查询全部操作日志
+     */
+    @PreAuthorize("hasAuthority('sys:operation-record:list')")
+    @OperationLog
+    @ApiOperation("查询全部操作日志")
+    @GetMapping()
+    public ApiResult<List<OperationRecord>> list(OperationRecordParam param) {
+        return success(operationRecordService.listRel(param));
+    }
+
+    /**
+     * 根据id查询操作日志
+     */
+    @PreAuthorize("hasAuthority('sys:operation-record:list')")
+    @ApiOperation("根据id查询操作日志")
+    @GetMapping("/{id}")
+    public ApiResult<OperationRecord> get(@PathVariable("id") Integer id) {
+        return success(operationRecordService.getByIdRel(id));
+    }
+
+}

modules/common/system/controller/OrderController.java

@@ -0,0 +1,180 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Order;
+import com.gxwebsoft.common.system.entity.OrderInfo;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.param.OrderParam;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.OrderInfoService;
+import com.gxwebsoft.common.system.service.OrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-24 13:46:21
+ */
+@Api(tags = "订单管理")
+@RestController
+@RequestMapping("/api/system/order")
+public class OrderController extends BaseController {
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private OrderInfoService orderInfoService;
+
+    @PreAuthorize("hasAuthority('sys:order:list')")
+    @OperationLog
+    @ApiOperation("分页查询订单")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Order>> page(OrderParam param) {
+        // 使用关联查询
+        return success(orderService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:list')")
+    @OperationLog
+    @ApiOperation("查询全部订单")
+    @GetMapping()
+    public ApiResult<List<Order>> list(OrderParam param) {
+        // 使用关联查询
+        return success(orderService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:list')")
+    @OperationLog
+    @ApiOperation("根据id查询订单")
+    @GetMapping("/{id}")
+    public ApiResult<Order> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(orderService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:save')")
+    @OperationLog
+    @ApiOperation("添加订单")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Order order) {
+      // 记录当前登录用户id
+      User loginUser = getLoginUser();
+      if (loginUser == null) {
+        return fail("请先登录");
+      }
+      // 微信openid(必填)
+      if(StrUtil.isBlank(loginUser.getOpenid())){
+        return fail("微信openid(必填)");
+      }
+      // 商品描述(必填)
+      if(StrUtil.isBlank(order.getComments())){
+        return fail("商品描述(必填)");
+      }
+      // 微信支付(商品金额不能为0)
+      if(order.getPayType().equals(1)){
+        if (order.getTotalPrice().compareTo(BigDecimal.ZERO) == 0) {
+          return fail("商品金额不能为0");
+        }
+      }
+
+      // 订单信息
+      long timeMillis = System.currentTimeMillis();
+      long orderNo = IdUtil.getSnowflakeNextId();
+      order.setOrderNo(Long.toString(orderNo));
+      order.setUserId(loginUser.getUserId());
+      order.setOpenid(loginUser.getOpenid());
+      order.setRealName(loginUser.getRealName());
+      order.setPhone(loginUser.getPhone());
+      final List<Integer> collect = order.getOrderInfoList().stream().map(OrderInfo::getStartTime).collect(Collectors.toList());
+      order.setStartTime(Collections.min(collect));
+      order.setVersion(10);
+      if (orderService.save(order)) {
+        order.getOrderInfoList().forEach(d -> {
+          d.setOid(order.getOrderId());
+          d.setTimeFlag(timeMillis);
+          d.setVersion(10);
+          d.setOrderTime(timeMillis / 1000);
+        });
+        orderInfoService.saveBatch(order.getOrderInfoList());
+        // 创建微信订单
+        if (order.getPayType().equals(1)) {
+          return success("下单成功",orderService.createWxOrder(order));
+        }
+      }
+      return fail("下单失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:update')")
+    @OperationLog
+    @ApiOperation("修改订单")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Order order) {
+        if (orderService.updateById(order)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:remove')")
+    @OperationLog
+    @ApiOperation("删除订单")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (orderService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:save')")
+    @OperationLog
+    @ApiOperation("批量添加订单")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Order> list) {
+        if (orderService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:update')")
+    @OperationLog
+    @ApiOperation("批量修改订单")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Order> batchParam) {
+        if (batchParam.update(orderService, "order_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:order:remove')")
+    @OperationLog
+    @ApiOperation("批量删除订单")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (orderService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/OrderInfoController.java

@@ -0,0 +1,138 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.OrderInfoService;
+import com.gxwebsoft.common.system.entity.OrderInfo;
+import com.gxwebsoft.common.system.param.OrderInfoParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author 科技小王子
+ * @since 2024-05-10 18:02:54
+ */
+@Api(tags = "管理")
+@RestController
+@RequestMapping("/api/system/order-info")
+public class OrderInfoController extends BaseController {
+    @Resource
+    private OrderInfoService orderInfoService;
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:list')")
+    @OperationLog
+    @ApiOperation("分页查询")
+    @GetMapping("/page")
+    public ApiResult<PageResult<OrderInfo>> page(OrderInfoParam param) {
+        PageParam<OrderInfo, OrderInfoParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(orderInfoService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(orderInfoService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:list')")
+    @OperationLog
+    @ApiOperation("查询全部")
+    @GetMapping()
+    public ApiResult<List<OrderInfo>> list(OrderInfoParam param) {
+        PageParam<OrderInfo, OrderInfoParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(orderInfoService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(orderInfoService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:list')")
+    @OperationLog
+    @ApiOperation("根据id查询")
+    @GetMapping("/{id}")
+    public ApiResult<OrderInfo> get(@PathVariable("id") Integer id) {
+        return success(orderInfoService.getById(id));
+        // 使用关联查询
+        //return success(orderInfoService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:save')")
+    @OperationLog
+    @ApiOperation("添加")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody OrderInfo orderInfo) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+        }
+        if (orderInfoService.save(orderInfo)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:update')")
+    @OperationLog
+    @ApiOperation("修改")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody OrderInfo orderInfo) {
+        if (orderInfoService.updateById(orderInfo)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:remove')")
+    @OperationLog
+    @ApiOperation("删除")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (orderInfoService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:save')")
+    @OperationLog
+    @ApiOperation("批量添加")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<OrderInfo> list) {
+        if (orderInfoService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:update')")
+    @OperationLog
+    @ApiOperation("批量修改")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderInfo> batchParam) {
+        if (batchParam.update(orderInfoService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:orderInfo:remove')")
+    @OperationLog
+    @ApiOperation("批量删除")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (orderInfoService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/OrganizationController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Organization;
+import com.gxwebsoft.common.system.param.OrganizationParam;
+import com.gxwebsoft.common.system.service.OrganizationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 组织机构控制器
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Api(tags = "组织机构管理")
+@RestController
+@RequestMapping("/api/system/organization")
+public class OrganizationController extends BaseController {
+    @Resource
+    private OrganizationService organizationService;
+
+    @PreAuthorize("hasAuthority('sys:org:list')")
+    @OperationLog
+    @ApiOperation("分页查询组织机构")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Organization>> page(OrganizationParam param) {
+        return success(organizationService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:list')")
+    @OperationLog
+    @ApiOperation("查询全部组织机构")
+    @GetMapping()
+    public ApiResult<List<Organization>> list(OrganizationParam param) {
+        return success(organizationService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:list')")
+    @OperationLog
+    @ApiOperation("根据id查询组织机构")
+    @GetMapping("/{id}")
+    public ApiResult<Organization> get(@PathVariable("id") Integer id) {
+        return success(organizationService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:save')")
+    @OperationLog
+    @ApiOperation("添加组织机构")
+    @PostMapping()
+    public ApiResult<?> add(@RequestBody Organization organization) {
+        if (organization.getParentId() == null) {
+            organization.setParentId(0);
+        }
+        if (organizationService.count(new LambdaQueryWrapper<Organization>()
+                .eq(Organization::getOrganizationName, organization.getOrganizationName())
+                .eq(Organization::getParentId, organization.getParentId())) > 0) {
+            return fail("机构名称已存在");
+        }
+        if (organizationService.save(organization)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:update')")
+    @OperationLog
+    @ApiOperation("修改组织机构")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Organization organization) {
+        if (organization.getOrganizationName() != null) {
+            if (organization.getParentId() == null) {
+                organization.setParentId(0);
+            }
+            if (organizationService.count(new LambdaQueryWrapper<Organization>()
+                    .eq(Organization::getOrganizationName, organization.getOrganizationName())
+                    .eq(Organization::getParentId, organization.getParentId())
+                    .ne(Organization::getOrganizationId, organization.getOrganizationId())) > 0) {
+                return fail("机构名称已存在");
+            }
+        }
+        if (organizationService.updateById(organization)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:remove')")
+    @OperationLog
+    @ApiOperation("删除组织机构")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (organizationService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:save')")
+    @OperationLog
+    @ApiOperation("批量添加组织机构")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Organization> organizationList) {
+        if (organizationService.saveBatch(organizationList)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:update')")
+    @OperationLog
+    @ApiOperation("批量修改组织机构")
+    @PutMapping("/batch")
+    public ApiResult<?> updateBatch(@RequestBody BatchParam<Organization> batchParam) {
+        if (batchParam.update(organizationService, Organization::getOrganizationId)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:org:remove')")
+    @OperationLog
+    @ApiOperation("批量删除组织机构")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (organizationService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/PaymentController.java

@@ -0,0 +1,246 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.*;
+import com.gxwebsoft.common.system.service.PaymentService;
+import com.gxwebsoft.common.system.param.PaymentParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.service.UserBalanceLogService;
+import com.gxwebsoft.common.system.service.UserService;
+import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
+import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount;
+import com.wechat.pay.java.service.payments.jsapi.model.Amount;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN;
+import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_USE;
+
+/**
+ * 支付方式控制器
+ *
+ * @author 科技小王子
+ * @since 2024-05-11 12:39:11
+ */
+@Api(tags = "支付方式管理")
+@RestController
+@RequestMapping("/api/system/payment")
+public class PaymentController extends BaseController {
+    @Resource
+    private PaymentService paymentService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private RequestUtil requestUtil;
+
+    @ApiOperation("余额支付接口")
+    @PostMapping("/balancePay")
+    public ApiResult<?> balancePay(@RequestBody Order order) {
+      System.out.println("使用余额支付 >>> 订单信息 " + order);
+
+      // 查询购买者信息
+      final User buyer = userService.getById(order.getUserId());
+
+      if (buyer.getBalance().compareTo(order.getPayPrice()) < 0) {
+        return fail("余额不足");
+      }
+
+      // 扣除余额
+      final BigDecimal subtract = buyer.getBalance().subtract(order.getTotalPrice());
+      buyer.setBalance(subtract);
+      final boolean updateUser = userService.updateUser(buyer);
+      System.out.println("updateUser = " + updateUser);
+
+      // 记录余额明细
+      UserBalanceLog userBalanceLog = new UserBalanceLog();
+      userBalanceLog.setUserId(buyer.getUserId());
+      userBalanceLog.setScene(BALANCE_USE);
+      userBalanceLog.setMoney(order.getPayPrice());
+      BigDecimal balance = buyer.getBalance().add(order.getPayPrice());
+      userBalanceLog.setBalance(balance);
+      userBalanceLog.setComments(order.getMerchantName());
+      userBalanceLog.setTransactionId(UUID.randomUUID().toString());
+      userBalanceLog.setOrderNo(order.getOrderNo());
+      final boolean save = userBalanceLogService.save(userBalanceLog);
+      System.out.println("save = " + save);
+
+      // 推送微信官方支付结果(携带租户ID的POST请求)
+      final Transaction transaction = new Transaction();
+      transaction.setOutTradeNo(order.getOrderNo());
+      transaction.setTransactionId(order.getOrderNo());
+      final TransactionAmount amount = new TransactionAmount();
+      // 计算金额
+//      BigDecimal decimal = order.getTotalPrice();
+//      final BigDecimal multiply = decimal.multiply(new BigDecimal(100));
+//      // 将 BigDecimal 转换为 Integer
+//      Integer money = multiply.intValue();
+      amount.setTotal(order.getPayPrice().intValue());
+      amount.setCurrency("CNY");
+      transaction.setAmount(amount);
+      // 获取支付配置信息用于解密
+      String key = "Payment:0:".concat(order.getTenantId().toString());
+      System.out.println("key = " + key);
+      final Payment payment = redisUtil.get(key, Payment.class);
+      requestUtil.pushBalancePayNotify(transaction, payment);
+
+      return success("支付成功",order.getOrderNo());
+    }
+
+    @ApiOperation("选择支付方式")
+    @GetMapping("/select")
+    public ApiResult<?> select(PaymentParam param) {
+      String key = "SelectPayment:".concat(getTenantId().toString());
+      final String string = redisUtil.get(key);
+      final List<Payment> paymentList = JSONObject.parseArray(string, Payment.class);
+      if (!CollectionUtils.isEmpty(paymentList)) {
+        return success(paymentList);
+      }
+      // 使用关联查询
+      final List<Payment> list = paymentService.list(new LambdaUpdateWrapper<Payment>().eq(Payment::getStatus, true));
+      if (!CollectionUtils.isEmpty(list)) {
+        list.forEach(d -> {
+          d.setApiKey(null);
+          d.setApiclientCert(null);
+          d.setApiclientKey(null);
+          d.setMerchantSerialNumber(null);
+        });
+      }
+      redisUtil.set(key,list,1L, TimeUnit.DAYS);
+      return success(list);
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:list')")
+    @OperationLog
+    @ApiOperation("分页查询支付方式")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Payment>> page(PaymentParam param) {
+        PageParam<Payment, PaymentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time asc");
+        return success(paymentService.page(page, page.getWrapper()));
+        // 使用关联查询
+//        return success(paymentService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:list')")
+    @OperationLog
+    @ApiOperation("查询全部支付方式")
+    @GetMapping()
+    public ApiResult<List<Payment>> list(PaymentParam param) {
+        PageParam<Payment, PaymentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time asc");
+        return success(paymentService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(paymentService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:list')")
+    @OperationLog
+    @ApiOperation("根据id查询支付方式")
+    @GetMapping("/{id}")
+    public ApiResult<Payment> get(@PathVariable("id") Integer id) {
+        return success(paymentService.getById(id));
+        // 使用关联查询
+        //return success(paymentService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:save')")
+    @OperationLog
+    @ApiOperation("添加支付方式")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Payment payment) {
+        if (paymentService.count(new LambdaQueryWrapper<Payment>().eq(Payment::getCode,payment.getCode())) > 0) {
+          return fail(payment.getName() + "已存在");
+        }
+        if (paymentService.save(payment)) {
+            String key = "Payment:" + payment.getCode() + ":" + getTenantId();
+            redisUtil.set(key,payment);
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:update')")
+    @OperationLog
+    @ApiOperation("修改支付方式")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Payment payment) {
+        if (paymentService.updateById(payment)) {
+            String key = "Payment:" + payment.getCode() + ":" + getTenantId();
+            redisUtil.set(key,payment);
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:remove')")
+    @OperationLog
+    @ApiOperation("删除支付方式")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        final Payment payment = paymentService.getById(id);
+      System.out.println("payment = " + payment);
+        String key = "Payment:" + payment.getCode() + ":" + getTenantId();
+        redisUtil.delete(key);
+        if (paymentService.removeById(id)) {
+          return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:save')")
+    @OperationLog
+    @ApiOperation("批量添加支付方式")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Payment> list) {
+        if (paymentService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:update')")
+    @OperationLog
+    @ApiOperation("批量修改支付方式")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Payment> batchParam) {
+        if (batchParam.update(paymentService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:payment:remove')")
+    @OperationLog
+    @ApiOperation("批量删除支付方式")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (paymentService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/PlugController.java

@@ -0,0 +1,139 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.PlugService;
+import com.gxwebsoft.common.system.entity.Plug;
+import com.gxwebsoft.common.system.param.PlugParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 插件扩展控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-12 09:53:07
+ */
+@Api(tags = "插件扩展管理")
+@RestController
+@RequestMapping("/api/system/plug")
+public class PlugController extends BaseController {
+    @Resource
+    private PlugService plugService;
+
+    @PreAuthorize("hasAuthority('sys:plug:list')")
+    @OperationLog
+    @ApiOperation("分页查询插件扩展")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Plug>> page(PlugParam param) {
+        PageParam<Plug, PlugParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(plugService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(plugService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:list')")
+    @OperationLog
+    @ApiOperation("查询全部插件扩展")
+    @GetMapping()
+    public ApiResult<List<Plug>> list(PlugParam param) {
+        PageParam<Plug, PlugParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(plugService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(plugService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:list')")
+    @OperationLog
+    @ApiOperation("根据id查询插件扩展")
+    @GetMapping("/{id}")
+    public ApiResult<Plug> get(@PathVariable("id") Integer id) {
+        return success(plugService.getById(id));
+        // 使用关联查询
+        //return success(plugService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:save')")
+    @OperationLog
+    @ApiOperation("添加插件扩展")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Plug plug) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          plug.setUserId(loginUser.getUserId());
+        }
+        if (plugService.save(plug)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:update')")
+    @OperationLog
+    @ApiOperation("修改插件扩展")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Plug plug) {
+        if (plugService.updateById(plug)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:remove')")
+    @OperationLog
+    @ApiOperation("删除插件扩展")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (plugService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:save')")
+    @OperationLog
+    @ApiOperation("批量添加插件扩展")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Plug> list) {
+        if (plugService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:update')")
+    @OperationLog
+    @ApiOperation("批量修改插件扩展")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Plug> batchParam) {
+        if (batchParam.update(plugService, "plug_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:plug:remove')")
+    @OperationLog
+    @ApiOperation("批量删除插件扩展")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (plugService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/RechargeOrderController.java

@@ -0,0 +1,191 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.IdUtil;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.common.system.entity.RechargeOrder;
+import com.gxwebsoft.common.system.entity.UserBalanceLog;
+import com.gxwebsoft.common.system.param.RechargeOrderParam;
+import com.gxwebsoft.common.system.service.RechargeOrderService;
+import com.gxwebsoft.common.system.service.UserBalanceLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN;
+
+/**
+ * 会员充值订单表控制器
+ *
+ * @author 科技小王子
+ * @since 2024-07-26 23:18:48
+ */
+@Api(tags = "会员充值订单表管理")
+@RestController
+@RequestMapping("/api/sys/recharge-order")
+public class RechargeOrderController extends BaseController {
+    @Resource
+    private RechargeOrderService rechargeOrderService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:save')")
+    @ApiOperation("会员充值")
+    @PostMapping("/recharge")
+    @Transactional(rollbackFor = {Exception.class})
+    public ApiResult<?> recharge(@RequestBody RechargeOrder rechargeOrder) {
+      // 充值
+      User user = userService.getById(rechargeOrder.getUserId());
+      BigDecimal balance = user.getBalance().add(rechargeOrder.getPayPrice());
+      user.setBalance(balance);
+      userService.updateById(user);
+      // 保存充值记录
+      rechargeOrder.setOrderNo(Long.toString(IdUtil.getSnowflakeNextId()));
+      rechargeOrder.setTradeId(Integer.valueOf(CommonUtil.createOrderNo()));
+      rechargeOrder.setBalance(balance);
+      if (rechargeOrderService.save(rechargeOrder)) {
+        // 记录余额明细
+        UserBalanceLog userBalanceLog = new UserBalanceLog();
+        userBalanceLog.setUserId(rechargeOrder.getUserId());
+        userBalanceLog.setScene(BALANCE_ADMIN);
+        userBalanceLog.setMoney(rechargeOrder.getPayPrice());
+        userBalanceLog.setBalance(balance);
+        userBalanceLog.setTransactionId(UUID.randomUUID().toString());
+        userBalanceLog.setComments("操作人：" + getLoginUser().getNickname());
+        userBalanceLog.setRemark(rechargeOrder.getComments());
+        userBalanceLog.setMerchantCode(rechargeOrder.getMerchantCode());
+        userBalanceLogService.save(userBalanceLog);
+        return success("充值成功", user);
+      }
+      return fail("充值失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:list')")
+    @ApiOperation("分页查询会员充值订单表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<RechargeOrder>> page(RechargeOrderParam param) {
+        // 使用关联查询
+        return success(rechargeOrderService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:list')")
+    @ApiOperation("查询全部会员充值订单表")
+    @GetMapping()
+    public ApiResult<List<RechargeOrder>> list(RechargeOrderParam param) {
+        // 使用关联查询
+        return success(rechargeOrderService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:list')")
+    @ApiOperation("根据id查询会员充值订单表")
+    @GetMapping("/{id}")
+    public ApiResult<RechargeOrder> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(rechargeOrderService.getByIdRel(id));
+    }
+
+    @ApiOperation("添加会员充值订单表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody RechargeOrder rechargeOrder) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+         rechargeOrder.setUserId(loginUser.getUserId());
+        }
+        if (rechargeOrderService.save(rechargeOrder)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @ApiOperation("修改会员充值订单表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody RechargeOrder rechargeOrder) {
+        if (rechargeOrderService.updateById(rechargeOrder)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @ApiOperation("删除会员充值订单表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (rechargeOrderService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:save')")
+    @ApiOperation("批量充值")
+    @PostMapping("/batchRecharge")
+    @Transactional(rollbackFor = {Exception.class})
+    public ApiResult<?> batchRecharge(@RequestBody List<RechargeOrder> list) {
+      String nickname = getLoginUser().getNickname();
+      String realName = getLoginUser().getRealName();
+      ArrayList<User> users = new ArrayList<>(list.size());
+      ArrayList<UserBalanceLog> logs = new ArrayList<>(list.size());
+
+      list.forEach(d -> {
+        User user = userService.getByIdRel(d.getUserId());
+        BigDecimal balance = user.getBalance().add(d.getPayPrice());
+        user.setBalance(balance);
+        users.add(user);
+        UserBalanceLog userBalanceLog = new UserBalanceLog();
+        userBalanceLog.setUserId(d.getUserId());
+        userBalanceLog.setScene(BALANCE_ADMIN);
+        userBalanceLog.setMoney(d.getPayPrice());
+        userBalanceLog.setBalance(balance);
+        userBalanceLog.setComments("操作员：" + realName);
+        userBalanceLog.setRemark(d.getComments());
+        userBalanceLog.setMerchantCode(d.getMerchantCode());
+        d.setOperator(realName);
+        logs.add(userBalanceLog);
+      });
+
+      if (rechargeOrderService.saveBatch(list)) {
+          // 批量充值
+          userService.updateBatchById(users);
+          // 记录余额明细
+          userBalanceLogService.saveBatch(logs);
+        return success("充值成功");
+      }
+      return fail("充值失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:update')")
+    @ApiOperation("批量修改会员充值订单表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<RechargeOrder> batchParam) {
+        if (batchParam.update(rechargeOrderService, "order_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:rechargeOrder:remove')")
+    @ApiOperation("批量删除会员充值订单表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (rechargeOrderService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/RedisUtilController.java

@@ -0,0 +1,77 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.utils.CacheClient;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/redis-util")
+@Api(tags = "Redis缓存工具接口")
+public class RedisUtilController extends BaseController {
+  private CacheClient cacheClient;
+  private final StringRedisTemplate redisTemplate;
+  private static final String SPLIT = ":";
+  private static final String PREFIX_ENTITY_LIKE = "focus:user";
+  private static final String PREFIX_USER_LIKE = "like:user";
+  private static final String PREFIX_FOLLOWEE = "followee";
+  private static final String PREFIX_FOLLOWER = "follower";
+
+
+  public RedisUtilController(StringRedisTemplate redisTemplate) {
+    this.redisTemplate = redisTemplate;
+  }
+
+  @ApiOperation("添加关注")
+  @PostMapping("/addFocus")
+  public ApiResult<?> addFocus(@RequestBody User user) {
+    final Integer userId = user.getUserId();
+    redisTemplate.opsForZSet().incrementScore(getFocusKey(userId), userId.toString(), 1);
+    return success("关注成功");
+  }
+
+  /**
+   * 某个用户的关注数
+   * @return like:entity:[entityId] ->set(userId)
+   */
+  public static String getFocusKey(Integer userId) {
+    return PREFIX_ENTITY_LIKE + SPLIT + userId;
+  }
+
+  /**
+   * 某个用户的赞
+   * @return like:entity:[entityId] ->set(userId)
+   */
+  public static String getEntityLikeKey(int entityType, int entityId) {
+    return PREFIX_ENTITY_LIKE + SPLIT + entityType + SPLIT + entityId;
+  }
+
+  /**
+   * 某个用户的赞
+   * @return like:user:[userId] ->int
+   */
+  public static String getUserLikeKey(int userId) {
+    return PREFIX_USER_LIKE + SPLIT + userId;
+  }
+
+  /**
+   * 某个用户关注的实体（键：用户Id，值：实体Id）
+   * @return followee:[userId:entityType] ->zSet(entityId,now)
+   */
+  public static String getFolloweeKey(int userId, int entityType) {
+    return PREFIX_FOLLOWEE + SPLIT + userId + SPLIT + entityType;
+  }
+
+  /**
+   * 某个实体拥有的粉丝（键：实体Id，值：用户Id)
+   * @return follower:[entityType:entityId] ->zSet(entityId,now)
+   */
+  public static String getFollowerKey(int entityType, int entityId) {
+    return PREFIX_FOLLOWER + SPLIT + entityType + SPLIT + entityId;
+  }
+
+}

modules/common/system/controller/RoleController.java

@@ -0,0 +1,154 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Role;
+import com.gxwebsoft.common.system.param.RoleParam;
+import com.gxwebsoft.common.system.service.RoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 角色控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:02
+ */
+@Api(tags = "角色管理")
+@RestController
+@RequestMapping("/api/system/role")
+public class RoleController extends BaseController {
+    @Resource
+    private RoleService roleService;
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @ApiOperation("分页查询角色")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Role>> page(RoleParam param) {
+        PageParam<Role, RoleParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc");
+        return success(roleService.page(page, page.getWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @ApiOperation("查询全部角色")
+    @GetMapping()
+    public ApiResult<List<Role>> list(RoleParam param) {
+        PageParam<Role, RoleParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc");
+        return success(roleService.list(page.getOrderWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @ApiOperation("根据id查询角色")
+    @GetMapping("/{id}")
+    public ApiResult<Role> get(@PathVariable("id") Integer id) {
+        return success(roleService.getById(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:save')")
+    @OperationLog
+    @ApiOperation("添加角色")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Role role) {
+        if (roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getRoleCode, role.getRoleCode())) > 0) {
+            return fail("角色标识已存在");
+        }
+        if (roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getRoleName, role.getRoleName())) > 0) {
+            return fail("角色名称已存在");
+        }
+        if (roleService.save(role)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:update')")
+    @OperationLog
+    @ApiOperation("修改角色")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Role role) {
+        if (role.getRoleCode() != null && roleService.count(new LambdaQueryWrapper<Role>()
+                .eq(Role::getRoleCode, role.getRoleCode())
+                .ne(Role::getRoleId, role.getRoleId())) > 0) {
+            return fail("角色标识已存在");
+        }
+        if (role.getRoleName() != null && roleService.count(new LambdaQueryWrapper<Role>()
+                .eq(Role::getRoleName, role.getRoleName())
+                .ne(Role::getRoleId, role.getRoleId())) > 0) {
+            return fail("角色名称已存在");
+        }
+        if (roleService.updateById(role)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:remove')")
+    @OperationLog
+    @ApiOperation("删除角色")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (roleService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:save')")
+    @OperationLog
+    @ApiOperation("批量添加角色")
+    @PostMapping("/batch")
+    public ApiResult<List<String>> saveBatch(@RequestBody List<Role> list) {
+        // 校验是否重复
+        if (CommonUtil.checkRepeat(list, Role::getRoleName)) {
+            return fail("角色名称存在重复", null);
+        }
+        if (CommonUtil.checkRepeat(list, Role::getRoleCode)) {
+            return fail("角色标识存在重复", null);
+        }
+        // 校验是否存在
+        List<Role> codeExists = roleService.list(new LambdaQueryWrapper<Role>().in(Role::getRoleCode,
+                list.stream().map(Role::getRoleCode).collect(Collectors.toList())));
+        if (codeExists.size() > 0) {
+            return fail("角色标识已存在", codeExists.stream().map(Role::getRoleCode)
+                    .collect(Collectors.toList())).setCode(2);
+        }
+        List<Role> nameExists = roleService.list(new LambdaQueryWrapper<Role>().in(Role::getRoleName,
+                list.stream().map(Role::getRoleCode).collect(Collectors.toList())));
+        if (nameExists.size() > 0) {
+            return fail("角色标识已存在", nameExists.stream().map(Role::getRoleCode)
+                    .collect(Collectors.toList())).setCode(3);
+        }
+        if (roleService.saveBatch(list)) {
+            return success("添加成功", null);
+        }
+        return fail("添加失败", null);
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:remove')")
+    @OperationLog
+    @ApiOperation("批量删除角色")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (roleService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/RoleMenuController.java

@@ -0,0 +1,100 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.system.entity.Menu;
+import com.gxwebsoft.common.system.entity.RoleMenu;
+import com.gxwebsoft.common.system.service.MenuService;
+import com.gxwebsoft.common.system.service.RoleMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 角色菜单控制器
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:01
+ */
+@Api(tags = "角色菜单管理")
+@RestController
+@RequestMapping("/api/system/role-menu")
+public class RoleMenuController extends BaseController {
+    @Resource
+    private RoleMenuService roleMenuService;
+    @Resource
+    private MenuService menuService;
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @ApiOperation("查询角色菜单")
+    @GetMapping("/{id}")
+    public ApiResult<List<Menu>> list(@PathVariable("id") Integer roleId) {
+        List<Menu> menus = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSortNumber));
+        List<RoleMenu> roleMenus = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>()
+                .eq(RoleMenu::getRoleId, roleId));
+        for (Menu menu : menus) {
+            menu.setChecked(roleMenus.stream().anyMatch((d) -> d.getMenuId().equals(menu.getMenuId())));
+        }
+        return success(menus);
+    }
+
+    @Transactional(rollbackFor = {Exception.class})
+    @PreAuthorize("hasAuthority('sys:role:update')")
+    @OperationLog
+    @ApiOperation("修改角色菜单")
+    @PutMapping("/{id}")
+    public ApiResult<?> update(@PathVariable("id") Integer roleId, @RequestBody List<Integer> menuIds) {
+        roleMenuService.remove(new LambdaUpdateWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
+        if (menuIds != null && menuIds.size() > 0) {
+            List<RoleMenu> roleMenuList = new ArrayList<>();
+            for (Integer menuId : menuIds) {
+                RoleMenu roleMenu = new RoleMenu();
+                roleMenu.setRoleId(roleId);
+                roleMenu.setMenuId(menuId);
+                roleMenuList.add(roleMenu);
+            }
+            if (!roleMenuService.saveBatch(roleMenuList)) {
+                throw new BusinessException("保存失败");
+            }
+        }
+        return success("保存成功");
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:update')")
+    @OperationLog
+    @ApiOperation("添加角色菜单")
+    @PostMapping("/{id}")
+    public ApiResult<?> addRoleAuth(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) {
+        RoleMenu roleMenu = new RoleMenu();
+        roleMenu.setRoleId(roleId);
+        roleMenu.setMenuId(menuId);
+        if (roleMenuService.save(roleMenu)) {
+            return success();
+        }
+        return fail();
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:update')")
+    @OperationLog
+    @ApiOperation("移除角色菜单")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) {
+        if (roleMenuService.remove(new LambdaUpdateWrapper<RoleMenu>()
+                .eq(RoleMenu::getRoleId, roleId).eq(RoleMenu::getMenuId, menuId))) {
+            return success();
+        }
+        return fail();
+    }
+
+}

modules/common/system/controller/SettingController.java

@@ -0,0 +1,193 @@
+package com.gxwebsoft.common.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Setting;
+import com.gxwebsoft.common.system.entity.Tenant;
+import com.gxwebsoft.common.system.param.SettingParam;
+import com.gxwebsoft.common.system.service.SettingService;
+import com.gxwebsoft.common.system.service.TenantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 系统设置控制器
+ *
+ * @author WebSoft
+ * @since 2022-11-19 13:54:27
+ */
+@Api(tags = "系统设置管理")
+@RestController
+@RequestMapping("/api/system/setting")
+public class SettingController extends BaseController {
+    @Resource
+    private SettingService settingService;
+    @Resource
+    private TenantService tenantService;
+    @Resource
+    private RedisUtil redisUtil;
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("分页查询系统设置")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Setting>> page(SettingParam param) {
+        PageParam<Setting, SettingParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(settingService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(settingService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("查询全部系统设置")
+    @GetMapping()
+    public ApiResult<List<Setting>> list(SettingParam param) {
+        PageParam<Setting, SettingParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(settingService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(settingService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("根据id查询系统设置")
+    @GetMapping("/{id}")
+    public ApiResult<Setting> get(@PathVariable("id") Integer id) {
+        return success(settingService.getById(id));
+        // 使用关联查询
+        //return success(settingService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("添加系统设置")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Setting setting) {
+        if (settingService.save(setting)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("修改系统设置")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Setting setting) {
+        if (settingService.updateById(setting)) {
+          // 更新系统设置信息到缓存 key = ""
+//          String key = StrUtil.upperFirst(setting.getSettingKey()).concat(":").concat(getTenantId().toString());
+          String key = setting.getSettingKey().concat(":").concat(setting.getTenantId().toString());
+          redisUtil.set(key, JSON.parseObject(setting.getContent()));
+          // 更新租户信息
+          if (setting.getSettingKey().equals("setting")) {
+            final String content = setting.getContent();
+            final JSONObject jsonObject = JSONObject.parseObject(content);
+            final String siteName = jsonObject.getString("siteName");
+            final String logo = jsonObject.getString("logo");
+            final Tenant tenant = new Tenant();
+            tenant.setTenantName(siteName);
+            tenant.setTenantId(getTenantId());
+            tenant.setLogo(logo);
+            tenantService.updateById(tenant);
+          }
+          return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:remove')")
+    @OperationLog
+    @ApiOperation("删除系统设置")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (settingService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("批量添加系统设置")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Setting> list) {
+        if (settingService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:update')")
+    @OperationLog
+    @ApiOperation("批量修改系统设置")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Setting> batchParam) {
+        if (batchParam.update(settingService, "setting_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:remove')")
+    @OperationLog
+    @ApiOperation("批量删除系统设置")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (settingService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:data')")
+    @OperationLog
+    @ApiOperation("查询租户设置信息")
+    @GetMapping("/data")
+    public ApiResult<?> data() {
+      return success(settingService.getData("setting"));
+    }
+
+    @PreAuthorize("hasAuthority('sys:setting:save')")
+    @OperationLog
+    @ApiOperation("更新主题皮肤")
+    @PutMapping("/theme")
+    public ApiResult<?> theme(@RequestBody Setting setting) {
+      String key = "theme:".concat(getTenantId().toString());
+      // 新增
+      final Setting one = settingService.getOne(new LambdaQueryWrapper<Setting>().eq(Setting::getSettingKey, setting.getSettingKey()));
+      if(one == null){
+        settingService.save(setting);
+        redisUtil.set(key,setting.getContent());
+        return success("保存成功");
+      }
+      // 更新
+      final Setting update = settingService.getOne(new LambdaQueryWrapper<Setting>().eq(Setting::getSettingKey, setting.getSettingKey()));
+      update.setContent(setting.getContent());
+      if (settingService.updateById(update)) {
+        redisUtil.set(key,setting.getContent());
+        return success("更新成功");
+      }
+      return fail("更新失败");
+    }
+
+    @ApiOperation("更新主题皮肤")
+    @GetMapping("/getTheme")
+    public ApiResult<?> getTheme() {
+      String key = "theme:".concat(getTenantId().toString());
+      return success("获取成功",redisUtil.get(key));
+    }
+}

modules/common/system/controller/TenantController.java

@@ -0,0 +1,193 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.*;
+import com.gxwebsoft.common.system.param.PlugParam;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.MenuService;
+import com.gxwebsoft.common.system.service.RoleMenuService;
+import com.gxwebsoft.common.system.service.TenantService;
+import com.gxwebsoft.common.system.param.TenantParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * 租户控制器
+ *
+ * @author 科技小王子
+ * @since 2023-07-17 17:49:53
+ */
+@Api(tags = "租户管理")
+@RestController
+@RequestMapping("/api/system/tenant")
+public class TenantController extends BaseController {
+  @Resource
+  private TenantService tenantService;
+  @Resource
+  private MenuService menuService;
+  @Resource
+  private RoleMenuService roleMenuService;
+  @Resource
+  private CompanyService companyService;
+  @Resource
+  private RedisUtil redisUtil;
+
+  @PreAuthorize("hasAuthority('sys:tenant:list')")
+  @ApiOperation("分页查询租户")
+  @GetMapping("/page")
+  public ApiResult<PageResult<Tenant>> page(TenantParam param) {
+    return success(tenantService.pageRel(param));
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:list')")
+  @ApiOperation("查询全部租户")
+  @GetMapping()
+  public ApiResult<List<Tenant>> list(TenantParam param) {
+    // 使用关联查询
+    return success(tenantService.listRel(param));
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:list')")
+  @ApiOperation("根据id查询租户")
+  @GetMapping("/{id}")
+  public ApiResult<Tenant> get(@PathVariable("id") Integer id) {
+    Tenant tenant = tenantService.getById(id);
+    // 附加企业信息
+    List<Company> list = companyService.list(new LambdaQueryWrapper<Company>().eq(Company::getTenantId, tenant.getTenantId()).eq(Company::getAuthoritative, true));
+    if (!CollectionUtils.isEmpty(list)) {
+      final Company company = list.get(0);
+      tenant.setCompany(company);
+    }
+    return success(tenant);
+  }
+
+  @ApiOperation("根据code搜索租户")
+  @GetMapping("/getTenantId/{code}")
+  public ApiResult<Integer> getTenantIdByKeywords(@PathVariable("code") String code) {
+    String key = "TenantCode:".concat(code);
+    // 查询缓存
+    final String string = redisUtil.get(key);
+    if(string != null){
+      return success(JSONUtil.parseObject(string, Integer.class));
+    }
+    // 使用关联查询
+    final Tenant tenant = tenantService.getOne(new LambdaUpdateWrapper<Tenant>().eq(Tenant::getTenantId, code).or().eq(Tenant::getTenantCode, code).last("limit 1"));
+    if(tenant == null){
+      return fail("应用不存在或已过期",null);
+    }
+    redisUtil.set(key,tenant.getTenantId().toString(),1L, TimeUnit.DAYS);
+    return success(tenant.getTenantId());
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:save')")
+  @OperationLog
+  @ApiOperation("添加租户")
+  @PostMapping()
+  public ApiResult<?> save(@RequestBody Tenant tenant) {
+    if (tenantService.save(tenant)) {
+      return success("添加成功");
+    }
+    return fail("添加失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:update')")
+  @OperationLog
+  @ApiOperation("修改租户")
+  @PutMapping()
+  public ApiResult<?> update(@RequestBody Tenant tenant) {
+    if (tenantService.updateById(tenant)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:remove')")
+  @OperationLog
+  @ApiOperation("删除租户")
+  @DeleteMapping("/{id}")
+  public ApiResult<?> remove(@PathVariable("id") Integer id) {
+    if (tenantService.removeById(id)) {
+      return success("删除成功");
+    }
+    return fail("删除失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:save')")
+  @OperationLog
+  @ApiOperation("批量添加租户")
+  @PostMapping("/batch")
+  public ApiResult<?> saveBatch(@RequestBody List<Tenant> list) {
+    if (tenantService.saveBatch(list)) {
+      return success("添加成功");
+    }
+    return fail("添加失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:update')")
+  @OperationLog
+  @ApiOperation("批量修改租户")
+  @PutMapping("/batch")
+  public ApiResult<?> removeBatch(@RequestBody BatchParam<Tenant> batchParam) {
+    if (batchParam.update(tenantService, "tenant_id")) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:tenant:remove')")
+  @OperationLog
+  @ApiOperation("批量删除租户")
+  @DeleteMapping("/batch")
+  public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+    if (tenantService.removeByIds(ids)) {
+      return success("删除成功");
+    }
+    return fail("删除失败");
+  }
+
+  @ApiOperation("租户角色权限初始化")
+  @GetMapping("/role-menu/{id}")
+  public ApiResult<List<Menu>> initialization(@PathVariable("id") Integer roleId) {
+    List<Menu> menus = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSortNumber));
+    List<RoleMenu> roleMenus = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>()
+      .eq(RoleMenu::getRoleId, roleId));
+    for (Menu menu : menus) {
+      menu.setChecked(roleMenus.stream().anyMatch((d) -> d.getMenuId().equals(menu.getMenuId())));
+    }
+    List<Integer> menuIds = menus.stream().map(Menu::getMenuId).collect(Collectors.toList());
+    roleMenuService.remove(new LambdaUpdateWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
+    if (menuIds.size() > 0) {
+      List<RoleMenu> roleMenuList = new ArrayList<>();
+      for (Integer menuId : menuIds) {
+        RoleMenu roleMenu = new RoleMenu();
+        roleMenu.setRoleId(roleId);
+        roleMenu.setMenuId(menuId);
+        roleMenuList.add(roleMenu);
+      }
+      if (!roleMenuService.saveBatch(roleMenuList)) {
+        throw new BusinessException("保存失败");
+      }
+    }
+    return success(menus);
+  }
+
+}

modules/common/system/controller/UserBalanceLogController.java

@@ -0,0 +1,132 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.UserBalanceLog;
+import com.gxwebsoft.common.system.param.UserBalanceLogParam;
+import com.gxwebsoft.common.system.service.UserBalanceLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 用户余额变动明细表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-04-21 15:59:09
+ */
+@Api(tags = "用户余额变动明细表管理")
+@RestController
+@RequestMapping("/api/sys/user-balance-log")
+public class UserBalanceLogController extends BaseController {
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:list')")
+    @OperationLog
+    @ApiOperation("分页查询用户余额变动明细表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<UserBalanceLog>> page(UserBalanceLogParam param) {
+        // 使用关联查询
+        return success(userBalanceLogService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:list')")
+    @OperationLog
+    @ApiOperation("查询全部用户余额变动明细表")
+    @GetMapping()
+    public ApiResult<List<UserBalanceLog>> list(UserBalanceLogParam param) {
+        PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(userBalanceLogService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(userBalanceLogService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:list')")
+    @OperationLog
+    @ApiOperation("根据id查询用户余额变动明细表")
+    @GetMapping("/{id}")
+    public ApiResult<UserBalanceLog> get(@PathVariable("id") Integer id) {
+        return success(userBalanceLogService.getById(id));
+        // 使用关联查询
+        //return success(userBalanceLogService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:save')")
+    @OperationLog
+    @ApiOperation("添加用户余额变动明细表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody UserBalanceLog userBalanceLog) {
+        // 记录当前登录用户id、租户id、商户编号
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          userBalanceLog.setUserId(loginUser.getUserId());
+        }
+        if (userBalanceLogService.save(userBalanceLog)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:update')")
+    @OperationLog
+    @ApiOperation("修改用户余额变动明细表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody UserBalanceLog userBalanceLog) {
+        if (userBalanceLogService.updateById(userBalanceLog)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:remove')")
+    @OperationLog
+    @ApiOperation("删除用户余额变动明细表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (userBalanceLogService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:save')")
+    @OperationLog
+    @ApiOperation("批量添加用户余额变动明细表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<UserBalanceLog> list) {
+        if (userBalanceLogService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:update')")
+    @OperationLog
+    @ApiOperation("批量修改用户余额变动明细表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserBalanceLog> batchParam) {
+        if (batchParam.update(userBalanceLogService, "log_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userBalanceLog:remove')")
+    @OperationLog
+    @ApiOperation("批量删除用户余额变动明细表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (userBalanceLogService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

modules/common/system/controller/UserCollectionController.java

@@ -0,0 +1,136 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserCollectionService;
+import com.gxwebsoft.common.system.entity.UserCollection;
+import com.gxwebsoft.common.system.param.UserCollectionParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 我的收藏控制器
+ *
+ * @author 科技小王子
+ * @since 2024-04-28 18:08:32
+ */
+@Api(tags = "我的收藏管理")
+@RestController
+@RequestMapping("/api/system/user-collection")
+public class UserCollectionController extends BaseController {
+    @Resource
+    private UserCollectionService userCollectionService;
+
+    @PreAuthorize("hasAuthority('sys:userCollection:list')")
+    @ApiOperation("分页查询我的收藏")
+    @GetMapping("/page")
+    public ApiResult<PageResult<UserCollection>> page(UserCollectionParam param) {
+        // 使用关联查询
+        return success(userCollectionService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:list')")
+    @ApiOperation("查询全部我的收藏")
+    @GetMapping()
+    public ApiResult<List<UserCollection>> list(UserCollectionParam param) {
+        // 使用关联查询
+        return success(userCollectionService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:list')")
+    @ApiOperation("根据id查询我的收藏")
+    @GetMapping("/{id}")
+    public ApiResult<UserCollection> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(userCollectionService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:save')")
+    @OperationLog
+    @ApiOperation("添加和取消收藏")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody UserCollection userCollection) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          userCollection.setUserId(loginUser.getUserId());
+          userCollection.setTid(userCollection.getTid());
+          final UserCollection one = userCollectionService.getOne(new LambdaQueryWrapper<UserCollection>().eq(UserCollection::getUserId, loginUser.getUserId()).eq(UserCollection::getTid, userCollection.getTid()).last("limit 1"));
+          if (one != null) {
+            userCollectionService.removeById(one.getId());
+            return success("已取消收藏");
+          }
+          if (userCollectionService.save(userCollection)) {
+            return success("已添加收藏");
+          }
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:update')")
+    @OperationLog
+    @ApiOperation("修改我的收藏")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody UserCollection userCollection) {
+        if (userCollectionService.updateById(userCollection)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:remove')")
+    @OperationLog
+    @ApiOperation("删除我的收藏")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (userCollectionService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:save')")
+    @OperationLog
+    @ApiOperation("批量添加我的收藏")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<UserCollection> list) {
+        if (userCollectionService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:update')")
+    @OperationLog
+    @ApiOperation("批量修改我的收藏")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserCollection> batchParam) {
+        if (batchParam.update(userCollectionService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:userCollection:remove')")
+    @OperationLog
+    @ApiOperation("批量删除我的收藏")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (userCollectionService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}