11 Commits

Author SHA1 Message Date
akun
3a6b90197c Merge remote-tracking branch 'origin/competition' into deployment_gateway_20240416
# Conflicts:
#	pom.xml
#	sf-admin/pom.xml
#	sf-admin/src/main/resources/application.yml
#	sf-service/pom.xml
#	sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java
#	sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
#	sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java
#	sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java
#	sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java
#	sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java
#	sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java
#	sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java
#	sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java
#	sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml
#	sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
#	sf-ui/package.json
#	sf-ui/src/api/FDS/whiteList.js
#	sf-ui/src/api/deploy/INFO.js
#	sf-ui/src/api/deployment/publish.js
#	sf-ui/src/components/FileUpload/index.vue
#	sf-ui/src/components/ImageUpload/index.vue
#	sf-ui/src/store/modules/permission.js
#	sf-ui/src/store/modules/user.js
#	sf-ui/src/utils/application.js
#	sf-ui/src/utils/request.js
#	sf-ui/src/views/FDS/installationList/add.vue
#	sf-ui/src/views/FDS/installationList/detail.vue
#	sf-ui/src/views/FDS/installationList/edit.vue
#	sf-ui/src/views/FDS/installationList/index.vue
#	sf-ui/src/views/FDS/publishList/components/addPack.vue
#	sf-ui/src/views/FDS/publishList/index.vue
#	sf-ui/src/views/FDS/whiteListManagement/add.vue
#	sf-ui/src/views/FDS/whiteListManagement/edit.vue
#	sf-ui/src/views/FDS/whiteListManagement/index.vue
#	sf-ui/src/views/deploy/INFO/add.vue
#	sf-ui/src/views/deployment/publish/index.vue
#	sf-ui/src/views/indexNew.vue
#	sf-ui/src/views/service/goods/index.vue
#	sf-ui/vue.config.js
2024-05-10 14:21:47 +08:00
yin fuxian
25eab4017c 网关服务代码合并 2024-04-22 17:46:24 +08:00
张洋川
0e1238636a fix: 修改原型白名单的部分,修改跳转方式 2024-04-15 17:51:38 +08:00
ztzh_xieyun
9e9242bb8d 修改为内网地址 2024-04-12 18:08:55 +08:00
张洋川
12f933c4fc Merge branch 'dev' into test
# Conflicts:
#	sf-admin/pom.xml
#	sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml
#	sf-ui/src/store/modules/permission.js
#	sf-ui/src/views/deploy/INFO/add.vue
#	sf-ui/src/views/deploy/INFO/index.vue
#	sf-ui/vue.config.js
2024-04-12 09:11:22 +08:00
张洋川
8a0e6b5a34 fix: 修改白名单页面,安装包页面,发布页面的字段和逻辑判断 2024-04-09 09:05:50 +08:00
akun
5ca2d775e5 访问端口调整 2024-04-08 16:08:46 +08:00
akun
8cb2755bec 访问端口调整 2024-04-08 16:02:55 +08:00
akun
bc6bb8aab9 访问端口调整 2024-04-08 15:46:58 +08:00
张洋川
31143ab53b feat: 修改全局的若依为"SAC",新增白名单列表,白名单新增,白名单配置,安装包管理,安装包管理新增的前端页面 2024-04-07 17:10:30 +08:00
ztzh_xieyun
bd6d109baf 基础框架搭建 2024-04-07 11:19:43 +08:00