chenshuichuan
|
101a3084a0
|
add 维保
|
2 years ago |
|
chenshuichuan
|
c77bcc809f
|
fix mysql
|
2 years ago |
|
chenshuichuan
|
3847649533
|
add mqtt data
|
2 years ago |
|
chenshuichuan
|
f9b02681a0
|
add mqtt data
|
2 years ago |
|
chenshuichuan
|
dafcffbacf
|
mysql
|
2 years ago |
|
chenshuichuan
|
34713bc663
|
fix erp
|
2 years ago |
|
chenshuichuan
|
7f47311ff8
|
fix app create and update report
|
2 years ago |
|
chenshuichuan
|
c434594315
|
fix work report
|
2 years ago |
|
chenshuichuan
|
0ceac9a468
|
add weather
|
2 years ago |
|
chenshuichuan
|
86ac28ec4f
|
fix mqtt http
|
2 years ago |
|
chenshuichuan
|
842e1eeff2
|
add url
|
2 years ago |
|
chenshuichuan
|
356e283c2f
|
fix feeding
|
2 years ago |
|
chenshuichuan
|
8a3eec1373
|
add task and plan
|
2 years ago |
|
chenshuichuan
|
a2a2b50ac7
|
add item analysis
|
2 years ago |
|
chenshuichuan
|
57d7761e72
|
add mqtt record
|
2 years ago |
|
chenshuichuan
|
7ad57f3084
|
fix user info
|
2 years ago |
|
chenshuichuan
|
4a4ac36709
|
add iot and machine
|
2 years ago |
|
chenshuichuan
|
cf9f50266f
|
fix product
|
2 years ago |
|
chenyuan
|
7bf09e7da1
|
add records
|
2 years ago |
|
chenyuan
|
9b20d1690c
|
add record
|
2 years ago |
|
chenyuan
|
71dca95ea3
|
add mes module
|
2 years ago |
|
chenyuan
|
0a3859b753
|
add all
|
2 years ago |
YunaiV
|
9f63e1e294
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2 years ago |
|
YunaiV
|
213a6aa0fc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
dhb52
|
774082509b
|
feat: 达梦DM8
|
2 years ago |
|
YunaiV
|
29746d1459
|
【修复】MySQL jdbc 连接 5.7 示例不正确
|
2 years ago |
|
YunaiV
|
6ba73e60f0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
|
2 years ago |
|
dhb52
|
fd8889e76a
|
wip: SQLServer数据库更新, 代码生成注释乱码
|
2 years ago |
|
YunaiV
|
ab00986a1d
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2 years ago |
|
YunaiV
|
c0722b3a19
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
|
2 years ago |
|
dhb52
|
06dacb747b
|
feat: Oracle数据 DDL 适配
|
2 years ago |
|
dhb52
|
4f3aaa124c
|
feat: 测试数据库docker-compose, postgres DDL初稿
|
2 years ago |
|
YunaiV
|
853db724ec
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
|
2 years ago |
|
YunaiV
|
cd5e6319d9
|
【增强】一键改包：支持 site、org 等包
|
2 years ago |
|
YunaiV
|
da5425da2f
|
【修复】pay：PayWalletServiceImpl 可能存在的循环依赖问题
【修复】system：dev 配置文件，缺少 WECHAT_MINI_APP 配置项~
|
2 years ago |
|
YunaiV
|
af621cb03f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
|
2 years ago |
|
YunaiV
|
fd832e23fd
|
bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题
|
2 years ago |
|
YunaiV
|
a27c040a8f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
|
2 years ago |
|
YunaiV
|
9a31613e5b
|
【移除】敏感词的管理，简化项目的复杂度
|
2 years ago |
|
YunaiV
|
8093ef3b96
|
【移除】错误码的管理，简化项目的复杂度
|
2 years ago |
|
YunaiV
|
62c6c4b9bd
|
同步 develop 最新代码
|
2 years ago |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
cc9b2e86b6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2 years ago |
|
YunaiV
|
2e03dcba69
|
移除 resilience4j 组件
|
2 years ago |
|
YunaiV
|
9b9f54bb03
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
|
2 years ago |
|
YunaiV
|
594eb0ccc2
|
全局：增加 VO 数据翻译的支持
|
2 years ago |
|
YunaiV
|
b4e602bbd4
|
全局：增加 VO 数据翻译的支持
|
2 years ago |
|
YunaiV
|
398e2a225a
|
Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
|
2 years ago |
|
YunaiV
|
beea186507
|
全局：增加 VO 数据翻译的支持
|
2 years ago |
|
YunaiV
|
dc466d2286
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
|
2 years ago |