OTTO 310f89aa25 Merge branch 'master' into dev_PMS_Merge_Master ... # Conflicts: # docker-gitlink/auto_redeploy.sh # docker-gitlink/build.sh # docker-gitlink/copy.sh # docker-gitlink/nginx/conf/default_nginx.conf # ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/service/HttpAPIService.java # ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java # ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/utils/ZoneGitLinkRequestUrl.java		2024-05-07 15:26:10 +08:00
..
gitlink	feat(微服务流量控制): 微服务接入Sentinel	2024-04-09 10:04:18 +08:00
nacos	Merge branch 'master' into dev_PMS_Merge_Master	2024-05-07 15:26:10 +08:00
nginx	feat(部署脚本更新): 完善前端部署脚本	2024-04-16 09:13:09 +08:00
redis	style(项目部署): 自动化部署脚本	2023-04-28 16:04:53 +08:00
173_test_config.profile	fix(项目部署): 173环境配置单独抽出来，整理测试环境配置	2023-06-08 11:23:35 +08:00
auto_redeploy.sh	feat(部署脚本更新): 完善前端部署脚本	2024-04-12 14:28:20 +08:00
build.sh	Merge remote-tracking branch 'origin/hot_fix'	2024-04-16 09:01:19 +08:00
copy.sh	feat(部署脚本更新): 完善前端部署脚本	2024-04-12 14:28:20 +08:00
default_docker-compose.yml	feat(部署脚本更新): 微服务容器内日志挂载到宿主机上	2024-04-24 09:05:09 +08:00
deploy.sh	feat(微服务流量控制): 微服务接入Sentinel	2024-04-09 10:04:18 +08:00
dev_config.profile	feat(微服务流量控制): 微服务接入Sentinel	2024-04-09 10:04:18 +08:00
prod_config.profile	feat(微服务流量控制): 微服务接入Sentinel	2024-04-09 10:04:18 +08:00
test_config.profile	feat(微服务流量控制): 微服务接入Sentinel	2024-04-09 10:04:18 +08:00
update_db.sh	feat(基础功能增强): 自动执行升级SQL	2023-08-24 11:16:10 +08:00