publish 0.8.3

.gitignore

@@ -5,3 +5,4 @@ rebel.xml
 *.iml
 /static/
 /config/
+/runtime/

.gitlab-ci.yml

@@ -16,4 +16,3 @@ deploy-jar:
     - git add .
     - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
     - git push origin master
-

CHANGELOG.md

@@ -0,0 +1,25 @@
+## 0.8.0
+
+### 调整
+
+> 1，移除**PasswordUtil**类，新增**EncryptConfig**配置；  
+> 2，默认启用网络请求的加解密，前端请配合接口使用。  
+
+## 0.7.4
+
+### 新增
+
+> 现在操作日志默认收集（不包括GET请求）：使用方法名称和接口作为参数存储。如果存在OperationLog注解，则使用注解的内容。
+
+## 0.7.3
+
+### 增加
+
+> 1，TsTokenConfig增加新的属性**ignorePaths**，用于通过路径忽略token；  
+> 2，PasswordUtils增加密码复杂度校验方法；  
+> 3，PasswordUtils.verifyPassword增加登录次数限制：10分钟内不能错误6次；
+>
+
+### 调整
+
+> 1，TsTokenConfig中的**ignores**属性调整为**testMap**；  

README.md

@@ -0,0 +1,4 @@
+## 杭州铁晟科技有限公司基础项目
+
+更新日志可点击查看[changelog](./CHANGELOG.md ':include')
+

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.4.1</version>
+    <version>0.8.3</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -19,7 +19,7 @@
 
     <modules>
         <module>springboot-ademo</module>
-        <module>springboot-db-migration</module>
+        <module>springboot-database</module>
         <module>springboot-login</module>
         <module>springboot-web</module>
         <module>springboot-util</module>
@@ -56,56 +56,56 @@
         <dependencies>
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
-                <artifactId>springboot-db-migration</artifactId>
-                <version>0.4.1</version>
+                <artifactId>springboot-database</artifactId>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.4.1</version>
+                <version>0.8.3</version>
             </dependency>
 
             <dependency>
@@ -136,12 +136,13 @@
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.3</version>
+                    <version>0.0.5</version>
                     <executions>
                         <execution>
                             <goals>
                                 <goal>initStartScript</goal>
                                 <goal>mysqlComparison</goal>
+                                <goal>mysqlDoc</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.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>

springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java

@@ -3,6 +3,7 @@ package com.tiesheng.demo;
 
 import com.tiesheng.core.EnableTieshengWeb;
 import com.tiesheng.demo.config.DemoWebConfigurer;
+import com.tiesheng.encrypt.EnableEncryptConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @SpringBootApplication
 @EnableTieshengWeb(webConfigurer = DemoWebConfigurer.class)
