diff --git a/.idea/.gitignore b/.idea/.gitignore index 35410ca..1f91de5 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -6,3 +6,4 @@ # Datasource local storage ignored files /dataSources/ /dataSources.local.xml +/logs/ diff --git a/BlockFinanceCentral/.gitignore b/BlockFinanceCentral/.gitignore index 7a5150e..3f7ae75 100644 --- a/BlockFinanceCentral/.gitignore +++ b/BlockFinanceCentral/.gitignore @@ -3,7 +3,7 @@ target/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ - +!**/logs/ ### STS ### .apt_generated .classpath @@ -33,3 +33,5 @@ build/ ### VS Code ### .vscode/ +/logs/ + diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/LogController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/LogController.java deleted file mode 100644 index 7bf833a..0000000 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/LogController.java +++ /dev/null @@ -1,43 +0,0 @@ -//package com.sztzjy.block_finance.controller; -// -// -//import cn.hutool.core.util.IdUtil; -//import com.sztzjy.block_finance.log.LogManager; -//import com.sztzjy.block_finance.util.ResultDataEntity; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.http.HttpStatus; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import javax.servlet.http.HttpServletRequest; -// -//@Api(tags = "日志管理") -//@RestController -//@RequestMapping("api/log") -//public class LogController { -// -// private final LogManager logManager; -// private final HttpServletRequest request; -// -// public LogController(LogManager logManager, HttpServletRequest request) { -// this.logManager = logManager; -// this.request = request; -// } -// -// @ApiOperation("新增单条日志记录") -// @PostMapping("addLog") -// public ResultDataEntity addLog(String action, -// String ipAddress, -// String operatorId, -// String operatorName, -// String userAgent, -// String params, -// String description) { -// //TODO 日志是在切面中完成， 该接口仅用于代码格式示例，无法调用。此接口类似情况的参数尽量使用对象（json或其他)接收，而不是单个或多个参数； -// logManager.create(IdUtil.simpleUUID(), action, ipAddress, operatorId, operatorName, userAgent, params, description); -// return new ResultDataEntity(HttpStatus.OK); -// } -// -//} diff --git a/BlockFinanceCentral/src/main/resources/application-dev.yml b/BlockFinanceCentral/src/main/resources/application-dev.yml index 39a2318..81e6903 100644 --- a/BlockFinanceCentral/src/main/resources/application-dev.yml +++ b/BlockFinanceCentral/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: datasource: druid: db-type: mysql - url: jdbc:mysql://${DB_HOST:120.79.54.255}:${DB_PORT:3306}/${DB_NAME:tz_block_financial_invoice}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://${DB_HOST:120.79.54.255}:${DB_PORT:3306}/${DB_NAME:tz_finance_supply}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:Sztzjy506} driver-class-name: com.mysql.cj.jdbc.Driver @@ -11,7 +11,7 @@ spring: # 文件存储 file: type: local - path: /usr/local/tianzeProject/invoiceItems/uploadFile + path: D:\home # path: D:\home # path: /usr/local/tianzeProject/blockFinance/uploadFile diff --git a/BlockFinanceCentral/src/main/resources/application.yml b/BlockFinanceCentral/src/main/resources/application.yml index 045926c..3f0e516 100644 --- a/BlockFinanceCentral/src/main/resources/application.yml +++ b/BlockFinanceCentral/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9900 + port: 7900 servlet: context-path: / tomcat: @@ -77,7 +77,7 @@ mybatis: swagger: - enable: false + enable: true tokenHeader: Authorization title: 天择区块链金融 • 接口文档 description: 天择区块链金融WebAPI接口文档 diff --git a/admin-convert-pdf/target/classes/lib/aspose-cells-20.7-crack.jar b/admin-convert-pdf/target/classes/lib/aspose-cells-20.7-crack.jar deleted file mode 100644 index 9676f04..0000000 Binary files a/admin-convert-pdf/target/classes/lib/aspose-cells-20.7-crack.jar and /dev/null differ diff --git a/admin-convert-pdf/target/classes/lib/aspose-pdf-18.2.jar b/admin-convert-pdf/target/classes/lib/aspose-pdf-18.2.jar deleted file mode 100644 index 833df4f..0000000 Binary files a/admin-convert-pdf/target/classes/lib/aspose-pdf-18.2.jar and /dev/null differ diff --git a/admin-convert-pdf/target/classes/lib/aspose-words-18.10-jdk16.jar b/admin-convert-pdf/target/classes/lib/aspose-words-18.10-jdk16.jar deleted file mode 100644 index 33057f9..0000000 Binary files a/admin-convert-pdf/target/classes/lib/aspose-words-18.10-jdk16.jar and /dev/null differ diff --git a/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil$TypeEnum.class b/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil$TypeEnum.class deleted file mode 100644 index a0b76a4..0000000 Binary files a/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil$TypeEnum.class and /dev/null differ diff --git a/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil.class b/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil.class deleted file mode 100644 index 07a2fc3..0000000 Binary files a/admin-convert-pdf/target/classes/util/convertPDF/PDFConvertUtil.class and /dev/null differ diff --git a/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 0396efb..0000000 --- a/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -util\convertPDF\PDFConvertUtil$TypeEnum.class -util\convertPDF\PDFConvertUtil.class diff --git a/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 48ccf27..0000000 --- a/admin-convert-pdf/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\tianze\tz_block_finance\admin-convert-pdf\src\main\java\util\convertPDF\PDFConvertUtil.java