|
|
c6d2c74896
|
环境修改
|
2024-08-26 18:08:25 +08:00 |
|
|
|
6d08c0383a
|
构建修改
|
2024-08-26 13:07:51 +08:00 |
|
|
|
311b44a5ec
|
环境修改
|
2024-08-22 10:17:27 +08:00 |
|
|
|
95efec4fb2
|
Merge pull request 'sjy' (#24) from sjy into master
Reviewed-on: #24
|
2024-08-22 10:09:18 +08:00 |
|
|
|
decde473dd
|
大屏未来三天天气接口
|
2024-08-22 09:59:39 +08:00 |
|
|
|
cdf2a116ee
|
构建修改
|
2024-08-21 17:23:07 +08:00 |
|
|
|
a8d4039fea
|
构建修改
|
2024-08-21 16:28:56 +08:00 |
|
|
|
ed9ab19f08
|
网关端口恢复为原来48080
|
2024-08-20 11:53:17 +08:00 |
|
|
|
f5ea9be887
|
线上环境
|
2024-08-20 11:52:14 +08:00 |
|
|
|
d9b26479ff
|
修改大屏接口路径
|
2024-08-20 11:43:38 +08:00 |
|
|
|
986a6be07d
|
还原为本地环境
|
2024-08-19 23:33:14 +08:00 |
|
|
|
3a6005b53c
|
网关端口为8080
|
2024-08-19 23:11:02 +08:00 |
|
|
|
ad6d43fbfa
|
环境改为线上
|
2024-08-19 23:06:05 +08:00 |
|
|
|
ed4f07c886
|
新增线上环境配置文件
|
2024-08-19 22:29:00 +08:00 |
|
|
|
fb04836336
|
开发时nacos环境使用本地
|
2024-08-19 09:44:08 +08:00 |
|
|
|
ddb32da95a
|
'本地nacos开发环境'
|
2024-08-15 09:24:16 +08:00 |
|
|
|
3ff87bfa3d
|
'build'
|
2024-08-15 09:15:08 +08:00 |
|
|
|
e024c3018c
|
配置文件中redis和nacos改为线上环境
|
2024-08-13 09:23:05 +08:00 |
|
|
|
145b7e7a30
|
大屏数据票务api
|
2024-07-23 16:34:44 +08:00 |
|
zsq
|
c5942eb785
|
停车场
|
2024-07-19 23:52:11 +08:00 |
|
|
|
3f4c483cd8
|
xxl-job integration
|
2024-07-05 17:11:08 +08:00 |
|
|
|
cd834112e2
|
ticket finish and sampling init
|
2024-07-04 11:50:11 +08:00 |
|
YunaiV
|
b1c11f8dd8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
|
2024-04-29 12:50:00 +08:00 |
|
YunaiV
|
b500bb7da1
|
【增强】一键改包：支持 site、org 等包
|
2024-04-29 12:48:46 +08:00 |
|
YunaiV
|
3aa8d41fcd
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 20:02:22 +08:00 |
|
YunaiV
|
be6aaec818
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:53:25 +08:00 |
|
YunaiV
|
e2c1c7d380
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:51:24 +08:00 |
|
YunaiV
|
5517dc7d4a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-02-27 22:12:05 +08:00 |
|
YunaiV
|
5be7965b18
|
bugfix：async Cache 导致租户不正确的问题
|
2024-02-27 22:11:42 +08:00 |
|
YunaiV
|
fb91eed961
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/CrmBacklogController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueTranslateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductCategoryController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/category/CrmProductCategoryCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateProductReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerPoolConfigService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/bo/CrmUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionCreateReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionTransferReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerSaveReqVO.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/health/HealthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/health/HealthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
|
2024-02-27 17:16:49 +08:00 |
|
YunaiV
|
e0ac8a28cb
|
✨ 同步最新 SYSTEM、INFRA、MALL 代码
|
2024-02-27 16:24:59 +08:00 |
|
YunaiV
|
8b4b4fc7ae
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
|
2024-02-17 23:28:43 +08:00 |
|
YunaiV
|
0e55c4da6d
|
✨ 增加 CRM 模块
|
2024-02-17 23:25:41 +08:00 |
|
YunaiV
|
5f53986d5e
|
✨ 增加 ERP 模块
|
2024-02-17 22:56:28 +08:00 |
|
YunaiV
|
f71a3b7dc0
|
✨ 2.0.1 版本发布准备
|
2024-02-17 22:38:38 +08:00 |
|
YunaiV
|
625ad70272
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
|
2024-01-27 10:29:42 +08:00 |
|
YunaiV
|
44699efc8d
|
✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter
|
2024-01-27 10:25:32 +08:00 |
|
YunaiV
|
1c409b8a6b
|
Update Dockerfile base image to 8-jre
|
2023-12-30 11:28:19 +08:00 |
|
YunaiV
|
55d5b81360
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
|
2023-12-30 11:27:50 +08:00 |
|
Xiaojun Yang
|
8e97e38050
|
Update Dockerfile base image to 21-jre
|
2023-12-09 09:08:04 -05:00 |
|
YunaiV
|
fd9c4d73b1
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-09 00:54:34 +08:00 |
|
YunaiV
|
bca3d0c691
|
⬆️ JDK21 + Spring Boot 3.2.0 + Spring Cloud 2023 晋升 master 分支，开启 2.0.0 版本
|
2023-12-09 00:43:37 +08:00 |
|
YunaiV
|
b3d02c1ed6
|
🐛 修复积木报表转发不正确的问题
|
2023-12-08 09:13:03 +08:00 |
|
YunaiV
|
2d9aa7a94a
|
websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息
|
2023-11-25 20:44:42 +08:00 |
|
YunaiV
|
f826d117f8
|
statistics：增加网关转发
|
2023-10-23 19:47:19 +08:00 |
|
YunaiV
|
e26b29c5eb
|
trade：增加 gateway 转发
|
2023-10-23 19:22:47 +08:00 |
|
YunaiV
|
52f014b195
|
promotion：完成网关的转发
|
2023-10-22 22:49:40 +08:00 |
|
YunaiV
|
df7d49a8b1
|
product：1)网关转发；2）完善配置类
|
2023-10-22 17:07:28 +08:00 |
|
YunaiV
|
323d160d61
|
member：启动成功，基本跑通
|
2023-10-22 11:53:35 +08:00 |
|
YunaiV
|
f2b7c0483c
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2023-09-06 20:42:01 +08:00 |
|