+@EnableEncryptConfig
 public class DemoApplication {
 
     public static void main(String[] args) {

springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java

@@ -1,7 +1,7 @@
 package com.tiesheng.demo.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.core.service.TieshengWebConfigurer;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -19,8 +19,11 @@ public class DemoWebConfigurer implements TieshengWebConfigurer {
     GlobalConfig globalConfig;
 
     @Override
-    public CurrentWebUser getCurrentUserName(TokenBean tokenBean) {
-        return null;
+    public RequestUserInfo getCurrentUserName(TokenBean tokenBean) {
+        RequestUserInfo info = new RequestUserInfo();
+        info.setId("1");
+        info.setName("test");
+        return info;
     }
 
     @Override

springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java

@@ -1,13 +1,17 @@
 package com.tiesheng.demo.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.log.LogFactory;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.demo.pojos.TestFile;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.config.aliyun.AliyunSmsConfig;
 import com.tiesheng.message.pojos.MessageReqResp;
+import com.tiesheng.util.config.EncryptConfig;
 import com.tiesheng.util.config.GlobalConfig;
+import com.tiesheng.util.config.Ip2regionConfig;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.util.pojos.FileUploadPath;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @author hao
@@ -29,6 +34,11 @@ public class TestController {
     AliyunSmsConfig aliyunSmsConfig;
     @Autowired
     TsTokenConfig tsTokenConfig;
+    @Autowired
+    Ip2regionConfig ip2regionConfig;
+    @Autowired
+    EncryptConfig encryptConfig;
+
 
     @RequestMapping("/index")
     @TokenIgnore
@@ -43,13 +53,12 @@ public class TestController {
     @RequestMapping("/redirect")
     @TokenIgnore
     public void redirect(HttpServletResponse response) {
-        tsTokenConfig.validToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2NzYwMDY4NzUsImlkIjoiMSIsImVudmlyb25tZW50VHlwZSI6Im1vYmlsZSIsInNlcnZpY2UiOiJjb250ZXN0LXJlc2VydmUiLCJleHRyYSI6IiJ9.nsfxEFpCNHC7eNCS5DJXdu1VDdnHrTjSfgrozND70Lc", true);
+//        tsTokenConfig.validToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2NzYwMDY4NzUsImlkIjoiMSIsImVudmlyb25tZW50VHlwZSI6Im1vYmlsZSIsInNlcnZpY2UiOiJjb250ZXN0LXJlc2VydmUiLCJleHRyYSI6IiJ9.nsfxEFpCNHC7eNCS5DJXdu1VDdnHrTjSfgrozND70Lc", true);
 //        globalConfig.redirect("mobile", "/test", response);
     }
 
 
     @RequestMapping("/send")
-    @TokenIgnore
     public ApiResp<MessageReqResp> sendMessage() {
         MessageReqResp reqResp = aliyunSmsConfig.sendSms("13567116463", "SMS_154950909",
                 JSONUtil.createObj().putOpt("code", "123456"));
@@ -80,4 +89,33 @@ public class TestController {
         return ApiResp.respOK(uploadPath.getAbsolutePath());
     }
 
+
+    @RequestMapping("searchIP")
+    @TokenIgnore
+    public ApiResp<String> searchIp() {
+        String search = ip2regionConfig.search("127.0.0.1");
+        return ApiResp.respOK(search);
+    }
+
+
+    @RequestMapping("desensitize")
+    @TokenIgnore
+    public ApiResp<List<TestFile>> desensitize() {
+        TestFile file = new TestFile("11111");
+        TestFile file1 = new TestFile("22222");
+        return ApiResp.respOK(CollUtil.newArrayList(file, file1));
+    }
+
+
+    @RequestMapping("passwd")
+    @TokenIgnore
+    public ApiResp<String> passwd() {
+
+        String passwdCreate = encryptConfig.passwdCreate("12345Zeng!", "");
+        LogFactory.get().info(passwdCreate);
+        encryptConfig.passwdVerify("12345Zeng!", passwdCreate);
+
+        return ApiResp.respOK("");
+    }
+
 }

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java

@@ -1,27 +1,27 @@
-//package com.tiesheng.demo.pojos;
-//
-//import com.alibaba.excel.annotation.ExcelProperty;
-//import com.tiesheng.poi.pojos.PoiWriteBase;
-//
-//public class TestFile implements PoiWriteBase {
-//
-//
-//    @ExcelProperty("测试")
-//    private String test;
-//
-//    public TestFile(String test) {
-//        this.test = test;
-//    }
-//
-//    ///////////////////////////////////////////////////////////////////////////
-//    // setter、getter
-//    ///////////////////////////////////////////////////////////////////////////
-//
-//    public String getTest() {
-//        return test;
-//    }
-//
-//    public void setTest(String test) {
-//        this.test = test;
-//    }
-//}
+package com.tiesheng.demo.pojos;
+
+import com.tiesheng.annotation.desensitize.Desensitize;
+import com.tiesheng.poi.pojos.PoiWriteBase;
+
+public class TestFile implements PoiWriteBase {
+
+
+    @Desensitize()
+    private String test;
+
+    public TestFile(String test) {
+        this.test = test;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter、getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTest() {
+        return test;
+    }
+
+    public void setTest(String test) {
+        this.test = test;
+    }
+}

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

@@ -16,7 +16,7 @@ platform:
 
 tiesheng:
   token:
-    ignores:
+    test-map:
       "1111":
         id: "1111"
   global:

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

@@ -1,6 +1,7 @@
 server:
   compression:
     enabled: true
+  port: 8100
 
 ## Spring配置
 spring:

springboot-annotation/pom.xml

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

springboot-annotation/src/main/java/com/tiesheng/annotation/desensitize/Desensitize.java

@@ -0,0 +1,16 @@
+package com.tiesheng.annotation.desensitize;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author hao
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Desensitize {
+
+    int prefix() default 1;
+
+    int suffix() default 1;
+
+}

springboot-annotation/src/main/java/com/tiesheng/annotation/encrypt/EncryptedRespBody.java

@@ -1,12 +0,0 @@
-package com.tiesheng.annotation.encrypt;
-
-import java.lang.annotation.*;
-
-/**
- * @author hao
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface EncryptedRespBody {
-}

springboot-database/pom.xml

@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
-    <artifactId>springboot-db-migration</artifactId>
+    <artifactId>springboot-database</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-database/src/main/java/com/tiesheng/database/DatabaseAutoConfigurer.java

@@ -0,0 +1,12 @@
+package com.tiesheng.database;
+
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @author hao
+ */
+@ComponentScan({
+        "com.tiesheng.database.**.*"
+})
+public class DatabaseAutoConfigurer {
+}

springboot-database/src/main/java/com/tiesheng/database/config/DbBackupConfig.java

@@ -0,0 +1,72 @@
+package com.tiesheng.database.config;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.RuntimeUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.log.LogFactory;
+import com.tiesheng.database.utls.TieshengDbUtil;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Date;
+
+/**
+ * @author hao
+ */
+@Configuration
+@ConfigurationProperties(prefix = "tiesheng.db-backup")
+public class DbBackupConfig {
+
+    /**
+     * 数据库备份的路径
+     */
+    private String path = "/root/backup/";
+
+    /**
+     * 备份文件的时间格式
+     */
+    private String format = "yyyyMMdd";
+
+
+    public void dbBackup() {
+        String url = SpringUtil.getProperty("spring.datasource.url");
+        String username = SpringUtil.getProperty("spring.datasource.username");
+        String password = SpringUtil.getProperty("spring.datasource.password");
+        String dbName = TieshengDbUtil.getTableSchema(url);
+
+        try {
+            String saveFile = StrUtil.format("{}{}/{}.sql", getPath(), dbName, DateUtil.format(new Date(), format));
+            FileUtil.mkParentDirs(saveFile);
+            String cmd = StrUtil.format("mysqldump -u{} -p {} > {}", username, dbName, saveFile);
+            LogFactory.get().info("cmd: " + cmd);
+            String forStr = RuntimeUtil.execForStr(cmd);
+            LogFactory.get().info("dbBackup: " + forStr);
+            forStr = RuntimeUtil.execForStr(password);
+            LogFactory.get().info("dbBackup: " + forStr);
+        } catch (Exception ignored) {
+        }
+
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = format;
+    }
+}

springboot-database/src/main/java/com/tiesheng/database/config/DbMigrationConfig.java

@@ -1,4 +1,4 @@
-package com.tiesheng.migration.config;
+package com.tiesheng.database.config;
 
 
 import cn.hutool.core.collection.CollUtil;

springboot-database/src/main/java/com/tiesheng/database/service/DbDataInitializer.java

@@ -0,0 +1,16 @@
+package com.tiesheng.database.service;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hao
+ */
+@Component
+public interface DbDataInitializer {
+
+    /**
+     * 初始化数据
+     */
+    void init();
+
+}

springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java

@@ -1,15 +1,14 @@
-package com.tiesheng.migration.service;
+package com.tiesheng.database.service;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.func.VoidFunc1;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
-import com.tiesheng.migration.config.DbMigrationConfig;
+import com.tiesheng.database.config.DbMigrationConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.core.io.Resource;
@@ -20,6 +19,8 @@ import javax.servlet.ServletContext;
 import javax.sql.DataSource;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.zip.Checksum;
 
@@ -35,12 +36,17 @@ public class DbMigrationInitializer implements ServletContextInitializer {
     DataSource dataSource;
     @Autowired
     DbMigrationConfig dbMigrationConfig;
+    @Autowired(required = false)
+    List<DbDataInitializer> dbDataInitializerList;
 
 
     @Override
     public void onStartup(ServletContext servletContext) {
         try {
             startDeal();
+            if (dbDataInitializerList != null) {
+                dbDataInitializerList.forEach(DbDataInitializer::init);
+            }
         } catch (Exception ignore) {
         }
     }
@@ -56,14 +62,16 @@ public class DbMigrationInitializer implements ServletContextInitializer {
         dbMigrationConfig.checkDbExists(coreDb);
 
         PathMatchingResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
+        List<Resource> resourceList = new ArrayList<>();
         for (String location : dbMigrationConfig.getLocations()) {
             Resource[] resources = patternResolver.getResources(location);
-            if (ArrayUtil.isEmpty(resources)) {
-                return;
-            }
-            for (Resource resource : resources) {
-                migrationByResource(resource, coreDb);
-            }
+            resourceList.addAll(Arrays.asList(resources));
+        }
+
+        // 排序后执行sql
+        resourceList.sort((o1, o2) -> StrUtil.compare(o1.getFilename(), o2.getFilename(), true));
+        for (Resource resource : resourceList) {
+            migrationByResource(resource, coreDb);
         }
     }
 

springboot-database/src/main/java/com/tiesheng/database/utls/TieshengDbUtil.java

@@ -0,0 +1,17 @@
+package com.tiesheng.database.utls;
+
+import cn.hutool.core.util.StrUtil;
+
+public class TieshengDbUtil {
+
+    /**
+     * 通过url获取table_schema
+     *
+     * @param url
+     * @return
+     */
+    public static String getTableSchema(String url) {
+        return StrUtil.sub(url, url.lastIndexOf('/') + 1, StrUtil.indexOf(url, '?'));
+    }
+
+}

springboot-db-migration/src/main/java/com/tiesheng/migration/MigrationAutoConfigurer.java

@@ -1,12 +0,0 @@
-package com.tiesheng.migration;
-
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * @author hao
- */
-@ComponentScan({
-        "com.tiesheng.migration.**.*"
-})
-public class MigrationAutoConfigurer {
-}

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>
@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15to18</artifactId>
-            <version>1.68</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java

@@ -1,20 +1,21 @@
 package com.tiesheng.encrypt;
 
 
-import com.tiesheng.encrypt.config.EncryptConfig;
-import com.tiesheng.encrypt.config.EncryptRequestBodyAdvice;
+import com.tiesheng.encrypt.config.DecryptRequestBodyAdvice;
 import com.tiesheng.encrypt.config.EncryptResponseBodyAdvice;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
 
 /**
  * @author hao
  */
-@Configuration
-@ComponentScan(basePackageClasses = {
-        EncryptConfig.class,
-        EncryptRequestBodyAdvice.class,
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+@Import({
+        DecryptRequestBodyAdvice.class,
         EncryptResponseBodyAdvice.class,
 })
-public class EnableEncryptConfig {
+public @interface EnableEncryptConfig {
 }

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/DecryptRequestBodyAdvice.java

@@ -3,13 +3,8 @@ package com.tiesheng.encrypt.config;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.ECKeyUtil;
-import cn.hutool.crypto.SmUtil;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.crypto.asymmetric.SM2;
 import cn.hutool.json.JSONUtil;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import com.tiesheng.util.config.EncryptConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpHeaders;
@@ -26,7 +21,7 @@ import java.nio.charset.Charset;
  * @author hao
  */
 @ControllerAdvice
-public class EncryptRequestBodyAdvice implements RequestBodyAdvice {
+public class DecryptRequestBodyAdvice implements RequestBodyAdvice {
 
 
     @Autowired
@@ -42,12 +37,8 @@ public class EncryptRequestBodyAdvice implements RequestBodyAdvice {
     public HttpInputMessage beforeBodyRead(HttpInputMessage inputMessage, MethodParameter parameter, Type targetType,
                                            Class<? extends HttpMessageConverter<?>> converterType) {
 
-        if (!encryptConfig.isEnable()) {
-            return inputMessage;
-        }
-
         try {
-            return new DecryptHttpInputMessage(inputMessage, encryptConfig.getPrivateQ());
+            return new DecryptHttpInputMessage(inputMessage, encryptConfig);
         } catch (Exception ignore) {
         }
 
@@ -72,16 +63,12 @@ public class EncryptRequestBodyAdvice implements RequestBodyAdvice {
         private HttpHeaders headers;
         private InputStream body;
 
-        DecryptHttpInputMessage(HttpInputMessage inputMessage, String privateQ) throws Exception {
+        DecryptHttpInputMessage(HttpInputMessage inputMessage, EncryptConfig encryptConfig) throws Exception {
             this.headers = inputMessage.getHeaders();
             String bodyStr = IoUtil.read(inputMessage.getBody(), CharsetUtil.CHARSET_UTF_8);
             String encryptData = JSONUtil.parseObj(bodyStr).getStr("encryptData");
             if (!StrUtil.isEmpty(encryptData)) {
-                // 部分语言加密之后缺少04前缀，如果解密失败，可尝试增加04
-                ECPrivateKeyParameters privateKeyParameters = ECKeyUtil.toSm2PrivateParams(privateQ);
-                ECPublicKeyParameters publicKeyParameters = ECKeyUtil.getPublicParams(privateKeyParameters);
-                SM2 sm2 = SmUtil.sm2(privateKeyParameters, publicKeyParameters);
-                String decrypt = sm2.decryptStr(encryptData, KeyType.PrivateKey);
+                String decrypt = encryptConfig.decrypt(encryptData);
                 this.body = IoUtil.toStream(decrypt, Charset.defaultCharset());
             } else {
                 this.body = IoUtil.toStream(bodyStr, Charset.defaultCharset());

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptConfig.java

@@ -1,44 +0,0 @@
-package com.tiesheng.encrypt.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author hao
- */
-@Configuration
-@ConfigurationProperties(prefix = "tiesheng.encrypt")
-public class EncryptConfig {
-
-    public String publicD;
-    public String privateQ;
-    private boolean enable = false;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
-
-    public boolean isEnable() {
-        return enable;
-    }
-
-    public void setEnable(boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getPublicD() {
-        return publicD;
-    }
-
-    public void setPublicD(String publicD) {
-        this.publicD = publicD;
-    }
-
-    public String getPrivateQ() {
-        return privateQ;
-    }
-
-    public void setPrivateQ(String privateQ) {
-        this.privateQ = privateQ;
-    }
-}

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java

@@ -1,17 +1,10 @@
 package com.tiesheng.encrypt.config;
 
 import cn.hutool.core.annotation.AnnotationUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.ECKeyUtil;
-import cn.hutool.crypto.SmUtil;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.crypto.asymmetric.SM2;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import cn.hutool.log.LogFactory;
-import com.tiesheng.annotation.encrypt.EncryptedRespBody;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import com.tiesheng.util.CommonUtil;
+import com.tiesheng.util.config.EncryptConfig;
+import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
@@ -19,6 +12,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 
@@ -26,50 +20,30 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
  * @author hao
  */
 @ControllerAdvice
-public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<Object> {
+public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<ApiResp> {
 
     @Autowired
     EncryptConfig encryptConfig;
 
     @Override
     public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
-        return true;
+        return AnnotationUtil.getAnnotation(returnType.getContainingClass(), RestController.class) != null;
     }
 
     @Override
-    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class<? extends
+    public ApiResp beforeBodyWrite(ApiResp body, MethodParameter returnType, MediaType selectedContentType, Class<? extends
             HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 
-        if (!encryptConfig.isEnable()) {
-            return body;
-        }
-
-        boolean encrypt = AnnotationUtil.getAnnotation(returnType.getContainingClass(), EncryptedRespBody.class) != null;
-        if (!encrypt) {
-            return body;
-        }
-
         try {
 
-            String content = JSONUtil.toJsonStr(body);
-            String respData = JSONUtil.parseObj(content).getStr("data");
-
-            if (StrUtil.isEmpty(respData)) {
-                // 无需加密
+            Object data = body.getData();
+            if (data == null || !body.successful()) {
                 return body;
             }
 
-            JSONObject resp = JSONUtil.parseObj(content);
-            resp.set("encrypted", true);
-            if (resp.getInt("code") == 200) {
-                // 用公钥进行加密
-                ECPrivateKeyParameters privateKeyParameters = ECKeyUtil.toSm2PrivateParams(encryptConfig.getPrivateQ());
-                ECPublicKeyParameters publicKeyParameters = ECKeyUtil.getPublicParams(privateKeyParameters);
-                SM2 sm2 = SmUtil.sm2(privateKeyParameters, publicKeyParameters);
-                String decrypt = sm2.encryptHex(respData, KeyType.PublicKey);
-                resp.set("data", decrypt.substring(2));
-            }
-            return resp;
+            body.setEncrypt(true);
+            body.setData(encryptConfig.encrypt(CommonUtil.writeJsonString(data)));
+            return body;
         } catch (Exception var17) {
             LogFactory.get().info("加密数据异常", var17);
         }

springboot-login/pom.xml

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

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

@@ -1,6 +1,8 @@
 package com.tiesheng.login.config.token;
 
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.util.ServletKit;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -46,13 +48,18 @@ public class TsTokenAspect {
     @Before("methodArgs()")
     public void before(JoinPoint joinPoint) {
 
+        // 过滤不要需要验证的接口（path）
+        String requestURI = ServletKit.getRequest().getRequestURI();
+        if (StrUtil.startWithAnyIgnoreCase(requestURI, tsTokenConfig.getIgnorePaths())) {
+            return;
+        }
+
+        // 过滤不要需要验证的接口（注解）
         Object aThis = joinPoint.getTarget();
         TokenIgnore annotation = aThis.getClass().getAnnotation(TokenIgnore.class);
         if (annotation != null) {
             return;
         }
-
-        // 过滤不要需要验证的接口
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         TokenIgnore apiTokenIgnore = method.getAnnotation(TokenIgnore.class);

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

@@ -1,7 +1,6 @@
 package com.tiesheng.login.config.token;
 
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
@@ -24,9 +23,10 @@ import java.util.Map;
 @ConfigurationProperties("tiesheng.token")
 public class TsTokenConfig {
 
-    private Map<String, TokenBean> ignores = MapUtil.newHashMap();
+    private Map<String, TokenBean> testMap = MapUtil.newHashMap();
     private String encryptKey = "%kIp9frQCu";
     private Integer expireHours = 48;
+    private String[] ignorePaths;
 
 
     /**
@@ -57,11 +57,11 @@ public class TsTokenConfig {
      * @param token
      * @return
      */
-    public TokenBean isIgnored(String token) {
-        if (ignores == null) {
+    public TokenBean isTestToken(String token) {
+        if (testMap == null) {
             return null;
         }
-        return ignores.get(token);
+        return testMap.get(token);
     }
 
 
@@ -83,7 +83,7 @@ public class TsTokenConfig {
      * @return
      */
     public TokenBean validToken(String token, boolean thrExp) {
-        TokenBean tokenBean = isIgnored(token);
+        TokenBean tokenBean = isTestToken(token);
         if (tokenBean != null) {
             return tokenBean;
         }
@@ -101,7 +101,8 @@ public class TsTokenConfig {
         }
 
         if (tokenBean == null && thrExp) {
-            throw new ApiException(StrUtil.isEmpty(token) ? "请先登录" : "登录过期，请重新登陆");
+            throw new ApiException(StrUtil.isEmpty(token) ? 110 : 112,
+                    StrUtil.isEmpty(token) ? "请先登录" : "登录过期，请重新登陆");
         }
 
         if (tokenBean == null) {
@@ -116,12 +117,12 @@ public class TsTokenConfig {
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////
 
-    public Map<String, TokenBean> getIgnores() {
-        return ignores;
+    public Map<String, TokenBean> getTestMap() {
+        return testMap;
     }
 
-    public void setIgnores(Map<String, TokenBean> ignores) {
-        this.ignores = ignores;
+    public void setTestMap(Map<String, TokenBean> testMap) {
+        this.testMap = testMap;
     }
 
     public String getEncryptKey() {
@@ -139,4 +140,12 @@ public class TsTokenConfig {
     public void setExpireHours(Integer expireHours) {
         this.expireHours = expireHours;
     }
+
+    public String[] getIgnorePaths() {
+        return ignorePaths;
+    }
+
+    public void setIgnorePaths(String[] ignorePaths) {
+        this.ignorePaths = ignorePaths;
+    }
 }

springboot-login/src/main/java/com/tiesheng/login/config/zust/CasLoginDTO.java

@@ -1,94 +0,0 @@
-package com.tiesheng.login.config.zust;
-
-public class CasLoginDTO {
-
-    private String data;
-
-    /**
-     * 工号
-     */
-    private String casUser;
-
-    /**
-     * 用户容器
-     */
-    private String casUserContainerId;
-
-    /**
-     * 用户姓名
-     */
-    private String casUserCn;
-
-    /**
-     * 用户别名
-     */
-    private String casUserAlias;
-    /**
-     * 用户所在组
-     */
-    private String casUserMemberOf;
-    /**
-     * 用户性别
-     */
-    private String casUserGender;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public String getCasUser() {
-        return casUser;
-    }
-
-    public void setCasUser(String casUser) {
-        this.casUser = casUser;
-    }
-
-    public String getCasUserContainerId() {
-        return casUserContainerId;
-    }
-
-    public void setCasUserContainerId(String casUserContainerId) {
-        this.casUserContainerId = casUserContainerId;
-    }
-
-    public String getCasUserCn() {
-        return casUserCn;
-    }
-
-    public void setCasUserCn(String casUserCn) {
-        this.casUserCn = casUserCn;
-    }
-
-    public String getCasUserAlias() {
-        return casUserAlias;
-    }
-
-    public void setCasUserAlias(String casUserAlias) {
-        this.casUserAlias = casUserAlias;
-    }
-
-    public String getCasUserMemberOf() {
-        return casUserMemberOf;
-    }
-
-    public void setCasUserMemberOf(String casUserMemberOf) {
-        this.casUserMemberOf = casUserMemberOf;
-    }
-
-    public String getCasUserGender() {
-        return casUserGender;
-    }
-
-    public void setCasUserGender(String casUserGender) {
-        this.casUserGender = casUserGender;
-    }
-}

springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java

@@ -9,11 +9,14 @@ import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.login.pojos.CodeExtraDTO;
 import com.tiesheng.login.pojos.DoLoginInfo;
 import com.tiesheng.login.pojos.UniqueIndexDTO;
+import com.tiesheng.login.pojos.WxminiLoginVo;
 import com.tiesheng.login.service.TieshengLoginConfigurer;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
 import com.tiesheng.platform.config.ding.bean.DingJsapiSignature;
 import com.tiesheng.platform.config.ding.bean.DingUserInfo;
+import com.tiesheng.platform.config.wxmini.PlatformWxminiConfig;
 import com.tiesheng.platform.config.wxmp.PlatformWxmpConfig;
+import com.tiesheng.platform.config.wxmp.bean.WxConfigBean;
 import com.tiesheng.platform.config.wxmp.bean.WxJsapiSignature;
 import com.tiesheng.platform.config.wxmp.bean.WxUserInfo;
 import com.tiesheng.util.config.GlobalConfig;
@@ -32,6 +35,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/login")
+@TokenIgnore
 public class LoginController {
 
 
@@ -40,6 +44,8 @@ public class LoginController {
     @Autowired
     PlatformDingConfig platformDingConfig;
     @Autowired
+    PlatformWxminiConfig platformWxminiConfig;
+    @Autowired
     TieshengLoginConfigurer tieshengLoginConfigurer;
     @Autowired
     GlobalConfig globalConfig;
@@ -51,7 +57,6 @@ public class LoginController {
      * @return
      */
     @GetMapping("/unique/redirect")
-    @TokenIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
                 dto.getNo(), "web", dto.getTo(), dto.getInfo()));
@@ -66,7 +71,6 @@ public class LoginController {
      * @return
      */
     @PostMapping("/unique/index")
-    @TokenIgnore
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
                 dto.getNo(), "web", dto.getTo(), dto.getInfo()));
@@ -89,7 +93,6 @@ public class LoginController {
      * @param response
      */
     @GetMapping("/ding/index/{service}")
-    @TokenIgnore
     public void dingIndex(@PathVariable String service, String extra, HttpServletResponse response) {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
@@ -113,7 +116,6 @@ public class LoginController {
      * @param service
      */
     @RequestMapping("/ding/oauth2/{service}")
-    @TokenIgnore
     public void dingOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
         String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
         DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
@@ -131,7 +133,6 @@ public class LoginController {
      * @return
      */
     @GetMapping("/ding/jssdk/{service}")
-    @TokenIgnore
     public ApiResp<DingJsapiSignature> dingJssdk(@PathVariable String service, String url) {
         DingJsapiSignature jsapiSignature = platformDingConfig.createJsapiSignature(service, url);
         return ApiResp.respOK(jsapiSignature);
@@ -149,7 +150,6 @@ public class LoginController {
      * @return
      */
     @RequestMapping("/wxmp/index/{service}")
-    @TokenIgnore
     public void wxmpIndex(@PathVariable String service, String extra, HttpServletResponse response) throws IOException {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
@@ -164,7 +164,6 @@ public class LoginController {
      * 微信授权回调
      */
     @RequestMapping("/wxmp/oauth2/{service}")
-    @TokenIgnore
     public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
         WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(wxUserInfo.getAppId(),
@@ -180,11 +179,34 @@ public class LoginController {
      * @return
      */
     @GetMapping("/wxmp/jssdk/{service}")
-    @TokenIgnore
     public ApiResp<WxJsapiSignature> wxmpJssdk(@PathVariable String service, String url) {
         WxJsapiSignature jsapiSignature = platformWxmpConfig.createJsapiSignature(service, url);
         return ApiResp.respOK(jsapiSignature);
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    // 小程序相关
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 微信小程序登录
+     *
+     * @return
+     */
+    @RequestMapping("/wxmini/index/{service}")
+    public ApiResp<WxminiLoginVo> wxminiIndex(@PathVariable String service, String code) {
+        String openid = platformWxminiConfig.jscode2session(service, code);
+        WxConfigBean configBean = platformWxminiConfig.getConfigBean(service);
+        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(configBean.getAppId(),
+                openid, "wxmini", "mini", "{}"));
+
+        WxminiLoginVo loginVo = new WxminiLoginVo();
+        loginVo.setOpenid(openid);
+        if (tokenBean != null) {
+            loginVo.setToken(tokenBean.toToken());
+        }
+        return ApiResp.respOK(loginVo);
+    }
+
 
 }

springboot-login/src/main/java/com/tiesheng/login/pojos/WxminiLoginVo.java

@@ -0,0 +1,27 @@
+package com.tiesheng.login.pojos;
+
+public class WxminiLoginVo {
+
+    private String openid;
+    private String token;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.4.1</version>
+        <version>0.8.3</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.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-platform/src/main/java/com/tiesheng/platform/config/wxmini/PlatformWxminiConfig.java

@@ -0,0 +1,95 @@
+package com.tiesheng.platform.config.wxmini;
+
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.tiesheng.platform.config.wxmp.bean.WxConfigBean;
+import com.tiesheng.util.exception.ApiException;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+
+/**
+ * @author hao
+ */
+@Configuration
+@ConfigurationProperties(prefix = "platform.wxmini")
+public class PlatformWxminiConfig {
+
+    private WxConfigBean global;
+    private Map<String, WxConfigBean> configs = MapUtil.newHashMap();
+
+    /**
+     * 获取一个DingConfigBean
+     *
+     * @param service
+     * @return
+     */
+    public WxConfigBean getConfigBean(String service) {
+        WxConfigBean bean = configs.get(service);
+        if (bean == null) {
+            bean = global;
+        }
+        if (bean == null) {
+            throw new ApiException("该服务未配置微信小程序授权");
+        }
+        return bean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 业务逻辑
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 通过code获取openid
+     *
+     * @return
+     */
+    public String jscode2session(String service, String code) {
+        WxConfigBean configBean = getConfigBean(service);
+        String body = HttpRequest.get("https://api.weixin.qq.com/sns/jscode2session"
+                + "?appid=" + configBean.getAppId()
+                + "&secret=" + configBean.getAppSecret()
+                + "&js_code=" + code + "&grant_type=authorization_code").execute().body();
+        JSONObject object = JSONUtil.parseObj(body);
+        return object.getStr("openid");
+    }
+
+    /**
+     * 获取access_token
+     *
+     * @return
+     */
+    public String getAccessToken(String service) {
+        WxConfigBean configBean = getConfigBean(service);
+        String body = HttpRequest.get("https://api.weixin.qq.com/cgi-bin/token"
+                + "?grant_type=client_credential&appid=" + configBean.getAppId()
+                + "&secret=" + configBean.getAppSecret()).execute().body();
+        JSONObject object = JSONUtil.parseObj(body);
+        return object.getStr("access_token");
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public Map<String, WxConfigBean> getConfigs() {
+        return configs;
+    }
+
+    public void setConfigs(Map<String, WxConfigBean> configs) {
+        this.configs = configs;
+    }
+
+    public WxConfigBean getGlobal() {
+        return global;
+    }
+
+    public void setGlobal(WxConfigBean global) {
+        this.global = global;
+    }
+}

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.4.1</version>
+        <version>0.8.3</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.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
@@ -25,6 +25,11 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.tiesheng.springboot-parent</groupId>
+            <artifactId>springboot-annotation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -37,6 +42,14 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.78</version>
         </dependency>
+
+        <!--   加解密     -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15to18</artifactId>
+            <version>1.68</version>
+        </dependency>
+
     </dependencies>
 
 </project>

springboot-util/src/main/java/com/tiesheng/util/CommonUtil.java

@@ -0,0 +1,55 @@
+package com.tiesheng.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializeFilter;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.tiesheng.util.config.desensitize.DesensitizeValueFilter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class CommonUtil {
+
+
+    /**
+     * FastJson配置
+     *
+     * @return
+     */
+    public static FastJsonConfig fastJsonConfig() {
+        FastJsonConfig config = new FastJsonConfig();
+        config.setSerializerFeatures(SerializerFeature.WriteMapNullValue,
+                SerializerFeature.WriteNullStringAsEmpty,
+                SerializerFeature.WriteEnumUsingName);
+        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        config.setSerializeFilters(new DesensitizeValueFilter());
+        return config;
+    }
+
+
+    /**
+     * 格式化数据
+     *
+     * @param value
+     * @return
+     * @throws IOException
+     */
+    public static String writeJsonString(Object value) throws IOException {
+        FastJsonConfig fastJsonConfig = fastJsonConfig();
+        SerializeFilter[] globalFilters = fastJsonConfig.getSerializeFilters();
+        List<SerializeFilter> allFilters = new ArrayList(Arrays.asList(globalFilters));
+
+        ByteArrayOutputStream outnew = new ByteArrayOutputStream();
+        JSON.writeJSONStringWithFastJsonConfig(outnew, fastJsonConfig.getCharset(),
+                value, fastJsonConfig.getSerializeConfig(),
+                allFilters.toArray(new SerializeFilter[allFilters.size()]),
+                fastJsonConfig.getDateFormat(), JSON.DEFAULT_GENERATE_FEATURE,
+                fastJsonConfig.getSerializerFeatures());
+        return outnew.toString();
+    }
+
+}

springboot-util/src/main/java/com/tiesheng/util/PasswordUtils.java

@@ -1,44 +0,0 @@
-package com.tiesheng.util;
-
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
-import com.tiesheng.util.exception.ApiException;
-
-public class PasswordUtils {
-
-    private static final int PREFIX_SIZE = 8;
-
-
-    /**
-     * 获取加密密码
-     *
-     * @param password
-     * @return
-     */
-    public static String buildPassword(String password) {
-        String prefix = RandomUtil.randomString(PREFIX_SIZE);
-        return prefix + SecureUtil.sha1(password);
-    }
-
-
-    /**
-     * 验证密码
-     *
-     * @param userInput
-     * @param encrypted
-     * @return
-     */
-    public static void verifyPassword(String userInput, String encrypted) {
-        String userEncrypted = buildPassword(userInput);
-
-        userEncrypted = StrUtil.subSuf(userEncrypted, PREFIX_SIZE);
-        encrypted = StrUtil.subSuf(encrypted, PREFIX_SIZE);
-
-        if (!StrUtil.equals(userEncrypted, encrypted)) {
-            throw new ApiException("账号或密码错误");
-        }
-    }
-
-
-}

springboot-util/src/main/java/com/tiesheng/util/ServletKit.java

@@ -20,5 +20,14 @@ public class ServletKit extends ServletUtil {
         return attributes.getRequest();
     }
 
+    /**
+     * 获取客户端IP
+     *
+     * @return
+     */
+    public static String getClientIP() {
+        return getClientIP(getRequest());
+    }
+
 
 }

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

@@ -0,0 +1,136 @@
+package com.tiesheng.util.config;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.SmUtil;
+import cn.hutool.crypto.symmetric.SM4;
+import com.tiesheng.util.ServletKit;
+import com.tiesheng.util.TimedCacheHelper;
+import com.tiesheng.util.exception.ApiException;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author hao
+ */
+@Configuration
+@ConfigurationProperties(prefix = "tiesheng.encrypt")
+public class EncryptConfig {
+
+    /**
+     * 加解密对象
+     */
+    private final SM4 sm4;
+
+    /**
+     * 加密密钥
+     */
+    private String key = "WmdUzPJXbngVNiaSsQrihg==";
+    private Integer saltSize = 8;
+
+    public EncryptConfig() {
+        sm4 = SmUtil.sm4(Base64.decode(getKey()));
+    }
+
+    /**
+     * 加密
+     *
+     * @param content
+     * @return
+     */
+    public String encrypt(String content) {
+        if (StrUtil.isEmpty(content)) {
+            return "";
+        }
+        return sm4.encryptBase64(content);
+    }
+
+
+    /**
+     * 解密
+     *
+     * @param base64
+     * @return
+     */
+    public String decrypt(String base64) {
+        try {
+            return sm4.decryptStr(base64);
+        } catch (Exception ignore) {
+        }
+        return base64;
+    }
+
+
+    /**
+     * 创建密码
+     *
+     * @param inputPasswd
+     * @param salt        盐，不存将自动生成
+     * @return
+     */
+    public String passwdCreate(String inputPasswd, String salt) {
+        if (StrUtil.isEmpty(salt)) {
+            salt = RandomUtil.randomString(saltSize);
+        }
+        if (!passwdComplexity(inputPasswd)) {
+            throw new ApiException("需要包含数字、大小写字母、特殊符号，且长度不低于8位");
+        }
+        return encrypt(salt + SecureUtil.sha1(salt + inputPasswd));
+    }
+
+
+    /**
+     * 复杂度校验
+     *
+     * @param inputPasswd
+     * @return
+     */
+    public boolean passwdComplexity(String inputPasswd) {
+        String password = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
+        return inputPasswd.matches(password);
+    }
+
+
+    /**
+     * 密码校验
+     *
+     * @param inputPasswd
+     */
+    public void passwdVerify(String inputPasswd, String encrypted) {
+        String salt = decrypt(encrypted).substring(0, saltSize);
+        String inputEncrypted = passwdCreate(inputPasswd, salt);
+        if (!StrUtil.equals(inputEncrypted, encrypted)) {
+            String clientIp = ServletKit.getClientIP();
+            int num = NumberUtil.parseInt(TimedCacheHelper.getTimedCache().get(clientIp, false));
+            if (num > 5) {
+                throw new ApiException("登录失败已达6次，请10分钟后再试");
+            }
+            TimedCacheHelper.getTimedCache().put(clientIp, String.valueOf(num + 1), 10 * 60 * 1000);
+            throw new ApiException("账号或密码错误");
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Integer getSaltSize() {
+        return saltSize;
+    }
+
+    public void setSaltSize(Integer saltSize) {
+        this.saltSize = saltSize;
+    }
+}

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

@@ -3,12 +3,11 @@ package com.tiesheng.util.config;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.log.LogFactory;
+import com.tiesheng.util.ip2region.Searcher;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
-import java.io.FileNotFoundException;
-import java.io.RandomAccessFile;
 
 /**
  * @author hao
@@ -17,8 +16,8 @@ import java.io.RandomAccessFile;
 @ConfigurationProperties(prefix = "tiesheng.ip2region")
 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") + "/runtime/ip2region.db";
+    private String dbUrl = "http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master/ipdb/ip2region.xdb";
+    private String dbPath = System.getProperty("user.dir") + "/runtime/ip2region/ip2region.xdb";
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -35,15 +34,20 @@ public class Ip2regionConfig {
 
 
     /**
-     * 获取db文件
+     * 搜索ip
      *
+     * @param ip
      * @return
      */
-    public RandomAccessFile getDbAccessFile() throws FileNotFoundException {
-        if (!FileUtil.exist(dbPath)) {
-            downloadDbFile();
+    public String search(String ip) {
+        String region = "";
+        try {
+            Searcher searcher = Searcher.newWithFileOnly(dbPath);
+            region = searcher.search(ip);
+            searcher.close();
+        } catch (Exception ignored) {
         }
-        return new RandomAccessFile(dbPath, "r");
+        return region;
     }
 
     ///////////////////////////////////////////////////////////////////////////

springboot-util/src/main/java/com/tiesheng/util/config/desensitize/DesensitizeValueFilter.java

@@ -0,0 +1,37 @@
+package com.tiesheng.util.config.desensitize;
+
+import cn.hutool.core.util.ClassUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.serializer.ValueFilter;
+import com.tiesheng.annotation.desensitize.Desensitize;
+
+import java.lang.reflect.Field;
+
+/**
+ * 脱敏过滤类
+ *
+ * @author hao
+ */
+public class DesensitizeValueFilter implements ValueFilter {
+
+    @Override
+    public Object process(Object object, String name, Object value) {
+        if (ObjectUtil.isEmpty(value) || !(value instanceof String)) {
+            return value;
+        }
+
+        Field field = ClassUtil.getDeclaredField(object.getClass(), name);
+        if (ObjectUtil.isEmpty(field)) {
+            return value;
+        }
+        Desensitize desensitize = field.getAnnotation(Desensitize.class);
+        if (String.class != field.getType() || ObjectUtil.isEmpty(desensitize)) {
+            return value;
+        }
+        String originVal = String.valueOf(value);
+        return StrUtil.hide(originVal, desensitize.prefix(),
+                StrUtil.length(originVal) - desensitize.suffix());
+
+    }
+}

springboot-util/src/main/java/com/tiesheng/util/ip2region/DataBlock.java

@@ -1,76 +0,0 @@
-package com.tiesheng.util.ip2region;
-
-/**
- * data block class
- *
- * @author chenxin<chenxin619315 @ gmail.com>
- */
-public class DataBlock {
-    /**
-     * city id
-     */
-    private int cityId;
-
-    /**
-     * region address
-     */
-    private String region;
-
-    /**
-     * region ptr in the db file
-     */
-    private int dataPtr;
-
-    /**
-     * construct method
-     *
-     * @param cityId
-     * @param region  region string
-     * @param dataPtr data ptr
-     */
-    public DataBlock(int cityId, String region, int dataPtr) {
-        this.cityId = cityId;
-        this.region = region;
-        this.dataPtr = dataPtr;
-    }
-
-    public DataBlock(int cityId, String region) {
-        this(cityId, region, 0);
-    }
-
-    public int getCityId() {
-        return cityId;
-    }
-
-    public DataBlock setCityId(int cityId) {
-        this.cityId = cityId;
-        return this;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public DataBlock setRegion(String region) {
-        this.region = region;
-        return this;
-    }
-
-    public int getDataPtr() {
-        return dataPtr;
-    }
-
-    public DataBlock setDataPtr(int dataPtr) {
-        this.dataPtr = dataPtr;
-        return this;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(cityId).append('|').append(region).append('|').append(dataPtr);
-        return sb.toString();
-    }
-
-}

springboot-util/src/main/java/com/tiesheng/util/ip2region/DbConfig.java

@@ -1,51 +0,0 @@
-package com.tiesheng.util.ip2region;
-
-/**
- * database configuration class
- *
- * @author chenxin<chenxin619315 @ gmail.com>
- */
-public class DbConfig {
-    /**
-     * total header data block size
-     */
-    private int totalHeaderSize;
-
-    /**
-     * max index data block size
-     * u should always choice the fastest read block size
-     */
-    private int indexBlockSize;
-
-    /**
-     * construct method
-     *
-     * @param totalHeaderSize
-     */
-    public DbConfig(int totalHeaderSize) {
-        this.totalHeaderSize = totalHeaderSize;
-        this.indexBlockSize = 8192;
-    }
-
-    public DbConfig() {
-        this(8 * 2048);
-    }
-
-    public int getTotalHeaderSize() {
-        return totalHeaderSize;
-    }
-
-    public DbConfig setTotalHeaderSize(int totalHeaderSize) {
-        this.totalHeaderSize = totalHeaderSize;
-        return this;
-    }
-
-    public int getIndexBlockSize() {
-        return indexBlockSize;
-    }
-
-    public DbConfig setIndexBlockSize(int dataBlockSize) {
-        this.indexBlockSize = dataBlockSize;
-        return this;
-    }
-}

springboot-util/src/main/java/com/tiesheng/util/ip2region/Header.java

@@ -0,0 +1,34 @@
+package com.tiesheng.util.ip2region;
+
+/**
+ * @author hao
+ */
+public class Header {
+    public final int version;
+    public final int indexPolicy;
+    public final int createdAt;
+    public final int startIndexPtr;
+    public final int endIndexPtr;
+    public final byte[] buffer;
+
+    public Header(byte[] buff) {
+        assert buff.length >= 16;
+        version = Searcher.getInt2(buff, 0);
+        indexPolicy = Searcher.getInt2(buff, 2);
+        createdAt = Searcher.getInt(buff, 4);
+        startIndexPtr = Searcher.getInt(buff, 8);
+        endIndexPtr = Searcher.getInt(buff, 12);
+        buffer = buff;
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "Version: " + version + ',' +
+                "IndexPolicy: " + indexPolicy + ',' +
+                "CreatedAt: " + createdAt + ',' +
+                "StartIndexPtr: " + startIndexPtr + ',' +
+                "EndIndexPtr: " + endIndexPtr +
+                '}';
+    }
+}

springboot-util/src/main/java/com/tiesheng/util/ip2region/IndexBlock.java

@@ -1,102 +0,0 @@
-package com.tiesheng.util.ip2region;
-
-/**
- * item index class
- *
- * @author chenxin<chenxin619315 @ gmail.com>
- */
-public class IndexBlock {
-
-    private static int LENGTH = 12;
-
-    /**
-     * start ip address
-     */
-    private long startIp;
-
-    /**
-     * end ip address
-     */
-    private long endIp;
-
-    /**
-     * data ptr and data length
-     */
-    private int dataPtr;
-
-    /**
-     * data length
-     */
-    private int dataLen;
-
-    public IndexBlock(long startIp, long endIp, int dataPtr, int dataLen) {
-        this.startIp = startIp;
-        this.endIp = endIp;
-        this.dataPtr = dataPtr;
-        this.dataLen = dataLen;
-    }
-
-    public static int getIndexBlockLength() {
-        return LENGTH;
-    }
-
-    public long getStartIp() {
-        return startIp;
-    }
-
-    public IndexBlock setStartIp(long startIp) {
-        this.startIp = startIp;
-        return this;
-    }
-
-    public long getEndIp() {
-        return endIp;
-    }
-
-    public IndexBlock setEndIp(long endIp) {
-        this.endIp = endIp;
-        return this;
-    }
-
-    public int getDataPtr() {
-        return dataPtr;
-    }
-
-    public IndexBlock setDataPtr(int dataPtr) {
-        this.dataPtr = dataPtr;
-        return this;
-    }
-
-    public int getDataLen() {
-        return dataLen;
-    }
-
-    public IndexBlock setDataLen(int dataLen) {
-        this.dataLen = dataLen;
-        return this;
-    }
-
-    /**
-     * get the bytes for storage
-     *
-     * @return byte[]
-     */
-    public byte[] getBytes() {
-        /*
-         * +------------+-----------+-----------+
-         * | 4bytes        | 4bytes    | 4bytes    |
-         * +------------+-----------+-----------+
-         *  start ip      end ip      data ptr + len
-         */
-        byte[] b = new byte[12];
-
-        IpUtil.writeIntLong(b, 0, startIp);    //start ip
-        IpUtil.writeIntLong(b, 4, endIp);        //end ip
-
-        //write the data ptr and the length
-        long mix = dataPtr | ((dataLen << 24) & 0xFF000000L);
-        IpUtil.writeIntLong(b, 8, mix);
-
-        return b;
-    }
-}

springboot-util/src/main/java/com/tiesheng/util/ip2region/Ip2Region.java

@@ -1,416 +0,0 @@
-package com.tiesheng.util.ip2region;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.tiesheng.util.config.Ip2regionConfig;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.charset.StandardCharsets;
-
-/**
- * ip db searcher class (Not thread safe)
- *
- * @author chenxin<chenxin619315 @ gmail.com>
- */
-public class Ip2Region {
-
-
-    private static Ip2Region ip2Region;
-    /**
-     * db config
-     */
-    private final DbConfig dbConfig;
-    /**
-     * db file access handler
-     */
-    private RandomAccessFile raf = null;
-    /**
-     * header blocks buffer
-     */
-    private long[] headerSip = null;
-    private int[] headerPtr = null;
-    private int headerLength;
-    /**
-     * super blocks info
-     */
-    private long firstIndexPtr = 0;
-    private long lastIndexPtr = 0;
-    private int totalIndexBlocks = 0;
-    /**
-     * for memory mode
-     * the original db binary string
-     */
-    private byte[] dbBinStr = null;
-
-    /**
-     * construct class
-     */
-    public Ip2Region() {
-        this.dbConfig = new DbConfig();
-        try {
-            Ip2regionConfig ip2regionConfig = SpringUtil.getBean(Ip2regionConfig.class);
-            raf = ip2regionConfig.getDbAccessFile();
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * 获取单例
-     *
-     * @return
-     */
-    public static Ip2Region getInstance() {
-        if (ip2Region == null) {
-            synchronized (Ip2Region.class) {
-                if (ip2Region == null) {
-                    ip2Region = new Ip2Region();
-                }
-            }
-        }
-        return ip2Region;
-    }
-
-    /**
-     * get the region with an int ip address with memory binary search algorithm
-     *
-     * @param ip
-     * @throws IOException
-     */
-    public DataBlock memorySearch(long ip) throws IOException {
-        int blen = IndexBlock.getIndexBlockLength();
-        if (dbBinStr == null) {
-            dbBinStr = new byte[(int) raf.length()];
-            raf.seek(0L);
-            raf.readFully(dbBinStr, 0, dbBinStr.length);
-
-            //initialize the global vars
-            firstIndexPtr = IpUtil.getIntLong(dbBinStr, 0);
-            lastIndexPtr = IpUtil.getIntLong(dbBinStr, 4);
-            totalIndexBlocks = (int) ((lastIndexPtr - firstIndexPtr) / blen) + 1;
-        }
-
-        //search the index blocks to define the data
-        int l = 0, h = totalIndexBlocks;
-        long sip, eip, dataptr = 0;
-        while (l <= h) {
-            int m = (l + h) >> 1;
-            int p = (int) (firstIndexPtr + m * blen);
-
-            sip = IpUtil.getIntLong(dbBinStr, p);
-            if (ip < sip) {
-                h = m - 1;
-            } else {
-                eip = IpUtil.getIntLong(dbBinStr, p + 4);
-                if (ip > eip) {
-                    l = m + 1;
-                } else {
-                    dataptr = IpUtil.getIntLong(dbBinStr, p + 8);
-                    break;
-                }
-            }
-        }
-
-        //not matched
-        if (dataptr == 0) {
-            return null;
-        }
-
-        //get the data
-        int dataLen = (int) ((dataptr >> 24) & 0xFF);
-        int dataPtr = (int) ((dataptr & 0x00FFFFFF));
-        int cityId = (int) IpUtil.getIntLong(dbBinStr, dataPtr);
-        String region = new String(dbBinStr, dataPtr + 4, dataLen - 4, StandardCharsets.UTF_8);
-
-        return new DataBlock(cityId, region, dataPtr);
-    }
-
-    /**
-     * get the region throught the ip address with memory binary search algorithm
-     *
-     * @return DataBlock
-     * @throws IOException
-     */
-    public DataBlock memorySearch() throws IOException {
-        return memorySearch(null);
-    }
-
-    /**
-     * get the region throught the ip address with memory binary search algorithm
-     *
-     * @param ip
-     * @return DataBlock
-     * @throws IOException
-     */
-    public DataBlock memorySearch(String ip) throws IOException {
-        return memorySearch(IpUtil.ip2long(ip));
-    }
-
-
-    /**
-     * get by index ptr
-     *
-     * @param ptr
-     * @throws IOException
-     */
-    public DataBlock getByIndexPtr(long ptr) throws IOException {
-        raf.seek(ptr);
-        byte[] buffer = new byte[12];
-        raf.readFully(buffer, 0, buffer.length);
-        long extra = IpUtil.getIntLong(buffer, 8);
-
-        int dataLen = (int) ((extra >> 24) & 0xFF);
-        int dataPtr = (int) ((extra & 0x00FFFFFF));
-
-        raf.seek(dataPtr);
-        byte[] data = new byte[dataLen];
-        raf.readFully(data, 0, data.length);
-
-        int cityId = (int) IpUtil.getIntLong(data, 0);
-        String region = new String(data, 4, data.length - 4, StandardCharsets.UTF_8);
-
-        return new DataBlock(cityId, region, dataPtr);
-    }
-
-    /**
-     * get the region with an int ip address with b-tree algorithm
-     *
-     * @param ip
-     * @throws IOException
-     */
-    public DataBlock btreeSearch(long ip) throws IOException {
-        //check and load the header
-        if (headerSip == null) {
-            raf.seek(8L);
-            byte[] b = new byte[dbConfig.getTotalHeaderSize()];
-            raf.readFully(b, 0, b.length);
-
-            //fill the header
-            int len = b.length >> 3, idx = 0;
-            headerSip = new long[len];
-            headerPtr = new int[len];
-            long startIp, dataPtr;
-            for (int i = 0; i < b.length; i += 8) {
-                startIp = IpUtil.getIntLong(b, i);
-                dataPtr = IpUtil.getIntLong(b, i + 4);
-                if (dataPtr == 0) {
-                    break;
-                }
-
-                headerSip[idx] = startIp;
-                headerPtr[idx] = (int) dataPtr;
-                idx++;
-            }
-
-            headerLength = idx;
-        }
-
-        //1. define the index block with the binary search
-        if (ip == headerSip[0]) {
-            return getByIndexPtr(headerPtr[0]);
-        } else if (ip == headerSip[headerLength - 1]) {
-            return getByIndexPtr(headerPtr[headerLength - 1]);
-        }
-
-        int l = 0, h = headerLength, sptr = 0, eptr = 0;
-        while (l <= h) {
-            int m = (l + h) >> 1;
-
-            //perfetc matched, just return it
-            if (ip == headerSip[m]) {
-                if (m > 0) {
-                    sptr = headerPtr[m - 1];
-                    eptr = headerPtr[m];
-                } else {
-                    sptr = headerPtr[m];
-                    eptr = headerPtr[m + 1];
-                }
-
-                break;
-            }
-
-            //less then the middle value
-            if (ip < headerSip[m]) {
-                if (m == 0) {
-                    sptr = headerPtr[m];
-                    eptr = headerPtr[m + 1];
-                    break;
-                } else if (ip > headerSip[m - 1]) {
-                    sptr = headerPtr[m - 1];
-                    eptr = headerPtr[m];
-                    break;
-                }
-                h = m - 1;
-            } else {
-                if (m == headerLength - 1) {
-                    sptr = headerPtr[m - 1];
-                    eptr = headerPtr[m];
-                    break;
-                } else if (ip <= headerSip[m + 1]) {
-                    sptr = headerPtr[m];
-                    eptr = headerPtr[m + 1];
-                    break;
-                }
-                l = m + 1;
-            }
-        }
-
-        //match nothing just stop it
-        if (sptr == 0) {
-            return null;
-        }
-
-        //2. search the index blocks to define the data
-        int blockLen = eptr - sptr, blen = IndexBlock.getIndexBlockLength();
-        //include the right border block
-        byte[] iBuffer = new byte[blockLen + blen];
-        raf.seek(sptr);
-        raf.readFully(iBuffer, 0, iBuffer.length);
-
-        l = 0;
-        h = blockLen / blen;
-        long sip, eip, dataptr = 0;
-        while (l <= h) {
-            int m = (l + h) >> 1;
-            int p = m * blen;
-            sip = IpUtil.getIntLong(iBuffer, p);
-            if (ip < sip) {
-                h = m - 1;
-            } else {
-                eip = IpUtil.getIntLong(iBuffer, p + 4);
-                if (ip > eip) {
-                    l = m + 1;
-                } else {
-                    dataptr = IpUtil.getIntLong(iBuffer, p + 8);
-                    break;
-                }
-            }
-        }
-
-        //not matched
-        if (dataptr == 0) {
-            return null;
-        }
-
-        //3. get the data
-        int dataLen = (int) ((dataptr >> 24) & 0xFF);
-        int dataPtr = (int) ((dataptr & 0x00FFFFFF));
-
-        raf.seek(dataPtr);
-        byte[] data = new byte[dataLen];
-        raf.readFully(data, 0, data.length);
-
-        int cityId = (int) IpUtil.getIntLong(data, 0);
-        String region = new String(data, 4, data.length - 4, StandardCharsets.UTF_8);
-
-        return new DataBlock(cityId, region, dataPtr);
-    }
-
-    /**
-     * get the region throught the ip address with b-tree search algorithm
-     *
-     * @param ip
-     * @return DataBlock
-     * @throws IOException
-     */
-    public DataBlock btreeSearch(String ip) {
-        try {
-            return btreeSearch(IpUtil.ip2long(ip));
-        } catch (IOException ignored) {
-        }
-        return new DataBlock(0, "未知IP");
-    }
-
-    /**
-     * get the region with a int ip address with binary search algorithm
-     *
-     * @param ip
-     * @throws IOException
-     */
-    public DataBlock binarySearch(long ip) throws IOException {
-        int blen = IndexBlock.getIndexBlockLength();
-        if (totalIndexBlocks == 0) {
-            raf.seek(0L);
-            byte[] superBytes = new byte[8];
-            raf.readFully(superBytes, 0, superBytes.length);
-            //initialize the global vars
-            firstIndexPtr = IpUtil.getIntLong(superBytes, 0);
-            lastIndexPtr = IpUtil.getIntLong(superBytes, 4);
-            totalIndexBlocks = (int) ((lastIndexPtr - firstIndexPtr) / blen) + 1;
-        }
-
-        //search the index blocks to define the data
-        int l = 0, h = totalIndexBlocks;
-        byte[] buffer = new byte[blen];
-        long sip, eip, dataptr = 0;
-        while (l <= h) {
-            int m = (l + h) >> 1;
-            raf.seek(firstIndexPtr + m * blen);
-            raf.readFully(buffer, 0, buffer.length);
-            sip = IpUtil.getIntLong(buffer, 0);
-            if (ip < sip) {
-                h = m - 1;
-            } else {
-                eip = IpUtil.getIntLong(buffer, 4);
-                if (ip > eip) {
-                    l = m + 1;
-                } else {
-                    dataptr = IpUtil.getIntLong(buffer, 8);
-                    break;
-                }
-            }
-        }
-
-        //not matched
-        if (dataptr == 0) {
-            return null;
-        }
-
-        //get the data
-        int dataLen = (int) ((dataptr >> 24) & 0xFF);
-        int dataPtr = (int) ((dataptr & 0x00FFFFFF));
-
-        raf.seek(dataPtr);
-        byte[] data = new byte[dataLen];
-        raf.readFully(data, 0, data.length);
-
-        int cityId = (int) IpUtil.getIntLong(data, 0);
-        String region = new String(data, 4, data.length - 4, StandardCharsets.UTF_8);
-
-        return new DataBlock(cityId, region, dataPtr);
-    }
-
-    /**
-     * get the region throught the ip address with binary search algorithm
-     *
-     * @param ip
-     * @return DataBlock
-     * @throws IOException
-     */
-    public DataBlock binarySearch(String ip) throws IOException {
-        return binarySearch(IpUtil.ip2long(ip));
-    }
-
-    /**
-     * get the db config
-     *
-     * @return DbConfig
-     */
-    public DbConfig getDbConfig() {
-        return dbConfig;
-    }
-
-    /**
-     * close the db
-     *
-     * @throws IOException
-     */
-    public void close() throws IOException {
-        headerSip = null;
-        headerPtr = null;
-        dbBinStr = null;
-        if (raf != null) {
-            raf.close();
-        }
-    }
-
-}

springboot-util/src/main/java/com/tiesheng/util/ip2region/IpUtil.java

@@ -1,117 +0,0 @@
-package com.tiesheng.util.ip2region;
-
-/**
- * util class
- *
- * @author chenxin<chenxin619315 @ gmail.com>
- */
-public class IpUtil {
-    /**
-     * write specfield bytes to a byte array start from offset
-     *
-     * @param b
-     * @param offset
-     * @param v
-     * @param bytes
-     */
-    public static void write(byte[] b, int offset, long v, int bytes) {
-        for (int i = 0; i < bytes; i++) {
-            b[offset++] = (byte) ((v >>> (8 * i)) & 0xFF);
-        }
-    }
-
-    /**
-     * write a int to a byte array
-     *
-     * @param b
-     * @param offset
-     * @param v
-     */
-    public static void writeIntLong(byte[] b, int offset, long v) {
-        b[offset++] = (byte) ((v >> 0) & 0xFF);
-        b[offset++] = (byte) ((v >> 8) & 0xFF);
-        b[offset++] = (byte) ((v >> 16) & 0xFF);
-        b[offset] = (byte) ((v >> 24) & 0xFF);
-    }
-
-    /**
-     * get a int from a byte array start from the specifiled offset
-     *
-     * @param b
-     * @param offset
-     */
-    public static long getIntLong(byte[] b, int offset) {
-        return (
-                ((b[offset++] & 0x000000FFL)) |
-                        ((b[offset++] << 8) & 0x0000FF00L) |
-                        ((b[offset++] << 16) & 0x00FF0000L) |
-                        ((b[offset] << 24) & 0xFF000000L)
-        );
-    }
-
-    /**
-     * get a int from a byte array start from the specifield offset
-     *
-     * @param b
-     * @param offset
-     */
-    public static int getInt3(byte[] b, int offset) {
-        return (
-                (b[offset++] & 0x000000FF) |
-                        (b[offset++] & 0x0000FF00) |
-                        (b[offset] & 0x00FF0000)
-        );
-    }
-
-    public static int getInt2(byte[] b, int offset) {
-        return (
-                (b[offset++] & 0x000000FF) |
-                        (b[offset] & 0x0000FF00)
-        );
-    }
-
-    public static int getInt1(byte[] b, int offset) {
-        return (
-                (b[offset] & 0x000000FF)
-        );
-    }
-
-    /**
-     * string ip to long ip
-     *
-     * @param ip
-     * @return long
-     */
-    public static long ip2long(String ip) {
-        String[] p = ip.split("\\.");
-        if (p.length != 4) {
-            return 0;
-        }
-
-        int p1 = ((Integer.valueOf(p[0]) << 24) & 0xFF000000);
-        int p2 = ((Integer.valueOf(p[1]) << 16) & 0x00FF0000);
-        int p3 = ((Integer.valueOf(p[2]) << 8) & 0x0000FF00);
-        int p4 = ((Integer.valueOf(p[3]) << 0) & 0x000000FF);
-
-        return ((p1 | p2 | p3 | p4) & 0xFFFFFFFFL);
-    }
-
-    /**
-     * int to ip string
-     *
-     * @param ip
-     * @return string
-     */
-    public static String long2ip(long ip) {
-        StringBuilder sb = new StringBuilder();
-
-        sb
-                .append((ip >> 24) & 0xFF).append('.')
-                .append((ip >> 16) & 0xFF).append('.')
-                .append((ip >> 8) & 0xFF).append('.')
-                .append((ip >> 0) & 0xFF);
-
-        return sb.toString();
-    }
-
-}

springboot-util/src/main/java/com/tiesheng/util/ip2region/Searcher.java

@@ -0,0 +1,258 @@
+package com.tiesheng.util.ip2region;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class Searcher {
+    // constant defined copied from the xdb maker
+    public static final int HeaderInfoLength = 256;
+    public static final int VectorIndexRows = 256;
+    public static final int VectorIndexCols = 256;
+    public static final int VectorIndexSize = 8;
+    public static final int SegmentIndexSize = 14;
+    public static final byte[] shiftIndex = {24, 16, 8, 0};
+    // random access file handle for file based search
+    private final RandomAccessFile handle;
+    // vector index.
+    // use the byte[] instead of VectorIndex entry array to keep
+    // the minimal memory allocation.
+    private final byte[] vectorIndex;
+
+    // xdb content buffer, used for in-memory search
+    private final byte[] contentBuff;
+
+    // --- static method to create searchers
+    private int ioCount = 0;
+
+    public Searcher(String dbFile, byte[] vectorIndex, byte[] cBuff) throws IOException {
+        if (cBuff != null) {
+            this.handle = null;
+            this.vectorIndex = null;
+            this.contentBuff = cBuff;
+        } else {
+            this.handle = new RandomAccessFile(dbFile, "r");
+            this.vectorIndex = vectorIndex;
+            this.contentBuff = null;
+        }
+    }
+
+    public static Searcher newWithFileOnly(String dbPath) throws IOException {
+        return new Searcher(dbPath, null, null);
+    }
+
+    // --- End of creator
+
+    public static Searcher newWithVectorIndex(String dbPath, byte[] vectorIndex) throws IOException {
+        return new Searcher(dbPath, vectorIndex, null);
+    }
+
+    public static Searcher newWithBuffer(byte[] cBuff) throws IOException {
+        return new Searcher(null, null, cBuff);
+    }
+
+    public static Header loadHeader(RandomAccessFile handle) throws IOException {
+        handle.seek(0);
+        final byte[] buff = new byte[HeaderInfoLength];
+        handle.read(buff);
+        return new Header(buff);
+    }
+
+    public static Header loadHeaderFromFile(String dbPath) throws IOException {
+        final RandomAccessFile handle = new RandomAccessFile(dbPath, "r");
+        final Header header = loadHeader(handle);
+        handle.close();
+        return header;
+    }
+
+    public static byte[] loadVectorIndex(RandomAccessFile handle) throws IOException {
+        handle.seek(HeaderInfoLength);
+        int len = VectorIndexRows * VectorIndexCols * VectorIndexSize;
+        final byte[] buff = new byte[len];
+        int rLen = handle.read(buff);
+        if (rLen != len) {
+            throw new IOException("incomplete read: read bytes should be " + len);
+        }
+
+        return buff;
+    }
+
+    public static byte[] loadVectorIndexFromFile(String dbPath) throws IOException {
+        final RandomAccessFile handle = new RandomAccessFile(dbPath, "r");
+        final byte[] vIndex = loadVectorIndex(handle);
+        handle.close();
+        return vIndex;
+    }
+
+    // --- static cache util function
+
+    public static byte[] loadContent(RandomAccessFile handle) throws IOException {
+        handle.seek(0);
+        final byte[] buff = new byte[(int) handle.length()];
+        int rLen = handle.read(buff);
+        if (rLen != buff.length) {
+            throw new IOException("incomplete read: read bytes should be " + buff.length);
+        }
+
+        return buff;
+    }
+
+    public static byte[] loadContentFromFile(String dbPath) throws IOException {
+        final RandomAccessFile handle = new RandomAccessFile(dbPath, "r");
+        final byte[] content = loadContent(handle);
+        handle.close();
+        return content;
+    }
+
+    /* get an int from a byte array start from the specified offset */
+    public static long getIntLong(byte[] b, int offset) {
+        return (
+                ((b[offset++] & 0x000000FFL)) |
+                        ((b[offset++] << 8) & 0x0000FF00L) |
+                        ((b[offset++] << 16) & 0x00FF0000L) |
+                        ((b[offset] << 24) & 0xFF000000L)
+        );
+    }
+
+    public static int getInt(byte[] b, int offset) {
+        return (
+                ((b[offset++] & 0x000000FF)) |
+                        ((b[offset++] << 8) & 0x0000FF00) |
+                        ((b[offset++] << 16) & 0x00FF0000) |
+                        ((b[offset] << 24) & 0xFF000000)
+        );
+    }
+
+    public static int getInt2(byte[] b, int offset) {
+        return (
+                ((b[offset++] & 0x000000FF)) |
+                        ((b[offset] << 8) & 0x0000FF00)
+        );
+    }
+
+    /* long int to ip string */
+    public static String long2ip(long ip) {
+        return String.valueOf((ip >> 24) & 0xFF) + '.' +
+                ((ip >> 16) & 0xFF) + '.' + ((ip >> 8) & 0xFF) + '.' + ((ip) & 0xFF);
+    }
+
+    // --- End cache load util function
+
+    // --- static util method
+
+    /* check the specified ip address */
+    public static long checkIP(String ip) throws Exception {
+        String[] ps = ip.split("\\.");
+        if (ps.length != 4) {
+            throw new Exception("invalid ip address `" + ip + "`");
+        }
+
+        long ipDst = 0;
+        for (int i = 0; i < ps.length; i++) {
+            int val = Integer.parseInt(ps[i]);
+            if (val > 255) {
+                throw new Exception("ip part `" + ps[i] + "` should be less then 256");
+            }
+
+            ipDst |= ((long) val << shiftIndex[i]);
+        }
+
+        return ipDst & 0xFFFFFFFFL;
+    }
+
+    public void close() throws IOException {
+        if (this.handle != null) {
+            this.handle.close();
+        }
+    }
+
+    public int getIOCount() {
+        return ioCount;
+    }
+
+    public String search(String ipStr) throws Exception {
+        long ip = checkIP(ipStr);
+        return search(ip);
+    }
+
+    public String search(long ip) throws IOException {
+        // reset the global counter
+        this.ioCount = 0;
+
+        // locate the segment index block based on the vector index
+        int sPtr = 0, ePtr = 0;
+        int il0 = (int) ((ip >> 24) & 0xFF);
+        int il1 = (int) ((ip >> 16) & 0xFF);
+        int idx = il0 * VectorIndexCols * VectorIndexSize + il1 * VectorIndexSize;
+        // System.out.printf("il0: %d, il1: %d, idx: %d\n", il0, il1, idx);
+        if (vectorIndex != null) {
+            sPtr = getInt(vectorIndex, idx);
+            ePtr = getInt(vectorIndex, idx + 4);
+        } else if (contentBuff != null) {
+            sPtr = getInt(contentBuff, HeaderInfoLength + idx);
+            ePtr = getInt(contentBuff, HeaderInfoLength + idx + 4);
+        } else {
+            final byte[] buff = new byte[VectorIndexSize];
+            read(HeaderInfoLength + idx, buff);
+            sPtr = getInt(buff, 0);
+            ePtr = getInt(buff, 4);
+        }
+
+        // System.out.printf("sPtr: %d, ePtr: %d\n", sPtr, ePtr);
+
+        // binary search the segment index block to get the region info
+        final byte[] buff = new byte[SegmentIndexSize];
+        int dataLen = -1, dataPtr = -1;
+        int l = 0, h = (ePtr - sPtr) / SegmentIndexSize;
+        while (l <= h) {
+            int m = (l + h) >> 1;
+            int p = sPtr + m * SegmentIndexSize;
+
+            // read the segment index
+            read(p, buff);
+            long sip = getIntLong(buff, 0);
+            if (ip < sip) {
+                h = m - 1;
+            } else {
+                long eip = getIntLong(buff, 4);
+                if (ip > eip) {
+                    l = m + 1;
+                } else {
+                    dataLen = getInt2(buff, 8);
+                    dataPtr = getInt(buff, 10);
+                    break;
+                }
+            }
+        }
+
+        // empty match interception
+        // System.out.printf("dataLen: %d, dataPtr: %d\n", dataLen, dataPtr);
+        if (dataPtr < 0) {
+            return null;
+        }
+
+        // load and return the region data
+        final byte[] regionBuff = new byte[dataLen];
+        read(dataPtr, regionBuff);
+        return new String(regionBuff, "utf-8");
+    }
+
+    protected void read(int offset, byte[] buffer) throws IOException {
+        // check the in-memory buffer first
+        if (contentBuff != null) {
+            // @TODO: reduce data copying, directly decode the data ?
+            System.arraycopy(contentBuff, offset, buffer, 0, buffer.length);
+            return;
+        }
+
+        // read from the file handle
+        assert handle != null;
+        handle.seek(offset);
+
+        this.ioCount++;
+        int rLen = handle.read(buffer);
+        if (rLen != buffer.length) {
+            throw new IOException("incomplete read: read bytes should be " + buffer.length);
+        }
+    }
+
+}

springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java

@@ -129,6 +129,15 @@ public class ApiResp<T> {
     }
 
 
+    /**
+     * 是否成功
+     *
+     * @return
+     */
+    public boolean successful() {
+        return code == CODE_OK;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.4.1</version>
+        <version>0.8.3</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
@@ -64,7 +64,7 @@
 
         <dependency>
             <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-db-migration</artifactId>
+            <artifactId>springboot-database</artifactId>
         </dependency>
 
         <dependency>
@@ -72,11 +72,6 @@
             <artifactId>springboot-poi</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-annotation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.tiesheng.springboot-parent</groupId>
             <artifactId>springboot-login</artifactId>
@@ -87,6 +82,11 @@
             <artifactId>springboot-message</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.tiesheng.springboot-parent</groupId>
+            <artifactId>springboot-encrypt</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java

@@ -1,9 +1,9 @@
 package com.tiesheng.core;
 
 import com.tiesheng.core.service.TieshengWebConfigurer;
+import com.tiesheng.database.DatabaseAutoConfigurer;
 import com.tiesheng.login.LoginAutoConfigurer;
 import com.tiesheng.message.MessageAutoConfigurer;
-import com.tiesheng.migration.MigrationAutoConfigurer;
 import com.tiesheng.util.UtilAutoConfigurer;
 import org.springframework.context.annotation.Import;
 
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
         MessageAutoConfigurer.class,
         CoreAutoConfigurer.class,
         LoginAutoConfigurer.class,
-        MigrationAutoConfigurer.class
+        DatabaseAutoConfigurer.class
 })
 public @interface EnableTieshengWeb {
 

springboot-web/src/main/java/com/tiesheng/core/config/json/FastJsonMessageConverter.java

@@ -1,8 +1,7 @@
 package com.tiesheng.core.config.json;
 
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.tiesheng.util.CommonUtil;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,14 +24,9 @@ public class FastJsonMessageConverter {
      */
     @Bean
     public HttpMessageConverters fastJsonHttpMessageConverters() {
-        FastJsonConfig config = new FastJsonConfig();
-        config.setSerializerFeatures(SerializerFeature.WriteMapNullValue,
-                SerializerFeature.WriteNullStringAsEmpty,
-                SerializerFeature.WriteEnumUsingName);
-        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
 
         FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-        fastConverter.setFastJsonConfig(config);
+        fastConverter.setFastJsonConfig(CommonUtil.fastJsonConfig());
         fastConverter.setDefaultCharset(StandardCharsets.UTF_8);
 
         List<MediaType> mediaTypes = new ArrayList<>();

springboot-web/src/main/java/com/tiesheng/core/config/operation/OperationAspect.java

@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.operation.OperationLog;
 import com.tiesheng.core.service.CoreLogService;
+import com.tiesheng.util.ServletKit;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,6 +14,7 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +37,7 @@ public class OperationAspect {
     CoreLogService coreLogService;
 
 
-    @Pointcut("@annotation(com.tiesheng.annotation.operation.OperationLog)")
+    @Pointcut("execution(* com..controller..*.*(..))")
     public void methodArgs() {
 
     }
@@ -48,11 +50,24 @@ public class OperationAspect {
      */
     @Around("methodArgs()")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+
+        // GET请求不处理
+        HttpServletRequest request = ServletKit.getRequest();
+        if (StrUtil.equalsIgnoreCase(request.getMethod(), "GET")) {
+            return joinPoint.proceed(joinPoint.getArgs());
+        }
+
+        String title = "", subject = "";
+        String insertKey = "";
+
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         OperationLog operationLog = method.getAnnotation(OperationLog.class);
-        String subject = operationLog.subject();
-        String insertKey = operationLog.insertKey();
+        if (operationLog != null) {
+            title = operationLog.title();
+            subject = operationLog.subject();
+            insertKey = operationLog.insertKey();
+        }
 
         Object reqObj = null;
         Map<String, Object> allParams = new HashMap<>(16);
@@ -65,7 +80,6 @@ public class OperationAspect {
         allParams.putAll(BeanUtil.beanToMap(response));
 
         if (!StrUtil.isEmpty(subject)) {
-
             // 添加、编辑关键字处理
             if (!StrUtil.isEmpty(insertKey)) {
                 String insertVal = MapUtil.getStr(allParams, insertKey);
@@ -74,9 +88,12 @@ public class OperationAspect {
 
             // 占位符处理
             subject = StrUtil.format(subject, allParams);
+        } else {
+            title = method.getName();
+            subject = ServletKit.getRequest().getRequestURI();
         }
 
-        coreLogService.addOperationLog(operationLog.title(), subject, reqObj);
+        coreLogService.addOperationLog(title, subject, reqObj);
 
         return response;
     }

springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java

@@ -4,6 +4,9 @@ package com.tiesheng.core.controller;
 import cn.hutool.captcha.LineCaptcha;
 import cn.hutool.core.util.IdUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.core.pojos.dto.ChunkCheckDTO;
+import com.tiesheng.core.pojos.dto.ChunkMergeDTO;
+import com.tiesheng.core.pojos.dto.ChunkStartDTO;
 import com.tiesheng.core.pojos.dto.ImageCodeDTO;
 import com.tiesheng.core.pojos.vo.PicVerifyVo;
 import com.tiesheng.core.service.FileUploadService;
@@ -68,8 +71,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping(value = "/file/chunk_start")
-    public ApiResp<String> fileChunkStart(String fileExt) {
-        fileUploadService.chunkStart(fileExt);
+    public ApiResp<String> fileChunkStart(@RequestBody ChunkStartDTO dto) {
+        fileUploadService.chunkStart(dto.getFileExt());
         return ApiResp.respOK("");
     }
 
@@ -81,8 +84,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_check")
-    public ApiResp<Boolean> fileChunkCheck(String fileMd5, Integer chunk) {
-        boolean exist = fileUploadService.chunkCheck(fileMd5, chunk);
+    public ApiResp<Boolean> fileChunkCheck(@RequestBody ChunkCheckDTO dto) {
+        boolean exist = fileUploadService.chunkCheck(dto.getFileMd5(), dto.getChunk());
         return ApiResp.respOK(exist);
     }
 
@@ -108,8 +111,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_merge")
-    public ApiResp<String> fileChunkMerge(String fileMd5, String fileExt) {
-        String path = fileUploadService.chunkMerge(fileMd5, fileExt);
+    public ApiResp<String> fileChunkMerge(@RequestBody ChunkMergeDTO dto) {
+        String path = fileUploadService.chunkMerge(dto.getFileMd5(), dto.getFileExt());
         return ApiResp.respOK(path);
     }
 

springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java

@@ -1,6 +1,11 @@
 package com.tiesheng.core.pojos;
 
-public class CurrentWebUser {
+/**
+ * 当前token的数据
+ *
+ * @author hao
+ */
+public class RequestUserInfo {
 
     private String id;
     private String name;

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkCheckDTO.java

@@ -0,0 +1,30 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkCheckDTO {
+
+    private String fileMd5;
+    private Integer chunk;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileMd5() {
+        return fileMd5;
+    }
+
+    public void setFileMd5(String fileMd5) {
+        this.fileMd5 = fileMd5;
+    }
+
+    public Integer getChunk() {
+        return chunk;
+    }
+
+    public void setChunk(Integer chunk) {
+        this.chunk = chunk;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkMergeDTO.java

@@ -0,0 +1,30 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkMergeDTO {
+
+    private String fileMd5;
+    private String fileExt;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileMd5() {
+        return fileMd5;
+    }
+
+    public void setFileMd5(String fileMd5) {
+        this.fileMd5 = fileMd5;
+    }
+
+    public String getFileExt() {
+        return fileExt;
+    }
+
+    public void setFileExt(String fileExt) {
+        this.fileExt = fileExt;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkStartDTO.java

@@ -0,0 +1,21 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkStartDTO {
+
+    private String fileExt;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileExt() {
+        return fileExt;
+    }
+
+    public void setFileExt(String fileExt) {
+        this.fileExt = fileExt;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java

@@ -1,12 +1,13 @@
 package com.tiesheng.core.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONUtil;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
 import com.tiesheng.core.mapper.CoreLogOperationMapper;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
@@ -16,8 +17,7 @@ import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.pojos.MessageReqResp;
 import com.tiesheng.message.service.TieshengMessageConfigurer;
 import com.tiesheng.util.ServletKit;
-import com.tiesheng.util.ip2region.DataBlock;
-import com.tiesheng.util.ip2region.Ip2Region;
+import com.tiesheng.util.config.Ip2regionConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +35,8 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     CoreLogLoginMapper coreLogLoginMapper;
     @Autowired
     CoreLogMessageMapper coreLogMessageMapper;
+    @Autowired
+    Ip2regionConfig ip2regionConfig;
 
     public CoreLogLoginMapper getLogLoginMapper() {
         return coreLogLoginMapper;
@@ -53,10 +55,15 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      * 添加操作日志
      */
     public void addOperationLog(String title, String subject, Object params) {
+        TokenBean tokenBean = TsTokenConfig.getWithoutThr();
+        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
+            return;
+        }
+
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(tokenBean);
         CoreLogOperation operation = new CoreLogOperation();
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
-        operation.setUserId(currentWebUser.getId());
-        operation.setUserName(currentWebUser.getName());
+        operation.setUserId(requestUserInfo.getId());
+        operation.setUserName(requestUserInfo.getName());
         operation.setTitle(title);
         operation.setSubject(subject);
         if (params != null) {
@@ -81,15 +88,14 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         String ip = ServletUtil.getClientIP(request);
 
         CoreLogLogin login = new CoreLogLogin();
-        login.setUserId(platformUnique.getUserId());
+        login.setUserId(tokenBean.getId());
         login.setPlatform(platformUnique.getPlatform());
 
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(tokenBean);
-        login.setUserName(currentWebUser.getName());
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(tokenBean);
+        login.setUserName(requestUserInfo.getName());
 
         login.setIp(ip);
-        DataBlock dataBlock = Ip2Region.getInstance().btreeSearch(ip);
-        login.setAddress(dataBlock.getRegion());
+        login.setAddress(ip2regionConfig.search(login.getIp()));
         coreLogLoginMapper.insert(login);
     }
 

springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java

@@ -1,7 +1,6 @@
 package com.tiesheng.core.service;
 
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * @author hao
@@ -35,15 +33,12 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
             platformUnique.setUniqueId(loginInfo.getUnique());
         }
         platformUnique.setInfo(loginInfo.getInfo());
+        saveOrUpdate(platformUnique);
 
         TokenBean tokenBean = tieshengWebConfigurer.loginConfigurer().doLogin(platformUnique, loginInfo.getTo());
         if (tokenBean != null) {
-            platformUnique.setUserId(tokenBean.getId());
-            platformUnique.setIsDeleted(0);
-            saveOrUpdate(platformUnique);
-
             // 添加登录日志
-            coreLogService.addLoginLog(platformUnique,tokenBean);
+            coreLogService.addLoginLog(platformUnique, tokenBean);
         }
         return tokenBean;
     }
@@ -55,22 +50,18 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
 
 
     /**
-     * 通过平台和用户id查询
+     * 更新用户id
      *
-     * @param platform
-     * @param userIds
+     * @param uniqueId
+     * @param userId
      * @return
      */
-    private List<CorePlatformUnique> getByPlatformAndUser(String platform, List<String> userIds) {
-        if (CollUtil.isEmpty(userIds)) {
-            return CollUtil.newArrayList();
-        }
-
-        QueryWrapper<CorePlatformUnique> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id", userIds);
-        queryWrapper.eq("platform", platform);
-        queryWrapper.last("limit 1");
-        return list(queryWrapper);
+    public boolean updateUserId(String uniqueId, String userId) {
+        return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
+                .set("user_id", userId)
+                .set("is_deleted", 0)
+        );
     }
 
+
 }

springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java

@@ -1,7 +1,7 @@
 package com.tiesheng.core.service;
 
 import cn.hutool.log.LogFactory;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.exception.ApiRespEnum;
@@ -22,7 +22,7 @@ public interface TieshengWebConfigurer {
      *
      * @return
      */
-    CurrentWebUser getCurrentUserName(TokenBean userId);
+    RequestUserInfo getCurrentUserName(TokenBean userId);
 
 
     /**