Skip to content

8
8timerapiv200
Commit 78b4ac17 by 翁国栋
Options

ios端上传bug

parent 09830dc0
Showing with 24 additions and 23 deletions
src/main/java/cn/timer/api/controller/disk/DiskFilesController.java
...@@ -80,11 +80,13 @@ public class DiskFilesController { ...@@ -80,11 +80,13 @@ public class DiskFilesController {
@ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> upload(@CurrentUser UserBean userBean, @RequestParam(required = true) MultipartFile[] file, public Result<Object> upload(@CurrentUser UserBean userBean, @RequestParam(required = true) MultipartFile[] file,
@ApiParam("文件文件夹或共享空间ID") @RequestParam(required = false) Integer catalogueId,HttpServletRequest request) { @ApiParam("文件文件夹或共享空间ID") @RequestParam(required = false) Integer catalogueId,HttpServletRequest request) {
//如果不指定文件夹将选择该用户最近创建的第一级目录，ios端上传并没有指定文件夹
if(catalogueId<=0){ if(catalogueId<=0){
DiskCatalogue diskCatalogue = DiskCatalogue.builder().build().selectOne(new QueryWrapper<DiskCatalogue>().select("id") DiskCatalogue diskCatalogue = DiskCatalogue.builder().build().selectOne(new QueryWrapper<DiskCatalogue>().select("id")
.eq("org_id", userBean.getOrgCode()) .eq("org_id", userBean.getOrgCode())
.eq("parent_id",0)
.eq("delete_flag",0) .eq("delete_flag",0)
.eq("create_user_id",userBean.getEmpNum()).orderByAsc("create_time") .eq("create_user_id",userBean.getEmpNum()).orderByDesc("create_time")
); );
if(StringUtils.isEmpty(diskCatalogue)){ if(StringUtils.isEmpty(diskCatalogue)){
diskCatalogue = new DiskCatalogue(); diskCatalogue = new DiskCatalogue();
......
src/main/resources/application-pro.yml
...@@ -3,24 +3,24 @@ server: ...@@ -3,24 +3,24 @@ server:
port: 8083 port: 8083
servlet: servlet:
# context-path: /YoulinghrApiV100 # context-path: /YoulinghrApiV100
session: session:
timeout: 2592000 # session会话过期时间 timeout: 2592000 # session会话过期时间
spring: spring:
servlet: servlet:
multipart: multipart:
max-file-size: 500MB max-file-size: 500MB
max-request-size: 500MB max-request-size: 500MB
jpa: jpa:
# 配置生成表 存储引擎InnoDB # 配置生成表 存储引擎InnoDB
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
# database: # database:
open-in-view: false open-in-view: false
# naming: # naming:
# spring boot jpa hibernate 根据实体类生成表以及字段的命名策略 # spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
# 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
hibernate: hibernate:
ddl-auto: update ddl-auto: update
show-sql: true show-sql: true
datasource: datasource:
...@@ -55,7 +55,7 @@ spring: ...@@ -55,7 +55,7 @@ spring:
#max-pool-prepared-statement-per-connection-size: 20 #max-pool-prepared-statement-per-connection-size: 20
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录 # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
#connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 #connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
druid: druid:
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 ,不能用log4j，不然报错：Failed to bind properties under 'spring.datasource.druid' to javax.sql.DataSource: # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 ,不能用log4j，不然报错：Failed to bind properties under 'spring.datasource.druid' to javax.sql.DataSource:
filters: stat,slf4j filters: stat,slf4j
# 配置监控服务器 # 配置监控服务器
...@@ -78,15 +78,15 @@ spring: ...@@ -78,15 +78,15 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
# spring boot启动打印横幅 配置 # spring boot启动打印横幅 配置
banner: banner:
charset: UTF-8 # Banner file encoding. charset: UTF-8 # Banner file encoding.
location: banner.txt # Banner text resource location. location: banner.txt # Banner text resource location.
image: image:
location: banner.gif # Banner image file location (jpg or png can also be used). location: banner.gif # Banner image file location (jpg or png can also be used).
width: 76 # Width of the banner image in chars. width: 76 # Width of the banner image in chars.
height: 76 # Height of the banner image in chars (default based on image height). height: 76 # Height of the banner image in chars (default based on image height).
margin: 2 # Left hand image margin in chars. margin: 2 # Left hand image margin in chars.
invert: false # Whether images should be inverted for dark terminal themes. invert: false # Whether images should be inverted for dark terminal themes.
mail: mail:
port: 465 port: 465
protocol: smtp protocol: smtp
host: smtp.youlingrc.com host: smtp.youlingrc.com
...@@ -94,15 +94,15 @@ spring: ...@@ -94,15 +94,15 @@ spring:
password: YoulingRC2020 password: YoulingRC2020
default-encoding: utf-8 default-encoding: utf-8
properties: properties:
mail: mail:
smtp: smtp:
auth: true auth: true
starttls: starttls:
enable: true enable: true
required: true required: true
ssl: # SSL Config ssl: # SSL Config
enable: true enable: true
socketFactory: socketFactory:
port: 465 port: 465
class: javax.net.ssl.SSLSocketFactory class: javax.net.ssl.SSLSocketFactory
redis: redis:
...@@ -150,7 +150,7 @@ pagehelper: ...@@ -150,7 +150,7 @@ pagehelper:
reasonable: true reasonable: true
supportMethodsArguments: true supportMethodsArguments: true
params: count=countSql params: count=countSql
#showSql #showSql
logging: logging:
level: level:
...@@ -158,7 +158,7 @@ logging: ...@@ -158,7 +158,7 @@ logging:
cn.timer.api.dao: error cn.timer.api.dao: error
pattern: pattern:
console: '--%p--%m%n' console: '--%p--%m%n'
#swagger: #swagger:
# ui-config: # ui-config:
# operations-sorter: method # 它提供了两个配置项：alpha和method，分别代表了按字母表排序以及按方法定义顺序排序 # operations-sorter: method # 它提供了两个配置项：alpha和method，分别代表了按字母表排序以及按方法定义顺序排序
...@@ -195,14 +195,14 @@ config-8timer: ...@@ -195,14 +195,14 @@ config-8timer:
two: 7 two: 7
three: 30 three: 30
init-password: 123456 init-password: 123456
# 创建企业默认添加讯息 # 创建企业默认添加讯息
qyxx: qyxx:
title: '欢迎来到8小时' title: '欢迎来到8小时'
cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/%E6%AC%A2%E8%BF%8E%E5%9B%BE.png' cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/%E6%AC%A2%E8%BF%8E%E5%9B%BE.png'
summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>' summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
author: 'System' author: 'System'
# 客户管理导入服务器保存路径 # 客户管理导入服务器保存路径
crm-excel: crm-excel:
realPath: '/data/crm-excel/' realPath: '/data/crm-excel/'
...@@ -212,8 +212,8 @@ config-8timer: ...@@ -212,8 +212,8 @@ config-8timer:
# 文件存储地址类型：aliyun-oss(阿里云OSS)，physics-oss(物理机器OSS) # 文件存储地址类型：aliyun-oss(阿里云OSS)，physics-oss(物理机器OSS)
# 默认存储物理机器OSS # 默认存储物理机器OSS
file-address: file-address:
#type: physics-oss type: physics-oss
type: aliyun-oss # type: aliyun-oss
#导出zip临时地址 #导出zip临时地址
zip: zip:
...@@ -234,4 +234,4 @@ sftp: ...@@ -234,4 +234,4 @@ sftp:
serverUrl: 'https://oa-img.jidahuayi.com' serverUrl: 'https://oa-img.jidahuayi.com'
#serverUrl: 'http://8.134.55.197:8080' #serverUrl: 'http://8.134.55.197:8080'
targetPath: '/disk' targetPath: '/disk'
reservedName: false reservedName: false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment