publish 2.0.0.rc38

2024-08-23 11:12:16 +08:00
parent 6949f50c7c
commit 542e23ac1b
23 changed files with 164 additions and 107 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>2.0.0.rc37</version>
+    <version>2.0.0.rc38</version>
    <packaging>pom</packaging>
    <name>springboot-parent</name>
    <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,61 +58,61 @@
            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-database</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-login</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-web</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-util</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-platform</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-message</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-encrypt</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-role</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-poi</artifactId>
-                <version>2.0.0.rc37</version>
+                <version>2.0.0.rc38</version>
            </dependency>

            <dependency>
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,11 +6,11 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.0.rc37</version>
+    <version>2.0.0.rc38</version>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
@@ -1,6 +1,8 @@
 package com.tiesheng.demo.config;

 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.log.LogFactory;
 import com.tiesheng.login.pojos.RequestUserInfo;
 import com.tiesheng.login.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.service.TsLoginConfigurer;
@@ -19,13 +21,22 @@ public class DemoWebConfigurer implements TieshengWebConfigurer, TsLoginConfigur
    @Autowired
    GlobalConfig globalConfig;

+    public static void main(String[] args) {
+        RequestUserInfo info = new RequestUserInfo();
+        info.setId("1");
+        info.setName("name");
+        info.setData(info);
+        String jsonStr = JSONUtil.toJsonStr(info);
+        LogFactory.get().info(jsonStr);
+    }
+

    @Override
    public RequestUserInfo getCurrentUserName(TokenBean tokenBean) {
        RequestUserInfo info = new RequestUserInfo();
-        if (Objects.equals(tokenBean.getId(), "1")) {
-            return info;
-        }
+        info.setId(tokenBean.getId());
+        info.setName(tokenBean.getExtra());
+        info.setData(info);
        return info;
    }

--- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
@@ -3,7 +3,6 @@ package com.tiesheng.demo.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.log.LogFactory;
-import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
@@ -195,18 +194,4 @@ public class TestController {
        return ApiResp.respOK("");
    }

-    @RequestMapping("poiTool")
-    @TokenIgnore
-    public ApiResp<String> poiTool() {
-        TimeInterval timeInterval = new TimeInterval();
-
-        FileUploadPath file = FileUploadPath.file("/upload/test.xlsx");
-
-        ExcelUtil.getReader(new File(file.getAbsolutePath())).read();
-
-        System.out.println("timeInterval: " + timeInterval.interval());
-
-        return ApiResp.respOK("");
-    }
-
 }
--- a/springboot-ademo/src/main/resources/application-test.yml
+++ b/springboot-ademo/src/main/resources/application-test.yml
@@ -7,8 +7,9 @@ spring:
    url: jdbc:mysql://47.96.30.85:3306/com_tiesheng_web?useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&queryTimeout=5400&allowMultiQueries=true&serverTimezone=GMT%2B8
    username: com_tiesheng_web
    password: 4Xo$XheGFc
-#  redis:
-#    url: redis://kyF0zUL3011111@47.96.30.85:6234
+  redis:
+    url: redis://kyF0zUL3011111@47.96.30.85:6234
+    database: 1

 platform:
  ding:
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-annotation</artifactId>
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-database</artifactId>
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-encrypt</artifactId>
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-login</artifactId>
--- a/springboot-login/src/main/java/com/tiesheng/login/service/CorePlatformUniqueService.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/service/CorePlatformUniqueService.java
@@ -1,7 +1,6 @@
 package com.tiesheng.login.service;

 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.tiesheng.login.mapper.CoreLogLoginMapper;
 import com.tiesheng.login.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.login.pojos.DoLoginInfo;
