去除jpa依赖，部分不相关的代码去除。

TWAcoco · Aug 30, 2021 · f8c1e9d · f8c1e9d
1 parent 74f9250
commit f8c1e9d
Show file tree

Hide file tree

Showing 142 changed files with 137 additions and 1,038 deletions.
diff --git a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
@@ -6,7 +6,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -17,7 +16,6 @@
  * @since 2020/11/16 10:03 下午
  */
 @SpringBootApplication
-@EnableJpaAuditing
 @EnableCaching
 @EnableAsync
 public class BuyerApiApplication {

diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml
@@ -34,11 +34,6 @@ spring:
       max-request-size: 20MB
   cache:
     type: redis
-  #JPA
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   #jackson json解析
   jackson:
     time-zone: GMT+8

diff --git a/buyer-api/src/test/resources/application.yml b/buyer-api/src/test/resources/application.yml
@@ -40,10 +40,6 @@ spring:
   #amqp
   #  rabbitmq:
   #    host: 192.168.0.116
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 192.168.0.116

diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml
@@ -39,11 +39,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 127.0.0.1

diff --git a/config/application.yml b/config/application.yml
@@ -37,10 +37,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 192.168.0.116

diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml
@@ -42,11 +42,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 127.0.0.1

diff --git a/framework/pom.xml b/framework/pom.xml
@@ -63,11 +63,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
-        <!-- JPA -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
 <!--        &lt;!&ndash; Websocket &ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
@@ -102,26 +97,6 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>${knife4j.version}</version>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-swagger-ui</artifactId>-->
-        <!--            <version>${swagger-version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>guava</artifactId>-->
-        <!--                    <groupId>com.google.guava</groupId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>javassist</artifactId>-->
-        <!--                    <groupId>org.javassist</groupId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-swagger2</artifactId>-->
-        <!--            <version>${swagger-version}</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
@@ -156,22 +131,6 @@
             <artifactId>beetl</artifactId>
             <version>${beetl-version}</version>
         </dependency>
-        <!-- Minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jsr305</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- 阿里云核心包-->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -229,13 +188,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <!--            <scope>test</scope>-->
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.junit.vintage</groupId>-->
-            <!--                    <artifactId>junit-vintage-engine</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
         </dependency>
 
         <!-- 解决版本提示问题 -->

diff --git a/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
@@ -1,8 +1,8 @@
 package cn.lili.common.security.token;
 
-import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import org.apache.commons.codec.binary.Base64;
 
 import javax.crypto.SecretKey;
 

diff --git a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
@@ -18,7 +18,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration;
 
-import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.List;
@@ -40,7 +39,6 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
 
     @Override
     @Bean
-    @Nonnull
     public RestHighLevelClient elasticsearchClient() {
         RestClientBuilder restBuilder = RestClient
                 .builder(this.getHttpHosts());

diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.connect.entity;
 
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,33 +14,20 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * @author Chopper
  */
 @Data
-@Entity
-@Table(name = "li_connect")
 @TableName("li_connect")
 @ApiModel(value = "联合登陆")
 @NoArgsConstructor
-public class Connect implements Serializable {
+public class Connect extends IdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
 
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
@@ -48,7 +36,7 @@ public class Connect implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
@@ -8,17 +8,13 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author Chopper
  */
 @Data
-@Entity
-@Table(name = "li_connect_config")
 @TableName("li_connect_config")
 @ApiModel(value = "联合登陆配置")
 @NoArgsConstructor

diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
@@ -10,8 +10,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
@@ -22,10 +20,8 @@
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销员")
 @TableName("li_distribution")
-@Table(name = "li_distribution")
 @NoArgsConstructor
 public class Distribution extends BaseEntity {
 

diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
@@ -12,8 +12,6 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -23,8 +21,6 @@
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
-@Table(name = "li_distribution_cash")
 @TableName("li_distribution_cash")
 @ApiModel(value = "分销佣金")
 @NoArgsConstructor
@@ -48,7 +44,7 @@ public class DistributionCash extends BaseEntity {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "支付时间")
     private Date payTime;
 

diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java
@@ -3,9 +3,9 @@
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -17,10 +17,6 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -33,30 +29,21 @@
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销商品")
-@Table(name = "li_distribution_goods")
 @TableName("li_distribution_goods")
 @NoArgsConstructor
-public class DistributionGoods {
+public class DistributionGoods extends IdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建者", hidden = true)
     private String createBy;
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -73,7 +60,6 @@ public class DistributionGoods {
     private String skuId;
 
     @ApiModelProperty(value = "规格信息json", hidden = true)
-    @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String specs;