yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Pancaihua 2024-10-17 18:27:07 +08:00
parent eeff34622c
commit c23b9f39a2
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java
View File

@ -41,7 +41,7 @@ import java.util.Map;
* @author pch * @author pch
*/ */
public class EsearchUtils { public class EsearchUtils {
private static String ipStr = "192.168.1.28"; private static String ipStr = "140.143.164.40";
private static int port = 9200; private static int port = 9200;
private static String modeStr = "http"; private static String modeStr = "http";
private static RestHighLevelClient esClient = new RestHighLevelClient(RestClient.builder(new HttpHost(ipStr,port,modeStr))); private static RestHighLevelClient esClient = new RestHighLevelClient(RestClient.builder(new HttpHost(ipStr,port,modeStr)));

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java
View File

@ -112,6 +112,8 @@ public class onlyofController {
@Operation(summary = "更新文件编辑") @Operation(summary = "更新文件编辑")
@PreAuthorize("@ss.hasPermission('only:onlyof:update')") @PreAuthorize("@ss.hasPermission('only:onlyof:update')")
public ResponseEntity<Object> upload(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws Exception { public ResponseEntity<Object> upload(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws Exception {
System.out.println("file-filename:"+file.getOriginalFilename());
System.out.println("file-name:"+file.getName());
if (file.isEmpty()){ if (file.isEmpty()){
throw new Exception("上传文件不能为空"); throw new Exception("上传文件不能为空");
} }
@ -123,7 +125,7 @@ public class onlyofController {
upload.setFilePath(filePath); upload.setFilePath(filePath);
upload.setFileName(file.getOriginalFilename()); upload.setFileName(file.getOriginalFilename());
upload.setFileSize(file.getSize()); upload.setFileSize(file.getSize());
// System.out.println("111"+upload); System.out.println("111"+upload);
uploadService.save(upload); uploadService.save(upload);
System.gc(); System.gc();

6
yudao-server/src/main/resources/application-local.yaml
View File

@ -46,8 +46,8 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: jdbc:mysql://192.168.1.28:3306/yudao-vue?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://140.143.164.40:3306/yudao-vue?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://192.168.1.28:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
@ -71,7 +71,7 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis: redis:
host: 192.168.1.28 # 地址140.143.164.40 host: 140.143.164.40 # 地址140.143.164.40
port: 6379 # 端口 port: 6379 # 端口
database: 0 # 数据库索引 database: 0 # 数据库索引
password: 123456 password: 123456

4
yudao-server/src/main/resources/application.yaml
View File

@ -321,14 +321,14 @@ document:
# host: 192.168.1.15:20053 # host: 192.168.1.15:20053
# docker的访问地址还有需要的配置 # docker的访问地址还有需要的配置
files: files:
savePath: D:\doc\ savePath: /root/ai/Docs/
docservice: docservice:
convert-docs: .docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2 convert-docs: .docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
edited-docs: .docx|.xlsx|.csv|.pptx|.txt edited-docs: .docx|.xlsx|.csv|.pptx|.txt
viewed-docs: .pdf|.djvu|.xps viewed-docs: .pdf|.djvu|.xps
url: url:
# site: http://192.168.1.15:7878/ # site: http://192.168.1.15:7878/
site: http://192.168.1.28:8088/ site: http://140.143.164.40:8098/
converter: ConvertService.ashx converter: ConvertService.ashx
command: coauthoring/CommandService.ashx command: coauthoring/CommandService.ashx
api: web-apps/apps/api/documents/api.js api: web-apps/apps/api/documents/api.js