publish 0.4.1

This reverts commit f0493cea

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.1</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-db-migration</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.3.0</version>
+                <version>0.4.1</version>
             </dependency>
 
             <dependency>
@@ -135,12 +135,13 @@
             <plugins>
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
-                    <artifactId>launcher-maven-plugin</artifactId>
-                    <version>0.0.2</version>
+                    <artifactId>tiesheng-maven-plugin</artifactId>
+                    <version>0.0.3</version>
                     <executions>
                         <execution>
                             <goals>
-                                <goal>initScript</goal>
+                                <goal>initStartScript</goal>
+                                <goal>mysqlComparison</goal>
                             </goals>
                         </execution>
                     </executions>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
@@ -16,6 +16,8 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!--     该模块不发布到maven仓库   -->
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>
@@ -36,7 +38,7 @@
         <plugins>
             <plugin>
                 <groupId>com.tiesheng.springboot-plugin</groupId>
-                <artifactId>launcher-maven-plugin</artifactId>
+                <artifactId>tiesheng-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

springboot-ademo/src/main/resources/application.yml

@@ -18,4 +18,4 @@ spring:
 ## 日志
 logging:
   file:
-    name: logs/tiesheng.log
+    name: runtime/logs/tiesheng.log

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-annotation/src/main/java/com/tiesheng/annotation/token/TokenIgnore.java

@@ -5,7 +5,7 @@ import java.lang.annotation.*;
 /**
  * @author hao
  */
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD,ElementType.TYPE})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TokenIgnore {

springboot-db-migration/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-db-migration</artifactId>

springboot-db-migration/src/main/java/com/tiesheng/migration/config/DbMigrationConfig.java

@@ -21,7 +21,7 @@ public class DbMigrationConfig {
 
     private String table = "core_config_db";
     private List<String> locations = CollUtil.newArrayList("classpath*:db/migration/*.sql");
-    private String ignoreSqls = "drop,delete";
+    private String ignoreSqls = "drop table,delete from";
 
     /**
      * 检查数据库是否存在

springboot-db-migration/src/main/java/com/tiesheng/migration/service/DbMigrationInitializer.java

@@ -91,7 +91,7 @@ public class DbMigrationInitializer implements ServletContextInitializer {
                 if (StrUtil.isEmpty(sql)) {
                     continue;
                 }
-                if (StrUtil.startWithAnyIgnoreCase(sql, StrUtil.splitToArray(dbMigrationConfig.getIgnoreSqls(), ","))) {
+                if (StrUtil.containsAnyIgnoreCase(sql, StrUtil.splitToArray(dbMigrationConfig.getIgnoreSqls(), ","))) {
                     continue;
                 }
                 try {

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java

@@ -46,6 +46,12 @@ public class TsTokenAspect {
     @Before("methodArgs()")
     public void before(JoinPoint joinPoint) {
 
+        Object aThis = joinPoint.getTarget();
+        TokenIgnore annotation = aThis.getClass().getAnnotation(TokenIgnore.class);
+        if (annotation != null) {
+            return;
+        }
+
         // 过滤不要需要验证的接口
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/config/Ip2regionConfig.java

@@ -18,7 +18,7 @@ import java.io.RandomAccessFile;
 public class Ip2regionConfig {
 
     private String dbUrl = "http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master/ipdb/ip2region.db";
-    private String dbPath = System.getProperty("user.dir") + "/config/ip2region.db";
+    private String dbPath = System.getProperty("user.dir") + "/runtime/ip2region.db";
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.1</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>