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 |
|
张洋川
|
6a7eaa8229
|
fix: 修改对接图片上传，对接白名单
fix: 修改对接图片上传，对接白名单
|
2024-04-28 09:28:39 +08:00 |
|
yin fuxian
|
87f61bc4d8
|
gateway基本功能页面
|
2024-04-24 17:24:58 +08:00 |
|
张洋川
|
7c5b4657e1
|
fix: 对接发布的接口，修改安装包的字段,修改二维码显示
|
2024-04-24 09:09:11 +08:00 |
|
pengren
|
bd3a791ab0
|
编号：ZSSAC-585 描述：安装包页面修改
|
2024-04-23 18:04:35 +08:00 |
|
yin fuxian
|
fd552c9732
|
Merge branch 'deployment_gateway_20240416' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into deployment_gateway_20240416
|
2024-04-22 17:47:02 +08:00 |
|
yin fuxian
|
25eab4017c
|
网关服务代码合并
|
2024-04-22 17:46:24 +08:00 |
|
pengren
|
a73e58d1ab
|
编号：ZSSAC-585 描述：H5安装包页面生成
|
2024-04-22 16:36:07 +08:00 |
|
pengren
|
beefea5aaf
|
编号：ZSSAC-585 描述：发布列表与环境维护
|
2024-04-22 10:03:17 +08:00 |
|
pengren
|
77768995cb
|
编号：ZSSAC-585 描述：发布列表与环境维护
|
2024-04-19 17:21:22 +08:00 |
|
akun
|
9400c9985c
|
华为应用内支付完成会员订购，会员与商品调整
|
2024-04-18 15:52:07 +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 |
|
yin fuxian
|
3202aa73b4
|
项目应用首页
|
2024-04-11 18:17:48 +08:00 |
|
张洋川
|
10c746c4f9
|
fix: 修改权限，路由代码，修改对应模块的路由跳转功能
|
2024-04-11 18:04:49 +08:00 |
|
pengren
|
ca8678a900
|
编号：ZSSAC-163 描述：首页后台接口
|
2024-04-11 16:07:10 +08:00 |
|
pengren
|
2623d56340
|
编号：ZSSAC-163 描述：我的购买商品与安装包后台
|
2024-04-11 14:05:57 +08:00 |
|
pengren
|
161a7b8af0
|
编号：ZSSAC-163 描述：我的购买商品与安装包后台
|
2024-04-11 13:51:18 +08:00 |
|
张洋川
|
02253789e8
|
feat: 新增发布列表，修改白名单和安装包的字段
|
2024-04-08 14:07:00 +08:00 |
|
ztzh_xieyun
|
bd6d109baf
|
基础框架搭建
|
2024-04-07 11:19:43 +08:00 |
|