publish 2.0.22

CHANGELOG_V1.md

@@ -50,7 +50,7 @@
   <repositories>
         <repository>
             <id>kepai-repo</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </repository>
     </repositories>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.19</version>
+    <version>2.0.22</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.19</version>
+                <version>2.0.22</version>
             </dependency>
 
             <dependency>
@@ -120,8 +120,8 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>kepai-repo-plugin</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <id>tiesheng-repo-plugin</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </pluginRepository>
     </pluginRepositories>
 

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.19</version>
+        <version>2.0.22</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.19</version>
+    <version>2.0.22</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -46,8 +46,8 @@
 
     <repositories>
         <repository>
-            <id>kepai-repo</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <id>tiesheng-repo</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </repository>
     </repositories>
 

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.database.config.DbBackupConfig;
+import com.tiesheng.demo.pojos.CustTokenBean;
 import com.tiesheng.demo.pojos.JsonTest;
 import com.tiesheng.demo.pojos.PoiBean;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
@@ -43,7 +44,6 @@ import java.util.function.Consumer;
  */
 @RestController
 @RequestMapping("/test")
-@RoleAuthority(value = "test", group = "test")
 public class TestController {
 
     @Autowired
@@ -65,7 +65,6 @@ public class TestController {
 
 
     @RequestMapping("/index")
-    @TokenIgnore
     public void index(HttpServletResponse response) {
         globalConfig.redirectWithVer("mobile", "/test", response);
     }
@@ -113,8 +112,9 @@ public class TestController {
 
 
     @GetMapping("/send")
-    @TokenIgnore
-    public ApiResp<String> sendMessage() {
+    public ApiResp<String> sendMessage(CustTokenBean tokenBean) {
+
+        tokenBean.test();
 
 //        MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
 //                JSONUtil.createObj().putOpt("action", "sms-visitor-invite"));

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

@@ -0,0 +1,12 @@
+package com.tiesheng.demo.pojos;
+
+import com.tiesheng.util.pojos.TokenBean;
+
+public class CustTokenBean extends TokenBean {
+
+
+    public void test() {
+        System.out.println("test: " + getId());
+    }
+
+}

springboot-annotation/pom.xml

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

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.19</version>
+        <version>2.0.22</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-login/pom.xml

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

springboot-login/src/main/java/com/tiesheng/login/config/TokenWebMvcConfigurer.java

@@ -1,5 +1,6 @@
 package com.tiesheng.login.config;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
@@ -40,7 +41,7 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
         resolvers.add(new HandlerMethodArgumentResolver() {
             @Override
             public boolean supportsParameter(MethodParameter parameter) {
-                return parameter.getParameterType().isAssignableFrom(TokenBean.class);
+                return TokenBean.class.isAssignableFrom(parameter.getParameterType());
             }
 
             @Override
@@ -54,7 +55,9 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
                     TokenIgnore annotation = method.getAnnotation(TokenIgnore.class);
                     thrExp = annotation == null;
                 }
-                return tsTokenConfig.validToken(header, thrExp);
+
+                TokenBean tokenBean = tsTokenConfig.validToken(header, thrExp);
+                return BeanUtil.copyProperties(tokenBean, parameter.getParameterType());
             }
         });
     }

springboot-message/pom.xml

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

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.19</version>
+        <version>2.0.22</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-util/pom.xml

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

springboot-web/pom.xml

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

springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java

@@ -2,7 +2,6 @@ package com.tiesheng.web.service;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.web.mapper.CoreLogApiMapper;
 import com.tiesheng.web.pojos.dao.CoreLogApi;
@@ -12,6 +11,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.util.Objects;
 
 @Component
 public class OkHttpLogInterceptor implements Interceptor {
@@ -22,11 +23,14 @@ public class OkHttpLogInterceptor implements Interceptor {
 
     @NotNull
     @Override
-    public Response intercept(@NotNull Chain chain) {
-
-        CoreLogApi logApi = new CoreLogApi();
+    public Response intercept(@NotNull Chain chain) throws IOException {
 
         Request request = chain.request();
+        if (Objects.equals(request.header("skipApiLog"), "true")) {
+            return chain.proceed(request);
+        }
+
+        CoreLogApi logApi = new CoreLogApi();
         logApi.setUrl(request.url().toString());
         logApi.setContent(requestBody2String(request));
 
@@ -47,10 +51,29 @@ public class OkHttpLogInterceptor implements Interceptor {
             }
         } catch (Exception e) {
             JSONObject object = new JSONObject();
-            object.put("code", -1);
-            object.put("message", JSON.toJSONString(e));
+            object.put("code", 500);
+            object.put("message", e.getMessage());
             object.put("exception", e);
             logApi.setRespBody(object.toJSONString());
+
+            response = new Response.Builder()
+
+                    // 必须设置请求对象
+                    .request(chain.request())
+
+                    // 指定协议版本
+                    .protocol(Protocol.HTTP_1_1)
+
+                    // 设置HTTP状态码
+                    .code(object.getInteger("code"))
+
+                    // 状态信息
+                    .message(object.getString("message"))
+
+                    // 设置响应体
+                    .body(ResponseBody.create(MediaType.parse("application/json"), object.toJSONString()))
+                    .headers(new Headers.Builder().build()) // 可选：设置响应头
+                    .build();
         }
 
         ThreadUtil.execute(() -> coreLogApiMapper.insert(logApi));