chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202 Commits 4 Branches 0 Tags 10 MiB
Commit Graph

80 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
张洋川
8b9367e5cd fix: 修改appCode取值 
fix: 修改appCode取值
 2024-05-08 11:13:12 +08:00
张洋川
6a7eaa8229 fix: 修改对接图片上传，对接白名单 
fix: 修改对接图片上传，对接白名单
 2024-04-28 09:28:39 +08:00
pengren
934f440394 编号：ZSSAC-585 描述：订单做数据隔离 2024-04-26 14:08:00 +08:00
pengren
8365f735bd 编号：ZSSAC-585 描述：修改nginx配置 2024-04-26 11:23:01 +08:00
pengren
d0deb9e786 编号：ZSSAC-585 描述：修改nginx配置 2024-04-26 10:33:39 +08:00
pengren
e889f9adb7 编号：ZSSAC-585 描述：修改图片转发 2024-04-26 09:22:31 +08:00
yin fuxian
87f61bc4d8 gateway基本功能页面 2024-04-24 17:24:58 +08:00
张洋川
7ff0b19600 fix: 在全局的请求添加appCode 2024-04-24 16:53:43 +08:00
张洋川
269017ef20 fix: 在全局的请求添加appCode 2024-04-24 16:35:28 +08:00
张洋川
ca41d8eaff fix: 修改固定的appCode，变成动态的 2024-04-24 16:11:15 +08:00
张洋川
9dbbf9c198 fix: 修改发布的问题 2024-04-24 12:59:36 +08:00
张洋川
5d24f5d25d fix: 修改因为APPCode的问题 2024-04-24 12:37:07 +08:00
张洋川
43deb6286c fix: 修改因为APPCode的问题 2024-04-24 11:07:09 +08:00
张洋川
af18464f1d Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test 2024-04-24 10:54:43 +08:00
张洋川
31cc16d921 fix: 修改发布列表的数据，修改加密上传反了的问题 2024-04-24 10:54:31 +08:00
pengren
0c43e87718 编号：ZSSAC-585 描述：修改nginx 2024-04-24 10:14:33 +08:00
张洋川
2ea25e19ac fix: 删除一个包 2024-04-24 09:44:56 +08:00
张洋川
c58996930a fix: 修改发布状态显示的问题 2024-04-24 09:31:20 +08:00
张洋川
7c5b4657e1 fix: 对接发布的接口，修改安装包的字段,修改二维码显示 2024-04-24 09:09:11 +08:00
pengren
bd3a791ab0 编号：ZSSAC-585 描述：安装包页面修改 2024-04-23 18:04:35 +08:00
pengren
83f3b02382 编号：ZSSAC-585 描述：安装包页面修改 2024-04-23 17:08:19 +08:00
张洋川
d6d992ca44 fix: 对接发布的接口，修改安装包的字段 2024-04-23 16:38:09 +08:00
张洋川
e591a92436 fix: 对接发布的接口，根据原型调整数据结构 2024-04-23 15:22:59 +08:00
yin fuxian
4a24397f08 服务配置 2024-04-23 14:26:55 +08:00
张洋川
e8ded5cae2 Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test 2024-04-23 09:08:54 +08:00
张洋川
c56712de06 fix: 修改上传接口 2024-04-23 09:08:44 +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
张洋川
833b60bcad fix: 修改上传接口 2024-04-19 17:52:48 +08:00
pengren
77768995cb 编号：ZSSAC-585 描述：发布列表与环境维护 2024-04-19 17:21:22 +08:00
张洋川
6181876f6c Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test 2024-04-18 18:24:27 +08:00
张洋川
f5faec22a3 fix: 修改上传接口 2024-04-18 18:24:19 +08:00
akun
72d51a2fbf 商品信息页面调整 2024-04-18 17:01:43 +08:00
akun
1b3c0826b0 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
#	sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
#	sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
#	sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
#	sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
 2024-04-18 16:04:41 +08:00
akun
9400c9985c 华为应用内支付完成会员订购，会员与商品调整 2024-04-18 15:52:07 +08:00
张洋川
333eefd2a1 fix: 修改上传接口，补全字段逻辑。新增环境服务的页面开发 2024-04-16 17:59:05 +08:00
张洋川
0e1238636a fix: 修改原型白名单的部分，修改跳转方式 2024-04-15 17:51:38 +08:00
akun
c40002ca5b 调整nginx 2024-04-12 18:27:27 +08:00
ztzh_xieyun
86dbb51793 修改nginx后端ip地址 2024-04-12 18:17:35 +08:00
ztzh_xieyun
9e9242bb8d 修改为内网地址 2024-04-12 18:08:55 +08:00
akun
af78ff6819 调整nginx 2024-04-12 18:03:51 +08:00
yin fuxian
aa13c22813 进入需要关联项目的页面拦截 2024-04-12 15:10:04 +08:00
张洋川
6b9f0bbf9c Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test 2024-04-12 11:49:30 +08:00
张洋川
58e0e2c7aa fix: 修改安装包模块出现的问题 2024-04-12 11:49:20 +08:00
yin fuxian
06a582c576 Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test 2024-04-12 10:51:36 +08:00
yin fuxian
2a908a3b0f 选中项目后储存项目应用信息 2024-04-12 10:51:10 +08:00
张洋川
1f7755386d fix: 修改白名单路由 2024-04-12 09:42:28 +08:00