tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
This commit is contained in:
曾文豪
2024-09-18 14:53:10 +08:00
parent e519781207 e602f4c658
commit fd0976a30c
13 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>springboot-parent</name> <name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description> <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId> <artifactId>springboot-database</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId> <artifactId>springboot-login</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId> <artifactId>springboot-web</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId> <artifactId>springboot-util</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId> <artifactId>springboot-platform</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId> <artifactId>springboot-message</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId> <artifactId>springboot-role</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId> <artifactId>springboot-annotation</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>

4
springboot-ademo/pom.xml
View File

@@ -6,11 +6,11 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</parent> </parent>
<artifactId>springboot-ademo</artifactId> <artifactId>springboot-ademo</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>

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

@@ -84,12 +84,8 @@ public class TestController {
String jsonString = JSON.toJSONString(jsonTest); String jsonString = JSON.toJSONString(jsonTest);
LogFactory.get().info(jsonString); LogFactory.get().info(jsonString);
String s = OkHttpUtil.get("http://toolbox.tieshengkeji.com/test/login/23232/3232");
// String data = "0moeVHD0879FOJzCORIxc3SDFIsgzDBCmrZSCORLXPxMUtruvUifSME7xanfM3cJd6qgYRN7yIhL7Jc29PTy9DIhBMzEV3VYcN4r+WYw7VDHMIVJ9nprKqekHgujJtdHiUNKdYYm7yDhlb8cZE4Gam5/xTV20BZk92EV08/4S9A5txZCj2ETJ9/51WEeoC2V1Z3tVFdbOx2ktbygeOce3BUD5/q9UGRf59xshDe6Yow="; LogFactory.get().info(s);
String data = "C9g1Kr5UttpMdFWOvAvVTyUMjpNuCJglVv5mkF0ZexkjUPE9XJAFtJegV5x3bAJnN/8Coe18s/eQ+PhwN1cRMCChiOjbjOD4raqlTVjwCDzV/d7BD2b1nVI3J38tDBE26GDQ158MY3d7Q554wTahy8uvNoo+tFyVpMVw0B6GPW2IEF8KYU3u62eur+x2FhoSuPkPAyNpcwAK8hrC3m684lBc8+l3+zs7re0wSd0ypf7hD5QbEE+NbkBMJAOv78CXmhgTQ6zXerKmPEIw+gvviODoHbcsqUODLnCVyny0xTNzAHeNciYZgKarNu5aherI";
String decrypt = encryptConfig.decrypt(data);
LogFactory.get().info(decrypt);
// ArrayList<String> strings = CollUtil.newArrayList("11111", "22222"); // ArrayList<String> strings = CollUtil.newArrayList("11111", "22222");
// coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer<String>() { // coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer<String>() {

2
springboot-annotation/pom.xml
View File

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

2
springboot-database/pom.xml
View File

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

2
springboot-login/pom.xml
View File

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

2
springboot-message/pom.xml
View File

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

2
springboot-platform/pom.xml
View File

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

2
springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java
View File

@@ -246,7 +246,7 @@ public class PlatformDingConfig {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("dept_id", deptId); object.put("dept_id", deptId);
object.put("cursor", cursor); object.put("cursor", cursor);
object.put("size", 100); object.put("size", 200);
return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list", return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list",
object, new TypeReference<DingResponse<DingUserListVo>>() { object, new TypeReference<DingResponse<DingUserListVo>>() {

2
springboot-role/pom.xml
View File

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

2
springboot-util/pom.xml
View File

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

2
springboot-web/pom.xml
View File

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

5
springboot-web/src/main/java/com/tiesheng/web/service/LogApiOkHttpInterceptor.java → springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java
View File

@@ -14,7 +14,7 @@ import javax.annotation.Resource;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Component @Component
public class LogApiOkHttpInterceptor implements Interceptor { public class OkHttpLogInterceptor implements Interceptor {
@Resource @Resource
CoreLogApiMapper coreLogApiMapper; CoreLogApiMapper coreLogApiMapper;
@@ -52,6 +52,9 @@ public class LogApiOkHttpInterceptor implements Interceptor {
response = new Response.Builder() response = new Response.Builder()
.request(request) .request(request)
.protocol(Protocol.HTTP_1_1)
.code(logApi.getResult())
.message(e.getMessage())
.body(OkHttpUtil.ofJsonResponse(logApi.getRespBody())) .body(OkHttpUtil.ofJsonResponse(logApi.getRespBody()))
.build(); .build();
} }