@@ -103,7 +102,7 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
    public void addLoginLog(CorePlatformUnique platformUnique, TokenBean tokenBean) {

        HttpServletRequest request = ServletKit.getRequest();
-        String ip = ServletUtil.getClientIP(request);
+        String ip = ServletKit.getClientIP(request);

        CoreLogLogin login = new CoreLogLogin();
        login.setUserId(tokenBean.getId());
--- a/springboot-login/src/main/java/com/tiesheng/login/service/TsLoginConfigurer.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/service/TsLoginConfigurer.java
@@ -1,9 +1,9 @@
 package com.tiesheng.login.service;

 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.tiesheng.login.pojos.RequestUserInfo;
 import com.tiesheng.login.pojos.dao.CorePlatformUnique;
+import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.config.TsTokenConfig;
 import com.tiesheng.util.pojos.TokenBean;
 import com.tiesheng.util.service.TsCacheService;
@@ -37,7 +37,7 @@ public interface TsLoginConfigurer {
     * 签名错误的时候
     */
    default void onSignError(HttpServletResponse response) {
-        ServletUtil.write(response, "404", "text");
+        ServletKit.write(response, "404", "text");
    }


--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-message</artifactId>
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-poi</artifactId>
--- a/springboot-role/pom.xml
+++ b/springboot-role/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-role</artifactId>
--- a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
@@ -1,15 +1,12 @@
 package com.tiesheng.role.service;

-import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.role.mapper.*;
 import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
 import com.tiesheng.role.pojos.dao.CoreRoleGroup;
@@ -18,27 +15,19 @@ import com.tiesheng.role.pojos.dao.CoreRoleUser;
 import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
 import com.tiesheng.role.pojos.dto.OwnerMenuDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
-import com.tiesheng.util.config.GlobalConfig;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
 import com.tiesheng.util.service.role.TsAuthorityHandler;
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
-import java.lang.reflect.Method;
 import java.util.*;
 import java.util.stream.Collectors;

@Service
-public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRoleGroup>
-        implements ApplicationListener<ContextRefreshedEvent> {
+public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRoleGroup> {

    @Resource
    CoreRoleUserMapper coreRoleUserMapper;
@@ -48,10 +37,7 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
    CoreRoleAuthorityMapper coreRoleAuthorityMapper;
    @Resource
    CoreRoleServerMapper coreRoleServerMapper;
-    @Resource
-    TsAuthorityHandler tsAuthorityHandler;
-    @Autowired
-    private GlobalConfig globalConfig;
+

    public CoreRoleServerMapper getServerMapper() {
        return coreRoleServerMapper;
@@ -252,37 +238,4 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
                .collect(Collectors.toList());
    }

-
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        ApplicationContext applicationContext = event.getApplicationContext();
-        Map<String, Object> beansOfType = applicationContext.getBeansWithAnnotation(RoleAuthority.class);
-
-        String version = DateUtil.format(new Date(), "yyyyMMddHHmmss");
-
-        for (Map.Entry<String, Object> entry : beansOfType.entrySet()) {
-
-            Class<?> targetClass = AopUtils.getTargetClass(entry.getValue());
-            RoleAuthority menu = targetClass.getAnnotation(RoleAuthority.class);
-
-            List<RoleAuthority> points = new ArrayList<>();
-            Method[] methods = targetClass.getDeclaredMethods();
-            for (Method method : methods) {
-                RoleAuthority methodAuthority = AnnotationUtil.getAnnotation(method, RoleAuthority.class);
-                if (methodAuthority != null) {
-                    points.add(methodAuthority);
-                }
-            }
-
-            tsAuthorityHandler.addRoleAuthority(version, menu, points);
-        }
-
-        coreRoleAuthorityMapper.delete(new QueryWrapper<CoreRoleAuthority>()
-                .ne("version", version)
-                .eq("service", globalConfig.getService())
-                .eq("source", "auto")
-        );
-
-    }
-
 }
--- a/springboot-role/src/main/java/com/tiesheng/role/service/RoleAuthorityHandler.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/service/RoleAuthorityHandler.java
@@ -2,6 +2,7 @@ package com.tiesheng.role.service;

 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.role.mapper.CoreRoleAuthorityMapper;
 import com.tiesheng.role.mapper.CoreRoleUserMapper;
@@ -107,4 +108,13 @@ public class RoleAuthorityHandler implements TsAuthorityHandler {
        return list.stream().map(CoreRoleAuthority::getNo).distinct().collect(Collectors.toList());
    }

+    @Override
+    public void onCreateAfter(String version) {
+        coreRoleAuthorityMapper.delete(new QueryWrapper<CoreRoleAuthority>()
+                .ne("version", version)
+                .eq("service", globalConfig.getService())
+                .eq("source", "auto")
+        );
+    }
+
 }
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-util</artifactId>
@@ -15,6 +15,7 @@
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hutool.version>5.8.31</hutool.version>
    </properties>

    <dependencies>
@@ -32,15 +33,50 @@

        <dependency>
            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-bom</artifactId>
-            <version>5.8.16</version>
-            <type>pom</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>cn.hutool</groupId>
-                    <artifactId>hutool-http</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>hutool-core</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-cache</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-captcha</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-jwt</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-log</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-extra</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-db</artifactId>
+            <version>${hutool.version}</version>
        </dependency>

        <dependency>
@@ -71,7 +107,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
-            <version>1.2.83</version>
+            <version>1.2.76</version>
        </dependency>

        <!--   加解密     -->
--- a/springboot-util/src/main/java/com/tiesheng/util/service/cache/TsCacheRedisHandler.java
+++ b/springboot-util/src/main/java/com/tiesheng/util/service/cache/TsCacheRedisHandler.java
@@ -1,5 +1,6 @@
 package com.tiesheng.util.service.cache;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -13,7 +14,7 @@ import java.util.concurrent.TimeUnit;
@ConditionalOnProperty("spring.redis.url")
 public class TsCacheRedisHandler implements TsCacheHandler {

-    @Resource
+    @Autowired
    RedisTemplate<String, String> redisTemplate;


--- a/springboot-util/src/main/java/com/tiesheng/util/service/role/TsAuthorityHandler.java
+++ b/springboot-util/src/main/java/com/tiesheng/util/service/role/TsAuthorityHandler.java
@@ -30,4 +30,12 @@ public interface TsAuthorityHandler {
     */
    List<String> getAuthorities(TokenBean tokenBean);

+
+    /**
+     * 创建结束后
+     *
+     * @param version
+     */
+    void onCreateAfter(String version);
+
 }
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc37</version>
+        <version>2.0.0.rc38</version>
    </parent>

    <artifactId>springboot-web</artifactId>
--- a/springboot-web/src/main/java/com/tiesheng/web/config/role/RoleAuthorityCreator.java
+++ b/springboot-web/src/main/java/com/tiesheng/web/config/role/RoleAuthorityCreator.java
@@ -0,0 +1,53 @@
+package com.tiesheng.web.config.role;
+
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.date.DateUtil;
+import com.tiesheng.annotation.role.RoleAuthority;
+import com.tiesheng.util.service.role.TsAuthorityHandler;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class RoleAuthorityCreator implements ApplicationListener<ContextRefreshedEvent> {
+
+    @Resource
+    TsAuthorityHandler tsAuthorityHandler;
+
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        ApplicationContext applicationContext = event.getApplicationContext();
+        Map<String, Object> beansOfType = applicationContext.getBeansWithAnnotation(RoleAuthority.class);
+
+        String version = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+
+        for (Map.Entry<String, Object> entry : beansOfType.entrySet()) {
+
+            Class<?> targetClass = AopUtils.getTargetClass(entry.getValue());
+            RoleAuthority menu = targetClass.getAnnotation(RoleAuthority.class);
+
+            List<RoleAuthority> points = new ArrayList<>();
+            Method[] methods = targetClass.getDeclaredMethods();
+            for (Method method : methods) {
+                RoleAuthority methodAuthority = AnnotationUtil.getAnnotation(method, RoleAuthority.class);
+                if (methodAuthority != null) {
+                    points.add(methodAuthority);
+                }
+            }
+
+            tsAuthorityHandler.addRoleAuthority(version, menu, points);
+        }
+
+        tsAuthorityHandler.onCreateAfter(version);
+    }
+}