mirror of https://github.com/elunez/eladmin
目录调整,新增 Not Equal 查询方式
parent
3daa826375
commit
5ab7fb5b73
|
@ -50,6 +50,8 @@ public @interface Query {
|
|||
, LESS_THAN_NQ
|
||||
// jie 2019/6/4 包含
|
||||
, IN
|
||||
// 不等于
|
||||
,NOT_EQUAL
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -106,6 +106,9 @@ public class QueryHelp {
|
|||
list.add(getExpression(attributeName,join,root).in((Collection<Long>) val));
|
||||
}
|
||||
break;
|
||||
case NOT_EQUAL:
|
||||
list.add(cb.notEqual(getExpression(attributeName,join,root), val));
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>eladmin</artifactId>
|
||||
<groupId>me.zhengjie</groupId>
|
||||
<version>2.3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>eladmin-generator</artifactId>
|
||||
<name>代码生成模块</name>
|
||||
|
||||
<properties>
|
||||
<configuration.version>1.9</configuration.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>me.zhengjie</groupId>
|
||||
<artifactId>eladmin-common</artifactId>
|
||||
<version>2.3</version>
|
||||
</dependency>
|
||||
|
||||
<!--模板引擎-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>${configuration.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
|
@ -1,10 +1,7 @@
|
|||
package me.zhengjie.modules.generator.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.*;
|
||||
|
||||
/**
|
||||
* 代码生成配置
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.generator.domain.vo;
|
||||
package me.zhengjie.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.generator.domain.vo;
|
||||
package me.zhengjie.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.generator.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
/**
|
|
@ -1,9 +1,9 @@
|
|||
package me.zhengjie.modules.generator.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.modules.generator.service.GenConfigService;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import me.zhengjie.service.GenConfigService;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
|
@ -1,17 +1,16 @@
|
|||
package me.zhengjie.modules.generator.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import cn.hutool.core.util.PageUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.modules.generator.service.GenConfigService;
|
||||
import me.zhengjie.modules.generator.service.GeneratorService;
|
||||
import me.zhengjie.service.GenConfigService;
|
||||
import me.zhengjie.service.GeneratorService;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.generator.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
|
||||
/**
|
||||
* @author Zheng Jie
|
|
@ -1,7 +1,7 @@
|
|||
package me.zhengjie.modules.generator.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import me.zhengjie.domain.vo.ColumnInfo;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,8 +1,8 @@
|
|||
package me.zhengjie.modules.generator.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.modules.generator.repository.GenConfigRepository;
|
||||
import me.zhengjie.modules.generator.service.GenConfigService;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import me.zhengjie.repository.GenConfigRepository;
|
||||
import me.zhengjie.service.GenConfigService;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
|
@ -1,12 +1,12 @@
|
|||
package me.zhengjie.modules.generator.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import me.zhengjie.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.domain.vo.TableInfo;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.modules.generator.domain.vo.TableInfo;
|
||||
import me.zhengjie.modules.generator.service.GeneratorService;
|
||||
import me.zhengjie.modules.generator.utils.GenUtil;
|
||||
import me.zhengjie.service.GeneratorService;
|
||||
import me.zhengjie.utils.GenUtil;
|
||||
import me.zhengjie.utils.PageUtil;
|
||||
import me.zhengjie.utils.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
|
@ -1,8 +1,6 @@
|
|||
package me.zhengjie.modules.generator.utils;
|
||||
package me.zhengjie.utils;
|
||||
|
||||
import org.apache.commons.configuration.Configuration;
|
||||
import org.apache.commons.configuration.ConfigurationException;
|
||||
import org.apache.commons.configuration.PropertiesConfiguration;
|
||||
import org.apache.commons.configuration.*;
|
||||
|
||||
/**
|
||||
* sql字段转java
|
|
@ -1,12 +1,10 @@
|
|||
package me.zhengjie.modules.generator.utils;
|
||||
package me.zhengjie.utils;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.extra.template.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import me.zhengjie.modules.generator.domain.GenConfig;
|
||||
import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
|
||||
import me.zhengjie.utils.FileUtil;
|
||||
import me.zhengjie.utils.StringUtils;
|
||||
import me.zhengjie.domain.GenConfig;
|
||||
import me.zhengjie.domain.vo.ColumnInfo;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
|
@ -17,6 +17,18 @@
|
|||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<!-- 代码生成模块 -->
|
||||
<dependency>
|
||||
<groupId>me.zhengjie</groupId>
|
||||
<artifactId>eladmin-generator</artifactId>
|
||||
<version>2.3</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>me.zhengjie</groupId>
|
||||
<artifactId>eladmin-common</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- tools 模块包含了 common 和 logging 模块 -->
|
||||
<dependency>
|
||||
|
|
|
@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
|
|||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.config.DataScope;
|
||||
import me.zhengjie.modules.tools.domain.VerificationCode;
|
||||
import me.zhengjie.domain.VerificationCode;
|
||||
import me.zhengjie.modules.system.domain.User;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.system.domain.vo.UserPassVo;
|
||||
|
@ -12,7 +12,7 @@ import me.zhengjie.modules.system.service.DeptService;
|
|||
import me.zhengjie.modules.system.service.RoleService;
|
||||
import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
|
||||
import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
|
||||
import me.zhengjie.modules.tools.service.VerificationCodeService;
|
||||
import me.zhengjie.service.VerificationCodeService;
|
||||
import me.zhengjie.utils.*;
|
||||
import me.zhengjie.modules.system.service.UserService;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
<mail.version>1.4.7</mail.version>
|
||||
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
|
||||
<alipay.version>3.1.0</alipay.version>
|
||||
<configuration.version>1.9</configuration.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
@ -34,19 +33,6 @@
|
|||
<version>${mail.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!--模板引擎-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>${configuration.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!--七牛云存储-->
|
||||
<dependency>
|
||||
<groupId>com.qiniu</groupId>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.persistence.*;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.*;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import org.hibernate.annotations.CreationTimestamp;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.persistence.*;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import org.hibernate.annotations.UpdateTimestamp;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain;
|
||||
package me.zhengjie.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain.vo;
|
||||
package me.zhengjie.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.domain.vo;
|
||||
package me.zhengjie.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.AlipayConfig;
|
||||
import me.zhengjie.domain.AlipayConfig;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
/**
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.EmailConfig;
|
||||
import me.zhengjie.domain.EmailConfig;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
/**
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.LocalStorage;
|
||||
import me.zhengjie.domain.LocalStorage;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.Picture;
|
||||
import me.zhengjie.domain.Picture;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.QiniuConfig;
|
||||
import me.zhengjie.domain.QiniuConfig;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.QiniuContent;
|
||||
import me.zhengjie.domain.QiniuContent;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package me.zhengjie.modules.tools.repository;
|
||||
package me.zhengjie.repository;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.VerificationCode;
|
||||
import me.zhengjie.domain.VerificationCode;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
/**
|
|
@ -1,15 +1,15 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import me.zhengjie.annotation.AnonymousAccess;
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.modules.tools.domain.AlipayConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.TradeVo;
|
||||
import me.zhengjie.modules.tools.utils.AliPayStatusEnum;
|
||||
import me.zhengjie.modules.tools.utils.AlipayUtils;
|
||||
import me.zhengjie.modules.tools.service.AlipayService;
|
||||
import me.zhengjie.domain.vo.TradeVo;
|
||||
import me.zhengjie.domain.AlipayConfig;
|
||||
import me.zhengjie.utils.AliPayStatusEnum;
|
||||
import me.zhengjie.utils.AlipayUtils;
|
||||
import me.zhengjie.service.AlipayService;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
|
@ -1,11 +1,11 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.modules.tools.domain.EmailConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.modules.tools.service.EmailService;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.EmailConfig;
|
||||
import me.zhengjie.service.EmailService;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
|
@ -1,9 +1,9 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.modules.tools.domain.LocalStorage;
|
||||
import me.zhengjie.modules.tools.service.LocalStorageService;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
|
||||
import me.zhengjie.domain.LocalStorage;
|
||||
import me.zhengjie.service.LocalStorageService;
|
||||
import me.zhengjie.service.dto.LocalStorageQueryCriteria;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
|
@ -1,11 +1,11 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.modules.tools.domain.Picture;
|
||||
import me.zhengjie.modules.tools.service.PictureService;
|
||||
import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
|
||||
import me.zhengjie.domain.Picture;
|
||||
import me.zhengjie.service.PictureService;
|
||||
import me.zhengjie.service.dto.PictureQueryCriteria;
|
||||
import me.zhengjie.utils.SecurityUtils;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
|
@ -1,13 +1,13 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import me.zhengjie.aop.log.Log;
|
||||
import me.zhengjie.modules.tools.domain.QiniuConfig;
|
||||
import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
|
||||
import me.zhengjie.modules.tools.domain.QiniuContent;
|
||||
import me.zhengjie.modules.tools.service.QiNiuService;
|
||||
import me.zhengjie.domain.QiniuConfig;
|
||||
import me.zhengjie.domain.QiniuContent;
|
||||
import me.zhengjie.service.dto.QiniuQueryCriteria;
|
||||
import me.zhengjie.service.QiNiuService;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
|
@ -1,11 +1,11 @@
|
|||
package me.zhengjie.modules.tools.rest;
|
||||
package me.zhengjie.rest;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import me.zhengjie.modules.tools.domain.VerificationCode;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.modules.tools.service.EmailService;
|
||||
import me.zhengjie.modules.tools.service.VerificationCodeService;
|
||||
import me.zhengjie.domain.VerificationCode;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
import me.zhengjie.service.EmailService;
|
||||
import me.zhengjie.service.VerificationCodeService;
|
||||
import me.zhengjie.utils.ElAdminConstant;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
|
@ -1,7 +1,7 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.AlipayConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.TradeVo;
|
||||
import me.zhengjie.domain.vo.TradeVo;
|
||||
import me.zhengjie.domain.AlipayConfig;
|
||||
|
||||
/**
|
||||
* @author Zheng Jie
|
|
@ -1,7 +1,7 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.EmailConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.EmailConfig;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
|
||||
/**
|
|
@ -1,8 +1,8 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.LocalStorage;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
|
||||
import me.zhengjie.domain.LocalStorage;
|
||||
import me.zhengjie.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.service.dto.LocalStorageQueryCriteria;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.Picture;
|
||||
import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
|
||||
import me.zhengjie.domain.Picture;
|
||||
import me.zhengjie.service.dto.PictureQueryCriteria;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.QiniuConfig;
|
||||
import me.zhengjie.modules.tools.domain.QiniuContent;
|
||||
import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
|
||||
import me.zhengjie.domain.QiniuConfig;
|
||||
import me.zhengjie.domain.QiniuContent;
|
||||
import me.zhengjie.service.dto.QiniuQueryCriteria;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package me.zhengjie.modules.tools.service;
|
||||
package me.zhengjie.service;
|
||||
|
||||
import me.zhengjie.modules.tools.domain.VerificationCode;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.VerificationCode;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
|
||||
/**
|
||||
* @author Zheng Jie
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.dto;
|
||||
package me.zhengjie.service.dto;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.dto;
|
||||
package me.zhengjie.service.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import java.sql.Timestamp;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.dto;
|
||||
package me.zhengjie.service.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import me.zhengjie.annotation.Query;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.dto;
|
||||
package me.zhengjie.service.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import me.zhengjie.annotation.Query;
|
|
@ -1,14 +1,14 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import com.alipay.api.AlipayClient;
|
||||
import com.alipay.api.DefaultAlipayClient;
|
||||
import com.alipay.api.request.AlipayTradePagePayRequest;
|
||||
import com.alipay.api.request.AlipayTradeWapPayRequest;
|
||||
import me.zhengjie.modules.tools.domain.AlipayConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.TradeVo;
|
||||
import me.zhengjie.domain.vo.TradeVo;
|
||||
import me.zhengjie.domain.AlipayConfig;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.tools.repository.AlipayRepository;
|
||||
import me.zhengjie.modules.tools.service.AlipayService;
|
||||
import me.zhengjie.repository.AlipayRepository;
|
||||
import me.zhengjie.service.AlipayService;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.cache.annotation.CachePut;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
|
@ -1,12 +1,12 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import cn.hutool.extra.mail.Mail;
|
||||
import cn.hutool.extra.mail.MailAccount;
|
||||
import me.zhengjie.modules.tools.domain.EmailConfig;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.EmailConfig;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.tools.repository.EmailRepository;
|
||||
import me.zhengjie.modules.tools.service.EmailService;
|
||||
import me.zhengjie.repository.EmailRepository;
|
||||
import me.zhengjie.service.EmailService;
|
||||
import me.zhengjie.utils.EncryptUtils;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.cache.annotation.CachePut;
|
|
@ -1,14 +1,14 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import me.zhengjie.modules.tools.domain.LocalStorage;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
|
||||
import me.zhengjie.modules.tools.service.mapper.LocalStorageMapper;
|
||||
import me.zhengjie.domain.LocalStorage;
|
||||
import me.zhengjie.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.service.dto.LocalStorageQueryCriteria;
|
||||
import me.zhengjie.service.mapper.LocalStorageMapper;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.utils.*;
|
||||
import me.zhengjie.modules.tools.repository.LocalStorageRepository;
|
||||
import me.zhengjie.modules.tools.service.LocalStorageService;
|
||||
import me.zhengjie.repository.LocalStorageRepository;
|
||||
import me.zhengjie.service.LocalStorageService;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
|
@ -1,14 +1,14 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import me.zhengjie.modules.tools.domain.Picture;
|
||||
import me.zhengjie.modules.tools.repository.PictureRepository;
|
||||
import me.zhengjie.modules.tools.service.PictureService;
|
||||
import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
|
||||
import me.zhengjie.domain.Picture;
|
||||
import me.zhengjie.repository.PictureRepository;
|
||||
import me.zhengjie.service.PictureService;
|
||||
import me.zhengjie.service.dto.PictureQueryCriteria;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.utils.*;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.qiniu.common.QiniuException;
|
||||
|
@ -9,14 +9,14 @@ import com.qiniu.storage.UploadManager;
|
|||
import com.qiniu.storage.model.DefaultPutRet;
|
||||
import com.qiniu.storage.model.FileInfo;
|
||||
import com.qiniu.util.Auth;
|
||||
import me.zhengjie.modules.tools.domain.QiniuConfig;
|
||||
import me.zhengjie.modules.tools.domain.QiniuContent;
|
||||
import me.zhengjie.modules.tools.repository.QiniuContentRepository;
|
||||
import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
|
||||
import me.zhengjie.modules.tools.utils.QiNiuUtil;
|
||||
import me.zhengjie.domain.QiniuConfig;
|
||||
import me.zhengjie.domain.QiniuContent;
|
||||
import me.zhengjie.repository.QiniuContentRepository;
|
||||
import me.zhengjie.service.dto.QiniuQueryCriteria;
|
||||
import me.zhengjie.utils.QiNiuUtil;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.tools.repository.QiNiuConfigRepository;
|
||||
import me.zhengjie.modules.tools.service.QiNiuService;
|
||||
import me.zhengjie.repository.QiNiuConfigRepository;
|
||||
import me.zhengjie.service.QiNiuService;
|
||||
import me.zhengjie.utils.FileUtil;
|
||||
import me.zhengjie.utils.PageUtil;
|
||||
import me.zhengjie.utils.QueryHelp;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.service.impl;
|
||||
package me.zhengjie.service.impl;
|
||||
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
|
@ -6,11 +6,11 @@ import cn.hutool.extra.template.Template;
|
|||
import cn.hutool.extra.template.TemplateConfig;
|
||||
import cn.hutool.extra.template.TemplateEngine;
|
||||
import cn.hutool.extra.template.TemplateUtil;
|
||||
import me.zhengjie.modules.tools.domain.VerificationCode;
|
||||
import me.zhengjie.modules.tools.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.vo.EmailVo;
|
||||
import me.zhengjie.domain.VerificationCode;
|
||||
import me.zhengjie.exception.BadRequestException;
|
||||
import me.zhengjie.modules.tools.repository.VerificationCodeRepository;
|
||||
import me.zhengjie.modules.tools.service.VerificationCodeService;
|
||||
import me.zhengjie.repository.VerificationCodeRepository;
|
||||
import me.zhengjie.service.VerificationCodeService;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
|
@ -1,8 +1,8 @@
|
|||
package me.zhengjie.modules.tools.service.mapper;
|
||||
package me.zhengjie.service.mapper;
|
||||
|
||||
import me.zhengjie.base.BaseMapper;
|
||||
import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.modules.tools.domain.LocalStorage;
|
||||
import me.zhengjie.service.dto.LocalStorageDTO;
|
||||
import me.zhengjie.domain.LocalStorage;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.ReportingPolicy;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.utils;
|
||||
package me.zhengjie.utils;
|
||||
|
||||
/**
|
||||
* 支付状态
|
|
@ -1,8 +1,8 @@
|
|||
package me.zhengjie.modules.tools.utils;
|
||||
package me.zhengjie.utils;
|
||||
|
||||
import com.alipay.api.AlipayApiException;
|
||||
import com.alipay.api.internal.util.AlipaySignature;
|
||||
import me.zhengjie.modules.tools.domain.AlipayConfig;
|
||||
import me.zhengjie.domain.AlipayConfig;
|
||||
import org.springframework.stereotype.Component;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.SimpleDateFormat;
|
|
@ -1,4 +1,4 @@
|
|||
package me.zhengjie.modules.tools.utils;
|
||||
package me.zhengjie.utils;
|
||||
|
||||
import com.qiniu.storage.Region;
|
||||
import me.zhengjie.utils.FileUtil;
|
Loading…
Reference in New Issue