修复已知bug，调整代码结构

YuwangLiu · Sep 11, 2020 · 7bee117 · 7bee117
1 parent 45ba831
commit 7bee117
Show file tree

Hide file tree

Showing 24 changed files with 152 additions and 75 deletions.
diff --git a/applet/pom.xml b/applet/pom.xml
@@ -3,14 +3,14 @@
          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>tropical_fish</artifactId>
         <groupId>com.mcoding</groupId>
+        <artifactId>tropical_fish</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>applet</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>applet</name>
@@ -26,15 +26,15 @@
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>base-core</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.mcoding</groupId>
+            <artifactId>biz-component</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>biz-user</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

diff --git a/...activityorder/ActivityCodeController.java → ...der/component/ActivityCodeController.java b/...activityorder/ActivityCodeController.java → ...der/component/ActivityCodeController.java
@@ -1,8 +1,7 @@
-package com.mcoding.modular.biz.activityorder;
+package com.mcoding.applet.order.component;
 
 import com.alibaba.fastjson.JSON;
 import com.mcoding.base.core.rest.ResponseResult;
-import com.mcoding.modular.biz.activityorder.domain.ActivityOrderBizCodeGenerator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +15,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+;
+
 /**
  * @author wzt on 2020/2/9.
  * @version 1.0

diff --git a/...domain/ActivityOrderBizCodeGenerator.java → ...ponent/ActivityOrderBizCodeGenerator.java b/...domain/ActivityOrderBizCodeGenerator.java → ...ponent/ActivityOrderBizCodeGenerator.java
@@ -1,9 +1,8 @@
-package com.mcoding.modular.biz.activityorder.domain;
+package com.mcoding.applet.order.component;
 
 import com.google.common.collect.Range;
 import com.mcoding.base.common.exception.BizException;
-import com.mcoding.modular.biz.generatecode.contant.TargetCodeEnum;
-import com.mcoding.modular.biz.generatecode.domain.CommonBizCodeGenerator;
+import com.mcoding.base.component.generatecode.domain.CommonBizCodeGenerator;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

diff --git a/.../generatecode/contant/TargetCodeEnum.java → ...pplet/order/component/TargetCodeEnum.java b/.../generatecode/contant/TargetCodeEnum.java → ...pplet/order/component/TargetCodeEnum.java
@@ -1,4 +1,4 @@
-package com.mcoding.modular.biz.generatecode.contant;
+package com.mcoding.applet.order.component;
 
 /**
  * @author wzt on 2020/2/9.

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>backend</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>backend</name>
@@ -26,15 +26,11 @@
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>base-core</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>biz-user</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

diff --git a/base-common/pom.xml b/base-common/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>base-common</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>base-common</name>

diff --git a/base-core/pom.xml b/base-core/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>base-core</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>base-core</name>
@@ -21,11 +21,9 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>base-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <!-- spring 框架-->

diff --git a/base-generator/pom.xml b/base-generator/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>base-generator</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>base-generator</name>

diff --git a/base-generator/src/main/java/com/mcoding/base/generator/CodeGenerator.java b/base-generator/src/main/java/com/mcoding/base/generator/CodeGenerator.java
@@ -23,10 +23,10 @@
  */
 public class CodeGenerator {
 
-    static String URL = "jdbc:mysql://192.168.126.81:3307/mc_center?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true";
+    static String URL = "jdbc:mysql://mysql.dev.vv-che.com:3306/vv_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true";
     static String DRIVER = "com.mysql.jdbc.Driver";
-    static String USERNAME = "root";
-    static String PASSWORD = "Root@123";
+    static String USERNAME = "vvdev";
+    static String PASSWORD = "XFcWOBSOqJ7mzFEC";
 
     /**
      * <p>

diff --git a/biz-component/pom.xml b/biz-component/pom.xml
@@ -2,40 +2,36 @@
 <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">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>tropical_fish</artifactId>
         <groupId>com.mcoding</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <name>biz-component</name>
     <artifactId>biz-component</artifactId>
-
-    <version>0.0.1-SNAPSHOT</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
-    <name>biz-component</name>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>com.mcoding</groupId>
             <artifactId>base-core</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
 </project>
diff --git a/...ponent/src/main/java/com.mcoding.base.component/generatecode/dao/BaseGenerateCodeDao.java b/...ponent/src/main/java/com.mcoding.base.component/generatecode/dao/BaseGenerateCodeDao.java
@@ -1,8 +1,8 @@
-package com.mcoding.modular.biz.generatecode.dao;
+package com.mcoding.base.component.generatecode.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
 
 /**
  * <p>

diff --git a/.../src/main/java/com.mcoding.base.component/generatecode/domain/CommonBizCodeGenerator.java b/.../src/main/java/com.mcoding.base.component/generatecode/domain/CommonBizCodeGenerator.java
@@ -1,7 +1,7 @@
-package com.mcoding.modular.biz.generatecode.domain;
+package com.mcoding.base.component.generatecode.domain;
 
 import com.google.common.collect.Range;
-import com.mcoding.modular.biz.generatecode.service.BaseGenerateCodeService;
+import com.mcoding.base.component.generatecode.service.BaseGenerateCodeService;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/...ponent/src/main/java/com.mcoding.base.component/generatecode/entity/BaseGenerateCode.java b/...ponent/src/main/java/com.mcoding.base.component/generatecode/entity/BaseGenerateCode.java
@@ -1,4 +1,4 @@
-package com.mcoding.modular.biz.generatecode.entity;
+package com.mcoding.base.component.generatecode.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

diff --git a/...rc/main/java/com.mcoding.base.component/generatecode/service/BaseGenerateCodeService.java b/...rc/main/java/com.mcoding.base.component/generatecode/service/BaseGenerateCodeService.java
@@ -1,8 +1,9 @@
-package com.mcoding.modular.biz.generatecode.service;
+package com.mcoding.base.component.generatecode.service;
+
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
 
 import java.util.List;
 

diff --git a/...ava/com.mcoding.base.component/generatecode/service/impl/BaseGenerateCodeServiceImpl.java b/...ava/com.mcoding.base.component/generatecode/service/impl/BaseGenerateCodeServiceImpl.java
@@ -1,13 +1,14 @@
-package com.mcoding.modular.biz.generatecode.service.impl;
+package com.mcoding.base.component.generatecode.service.impl;
+
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mcoding.base.common.exception.CommonException;
+import com.mcoding.base.component.generatecode.dao.BaseGenerateCodeDao;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.service.BaseGenerateCodeService;
+import com.mcoding.base.component.generatecode.strategy.GenerateStrategy;
 import com.mcoding.base.core.spring.SpringContextHolder;
-import com.mcoding.modular.biz.generatecode.dao.BaseGenerateCodeDao;
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
-import com.mcoding.modular.biz.generatecode.service.BaseGenerateCodeService;
-import strategy.GenerateStrategy;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...src/main/java/com.mcoding.base.component/generatecode/strategy/AutoIncrementStrategy.java b/...src/main/java/com.mcoding.base.component/generatecode/strategy/AutoIncrementStrategy.java
@@ -1,7 +1,7 @@
-package strategy;
+package com.mcoding.base.component.generatecode.strategy;
 
 import com.mcoding.base.common.exception.CommonException;
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 

diff --git a/...src/main/java/com.mcoding.base.component/generatecode/strategy/DateIncrementStrategy.java b/...src/main/java/com.mcoding.base.component/generatecode/strategy/DateIncrementStrategy.java
@@ -1,9 +1,9 @@
-package strategy;
+package com.mcoding.base.component.generatecode.strategy;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.mcoding.base.common.exception.CommonException;
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 

diff --git a/...nent/src/main/java/com.mcoding.base.component/generatecode/strategy/GenerateStrategy.java b/...nent/src/main/java/com.mcoding.base.component/generatecode/strategy/GenerateStrategy.java
@@ -1,7 +1,7 @@
-package strategy;
+package com.mcoding.base.component.generatecode.strategy;
 
 
-import com.mcoding.modular.biz.generatecode.entity.BaseGenerateCode;
+import com.mcoding.base.component.generatecode.entity.BaseGenerateCode;
 
 /**
  * 编码生成策略

diff --git a/biz-component/src/main/resources/application-dev.properties b/biz-component/src/main/resources/application-dev.properties
@@ -0,0 +1,37 @@
+spring.datasource.druid.url=jdbc:mysql://47.95.192.230:3306/mcoding?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.druid.username=root
+spring.datasource.druid.password=root
+spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.maxActive=20
+spring.datasource.druid.maxWait=60000
+spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+spring.datasource.druid.minEvictableIdleTimeMillis=300000
+spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.druid.connection-init-sqls=set names utf8mb4
+spring.datasource.druid.testWhileIdle=true
+spring.datasource.druid.testOnBorrow=false
+spring.datasource.druid.testOnReturn=false
+spring.datasource.druid.poolPreparedStatements=true
+spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
+spring.datasource.druid.filters=stat,wall,slf4j
+spring.datasource.druid.connectionProperties=druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+
+spring.datasource.druid.filter.stat.enabled=true
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.web-stat-filter.url-pattern=/*
+spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*
+
+spring.datasource.druid.stat-view-servlet.enabled=true
+spring.datasource.druid.stat-view-servlet.url-pattern=/druid/*
+spring.datasource.druid.stat-view-servlet.allow=
+spring.datasource.druid.stat-view-servlet.deny=
+spring.datasource.druid.stat-view-servlet.reset-enable=false
+spring.datasource.druid.stat-view-servlet.login-username=druid
+spring.datasource.druid.stat-view-servlet.login-password=druid#123456
+
+spring.redis.redisson.config=classpath:prop/redisson-dev.yaml
+spring.session.store-type=redis
+spring.session.timeout.seconds=900
+
diff --git a/biz-component/src/main/resources/application.properties b/biz-component/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+spring.application.name=biz-component
+server.port=8088
+server.servlet.context-path=/biz-component
+
+spring.profiles.active=dev
+spring.mvc.servlet.load-on-startup=1
+
+spring.main.allow-bean-definition-overriding=true
+spring.jackson.serialization.write-dates-as-timestamps: true
+
+mybatis.mapper-locations=classpath:mapper/*.xml
+
+mybatis-plus.configuration.log-impl=com.mcoding.base.core.log.MybatisLogImpl
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
diff --git a/biz-component/src/main/resources/prop/redisson-dev.yaml b/biz-component/src/main/resources/prop/redisson-dev.yaml
@@ -0,0 +1,23 @@
+singleServerConfig:
+  address: "redis://47.95.192.230:6379"
+  password: redis#123
+  clientName: fish_api_dev
+  database: 0
+  idleConnectionTimeout: 10000
+  pingTimeout: 1000
+  connectTimeout: 3000
+  timeout: 5000
+  retryAttempts: 3
+  retryInterval: 1500
+  subscriptionsPerConnection: 5
+  subscriptionConnectionMinimumIdleSize: 1
+  subscriptionConnectionPoolSize: 50
+  connectionMinimumIdleSize: 8
+  connectionPoolSize: 16
+  dnsMonitoringInterval: 5000
+
+threads: 0
+nettyThreads: 0
+codec:
+  class: "org.redisson.codec.JsonJacksonCodec"
+transportMode: "NIO"