切换数据源

pom.xml

@@ -36,12 +36,28 @@
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
 
+
     <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-db</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>8.0.25</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>mybatis-plus-boot-starter</artifactId>
+      <scope>compile</scope>
+      <version>3.4.3.4</version>
     </dependency>
 
+    <!--mybatis-plus代码生成器-->
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>mybatis-plus-generator</artifactId>
+      <scope>compile</scope>
+      <version>3.5.1</version>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

src/main/java/com/fdkankan/manage/config/MybatisPlusPageConfig.java

@@ -0,0 +1,22 @@
+package com.fdkankan.manage.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class MybatisPlusPageConfig {
+
+    /**
+     * mybatisPlus配置分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -91,10 +91,10 @@ public class SaTokenConfigure {
     }
 
 
-    // Sa-Token 整合 jwt
-    //Stateless 无状态模式 纯jwt
-    //Mixin 混入模式 jwt 与 Redis 逻辑混合
-    //Simple 简单模式   Token风格替换
+    //Sa-Token    整合 jwt
+    //Stateless   无状态模式 纯jwt
+    //Mixin       混入模式 jwt 与 Redis 逻辑混合
+    //Simple      简单模式   Token风格替换
     @Bean
     public StpLogic getStpLogicJwt() {
         return new StpLogicJwtForMixin();

src/main/java/com/fdkankan/manage/controller/InvoiceController.java

@@ -58,7 +58,7 @@ public class InvoiceController {
     public ResultData invoiceRegister(
         @RequestParam("id") Long id, @RequestParam("invoiceNum") String invoiceNum, String shipNum,
         @RequestParam(value = "file", required = false) MultipartFile file) throws Exception{
-        return invoiceService.invoiceRegister((Long) StpUtil.getLoginId(), id, invoiceNum, shipNum, file);
+        return invoiceService.invoiceRegister(Long.valueOf( StpUtil.getLoginId().toString()), id, invoiceNum, shipNum, file);
     }
 
     /**

src/main/java/com/fdkankan/manage/entity/InvoiceRegister.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fdkankan.db.base.BaseEntity;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;

src/main/java/com/fdkankan/manage/entity/News.java

@@ -1,10 +1,7 @@
 package com.fdkankan.manage.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fdkankan.db.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.sql.Blob;
 import java.util.Date;
@@ -22,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_news")
-public class News extends BaseEntity {
+public class News  {
 
     private static final long serialVersionUID = 1L;
 
@@ -88,4 +85,35 @@ public class News extends BaseEntity {
      */
     @TableField("top_time")
     private Date topTime;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改人id
+     */
+    @TableField("updater_id")
+    private Long updaterId;
+    /**
+     * 修改人id
+     */
+    @TableField("creater_id")
+    private Long createrId;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0-有效，1-删除, 2-禁用
+     */
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
 }

src/main/java/com/fdkankan/manage/vo/PageNewsVO.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fdkankan.db.base.BaseEntity;
 import java.sql.Blob;
 import java.util.Date;
 import lombok.Data;

src/main/java/com/fdkankan/manage/vo/SaveNewsParamVO.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fdkankan.db.base.BaseEntity;
 import java.sql.Blob;
 import java.util.Date;
 import javax.validation.constraints.NotBlank;

src/main/resources/bootstrap-dev.yml

@@ -1,43 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-manage
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4
-        extension-configs:
-          - data-id: 4dkankan-center-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config-52.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-satoken-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}
-
-
-

src/main/resources/bootstrap-pro.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-manage
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.18.157.42:8848
-        file-extension: yaml
-        namespace: 4dkankan-pro
-        extension-configs:
-          - data-id: 4dkankan-center-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 172.18.157.42:8848
-        namespace: 4dkankan-pro
-
-
-
-

src/main/resources/bootstrap-test.yml

@@ -12,10 +12,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: common-redis-config-52.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -31,10 +27,6 @@ spring:
           - data-id: common-mongodb-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-
-          - data-id: common-satoken-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}