From e313f96406ea75c583a1cbe0be0badaa30e89cd8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 10 Mar 2022 15:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/util/HttpRequestUtil.java | 2 +- .../service/IFeishuService.java | 2 +- .../service/impl/FeishuServiceImpl.java | 4 ++-- .../src/main/resources/application-dev.yml | 21 ++++++++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{document => feishu}/service/IFeishuService.java (93%) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{document => feishu}/service/impl/FeishuServiceImpl.java (97%) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java index 984f2c14e..d17fd4df6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java @@ -62,7 +62,7 @@ public class HttpRequestUtil { RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000000).setSocketTimeout(200000000).build(); HttpPost httpPost = new HttpPost(url); httpPost.setConfig(requestConfig); - httpPost.setEntity(new StringEntity(body)); + httpPost.setEntity(new StringEntity(body,"utf-8")); if (headerMap != null) { Iterator var38 = headerMap.entrySet().iterator(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java similarity index 93% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IFeishuService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index 9f18cf153..e529ecbb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -1,4 +1,4 @@ -package com.jero.modules.document.service; +package com.jero.modules.feishu.service; import java.io.IOException; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/FeishuServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 23732c555..7eb48ed40 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.modules.document.service.impl; +package com.jero.modules.feishu.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.jero.modules.document.service.IFeishuService; +import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index b8ab33495..f4dee408c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -132,13 +132,14 @@ spring: datasource: master: # url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai -# username: root -# password: 123456 -# driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false username: root - password: hzwlsoft.com + password: 123456 +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false +# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# username: root +# password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -185,7 +186,7 @@ jero : uploadType: local path : #文件上传根目录 设置 - upload: E://opt//upFiles + upload: D://opt//upFiles #webapp文件路径 webapp: D://opt//webapp shiro: @@ -359,3 +360,9 @@ people: secret: CDf2D9404C6ac1B0f7c3e3845ae0282a # appSecret CN PROD版 # secret: 7C3F03170E3ea489df04Ce8DEC7Df4f7 +## Feishu +Feishu: + appId: cli_a16d47ca9f381013 + appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe + getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal + batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ \ No newline at end of file