 chenxudong
|
97a7302c7b
|
Merge branch 'develop' into test
|
2024-11-29 16:59:35 +08:00 |
 sxlong
|
fecb6d2102
|
Merge remote-tracking branch 'origin/develop_comac' into develop
|
2024-11-29 16:24:07 +08:00 |
s2042968
|
4d09ba9d2c
|
jsonwebtoken包
|
2024-11-29 16:17:07 +08:00 |
|
s2042968
|
e34973d774
|
Merge branch 'test' into develop_comac
|
2024-11-29 16:11:00 +08:00 |
|
s2042968
|
0a1616fd53
|
创建本地线程存储用户信息，修改token加密方式
|
2024-11-29 16:08:19 +08:00 |
|
sxlong
|
133d62c55c
|
1.修改异常信息的返回方式。
|
2024-11-29 14:18:12 +08:00 |
|
sxlong
|
9ed6a64a9e
|
1.修改创建文件夹和上传文件的bug。
|
2024-11-29 11:27:56 +08:00 |
|
sxlong
|
143389f52b
|
1.修改发布页面查询数据的bug。
|
2024-11-29 10:00:25 +08:00 |
|
sxlong
|
9580e204a7
|
1.修改文件信息接口的异常反馈。
|
2024-11-29 09:38:23 +08:00 |
|
sxlong
|
b7ade7d149
|
1.修改作废的bug。
|
2024-11-28 14:56:32 +08:00 |
|
chenxudong
|
c9394fcc60
|
解决文件导入的问题。
|
2024-11-28 13:42:49 +08:00 |
|
chenxudong
|
74b3d9714f
|
clean code
|
2024-11-28 12:03:41 +08:00 |
|
chenxudong
|
8344baed68
|
解决下载文件乱码的问题
|
2024-11-28 09:48:31 +08:00 |
|
chenxudong
|
df92c856af
|
Merge branch 'develop' into test
|
2024-11-27 16:58:43 +08:00 |
|
sxlong
|
8f1968ca9f
|
1.修复已知的bug，除了下载文件时中文名乱码的问题。
|
2024-11-27 16:53:36 +08:00 |
578646533@qq.com
|
464f46cbf7
|
Merge branch 'develop' into test
# Conflicts:
# bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
# service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
|
2024-11-27 11:23:15 +08:00 |
|
chenxudong
|
92699d253d
|
解决打包的问题。
|
2024-11-27 10:04:51 +08:00 |
|
sxlong
|
9709d6a691
|
1.修改目录结构相关的接口代码逻辑。
|
2024-11-26 18:02:12 +08:00 |
|
chenxudong
|
c91f2cc8a9
|
编译
|
2024-11-26 15:47:52 +08:00 |
|
s2042968
|
010eb97a26
|
登出接口
|
2024-11-26 11:06:17 +08:00 |
|
chenxudong
|
1f18245c8f
|
文件下载接口实现
|
2024-11-26 10:31:35 +08:00 |
|
sxlong
|
286f23ad21
|
1.增加导出数据接口。
|
2024-11-26 09:31:30 +08:00 |
|
s2042968
|
39a279b96b
|
解决冲突
|
2024-11-25 16:44:53 +08:00 |
|
s2042968
|
cea8c222a2
|
增加用户校验，未发布用户不能登录
|
2024-11-25 14:28:54 +08:00 |
|
sxlong
|
4bc0c04706
|
1.增加数据导出接口。
|
2024-11-25 11:09:55 +08:00 |
|
chenxudong
|
a53b06385f
|
改bug
|
2024-11-25 09:01:45 +08:00 |
|
chenxudong
|
516e81ba91
|
实现文件上传的功能。
|
2024-11-22 17:17:15 +08:00 |
|
578646533@qq.com
|
a72c47581b
|
打包发布
|
2024-11-22 13:48:31 +08:00 |
|
578646533@qq.com
|
dc26b61e18
|
去除无效的引用
|
2024-11-22 10:10:44 +08:00 |
|
578646533@qq.com
|
a580177800
|
增加导入和导出步骤
|
2024-11-21 19:01:52 +08:00 |
|
578646533@qq.com
|
bf06d60796
|
Merge remote-tracking branch 'origin/develop' into test
|
2024-11-21 19:00:18 +08:00 |
|
578646533@qq.com
|
306bf091e7
|
增加导入和导出步骤
|
2024-11-21 18:58:58 +08:00 |
|
sxlong
|
8619126d16
|
1.增加数据库导出接口部分代码逻辑。(不能运行)
|
2024-11-21 18:12:43 +08:00 |
|
s2042968
|
1bc5ab6c4d
|
解决合并冲突
|
2024-11-21 16:49:53 +08:00 |
|
s2042968
|
4ddbc6eb34
|
查询用户分页，修改逻辑删除问题
|
2024-11-21 16:46:13 +08:00 |
 lizhanhao
|
05ff565097
|
修改删除用户功能,解决冲突
|
2024-11-21 15:38:31 +08:00 |
|
lizhanhao
|
798a15d570
|
修改删除用户功能
|
2024-11-21 15:34:15 +08:00 |
 石璞臻
|
ff453a4d52
|
修改用户发布传参模型
|
2024-11-21 15:18:08 +08:00 |
|
578646533@qq.com
|
66acedc8b9
|
增加导入和导出步骤
|
2024-11-21 09:31:53 +08:00 |
|
sxlong
|
91e95ee10b
|
1.合并develop_comac分支代码。
|
2024-11-20 17:57:20 +08:00 |
|
sxlong
|
55ad1665b9
|
1.增加文件上传时将文件重命名并存到缓存目录再移动的逻辑；2.增加相关接口中批量上传时间和保存状态字段。
|
2024-11-20 17:40:21 +08:00 |
|
s2042968
|
00103fdff5
|
查询用户分页
|
2024-11-20 17:08:10 +08:00 |
|
s2042968
|
eea01eab93
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 11:14:28 +08:00 |
|
石璞臻
|
15733c9a6b
|
解决冲突
|
2024-11-20 10:53:59 +08:00 |
|
s2042968
|
9aece9a346
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 10:49:41 +08:00 |
|
石璞臻
|
18dab91f3b
|
Merge remote-tracking branch 'origin/develop_comac' into develop_comac
# Conflicts:
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java
# domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
# infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java
# service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java
|
2024-11-20 10:49:18 +08:00 |
|
石璞臻
|
8100a55d23
|
修改用户查询字段模型，修改查询逻辑
|
2024-11-20 10:45:56 +08:00 |
|
lizhanhao
|
3bb3e4f6cc
|
提交删除用户功能
|
2024-11-20 10:41:26 +08:00 |
|
s2042968
|
ffd4f4b665
|
Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
|
2024-11-20 09:18:26 +08:00 |
|
sxlong
|
512f9724d8
|
1.增加获取子文件数量接口；2.增加文件下载接口；3.修改上传文件接口
|
2024-11-19 16:50:07 +08:00 |