若依后台管理框架
+SAC后台管理框架
- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 + 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了SAC管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
当前版本: v{{ version }} @@ -120,21 +120,21 @@
QQ群： 满937441 满887144332
满180251782 满104180207 满186866453 满201396349
- 满101456076 满101539465 满264312783 满167385320
- 满104748341 满160110482 满170801498 满108482800
+ 满101456076 满101539465 满264312783 满167385320
+ 满104748341 满160110482 满170801498 满108482800
满101046199 满136919097 143961921
微信：/ *若依/ *SAC
支付宝：/ *若依/ *SAC
@@ -913,7 +913,7 @@-
-
- 若依前后端分离系统正式发布 +
- SAC前后端分离系统正式发布
若依后台管理系统
+SAC后台管理系统
若依后台管理系统
+SAC后台管理系统
+
+
+
+ {{item.title}}
+
+
-
+
-
+
-
-
+
+
-
+
批量删除
+
+
+
+
+
+
+
+
+
+ 下载安装包
+ 编辑
+ 详情
+ 删除
+
+
+
+
+
@@ -153,11 +224,11 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
diff --git a/sf-ui/src/views/FDS/channelManagement/index.vue b/sf-ui/src/views/FDS/publishList/index.vue
similarity index 87%
rename from sf-ui/src/views/FDS/channelManagement/index.vue
rename to sf-ui/src/views/FDS/publishList/index.vue
index efd9eea..a4932bb 100644
--- a/sf-ui/src/views/FDS/channelManagement/index.vue
+++ b/sf-ui/src/views/FDS/publishList/index.vue
@@ -1,26 +1,27 @@
-
+
新增
-
-
+
-
-
@@ -109,13 +114,44 @@
{{ parseTime(scope.row.createTime) }}
-
+
+
+
-
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
下架
- 预览
- 发布
修改
+ 详情
+ 下载安装包
+
+
+
diff --git a/sf-ui/src/views/FDS/publishList/setting/detail.vue b/sf-ui/src/views/FDS/publishList/setting/detail.vue
new file mode 100644
index 0000000..b41c34c
--- /dev/null
+++ b/sf-ui/src/views/FDS/publishList/setting/detail.vue
@@ -0,0 +1,219 @@
+
+
-
-
- {{ item.label }}
-
-
-
+
+
+
+
+
+
+
+
+
@@ -26,7 +26,7 @@
-
登录模块
{{ form.createTime }}
-
-
+
+
+
{{ form.created }}
- 日志日志
+
关 闭
diff --git a/sf-ui/src/views/FDS/installationList/edit.vue b/sf-ui/src/views/FDS/installationList/edit.vue
index 42fb55c..a3cdea0 100644
--- a/sf-ui/src/views/FDS/installationList/edit.vue
+++ b/sf-ui/src/views/FDS/installationList/edit.vue
@@ -8,15 +8,15 @@
-
-
- {{ item.label }}
-
-
-
+
+
+
+
+
+
+
+
+
@@ -27,8 +27,8 @@
-
Date: Tue, 23 Apr 2024 16:41:37 +0800
Subject: [PATCH 080/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E5=AE=89=E8=A3=85=E5=8C=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/SysApkInfoController.java | 3 +
.../java/com/sf/deploy/domain/SysApkInfo.java | 206 ++++++++++--------
.../service/impl/SysApkInfoServiceImpl.java | 1 +
sf-admin/src/main/resources/application.yml | 4 +-
.../mapper/deploy/SysApkInfoMapper.xml | 7 +-
5 files changed, 132 insertions(+), 89 deletions(-)
diff --git a/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java b/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java
index 5ac20f9..6239438 100644
--- a/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java
+++ b/sf-admin/src/main/java/com/sf/deploy/controller/SysApkInfoController.java
@@ -77,6 +77,8 @@ public class SysApkInfoController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SysApkInfo sysApkInfo)
{
+ sysApkInfo.setCreated(getUsername());
+ sysApkInfo.setModified(getUsername());
return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo));
}
@@ -88,6 +90,7 @@ public class SysApkInfoController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo)
{
+ sysApkInfo.setModified(getUsername());
return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo));
}
diff --git a/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java b/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java
index fe06f86..8b09ef0 100644
--- a/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java
+++ b/sf-admin/src/main/java/com/sf/deploy/domain/SysApkInfo.java
@@ -7,196 +7,232 @@ import com.sf.common.core.domain.BaseEntity;
/**
* 安装包管理（新）对象 SYS_APK_INFO
- *
+ *
* @author ztzh
* @date 2024-04-11
*/
-public class SysApkInfo extends BaseEntity
-{
+public class SysApkInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 主键 */
+ /**
+ * 主键
+ */
private Long id;
- /** 上传类型 */
+ /**
+ * 上传类型
+ */
+ private String appId;
+
+
+ private String appCode;
+
+ /**
+ * 上传类型
+ */
@Excel(name = "上传类型")
private String uploadingType;
- /** 安装包名称 */
+ /**
+ * 安装包名称
+ */
@Excel(name = "安装包名称")
private String sysApkName;
- /** 版本号 */
+ /**
+ * 版本号
+ */
@Excel(name = "版本号")
private String version;
- /** 安装包 */
+ /**
+ * 安装包
+ */
@Excel(name = "安装包")
private String sysApk;
- /** 安装包大小 */
+ /**
+ * 安装包大小
+ */
@Excel(name = "安装包大小")
private String sysApkSize;
- /** 安装包类型 */
+ /**
+ * 安装包类型
+ */
@Excel(name = "安装包类型")
private String sysType;
- /** 上传状态 */
+ /**
+ * 上传状态
+ */
private Long uploadingStatus;
- /** 日志id */
+ /**
+ * 日志id
+ */
private Long uploadingLogId;
- /** 排序 */
+ /**
+ * 排序
+ */
private Long orderNum;
- /** 逻辑删除,0:未删除,1:删除 */
+ /**
+ * 逻辑删除,0:未删除,1:删除
+ */
private Long isDelete;
- /** 创建人 */
+ /**
+ * 创建人
+ */
@Excel(name = "创建人")
private String created;
- /** 更新人 */
+ /**
+ * 更新人
+ */
private String modified;
- public void setId(Long id)
- {
+ public void setId(Long id) {
this.id = id;
}
- public Long getId()
- {
+ public Long getId() {
return id;
}
- public void setUploadingType(String uploadingType)
- {
+
+ public void setUploadingType(String uploadingType) {
this.uploadingType = uploadingType;
}
- public String getUploadingType()
- {
+ public String getUploadingType() {
return uploadingType;
}
- public void setSysApkName(String sysApkName)
- {
+
+ public void setSysApkName(String sysApkName) {
this.sysApkName = sysApkName;
}
- public String getSysApkName()
- {
+ public String getSysApkName() {
return sysApkName;
}
- public void setVersion(String version)
- {
+
+ public void setVersion(String version) {
this.version = version;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setSysApk(String sysApk)
- {
+
+ public void setSysApk(String sysApk) {
this.sysApk = sysApk;
}
- public String getSysApk()
- {
+ public String getSysApk() {
return sysApk;
}
- public void setSysApkSize(String sysApkSize)
- {
+
+ public void setSysApkSize(String sysApkSize) {
this.sysApkSize = sysApkSize;
}
- public String getSysApkSize()
- {
+ public String getSysApkSize() {
return sysApkSize;
}
- public void setSysType(String sysType)
- {
+
+ public void setSysType(String sysType) {
this.sysType = sysType;
}
- public String getSysType()
- {
+ public String getSysType() {
return sysType;
}
- public void setUploadingStatus(Long uploadingStatus)
- {
+
+ public void setUploadingStatus(Long uploadingStatus) {
this.uploadingStatus = uploadingStatus;
}
- public Long getUploadingStatus()
- {
+ public Long getUploadingStatus() {
return uploadingStatus;
}
- public void setUploadingLogId(Long uploadingLogId)
- {
+
+ public void setUploadingLogId(Long uploadingLogId) {
this.uploadingLogId = uploadingLogId;
}
- public Long getUploadingLogId()
- {
+ public Long getUploadingLogId() {
return uploadingLogId;
}
- public void setOrderNum(Long orderNum)
- {
+
+ public void setOrderNum(Long orderNum) {
this.orderNum = orderNum;
}
- public Long getOrderNum()
- {
+ public Long getOrderNum() {
return orderNum;
}
- public void setIsDelete(Long isDelete)
- {
+
+ public void setIsDelete(Long isDelete) {
this.isDelete = isDelete;
}
- public Long getIsDelete()
- {
+ public Long getIsDelete() {
return isDelete;
}
- public void setCreated(String created)
- {
+
+ public void setCreated(String created) {
this.created = created;
}
- public String getCreated()
- {
+ public String getCreated() {
return created;
}
- public void setModified(String modified)
- {
+
+ public void setModified(String modified) {
this.modified = modified;
}
- public String getModified()
- {
+ public String getModified() {
return modified;
}
+ public String getAppCode() {
+ return appCode;
+ }
+
+ public void setAppCode(String appCode) {
+ this.appCode = appCode;
+ }
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("uploadingType", getUploadingType())
- .append("sysApkName", getSysApkName())
- .append("version", getVersion())
- .append("sysApk", getSysApk())
- .append("sysApkSize", getSysApkSize())
- .append("sysType", getSysType())
- .append("uploadingStatus", getUploadingStatus())
- .append("uploadingLogId", getUploadingLogId())
- .append("orderNum", getOrderNum())
- .append("isDelete", getIsDelete())
- .append("created", getCreated())
- .append("modified", getModified())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("uploadingType", getUploadingType())
+ .append("sysApkName", getSysApkName())
+ .append("version", getVersion())
+ .append("sysApk", getSysApk())
+ .append("sysApkSize", getSysApkSize())
+ .append("sysType", getSysType())
+ .append("uploadingStatus", getUploadingStatus())
+ .append("uploadingLogId", getUploadingLogId())
+ .append("orderNum", getOrderNum())
+ .append("isDelete", getIsDelete())
+ .append("created", getCreated())
+ .append("modified", getModified())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("appCode", getAppId())
+ .append("appId", getAppCode())
+ .toString();
}
}
diff --git a/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java
index 3d3bc69..4821588 100644
--- a/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java
+++ b/sf-admin/src/main/java/com/sf/deploy/service/impl/SysApkInfoServiceImpl.java
@@ -54,6 +54,7 @@ public class SysApkInfoServiceImpl implements ISysApkInfoService
public int insertSysApkInfo(SysApkInfo sysApkInfo)
{
sysApkInfo.setCreateTime(DateUtils.getNowDate());
+ sysApkInfo.setUpdateTime(DateUtils.getNowDate());
return sysApkInfoMapper.insertSysApkInfo(sysApkInfo);
}
diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml
index 1a466e0..4a496a5 100644
--- a/sf-admin/src/main/resources/application.yml
+++ b/sf-admin/src/main/resources/application.yml
@@ -59,9 +59,9 @@ spring:
servlet:
multipart:
# 单个文件大小
- max-file-size: 10MB
+ max-file-size: 100MB
# 设置总上传的文件大小
- max-request-size: 20MB
+ max-request-size: 200MB
# 服务模块
devtools:
restart:
diff --git a/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
index d1a60cf..7d55141 100644
--- a/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
@@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO
+ select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO
-
-
-
+
+
+
+
+
@@ -59,11 +60,14 @@ export default {
// 显示搜索条件
showSearch: true,
total: 0,
+ open: true,
// 白名单配置表单验证
queryParams: {
pageNum: 1,
pageSize: 10,
- sysApkName: null
+ sysApkName: null,
+ appCode: '000000',
+ sysType: ''
}
}
},
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index fdb30e0..c197010 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -158,7 +158,7 @@
-
-
+ 复制
+
+
+
{{ form.createTime }}
@@ -460,6 +465,10 @@ export default {
handleDownLoad(row) {
window.open(row.moduleUrl)
+ },
+ copyIt(url) {
+ navigator.clipboard.writeText(url)
+ this.$message.success('复制成功')
}
}
}
diff --git a/sf-ui/src/views/deployment/publish/component/detail.vue b/sf-ui/src/views/deployment/publish/component/detail.vue
index 645ef6b..c9dc5d1 100644
--- a/sf-ui/src/views/deployment/publish/component/detail.vue
+++ b/sf-ui/src/views/deployment/publish/component/detail.vue
@@ -1,128 +1,137 @@
-
-
-
+
-
-
+
-
+ android
+ IOS
+ HarmonyOS
+
+
+
+
+
+
+
-
-
-
-
+
+ {{ form.apkId }}
+
+
+
-
-
-
-
- {{ dict.name }}
-
-
+
+
+
-
- {{ dict.label }}
-
-
+
+
+
-
-
- {{ dict.label }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.validityStartTime }}至{{ form.validityEndTime }}
-
-
-
+
+
+ {{ form.remark }}
-
-
-
+
+
+
+ 复制
+
+
+
+
+ {{ form.created }}
-
-
-
-
-
-
-
-
-
-
-
-
@@ -133,7 +142,7 @@ import { listEnvironment } from '@/api/deployment/environment'
export default {
name: 'AddPack',
- dicts: ['sys_yes_no'],
+ dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'],
props: {
detailId: {
type: String | Number,
@@ -155,32 +164,34 @@ export default {
// 显示搜索条件
showSearch: true,
total: 0,
+ open: true,
+ detailIds: '',
environmentList: [],
// 白名单配置表单验证
queryParams: {
pageNum: 1,
pageSize: 10,
sysApkName: null
+ },
+ queryParamsEnvironment: {
+ pageNum: 1,
+ pageSize: 999
}
}
},
- // computed: {
- // cachedViews() {
- // return this.$props.openDetail
- // }
- // },
+ watch: {
+ detailId: {
+ handler: function(val, oldVal) {
+ if (val) {
+ this.detailIds = val
+ this.getPublishList(val)
+ this.getEnvironmentList()
+ }
+ },
+ immediate: true
+ }
+ },
mounted() {
- console.log(this.detailId, 123321)
-
- this.$nextTick(() => {
- this.show = false
- })
-
- // nextTick(()=>{
- // this.configName = this.$route.query.configName
- // })
- // this.getPublishList(this.detailId)
- this.getEnvironmentList()
},
methods: {
@@ -221,15 +232,30 @@ export default {
})
},
- closeModal() {
- this.$emit('close')
- },
onOpen() {
this.active = this.current
this.key = ''
},
onClose() {
+ this.$emit('close')
+ },
+ // 选择系统做一些逻辑判断
+ changeSys(sysType) {
+ this.form.systemType = sysType
}
}
}
+
+
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 5094cc1..3a061a0 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -1,20 +1,20 @@
-
+
@@ -44,49 +44,49 @@
新增
修改
批量发布
批量删除
@@ -95,8 +95,7 @@
@@ -130,52 +129,84 @@
{{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
下架
发布
详情
下载安装包
修改
删除
@@ -183,30 +214,30 @@
-
-
+
-
-
+
-
+ android
+ IOS
+ HarmonyOS
+
@@ -224,65 +255,68 @@
-
- {{ dict.name }}
-
-
+
+
+
-
- {{ dict.label }}
-
-
+
+
+
-
-
- {{ dict.label }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index c197010..a079a4b 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -3,18 +3,18 @@
@@ -35,47 +35,47 @@
新增
修改
删除
导出
@@ -103,36 +103,36 @@
下载安装包
修改
详情
删除
@@ -140,11 +140,11 @@
-
+ system/oss/upload
diff --git a/sf-ui/src/views/deployment/publish/component/detail.vue b/sf-ui/src/views/deployment/publish/component/detail.vue
index c9dc5d1..1b609cf 100644
--- a/sf-ui/src/views/deployment/publish/component/detail.vue
+++ b/sf-ui/src/views/deployment/publish/component/detail.vue
@@ -128,10 +128,19 @@
复制
+
+
{{ form.created }}
+
+
+ {{ form.updateTime }}
+
+
+
@@ -142,7 +151,7 @@ import { listEnvironment } from '@/api/deployment/environment'
export default {
name: 'AddPack',
- dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'],
+ dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
props: {
detailId: {
type: String | Number,
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 5200d24..086d229 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -69,10 +69,10 @@
批量发布
@@ -121,7 +121,10 @@
width="180"
>
-
Date: Wed, 24 Apr 2024 11:07:09 +0800
Subject: [PATCH 088/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9B=A0?=
=?UTF-8?q?=E4=B8=BAAPPCode=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/FDS/installationList/index.vue | 2 ++
sf-ui/src/views/deployment/module/index.vue | 4 ++-
sf-ui/src/views/deployment/publish/index.vue | 31 ++++++++++++++++++-
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 1d03122..20c0f16 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -409,6 +409,8 @@ export default {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
+ console.log(data)
+ data.appCode = '000000'
delete data.explain
updateINFO(data).then(response => {
this.$modal.msgSuccess('修改成功')
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index a079a4b..189a854 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -368,7 +368,8 @@ export default {
created: null,
modified: null,
createTime: null,
- updateTime: null
+ updateTime: null,
+ appCode: '000000'
}
this.resetForm('form')
},
@@ -423,6 +424,7 @@ export default {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
+ data.appCode = '000000'
delete data.explain
updateModule(data).then(response => {
this.$modal.msgSuccess('修改成功')
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 086d229..d3d2cb4 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -368,7 +368,7 @@
@@ -397,10 +409,11 @@ import AddPack from '@/views/FDS/publishList/components/addPack.vue'
import DetailModal from './component/detail.vue'
import { listEnvironment } from '@/api/deployment/environment'
import { getApplicationName } from '@/utils/application'
+import { getINFO } from '@/api/FDS/installList'
export default {
name: 'Publish',
- dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
+ dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status', 'sys_apk_type'],
components: {
AddPack,
DetailModal
@@ -444,6 +457,12 @@ export default {
},
// 表单参数
form: {},
+ queryParamsPack: {
+ pageNum: 1,
+ pageSize: 10,
+ sysApkName: null,
+ appCode: '000000'
+ },
// 表单校验
rules: {
appName: [
@@ -568,8 +587,18 @@ export default {
this.form = response.data
this.open = true
this.title = '修改发布列表'
+ this.getPackList(this.form.apkId)
})
},
+
+ /** 查询参数列表 */
+ getPackList(id) {
+ this.loading = true
+ getINFO(id).then(response => {
+ this.form.sysApkName = response.data.sysApkName
+ })
+ },
+
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
@@ -578,6 +607,7 @@ export default {
let data = Object.assign({}, this.form)
delete data.explain
updatePublish(data).then(response => {
+ console.log(data)
this.$modal.msgSuccess('修改成功')
this.loading = false
this.open = false
@@ -604,18 +634,18 @@ export default {
let data = Object.assign({}, this.form)
delete data.explain
updatePublish(data).then(response => {
- this.$modal.msgSuccess('修改成功')
+ this.handlePublish(data.id)
this.loading = false
this.open = false
- this.handlePublish(data.id)
+
// this.getList()
})
} else {
addPublish(this.form).then((res) => {
- this.$modal.msgSuccess('新增成功')
+
this.loading = false
this.open = false
- this.handlePublish(res.id)
+ // this.handlePublish(res.id)
// this.getList()
})
}
@@ -646,9 +676,12 @@ export default {
},
addPack(e) {
+
this.form.apkId = e.apkId
this.form.version = e.version
this.form.systemType = e.sysType
+ this.form.sysApkName = e.sysApkName
+ this.form.sysApk = e.sysApk
this.packOpen = false
},
@@ -667,8 +700,13 @@ export default {
},
// 选择系统做一些逻辑判断
- changeSys(sysType) {
- this.form.systemType = sysType
+ changeSys() {
+ // this.form.systemType = sysType
+ this.form.apkId = null
+ this.form.version = null
+ this.form.sysApkName = null
+ this.form.appStoreAddress = null
+ console.log(this.form, 99999999)
},
/**下载安装包*/
handleDownload() {
@@ -677,12 +715,14 @@ export default {
/**下架*/
handleDown(row) {
soldPublish(row.id).then(response => {
+ this.$modal.msgSuccess('下架成功')
this.getList()
})
},
/**发布*/
- handlePublish(row) {
- publish(row.id).then(response => {
+ handlePublish(id) {
+ publish(id).then(response => {
+ this.$modal.msgSuccess('发布成功')
this.getList()
})
},
From 9dbbf9c1981733d4e573f4ad999a6c5f6d634cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Wed, 24 Apr 2024 12:59:36 +0800
Subject: [PATCH 091/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=91?=
=?UTF-8?q?=E5=B8=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deployment/publish/component/detail.vue | 15 ++++---
sf-ui/src/views/deployment/publish/index.vue | 40 ++++++++++++-------
2 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/sf-ui/src/views/deployment/publish/component/detail.vue b/sf-ui/src/views/deployment/publish/component/detail.vue
index a1ed8af..a0496f1 100644
--- a/sf-ui/src/views/deployment/publish/component/detail.vue
+++ b/sf-ui/src/views/deployment/publish/component/detail.vue
@@ -124,8 +124,8 @@
-
- 复制
+
+ 复制
@@ -212,16 +212,17 @@ export default {
this.loading = true
getPublish(id).then(response => {
this.form = response.data
- this.open = true
- this.title = '发布详情'
this.getPackList(this.form.apkId)
+
})
},
/** 查询参数列表 */
getPackList(id) {
getINFO(id).then(response => {
this.form.sysApkName = response.data.sysApkName
- console.log(this.form)
+ this.$nextTick(() => {
+ this.title = '发布详情'
+ })
})
},
/** 搜索按钮操作 */
@@ -261,6 +262,10 @@ export default {
// 选择系统做一些逻辑判断
changeSys(sysType) {
this.form.systemType = sysType
+ },
+ copyIt(url) {
+ navigator.clipboard.writeText(url)
+ this.$message.success('复制成功')
}
}
}
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 3228054..456cb98 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -219,7 +219,7 @@
>下载安装包
修改
-
+
@@ -500,6 +503,9 @@ export default {
],
createTime: [
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
+ ],
+ sysApkName: [
+ { required: true, message: '安装包不能为空', trigger: 'blur' }
]
}
}
@@ -510,13 +516,17 @@ export default {
},
methods: {
/** 查询发布列表列表 */
- getList() {
+ getList(type) {
+
this.loading = true
listPublish(this.queryParams).then(response => {
this.publishList = response.rows
this.total = response.total
this.loading = false
})
+ if (type) {
+ this.handlePublish(this.publishList[0].id)
+ }
},
// 取消按钮
cancel() {
@@ -551,7 +561,9 @@ export default {
created: null,
modified: null,
createTime: null,
- updateTime: null
+ updateTime: null,
+ apkUrl: null,
+ sysApkName: null
}
this.resetForm('form')
},
@@ -585,17 +597,17 @@ export default {
const id = row.id || this.ids
getPublish(id).then(response => {
this.form = response.data
- this.open = true
- this.title = '修改发布列表'
this.getPackList(this.form.apkId)
+
})
},
/** 查询参数列表 */
getPackList(id) {
- this.loading = true
getINFO(id).then(response => {
this.form.sysApkName = response.data.sysApkName
+ this.open = true
+ this.title = '修改发布列表'
})
},
@@ -642,11 +654,10 @@ export default {
})
} else {
addPublish(this.form).then((res) => {
-
this.loading = false
this.open = false
+ this.getList('publish')
// this.handlePublish(res.id)
- // this.getList()
})
}
}
@@ -656,7 +667,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
- this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项？').then(function() {
+ this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项？,请确定数据是已下架状态才能删除！').then(function() {
return delPublish(ids)
}).then(() => {
this.getList()
@@ -676,12 +687,11 @@ export default {
},
addPack(e) {
-
this.form.apkId = e.apkId
this.form.version = e.version
this.form.systemType = e.sysType
this.form.sysApkName = e.sysApkName
- this.form.sysApk = e.sysApk
+ this.form.apkUrl = e.sysApk
this.packOpen = false
},
@@ -706,6 +716,7 @@ export default {
this.form.version = null
this.form.sysApkName = null
this.form.appStoreAddress = null
+ this.form.apkUrl = null
console.log(this.form, 99999999)
},
/**下载安装包*/
@@ -734,6 +745,7 @@ export default {
closeDetailModal() {
this.openDetail = false
}
+
}
}
From ca41d8eafff551ef24152d5c1a8f54192f6578eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Wed, 24 Apr 2024 16:11:15 +0800
Subject: [PATCH 092/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9B=BA?=
=?UTF-8?q?=E5=AE=9A=E7=9A=84appCode=EF=BC=8C=E5=8F=98=E6=88=90=E5=8A=A8?=
=?UTF-8?q?=E6=80=81=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/components/FileUpload/index.vue | 5 ++
.../src/views/FDS/installationList/index.vue | 60 +++++++------------
.../FDS/publishList/components/addPack.vue | 3 +-
sf-ui/src/views/deployment/module/index.vue | 11 ++--
sf-ui/src/views/deployment/publish/index.vue | 12 ++--
sf-ui/src/views/system/user/index.vue | 2 +-
6 files changed, 41 insertions(+), 52 deletions(-)
diff --git a/sf-ui/src/components/FileUpload/index.vue b/sf-ui/src/components/FileUpload/index.vue
index a691dbe..8055550 100644
--- a/sf-ui/src/components/FileUpload/index.vue
+++ b/sf-ui/src/components/FileUpload/index.vue
@@ -2,6 +2,7 @@
'/system/oss/zip/upload'
+ },
+ accept: {
+ type: Array,
+ default: () => []
}
},
data() {
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 20c0f16..4aa0ee1 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -97,31 +97,24 @@
>批量删除
-
-
-
-
-
-
-
-
-
-
-
+
+ 安装包
+
+
+
+
+ 复制
+
+
@@ -129,7 +122,7 @@
+
-
-
-
-
-
-
-
-
-
-
+
@@ -196,12 +180,12 @@
-
Date: Thu, 25 Apr 2024 09:37:31 +0800
Subject: [PATCH 095/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/src/main/resources/application-druid.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-admin/src/main/resources/application-druid.yml b/sf-admin/src/main/resources/application-druid.yml
index c0a4cd2..600d272 100644
--- a/sf-admin/src/main/resources/application-druid.yml
+++ b/sf-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.1.23:22001/sac?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.1.23:22001/sac_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: abc&^321
# 从库数据源
From dd2a1afaa9befa8c0aaad12068f6ccc1c18821eb Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 25 Apr 2024 10:05:07 +0800
Subject: [PATCH 096/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/src/main/resources/application-druid.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-admin/src/main/resources/application-druid.yml b/sf-admin/src/main/resources/application-druid.yml
index 600d272..293e088 100644
--- a/sf-admin/src/main/resources/application-druid.yml
+++ b/sf-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.1.23:22001/sac_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.1.23:22001/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: abc&^321
# 从库数据源
From 6d661046d610b9602d5c05dc6bff607244bcc337 Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 25 Apr 2024 14:02:29 +0800
Subject: [PATCH 097/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/ApplyListInfoController.java | 3 ++
.../sf/common/enums/RequestHeaderEnums.java | 42 +++++++++++++++++++
.../sf/common/utils/http/RequestUtils.java | 20 +++++++++
.../DeploymentApplyEnvironmentController.java | 11 +++++
.../DeploymentModuleListController.java | 6 ++-
.../DeploymentServicePublishController.java | 4 ++
.../controller/SysApkInfoController.java | 4 ++
.../domain/DeploymentApplyEnvironment.java | 12 +++---
.../DeploymentApplyEnvironmentMapper.xml | 13 +++---
.../DeploymentServicePublishMapper.xml | 3 ++
.../system/deployment/SysApkInfoMapper.xml | 8 ++--
11 files changed, 109 insertions(+), 17 deletions(-)
create mode 100644 sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
create mode 100644 sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java
diff --git a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java b/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java
index 90ca829..bfc6939 100644
--- a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java
+++ b/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java
@@ -77,6 +77,8 @@ public class ApplyListInfoController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody ApplyListInfo applyListInfo)
{
+ applyListInfo.setCreated(getUsername());
+ applyListInfo.setModified(getUsername());
return toAjax(applyListInfoService.insertApplyListInfo(applyListInfo));
}
@@ -88,6 +90,7 @@ public class ApplyListInfoController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody ApplyListInfo applyListInfo)
{
+ applyListInfo.setModified(getUsername());
return toAjax(applyListInfoService.updateApplyListInfo(applyListInfo));
}
diff --git a/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
new file mode 100644
index 0000000..ec004a2
--- /dev/null
+++ b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
@@ -0,0 +1,42 @@
+package com.sf.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * header参数
+ *
+ * @author ztzh
+ *
+ */
+public enum RequestHeaderEnums
+{
+ /**
+ * 通知完成指令，用于客户端收到通知消息的确认
+ */
+ APP_CODE("appCode"),
+ ;
+
+ private static Map map = new HashMap<>();
+
+ static {
+ for (RequestHeaderEnums type : RequestHeaderEnums.values()) {
+ map.put(type.code, type);
+ }
+ }
+
+
+ private String code;
+
+ RequestHeaderEnums(String code) {
+ this.code = code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public static final RequestHeaderEnums getByCode(String code) {
+ return map.get(code);
+ }
+}
diff --git a/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java
new file mode 100644
index 0000000..e9d20df
--- /dev/null
+++ b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java
@@ -0,0 +1,20 @@
+package com.sf.common.utils.http;
+
+import com.sf.common.utils.StringUtils;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class RequestUtils {
+
+ public static String getHeader(String code){
+ RequestAttributes requestAttributes1 = RequestContextHolder.getRequestAttributes();
+ HttpServletRequest request = ((ServletRequestAttributes) requestAttributes1).getRequest();
+ if(StringUtils.isBlank(request.getHeader(code))){
+ throw new SecurityException("参数异常appCode为空");
+ }
+ return request.getHeader(code);
+ }
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java
index bd25e7b..53b31fa 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java
@@ -1,8 +1,14 @@
package com.sf.system.deployment.controller;
import java.util.List;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestAttributeEvent;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.sf.common.enums.RequestHeaderEnums;
+import com.sf.common.utils.StringUtils;
+import com.sf.common.utils.http.RequestUtils;
import com.sf.system.deployment.domain.DeploymentApplyEnvironment;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +27,9 @@ import com.sf.common.enums.BusinessType;
import com.sf.deployment.service.IDeploymentApplyEnvironmentService;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.common.core.page.TableDataInfo;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
/**
* 环境维护Controller
@@ -42,6 +51,7 @@ public class DeploymentApplyEnvironmentController extends BaseController
@GetMapping("/list")
public TableDataInfo list(DeploymentApplyEnvironment deploymentApplyEnvironment)
{
+ deploymentApplyEnvironment.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment);
return getDataTable(list);
@@ -78,6 +88,7 @@ public class DeploymentApplyEnvironmentController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment)
{
+ deploymentApplyEnvironment.setAppCode( RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
return toAjax(deploymentApplyEnvironmentService.insertDeploymentApplyEnvironment(deploymentApplyEnvironment));
}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index ac95292..7418ce4 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -3,7 +3,9 @@ package com.sf.system.deployment.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.sf.common.enums.RequestHeaderEnums;
import com.sf.common.utils.StringUtils;
+import com.sf.common.utils.http.RequestUtils;
import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,7 @@ public class DeploymentModuleListController extends BaseController
@GetMapping("/list")
public TableDataInfo list(DeploymentModuleList deploymentModuleList)
{
+ deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
return getDataTable(list);
@@ -55,7 +58,7 @@ public class DeploymentModuleListController extends BaseController
public AjaxResult queryByCore(ModuleListByCoreRequest request)
{
if(StringUtils.isEmpty(request.getAppCore())){
- return error("appCore不能为空");
+ throw new SecurityException("参数异常appCode为空");
}
DeploymentModuleList deploymentModuleList = new DeploymentModuleList();
deploymentModuleList.setAppCore(request.getAppCore());
@@ -95,6 +98,7 @@ public class DeploymentModuleListController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList)
{
+ deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList));
}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
index afe1e18..6c04f89 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
@@ -3,7 +3,9 @@ package com.sf.system.deployment.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.sf.common.enums.RequestHeaderEnums;
import com.sf.common.utils.DateUtils;
+import com.sf.common.utils.http.RequestUtils;
import com.sf.system.deployment.domain.DeploymentServicePublish;
import com.sf.system.deployment.service.IDeploymentServicePublishService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,6 +46,7 @@ public class DeploymentServicePublishController extends BaseController
@GetMapping("/list")
public TableDataInfo list(DeploymentServicePublish deploymentServicePublish)
{
+ deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish);
return getDataTable(list);
@@ -80,6 +83,7 @@ public class DeploymentServicePublishController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody DeploymentServicePublish deploymentServicePublish)
{
+ deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
return toAjax(deploymentServicePublishService.insertDeploymentServicePublish(deploymentServicePublish));
}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java
index 65b298e..dfc5970 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java
@@ -5,6 +5,8 @@ import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
import com.sf.common.core.page.TableDataInfo;
import com.sf.common.enums.BusinessType;
+import com.sf.common.enums.RequestHeaderEnums;
+import com.sf.common.utils.http.RequestUtils;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.system.deployment.domain.SysApkInfo;
import com.sf.system.deployment.service.ISysApkInfoService;
@@ -35,6 +37,7 @@ public class SysApkInfoController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysApkInfo sysApkInfo)
{
+ sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = sysApkInfoService.selectSysApkInfoList(sysApkInfo);
return getDataTable(list);
@@ -71,6 +74,7 @@ public class SysApkInfoController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SysApkInfo sysApkInfo)
{
+ sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
sysApkInfo.setCreated(getUsername());
sysApkInfo.setModified(getUsername());
return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo));
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java
index 6531a20..7e2872d 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java
@@ -22,7 +22,7 @@ public class DeploymentApplyEnvironment extends BaseEntity
private Long appId;
/** 应用编号 */
- private String applyCode;
+ private String appCode;
/** 环境名称 */
@Excel(name = "环境名称")
@@ -58,14 +58,14 @@ public class DeploymentApplyEnvironment extends BaseEntity
{
return appId;
}
- public void setApplyCode(String applyCode)
+ public void setAppCode(String appCode)
{
- this.applyCode = applyCode;
+ this.appCode = appCode;
}
- public String getApplyCode()
+ public String getAppCode()
{
- return applyCode;
+ return appCode;
}
public void setName(String name)
{
@@ -109,7 +109,7 @@ public class DeploymentApplyEnvironment extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("appId", getAppId())
- .append("applyCode", getApplyCode())
+ .append("applyCode", getAppCode())
.append("name", getName())
.append("serverAddress", getServerAddress())
.append("remark", getRemark())
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml
index 81b5f73..0438c2c 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, app_id, apply_code, name, server_address, remark, is_delete, create_dept, create_time, create_by, update_time, update_by from DEPLOYMENT_APPLY_ENVIRONMENT
+ select id, app_id, app_code, name, server_address, remark, is_delete, create_dept, create_time, create_by, update_time, update_by from DEPLOYMENT_APPLY_ENVIRONMENT
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into DEPLOYMENT_APPLY_ENVIRONMENT
app_id,
- apply_code,
+ app_code,
name,
server_address,
remark,
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{appId},
- #{applyCode},
+ #{appCode},
#{name},
#{serverAddress},
#{remark},
@@ -69,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update DEPLOYMENT_APPLY_ENVIRONMENT
app_id = #{appId},
- apply_code = #{applyCode},
+ apply_code = #{appCode},
name = #{name},
server_address = #{serverAddress},
remark = #{remark},
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
index 0d66211..c2623bb 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and app_name like concat('%', #{appName}, '%')
+ and app_code = #{appCode}
and version = #{version}
and validity_start_time = #{validityStartTime}
and validity_end_time = #{validityEndTime}
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
apply_id,
app_name,
+ app_code,
apk_url,
system_type,
apk_id,
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{applyId},
#{appName},
+ #{appCode},
#{apkUrl},
#{systemType},
#{apkId},
diff --git a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml
index 6a898e4..d741c83 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO
+ select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_APK_INFO
- insert into SYS_APK_INFO
+ insert into DEPLOYMENT_APK_INFO
uploading_type,
sys_apk_name,
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- update SYS_APK_INFO
+ update DEPLOYMENT_APK_INFO
uploading_type = #{uploadingType},
sys_apk_name = #{sysApkName},
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from SYS_APK_INFO where id = #{id}
+ delete from DEPLOYMENT_APK_INFO where id = #{id}
From 65e268f38e1f344a6eeb74c6ed24cb98a03dbdcb Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 25 Apr 2024 14:53:29 +0800
Subject: [PATCH 098/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9AH5=E6=A8=A1=E5=9D=97=E5=8C=85header?=
=?UTF-8?q?=E6=96=B0=E5=A2=9Eappcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/DeploymentModuleListController.java | 6 +++---
.../deployment/domain/DeploymentModuleList.java | 12 ++++++------
.../system/deployment/DeploymentModuleListMapper.xml | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index 7418ce4..7b9957b 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -46,7 +46,7 @@ public class DeploymentModuleListController extends BaseController
@GetMapping("/list")
public TableDataInfo list(DeploymentModuleList deploymentModuleList)
{
- deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
return getDataTable(list);
@@ -61,7 +61,7 @@ public class DeploymentModuleListController extends BaseController
throw new SecurityException("参数异常appCode为空");
}
DeploymentModuleList deploymentModuleList = new DeploymentModuleList();
- deploymentModuleList.setAppCore(request.getAppCore());
+ deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
deploymentModuleList.setSysType(request.getSysType());
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
return success(list);
@@ -98,7 +98,7 @@ public class DeploymentModuleListController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList)
{
- deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList));
}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java
index fa4f3ef..4231824 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java
@@ -22,7 +22,7 @@ public class DeploymentModuleList extends BaseEntity
private Long appId;
/** 应用core */
- private String appCore;
+ private String appCode;
/** 上传类型 */
private String uploadingType;
@@ -88,14 +88,14 @@ public class DeploymentModuleList extends BaseEntity
{
return appId;
}
- public void setAppCore(String appCore)
+ public void setAppCode(String appCode)
{
- this.appCore = appCore;
+ this.appCode = appCode;
}
- public String getAppCore()
+ public String getAppCode()
{
- return appCore;
+ return appCode;
}
public void setUploadingType(String uploadingType)
{
@@ -220,7 +220,7 @@ public class DeploymentModuleList extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("appId", getAppId())
- .append("appCore", getAppCore())
+ .append("appCore", getAppCode())
.append("uploadingType", getUploadingType())
.append("moduleName", getModuleName())
.append("version", getVersion())
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
index c5c777c..1008658 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
@@ -7,7 +7,7 @@
- and app_core = #{appCore}
+ and app_code = #{appCode}
and sys_type= #{sysType}
and module_name like concat('%', #{moduleName}, '%')
and version = #{version}
@@ -52,7 +52,7 @@
insert into DEPLOYMENT_MODULE_LIST
app_id,
- app_core,
+ app_code,
uploading_type,
module_name,
version,
@@ -71,7 +71,7 @@
#{appId},
- #{appCore},
+ #{appCode},
#{uploadingType},
#{moduleName},
#{version},
@@ -94,7 +94,7 @@
update DEPLOYMENT_MODULE_LIST
app_id = #{appId},
- app_core = #{appCore},
+ app_core = #{appCode},
uploading_type = #{uploadingType},
module_name = #{moduleName},
version = #{version},
From 6ee4325537327abb76fce3adf7dc23786ace01cb Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 25 Apr 2024 15:08:33 +0800
Subject: [PATCH 099/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9AH5=E6=A8=A1=E5=9D=97=E5=8C=85header?=
=?UTF-8?q?=E6=96=B0=E5=A2=9Eappcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/system/deployment/DeploymentModuleListMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
index 1008658..e8cc2f3 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml
@@ -26,7 +26,7 @@
- select id, app_id, app_core, uploading_type, module_name, version, module_url, module_size, sys_type, module_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_MODULE_LIST
+ select id, app_id, app_code, uploading_type, module_name, version, module_url, module_size, sys_type, module_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_MODULE_LIST
From 3ef81c28a45982f424dc254b79b5e16879152633 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 30 Apr 2024 15:33:00 +0800
Subject: [PATCH 110/118] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=8A=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/src/main/resources/application-druid.yml | 4 ++--
sf-admin/src/main/resources/application.yml | 7 +++----
.../main/java/com/sf/file/config/AmazonConfig.java | 2 +-
.../sf/order/controller/OrderInfoController.java | 13 +++++++++++++
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/sf-admin/src/main/resources/application-druid.yml b/sf-admin/src/main/resources/application-druid.yml
index 293e088..4dcf478 100644
--- a/sf-admin/src/main/resources/application-druid.yml
+++ b/sf-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.1.23:22001/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.108.66.163:3306/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: abc&^321
+ password: 82^hsgGHbs^2
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml
index 9f9beb2..10f2f35 100644
--- a/sf-admin/src/main/resources/application.yml
+++ b/sf-admin/src/main/resources/application.yml
@@ -70,9 +70,9 @@ spring:
# redis 配置
redis:
# 地址
- host: 192.168.1.23
+ host: 47.108.66.163
# 端口，默认为6379
- port: 22002
+ port: 6379
# 数据库索引
database: 0
# 密码
@@ -132,8 +132,7 @@ xss:
file:
ceph:
#endpoint: http://127.0.0.1:9000
- upload: http://192.168.1.23:9000
- endpoint: http://118.114.160.245
+ endpoint: http://47.108.66.163:9000
# 50M
defaultMaxSize: 52428800
access:
diff --git a/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java b/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
index 4548feb..dd20714 100644
--- a/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
+++ b/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
@@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
@Configuration
@Slf4j
public class AmazonConfig {
- @Value("${file.ceph.upload}")
+ @Value("${file.ceph.endpoint}")
private String FILE_CEPH_POINT;
@Value("${file.ceph.access.key}")
diff --git a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
index 4ecbfab..37b7d23 100644
--- a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
+++ b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -43,6 +43,19 @@ public class OrderInfoController extends BaseController {
return getDataTable(list);
}
+ /**
+ * 我的订单列表（当前用户）
+ */
+ @GetMapping("/myOrderList")
+ public TableDataInfo myOrderList(OrderListReqVo vo) {
+ vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ vo.setUserId(getUserId());
+ // startPage();
+ List list = orderInfoService.queryList(vo);
+ return getDataTable(list);
+ }
+
+
/**
* 导出订单基础信息列表
From a7396698f8a17beb1669d61db61fd71ea08ae13c Mon Sep 17 00:00:00 2001
From: pengren
Date: Tue, 30 Apr 2024 16:31:49 +0800
Subject: [PATCH 111/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9minio=E5=AF=86?=
=?UTF-8?q?=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/src/main/resources/application.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml
index 10f2f35..2f15fd5 100644
--- a/sf-admin/src/main/resources/application.yml
+++ b/sf-admin/src/main/resources/application.yml
@@ -132,15 +132,16 @@ xss:
file:
ceph:
#endpoint: http://127.0.0.1:9000
+ upload: http://47.108.66.163:9000
endpoint: http://47.108.66.163:9000
# 50M
defaultMaxSize: 52428800
access:
#key: iEJhVfZ8ColMeAnooVFx
- key: CvproVoq7XiXDTK1RLFT
+ key: apCif1DwuXBy85JCotx3
secret:
#key: SNTORcnq76xiaegoJ7Ap7Clldoq8HJUXqyn484o0
- key: dekJkBHBkO4HccNKsiqAC2mkeNxVKEWSRoll3yqp
+ key: Whb0j7jwk01iubHucyQ3DzJT5xUBkGrQvmdZ2k9k
bucket:
#name: ruoyi
name: sac
From df7faa85368008aebfc4e10a1ef355778e90ee48 Mon Sep 17 00:00:00 2001
From: pengren
Date: Tue, 7 May 2024 09:30:18 +0800
Subject: [PATCH 112/118] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=90=8E?=
=?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/HuaweiPaymentServiceImpl.java | 2 +-
.../DeploymentServicePublishController.java | 2 +-
.../DeploymentWhitelistInfoController.java | 128 ++++++++++++++
.../DeploymentWhitelistListController.java | 121 +++++++++++++
.../domain/DeploymentWhitelistInfo.java | 95 ++++++++++
.../domain/DeploymentWhitelistList.java | 165 ++++++++++++++++++
.../domain/rqs/AddWhiteMemberRequest.java | 16 ++
.../mapper/DeploymentWhitelistInfoMapper.java | 89 ++++++++++
.../mapper/DeploymentWhitelistListMapper.java | 62 +++++++
.../IDeploymentWhitelistInfoService.java | 77 ++++++++
.../IDeploymentWhitelistListService.java | 67 +++++++
.../DeploymentWhitelistInfoServiceImpl.java | 142 +++++++++++++++
.../DeploymentWhitelistListServiceImpl.java | 132 ++++++++++++++
.../DeploymentWhitelistInfoMapper.xml | 152 ++++++++++++++++
.../DeploymentWhitelistListMapper.xml | 97 ++++++++++
15 files changed, 1345 insertions(+), 2 deletions(-)
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java
create mode 100755 sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java
create mode 100644 sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml
create mode 100644 sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
diff --git a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java
index c7c2abe..473d026 100644
--- a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java
+++ b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java
@@ -128,7 +128,7 @@ public class HuaweiPaymentServiceImpl implements IHuaweiPaymentService {
bodyMap.put("purchaseOrderId", lastPurchaseOrder.getPurchaseOrderId());
// construct the Authorization in Header
Map headers = buildAuthorization(huaweiPaymentConfig.getAppId(), bodyMap);
-
+ log.info("调用华为主动续期入惨：{}", JSON.toJSONString(bodyMap));
// 订阅状态查询
String response = HttpUtil.createPost(ROOT_URL + SUBSCRIPTION_STATUS_QUERY_URL)
.addHeaders(headers)
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
index 89406df..0dd8fa3 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
@@ -123,7 +123,7 @@ public class DeploymentServicePublishController extends BaseController
}
/**
- * 获取发布列表详细信息
+ * 下架
*/
@PreAuthorize("@ss.hasPermi('deployment:publish:sold:out')")
@GetMapping(value = "/sold/out/{id}")
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java
new file mode 100644
index 0000000..8619710
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java
@@ -0,0 +1,128 @@
+package com.sf.system.deployment.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sf.common.enums.RequestHeaderEnums;
+import com.sf.common.utils.http.RequestUtils;
+import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
+import com.sf.system.deployment.service.IDeploymentWhitelistInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sf.common.annotation.Log;
+import com.sf.common.core.controller.BaseController;
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.poi.ExcelUtil;
+import com.sf.common.core.page.TableDataInfo;
+
+/**
+ * 白名单列表Controller
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+@RestController
+@RequestMapping("/deployment/whitelist")
+public class DeploymentWhitelistInfoController extends BaseController
+{
+ @Autowired
+ private IDeploymentWhitelistInfoService deploymentWhitelistInfoService;
+
+ /**
+ * 查询白名单列表列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DeploymentWhitelistInfo deploymentWhitelistInfo)
+ {
+ deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ startPage();
+ List list = deploymentWhitelistInfoService.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出白名单列表列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:export')")
+ @Log(title = "白名单列表", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DeploymentWhitelistInfo deploymentWhitelistInfo)
+ {
+ deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ List list = deploymentWhitelistInfoService.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+ ExcelUtil util = new ExcelUtil(DeploymentWhitelistInfo.class);
+ util.exportExcel(response, list, "白名单列表数据");
+ }
+
+ /**
+ * 获取白名单列表详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(deploymentWhitelistInfoService.selectDeploymentWhitelistInfoById(id));
+ }
+
+ /**
+ * 新增白名单列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:add')")
+ @Log(title = "白名单列表", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo)
+ {
+ deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ return toAjax(deploymentWhitelistInfoService.insertDeploymentWhitelistInfo(deploymentWhitelistInfo));
+ }
+
+ /**
+ * 修改白名单列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:edit')")
+ @Log(title = "白名单列表", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo)
+ {
+ return toAjax(deploymentWhitelistInfoService.updateDeploymentWhitelistInfo(deploymentWhitelistInfo));
+ }
+
+ /**
+ * 删除白名单列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:remove')")
+ @Log(title = "白名单列表", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(deploymentWhitelistInfoService.deleteDeploymentWhitelistInfoByIds(ids));
+ }
+ /**
+ * 发布功能
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:publish')")
+ @GetMapping(value = "/publish/{id}")
+ public AjaxResult publish(@PathVariable("id") Long id) throws Exception {
+ return success(deploymentWhitelistInfoService.publish(id));
+ }
+ /**
+ * 下架功能
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelist:sold:out')")
+ @GetMapping(value = "/sold/out/{id}")
+ public AjaxResult soldOut(@PathVariable("id") Long id)
+ {
+ return success(deploymentWhitelistInfoService.soldOut(id));
+ }
+
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java
new file mode 100644
index 0000000..0f0c786
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java
@@ -0,0 +1,121 @@
+package com.sf.system.deployment.controller;
+
+import java.io.IOException;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.sf.common.exception.ServiceException;
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+import com.sf.system.deployment.service.IDeploymentWhitelistListService;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.sf.common.annotation.Log;
+import com.sf.common.core.controller.BaseController;
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.poi.ExcelUtil;
+import com.sf.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 白名单成员列Controller
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+@RestController
+@RequestMapping("/deployment/whitelistMember")
+public class DeploymentWhitelistListController extends BaseController
+{
+ @Autowired
+ private IDeploymentWhitelistListService deploymentWhitelistListService;
+
+ /**
+ * 查询白名单成员列列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DeploymentWhitelistList deploymentWhitelistList)
+ {
+ if(null == deploymentWhitelistList.getWhitelistId()){
+ throw new SecurityException("参数异常WhitelistId为空");
+ }
+ startPage();
+ List list = deploymentWhitelistListService.selectDeploymentWhitelistListList(deploymentWhitelistList);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出白名单成员列列表
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:export')")
+ @Log(title = "白名单成员列", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DeploymentWhitelistList deploymentWhitelistList)
+ {
+ List list = deploymentWhitelistListService.selectDeploymentWhitelistListList(deploymentWhitelistList);
+ ExcelUtil util = new ExcelUtil(DeploymentWhitelistList.class);
+ util.exportExcel(response, list, "白名单成员列数据");
+ }
+
+ /**
+ * 获取白名单成员列详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(deploymentWhitelistListService.selectDeploymentWhitelistListById(id));
+ }
+
+ /**
+ * 新增白名单成员列
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:add')")
+ @Log(title = "白名单成员列", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DeploymentWhitelistList deploymentWhitelistList)
+ {
+ return toAjax(deploymentWhitelistListService.insertDeploymentWhitelistList(deploymentWhitelistList,getUsername()));
+ }
+
+ /**
+ * 修改白名单成员列
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:edit')")
+ @Log(title = "白名单成员列", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DeploymentWhitelistList deploymentWhitelistList)
+ {
+ return toAjax(deploymentWhitelistListService.updateDeploymentWhitelistList(deploymentWhitelistList));
+ }
+
+ /**
+ * 删除白名单成员列
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:remove')")
+ @Log(title = "白名单成员列", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(deploymentWhitelistListService.deleteDeploymentWhitelistListByIds(ids));
+ }
+ /**
+ * 批量导入
+ *
+ * @param file 文件
+ */
+ @PreAuthorize("@ss.hasPermi('deployment:whitelistMember:batch:import')")
+ @Log(title = "批量上传", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/batch/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public AjaxResult batchImport(@RequestPart("file") MultipartFile file,Long whitelistId) throws IOException {
+ if (ObjectUtil.isNull(file)) {
+ throw new ServiceException("上传文件不能为空");
+ }
+
+ return toAjax(deploymentWhitelistListService.batchImport(file,whitelistId,getUsername()));
+ }
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java
new file mode 100644
index 0000000..c515aaf
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java
@@ -0,0 +1,95 @@
+package com.sf.system.deployment.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sf.common.annotation.Excel;
+import com.sf.common.core.domain.BaseEntity;
+
+/**
+ * 白名单列表对象 DEPLOYMENT_WHITELIST_INFO
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+@Data
+public class DeploymentWhitelistInfo extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 主键 */
+ private Long id;
+
+ /** 应用id */
+ private Long appId;
+
+ /** 应用id */
+ @Excel(name = "应用id")
+ private String appCode;
+
+ /** 白名单名称 */
+ @Excel(name = "白名单名称")
+ private String whitelistName;
+
+ /** 白名单类型 */
+ @Excel(name = "白名单类型")
+ private Long whitelistType;
+
+ /** 白名单模式 */
+ @Excel(name = "白名单模式")
+ private Long whitelistMode;
+
+ /** 状态 */
+ @Excel(name = "状态")
+ private Long status;
+
+ /** 备注 */
+ @Excel(name = "备注")
+ private String remarks;
+
+ /** 排序 */
+ private Long orderNum;
+
+ /** 逻辑删除,0:未删除,1:删除 */
+ private Long isDelete;
+
+ /** 创建人 */
+ private String created;
+
+ /** 更新人 */
+ private String modified;
+
+ /** 白名单成员列信息 */
+ private List deploymentWhitelistListList;
+
+ /** 开始时间 */
+ private Date beginTime;
+
+ /** 开始时间 */
+ private Date endTime;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("appId", getAppId())
+ .append("appCode", getAppCode())
+ .append("whitelistName", getWhitelistName())
+ .append("whitelistType", getWhitelistType())
+ .append("whitelistMode", getWhitelistMode())
+ .append("status", getStatus())
+ .append("remarks", getRemarks())
+ .append("orderNum", getOrderNum())
+ .append("isDelete", getIsDelete())
+ .append("created", getCreated())
+ .append("modified", getModified())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("deploymentWhitelistListList", getDeploymentWhitelistListList())
+ .toString();
+ }
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java
new file mode 100644
index 0000000..a24aae5
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java
@@ -0,0 +1,165 @@
+package com.sf.system.deployment.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sf.common.annotation.Excel;
+import com.sf.common.core.domain.BaseEntity;
+
+/**
+ * 白名单成员列对象 DEPLOYMENT_WHITELIST_LIST
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+public class DeploymentWhitelistList extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 主键 */
+ private Long id;
+
+ /** 白名单id */
+ @Excel(name = "白名单id")
+ private Long whitelistId;
+
+ /** 应用id */
+ @Excel(name = "应用id")
+ private Long appId;
+
+ /** 应用code */
+ @Excel(name = "应用code")
+ private String appCode;
+
+ /** 人员或设备id */
+ @Excel(name = "人员或设备id")
+ private String user;
+
+ /** 备注 */
+ @Excel(name = "备注")
+ private String remarks;
+
+ /** 排序 */
+ @Excel(name = "排序")
+ private Long orderNum;
+
+ /** 逻辑删除,0:未删除,1:删除 */
+ @Excel(name = "逻辑删除,0:未删除,1:删除")
+ private Long isDelete;
+
+ /** 创建人 */
+ @Excel(name = "创建人")
+ private String created;
+
+ /** 更新人 */
+ @Excel(name = "更新人")
+ private String modified;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setWhitelistId(Long whitelistId)
+ {
+ this.whitelistId = whitelistId;
+ }
+
+ public Long getWhitelistId()
+ {
+ return whitelistId;
+ }
+ public void setAppId(Long appId)
+ {
+ this.appId = appId;
+ }
+
+ public Long getAppId()
+ {
+ return appId;
+ }
+ public void setAppCode(String appCode)
+ {
+ this.appCode = appCode;
+ }
+
+ public String getAppCode()
+ {
+ return appCode;
+ }
+ public void setUser(String user)
+ {
+ this.user = user;
+ }
+
+ public String getUser()
+ {
+ return user;
+ }
+ public void setRemarks(String remarks)
+ {
+ this.remarks = remarks;
+ }
+
+ public String getRemarks()
+ {
+ return remarks;
+ }
+ public void setOrderNum(Long orderNum)
+ {
+ this.orderNum = orderNum;
+ }
+
+ public Long getOrderNum()
+ {
+ return orderNum;
+ }
+ public void setIsDelete(Long isDelete)
+ {
+ this.isDelete = isDelete;
+ }
+
+ public Long getIsDelete()
+ {
+ return isDelete;
+ }
+ public void setCreated(String created)
+ {
+ this.created = created;
+ }
+
+ public String getCreated()
+ {
+ return created;
+ }
+ public void setModified(String modified)
+ {
+ this.modified = modified;
+ }
+
+ public String getModified()
+ {
+ return modified;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("whitelistId", getWhitelistId())
+ .append("appId", getAppId())
+ .append("appCode", getAppCode())
+ .append("user", getUser())
+ .append("remarks", getRemarks())
+ .append("orderNum", getOrderNum())
+ .append("isDelete", getIsDelete())
+ .append("created", getCreated())
+ .append("modified", getModified())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java
new file mode 100755
index 0000000..05984bf
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java
@@ -0,0 +1,16 @@
+package com.sf.system.deployment.domain.rqs;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Data
+public class AddWhiteMemberRequest {
+
+ @NotBlank
+ private Long whitelistId;
+
+ @NotBlank
+ private String userId;
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java
new file mode 100644
index 0000000..1f0e884
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java
@@ -0,0 +1,89 @@
+package com.sf.system.deployment.mapper;
+
+import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+
+import java.util.List;
+
+/**
+ * 白名单列表Mapper接口
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+public interface DeploymentWhitelistInfoMapper
+{
+ /**
+ * 查询白名单列表
+ *
+ * @param id 白名单列表主键
+ * @return 白名单列表
+ */
+ public DeploymentWhitelistInfo selectDeploymentWhitelistInfoById(Long id);
+
+ /**
+ * 查询白名单列表列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 白名单列表集合
+ */
+ public List selectDeploymentWhitelistInfoList(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+ /**
+ * 新增白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ public int insertDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+ /**
+ * 修改白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ public int updateDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+ /**
+ * 删除白名单列表
+ *
+ * @param id 白名单列表主键
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistInfoById(Long id);
+
+
+ /**
+ * 批量删除白名单列表
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistInfoByIds(Long[] ids);
+
+ /**
+ * 批量删除白名单成员列
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListByWhitelistIds(Long[] ids);
+
+ /**
+ * 批量新增白名单成员列
+ *
+ * @param deploymentWhitelistListList 白名单成员列列表
+ * @return 结果
+ */
+ public int batchDeploymentWhitelistList(List deploymentWhitelistListList);
+
+
+ /**
+ * 通过白名单列表主键删除白名单成员列信息
+ *
+ * @param id 白名单列表ID
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListByWhitelistId(Long id);
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java
new file mode 100644
index 0000000..d242af0
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java
@@ -0,0 +1,62 @@
+package com.sf.system.deployment.mapper;
+
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+
+import java.util.List;
+
+/**
+ * 白名单成员列Mapper接口
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+public interface DeploymentWhitelistListMapper
+{
+ /**
+ * 查询白名单成员列
+ *
+ * @param id 白名单成员列主键
+ * @return 白名单成员列
+ */
+ public DeploymentWhitelistList selectDeploymentWhitelistListById(Long id);
+
+ /**
+ * 查询白名单成员列列表
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 白名单成员列集合
+ */
+ public List selectDeploymentWhitelistListList(DeploymentWhitelistList deploymentWhitelistList);
+
+ /**
+ * 新增白名单成员列
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 结果
+ */
+ public int insertDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList);
+
+ /**
+ * 修改白名单成员列
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 结果
+ */
+ public int updateDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList);
+
+ /**
+ * 删除白名单成员列
+ *
+ * @param id 白名单成员列主键
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListById(Long id);
+
+ /**
+ * 批量删除白名单成员列
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListByIds(Long[] ids);
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java
new file mode 100644
index 0000000..5f337e7
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java
@@ -0,0 +1,77 @@
+package com.sf.system.deployment.service;
+
+import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
+
+import java.util.List;
+
+/**
+ * 白名单列表Service接口
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+public interface IDeploymentWhitelistInfoService
+{
+ /**
+ * 查询白名单列表
+ *
+ * @param id 白名单列表主键
+ * @return 白名单列表
+ */
+ public DeploymentWhitelistInfo selectDeploymentWhitelistInfoById(Long id);
+
+ /**
+ * 查询白名单列表列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 白名单列表集合
+ */
+ public List selectDeploymentWhitelistInfoList(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+ /**
+ * 新增白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ public int insertDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+
+ /**
+ * 修改白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ public int updateDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo);
+
+ /**
+ * 发布功能
+ * @param id
+ * @return
+ */
+ public int publish(Long id);
+ /**
+ * 下架功能
+ * @param id
+ * @return
+ */
+ public int soldOut(Long id);
+
+ /**
+ * 批量删除白名单列表
+ *
+ * @param ids 需要删除的白名单列表主键集合
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistInfoByIds(Long[] ids);
+
+ /**
+ * 删除白名单列表信息
+ *
+ * @param id 白名单列表主键
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistInfoById(Long id);
+
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java
new file mode 100644
index 0000000..b6bd394
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java
@@ -0,0 +1,67 @@
+package com.sf.system.deployment.service;
+
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 白名单成员列Service接口
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+public interface IDeploymentWhitelistListService
+{
+ /**
+ * 查询白名单成员列
+ *
+ * @param id 白名单成员列主键
+ * @return 白名单成员列
+ */
+ public DeploymentWhitelistList selectDeploymentWhitelistListById(Long id);
+
+ /**
+ * 查询白名单成员列列表
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 白名单成员列集合
+ */
+ public List selectDeploymentWhitelistListList(DeploymentWhitelistList deploymentWhitelistList);
+
+ /**
+ * 新增白名单成员列
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @param username
+ * @return 结果
+ */
+ public int insertDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList, String username);
+
+ /**
+ * 修改白名单成员列
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 结果
+ */
+ public int updateDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList);
+
+ /**
+ * 批量删除白名单成员列
+ *
+ * @param ids 需要删除的白名单成员列主键集合
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListByIds(Long[] ids);
+
+ /**
+ * 删除白名单成员列信息
+ *
+ * @param id 白名单成员列主键
+ * @return 结果
+ */
+ public int deleteDeploymentWhitelistListById(Long id);
+
+ public int batchImport(MultipartFile file, Long whitelistId, String username) throws IOException;
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
new file mode 100644
index 0000000..bf7b3c8
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
@@ -0,0 +1,142 @@
+package com.sf.system.deployment.service.impl;
+
+import java.util.List;
+
+import com.sf.common.utils.DateUtils;
+import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+import com.sf.system.deployment.mapper.DeploymentWhitelistInfoMapper;
+import com.sf.system.deployment.service.IDeploymentWhitelistInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+
+import com.sf.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 白名单列表Service业务层处理
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+@Service
+public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistInfoService {
+ @Autowired
+ private DeploymentWhitelistInfoMapper deploymentWhitelistInfoMapper;
+
+ /**
+ * 查询白名单列表
+ *
+ * @param id 白名单列表主键
+ * @return 白名单列表
+ */
+ @Override
+ public DeploymentWhitelistInfo selectDeploymentWhitelistInfoById(Long id) {
+ return deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoById(id);
+ }
+
+ /**
+ * 查询白名单列表列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 白名单列表
+ */
+ @Override
+ public List selectDeploymentWhitelistInfoList(DeploymentWhitelistInfo deploymentWhitelistInfo) {
+ return deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+ }
+
+ /**
+ * 新增白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ @Transactional
+ @Override
+ public int insertDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo) {
+ deploymentWhitelistInfo.setCreateTime(DateUtils.getNowDate());
+ int rows = deploymentWhitelistInfoMapper.insertDeploymentWhitelistInfo(deploymentWhitelistInfo);
+ insertDeploymentWhitelistList(deploymentWhitelistInfo);
+ return rows;
+ }
+
+
+ /**
+ * 修改白名单列表
+ *
+ * @param deploymentWhitelistInfo 白名单列表
+ * @return 结果
+ */
+ @Transactional
+ @Override
+ public int updateDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo) {
+ deploymentWhitelistInfo.setUpdateTime(DateUtils.getNowDate());
+ deploymentWhitelistInfoMapper.deleteDeploymentWhitelistListByWhitelistId(deploymentWhitelistInfo.getId());
+ insertDeploymentWhitelistList(deploymentWhitelistInfo);
+ return deploymentWhitelistInfoMapper.updateDeploymentWhitelistInfo(deploymentWhitelistInfo);
+ }
+
+ @Override
+ public int publish(Long id) {
+ DeploymentWhitelistInfo deploymentWhitelistInfo = deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoById(id);
+ deploymentWhitelistInfo.setStatus(1L);
+ return deploymentWhitelistInfoMapper.updateDeploymentWhitelistInfo(deploymentWhitelistInfo);
+ }
+
+ @Override
+ public int soldOut(Long id) {
+ DeploymentWhitelistInfo deploymentWhitelistInfo = deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoById(id);
+ deploymentWhitelistInfo.setStatus(0L);
+ return deploymentWhitelistInfoMapper.updateDeploymentWhitelistInfo(deploymentWhitelistInfo);
+ }
+
+ /**
+ * 批量删除白名单列表
+ *
+ * @param ids 需要删除的白名单列表主键
+ * @return 结果
+ */
+ @Transactional
+ @Override
+ public int deleteDeploymentWhitelistInfoByIds(Long[] ids) {
+ deploymentWhitelistInfoMapper.deleteDeploymentWhitelistListByWhitelistIds(ids);
+ return deploymentWhitelistInfoMapper.deleteDeploymentWhitelistInfoByIds(ids);
+ }
+
+ /**
+ * 删除白名单列表信息
+ *
+ * @param id 白名单列表主键
+ * @return 结果
+ */
+ @Transactional
+ @Override
+ public int deleteDeploymentWhitelistInfoById(Long id) {
+ deploymentWhitelistInfoMapper.deleteDeploymentWhitelistListByWhitelistId(id);
+ return deploymentWhitelistInfoMapper.deleteDeploymentWhitelistInfoById(id);
+ }
+
+
+ /**
+ * 新增白名单成员列信息
+ *
+ * @param deploymentWhitelistInfo 白名单列表对象
+ */
+ public void insertDeploymentWhitelistList(DeploymentWhitelistInfo deploymentWhitelistInfo) {
+ List deploymentWhitelistListList = deploymentWhitelistInfo.getDeploymentWhitelistListList();
+ Long id = deploymentWhitelistInfo.getId();
+ if (StringUtils.isNotNull(deploymentWhitelistListList)) {
+ List list = new ArrayList();
+ for (DeploymentWhitelistList deploymentWhitelistList : deploymentWhitelistListList) {
+ deploymentWhitelistList.setWhitelistId(id);
+ list.add(deploymentWhitelistList);
+ }
+ if (list.size() > 0) {
+ deploymentWhitelistInfoMapper.batchDeploymentWhitelistList(list);
+ }
+ }
+ }
+}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java
new file mode 100644
index 0000000..812b7ad
--- /dev/null
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java
@@ -0,0 +1,132 @@
+package com.sf.system.deployment.service.impl;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import com.sf.common.enums.RequestHeaderEnums;
+import com.sf.common.utils.DateUtils;
+import com.sf.common.utils.StringUtils;
+import com.sf.common.utils.http.RequestUtils;
+import com.sf.system.deployment.domain.DeploymentWhitelistList;
+import com.sf.system.deployment.mapper.DeploymentWhitelistListMapper;
+import com.sf.system.deployment.service.IDeploymentWhitelistListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 白名单成员列Service业务层处理
+ *
+ * @author ztzh
+ * @date 2024-05-06
+ */
+@Service
+public class DeploymentWhitelistListServiceImpl implements IDeploymentWhitelistListService
+{
+ @Autowired
+ private DeploymentWhitelistListMapper deploymentWhitelistListMapper;
+
+ /**
+ * 查询白名单成员列
+ *
+ * @param id 白名单成员列主键
+ * @return 白名单成员列
+ */
+ @Override
+ public DeploymentWhitelistList selectDeploymentWhitelistListById(Long id)
+ {
+ return deploymentWhitelistListMapper.selectDeploymentWhitelistListById(id);
+ }
+
+ /**
+ * 查询白名单成员列列表
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 白名单成员列
+ */
+ @Override
+ public List selectDeploymentWhitelistListList(DeploymentWhitelistList deploymentWhitelistList)
+ {
+ return deploymentWhitelistListMapper.selectDeploymentWhitelistListList(deploymentWhitelistList);
+ }
+
+ /**
+ * 新增白名单成员列
+ *
+ * @param member 白名单成员列
+ * @param username
+ * @return 结果
+ */
+ @Override
+ public int insertDeploymentWhitelistList(DeploymentWhitelistList member, String username)
+ {
+ if(null == member.getWhitelistId()){
+ throw new SecurityException("参数异常WhitelistId为空");
+ }
+ member.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ member.setCreated(username);
+ member.setCreateTime(DateUtils.getNowDate());
+ member.setModified(username);
+ member.setUpdateTime(DateUtils.getNowDate());
+ member.setCreateTime(DateUtils.getNowDate());
+ return deploymentWhitelistListMapper.insertDeploymentWhitelistList(member);
+ }
+
+ /**
+ * 修改白名单成员列
+ *
+ * @param deploymentWhitelistList 白名单成员列
+ * @return 结果
+ */
+ @Override
+ public int updateDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList)
+ {
+ deploymentWhitelistList.setUpdateTime(DateUtils.getNowDate());
+ return deploymentWhitelistListMapper.updateDeploymentWhitelistList(deploymentWhitelistList);
+ }
+
+ /**
+ * 批量删除白名单成员列
+ *
+ * @param ids 需要删除的白名单成员列主键
+ * @return 结果
+ */
+ @Override
+ public int deleteDeploymentWhitelistListByIds(Long[] ids)
+ {
+ return deploymentWhitelistListMapper.deleteDeploymentWhitelistListByIds(ids);
+ }
+
+ /**
+ * 删除白名单成员列信息
+ *
+ * @param id 白名单成员列主键
+ * @return 结果
+ */
+ @Override
+ public int deleteDeploymentWhitelistListById(Long id)
+ {
+ return deploymentWhitelistListMapper.deleteDeploymentWhitelistListById(id);
+ }
+
+ @Override
+ public int batchImport(MultipartFile file, Long whitelistId, String username) throws IOException {
+ String content = "";
+ try {
+ byte[] data = file.getBytes();
+ content = new String(data, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ content.replaceAll("/n","");
+ String[] split = StringUtils.split(content, ",");
+ for (String user : split) {
+ DeploymentWhitelistList menber = new DeploymentWhitelistList();
+ menber.setWhitelistId(whitelistId);
+ menber.setUser(user.trim());
+ insertDeploymentWhitelistList(menber, username);
+ }
+ return 1;
+ }
+}
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml
new file mode 100644
index 0000000..b1f28ce
--- /dev/null
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, app_id, app_code, whitelist_name, whitelist_type, whitelist_mode, status, remarks, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_WHITELIST_INFO
+
+
+
+
+
+
+
+ insert into DEPLOYMENT_WHITELIST_INFO
+
+ app_id,
+ app_code,
+ whitelist_name,
+ whitelist_type,
+ whitelist_mode,
+ status,
+ remarks,
+ order_num,
+ is_delete,
+ created,
+ modified,
+ create_time,
+ update_time,
+
+
+ #{appId},
+ #{appCode},
+ #{whitelistName},
+ #{whitelistType},
+ #{whitelistMode},
+ #{status},
+ #{remarks},
+ #{orderNum},
+ #{isDelete},
+ #{created},
+ #{modified},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+
+ update DEPLOYMENT_WHITELIST_INFO
+
+ app_id = #{appId},
+ app_code = #{appCode},
+ whitelist_name = #{whitelistName},
+ whitelist_type = #{whitelistType},
+ whitelist_mode = #{whitelistMode},
+ status = #{status},
+ remarks = #{remarks},
+ order_num = #{orderNum},
+ is_delete = #{isDelete},
+ created = #{created},
+ modified = #{modified},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from DEPLOYMENT_WHITELIST_INFO where id = #{id}
+
+
+
+ delete from DEPLOYMENT_WHITELIST_INFO where id in
+
+ #{id}
+
+
+
+
+ delete from DEPLOYMENT_WHITELIST_LIST where whitelist_id in
+
+ #{whitelistId}
+
+
+
+
+ delete from DEPLOYMENT_WHITELIST_LIST where whitelist_id = #{whitelistId}
+
+
+
+ insert into DEPLOYMENT_WHITELIST_LIST( id, whitelist_id, app_id, app_code, user, remarks, order_num, is_delete, created, modified, create_time, update_time) values
+
+ ( #{item.id}, #{item.whitelistId}, #{item.appId}, #{item.appCode}, #{item.user}, #{item.remarks}, #{item.orderNum}, #{item.isDelete}, #{item.created}, #{item.modified}, #{item.createTime}, #{item.updateTime})
+
+
+
\ No newline at end of file
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
new file mode 100644
index 0000000..9229e3b
--- /dev/null
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+ select id, whitelist_id, app_id, app_code, user, remarks, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_WHITELIST_LIST
+
+
+
+
+
+
+
+ insert into DEPLOYMENT_WHITELIST_LIST
+
+ whitelist_id,
+ app_id,
+ app_code,
+ user,
+ remarks,
+ order_num,
+ is_delete,
+ created,
+ modified,
+ create_time,
+ update_time,
+
+
+ #{whitelistId},
+ #{appId},
+ #{appCode},
+ #{user},
+ #{remarks},
+ #{orderNum},
+ #{isDelete},
+ #{created},
+ #{modified},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+ update DEPLOYMENT_WHITELIST_LIST
+
+ whitelist_id = #{whitelistId},
+ app_id = #{appId},
+ app_code = #{appCode},
+ user = #{user},
+ remarks = #{remarks},
+ order_num = #{orderNum},
+ is_delete = #{isDelete},
+ created = #{created},
+ modified = #{modified},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from DEPLOYMENT_WHITELIST_LIST where id = #{id}
+
+
+
+ delete from DEPLOYMENT_WHITELIST_LIST where id in
+
+ #{id}
+
+
+
\ No newline at end of file
From 8636ddf7d5b6a812f85ed68054917c9b62dc2264 Mon Sep 17 00:00:00 2001
From: pengren
Date: Tue, 7 May 2024 14:07:15 +0800
Subject: [PATCH 113/118] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=90=8E?=
=?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/DeploymentWhitelistInfoServiceImpl.java | 15 +++++++++++----
.../deployment/DeploymentWhitelistListMapper.xml | 1 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
index bf7b3c8..c302145 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
@@ -6,6 +6,7 @@ import com.sf.common.utils.DateUtils;
import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
import com.sf.system.deployment.domain.DeploymentWhitelistList;
import com.sf.system.deployment.mapper.DeploymentWhitelistInfoMapper;
+import com.sf.system.deployment.mapper.DeploymentWhitelistListMapper;
import com.sf.system.deployment.service.IDeploymentWhitelistInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistInfoService {
@Autowired
private DeploymentWhitelistInfoMapper deploymentWhitelistInfoMapper;
+ @Autowired
+ private DeploymentWhitelistListMapper deploymentWhitelistListMapper;
/**
* 查询白名单列表
@@ -45,7 +48,14 @@ public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistI
*/
@Override
public List selectDeploymentWhitelistInfoList(DeploymentWhitelistInfo deploymentWhitelistInfo) {
- return deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+ List infos = deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+ infos.forEach(deploymentWhitelistInfo1 -> {
+ DeploymentWhitelistList deploymentWhitelistList = new DeploymentWhitelistList();
+ deploymentWhitelistList.setWhitelistId(deploymentWhitelistInfo1.getId());
+ List list = deploymentWhitelistListMapper.selectDeploymentWhitelistListList(deploymentWhitelistList);
+ deploymentWhitelistInfo1.setDeploymentWhitelistListList(list);
+ });
+ return infos;
}
/**
@@ -73,9 +83,6 @@ public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistI
@Transactional
@Override
public int updateDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo) {
- deploymentWhitelistInfo.setUpdateTime(DateUtils.getNowDate());
- deploymentWhitelistInfoMapper.deleteDeploymentWhitelistListByWhitelistId(deploymentWhitelistInfo.getId());
- insertDeploymentWhitelistList(deploymentWhitelistInfo);
return deploymentWhitelistInfoMapper.updateDeploymentWhitelistInfo(deploymentWhitelistInfo);
}
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
index 9229e3b..63868a8 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and create_time = #{createTime}
and user = #{user}
+ and whitelist_id = #{whitelistId}
From 8b9367e5cdc174832e2c6aac8c7ce28c7dc1da60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Wed, 8 May 2024 11:13:12 +0800
Subject: [PATCH 114/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9appCode?=
=?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fix: 修改appCode取值
---
.../src/views/FDS/installationList/index.vue | 168 +++------
.../FDS/publishList/components/addPack.vue | 59 ++--
sf-ui/src/views/FDS/publishList/index.vue | 185 +++-------
sf-ui/src/views/deployment/module/index.vue | 194 ++++-------
sf-ui/src/views/deployment/publish/index.vue | 322 +++++-------------
5 files changed, 279 insertions(+), 649 deletions(-)
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 4aa0ee1..e356451 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -12,29 +12,14 @@
-
-
-
@@ -48,12 +33,7 @@
-
搜索
@@ -63,14 +43,8 @@
- 新增
+ 新增
@@ -86,23 +60,16 @@
- 批量删除
+ 批量删除
-
安装包
@@ -115,89 +82,56 @@
复制
-
-
-
- 下载安装包
+ 下载安装包
- 修改
+ 修改
- 详情
+ 详情
- 删除
+ 删除
-
-
-
-
-
-
@@ -249,7 +183,7 @@ import Cookies from 'js-cookie'
export default {
name: 'INFO',
dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
- data() {
+ data () {
return {
form: {
@@ -259,7 +193,7 @@ export default {
sysApk: null,
sysApkSize: undefined,
sysType: '',
- appCode: Cookies.get('Admin-Application-Id')
+ appCode: Cookies.get('Admin-Application-appCode')
},
// 遮罩层
@@ -312,12 +246,12 @@ export default {
}
}
},
- created() {
+ created () {
this.getList()
},
methods: {
/** 查询安装包管理（新）列表 */
- getList() {
+ getList () {
this.loading = true
listINFO(this.queryParams).then(response => {
this.INFOList = response.rows
@@ -326,12 +260,12 @@ export default {
})
},
// 取消按钮
- cancel() {
+ cancel () {
this.open = false
this.reset()
},
// 表单重置
- reset() {
+ reset () {
this.form = {
uploadingType: 'OnLineUploading',
sysApkName: undefined,
@@ -339,34 +273,34 @@ export default {
sysApk: null,
sysApkSize: undefined,
sysType: '',
- appCode: Cookies.get('Admin-Application-Id')
+ appCode: Cookies.get('Admin-Application-appCode')
}
this.resetForm('form')
},
/** 搜索按钮操作 */
- handleQuery() {
+ handleQuery () {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
- resetQuery() {
+ resetQuery () {
this.resetForm('queryForm')
this.handleQuery()
},
// 多选框选中数据
- handleSelectionChange(selection) {
+ handleSelectionChange (selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
- handleAdd() {
+ handleAdd () {
this.reset()
this.open = true
this.title = '添加安装包管理'
},
/** 修改按钮操作 */
- handleUpdate(row) {
+ handleUpdate (row) {
this.reset()
const id = row.id || this.ids
getINFO(id).then(response => {
@@ -377,7 +311,7 @@ export default {
},
/** 详情按钮操作 */
- handleDetail(row) {
+ handleDetail (row) {
this.reset()
const id = row.id || this.ids
getINFO(id).then(response => {
@@ -389,13 +323,13 @@ export default {
},
/** 提交按钮 */
- submitForm() {
+ submitForm () {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
- data.appCode = Cookies.get('Admin-Application-Id'),
- delete data.explain
+ data.appCode = Cookies.get('Admin-Application-appCode')
+ delete data.explain
updateINFO(data).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
@@ -412,9 +346,9 @@ export default {
})
},
/** 删除按钮操作 */
- handleDelete(row) {
+ handleDelete (row) {
const ids = row.id || this.ids
- this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项？').then(function() {
+ this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项？').then(function () {
return delINFO(ids)
}).then(() => {
this.getList()
@@ -422,7 +356,7 @@ export default {
}).catch(() => {
})
},
- getSize(e) {
+ getSize (e) {
this.form.sysApkSize = e[0].size + 'kb'
},
// /** 导出按钮操作 */
@@ -433,14 +367,14 @@ export default {
// },
/**下载安装包*/
- handleDownload(row) {
+ handleDownload (row) {
window.open(row.sysApk)
},
- cancelDetail() {
+ cancelDetail () {
this.openDetail = false
this.reset()
},
- copyIt(url) {
+ copyIt (url) {
navigator.clipboard.writeText(url)
this.$message.success('复制成功')
}
diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue
index 980fdee..585d3d4 100644
--- a/sf-ui/src/views/FDS/publishList/components/addPack.vue
+++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue
@@ -1,21 +1,10 @@
-
+ :visible.sync="open" v-bind="$attrs" width="700px" @close="onClose" @open="onOpen" v-on="$listeners">
+
-
搜索
@@ -23,10 +12,10 @@
-
-
@@ -56,7 +43,7 @@ export default {
default: ''
}
},
- data() {
+ data () {
return {
// 遮罩层
title: '添加安装包',
@@ -73,43 +60,43 @@ export default {
pageNum: 1,
pageSize: 10,
sysApkName: null,
- appCode: Cookies.get('Admin-Application-Id')
+ appCode: Cookies.get('Admin-Application-appCode')
}
}
},
- created() {
+ created () {
this.getList()
},
methods: {
/** 查询参数列表 */
- getList() {
+ getList () {
this.loading = true
listINFO(
{
...this.queryParams,
sysType: this.systemType
}).then(response => {
- this.moduleList = response.rows
- this.total = response.total
- this.loading = false
- })
+ this.moduleList = response.rows
+ this.total = response.total
+ this.loading = false
+ })
},
/** 搜索按钮操作 */
- handleQuery() {
+ handleQuery () {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
- resetQuery() {
+ resetQuery () {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增当前包的按钮 */
- addPack(row) {
+ addPack (row) {
this.$emit('addPack', {
apkId: row.id,
version: row.version,
@@ -119,14 +106,14 @@ export default {
})
},
- closeModal() {
+ closeModal () {
this.$emit('close')
},
- onOpen() {
+ onOpen () {
this.active = this.current
this.key = ''
},
- onClose() {
+ onClose () {
}
}
}
diff --git a/sf-ui/src/views/FDS/publishList/index.vue b/sf-ui/src/views/FDS/publishList/index.vue
index dc6b1c7..6102450 100644
--- a/sf-ui/src/views/FDS/publishList/index.vue
+++ b/sf-ui/src/views/FDS/publishList/index.vue
@@ -3,43 +3,21 @@
-
-
-
-
@@ -50,66 +28,42 @@
- 新增
+ 新增
- 批量发布
+ 批量发布
- 批量删除
+ 批量删除
-
-
+
+
-
-
@@ -118,10 +72,10 @@
{{ parseTime(scope.row.createTime) }}
-
-
@@ -131,19 +85,11 @@
-
+
-
+
@@ -162,39 +108,21 @@
- 下架
+ 下架
- 修改
+ 修改
-
+
更多
- 详情
+ 详情
- 下载安装包
+ 下载安装包
- 删除
+ 删除
@@ -203,13 +131,8 @@
-
@@ -220,7 +143,7 @@ import { delConfig, listConfig } from '@/api/system/config'
export default {
name: 'PublishList',
dicts: ['sys_yes_no'],
- data() {
+ data () {
return {
// 遮罩层
loading: true,
@@ -264,56 +187,56 @@ export default {
}
},
computed: {
- applicationInfo: function() {
+ applicationInfo: function () {
return this.$store.state.applicationInfo
}
},
- created() {
+ created () {
this.getList()
},
- mounted() {
+ mounted () {
console.log(this.$store.getters.applicationId)
console.log(this.applicationInfo)
},
methods: {
/** 查询参数列表 */
- getList() {
+ getList () {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.configList = response.rows
- this.total = response.total
- this.loading = false
- }
+ this.configList = response.rows
+ this.total = response.total
+ this.loading = false
+ }
)
},
/** 搜索按钮操作 */
- handleQuery() {
+ handleQuery () {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
- resetQuery() {
+ resetQuery () {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
- handleAdd() {
+ handleAdd () {
const params = {
type: 'add'
}
this.$tab.openPage('新增发布', '/build/publishList/add/', params)
},
// 多选框选中数据
- handleSelectionChange(selection) {
+ handleSelectionChange (selection) {
this.ids = selection.map(item => item.configId)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 删除按钮操作 */
- async handleDelete(row) {
+ async handleDelete (row) {
const configIds = row.configId || this.ids
try {
await this.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？')
@@ -326,25 +249,25 @@ export default {
}
},
/**查看详情*/
- handleDetail() {
+ handleDetail () {
this.$tab.openPage('发布详情', '/build/publishList/detail/', '')
},
/**下载安装包*/
- handleDownload() {
+ handleDownload () {
},
/**********编辑*******/
- handleEdit() {
+ handleEdit () {
const params = {
type: 'edit'
}
this.$tab.openPage('编辑发布', '/build/publishList/add/', params)
},
/** 发布操作*/
- handlePublish() {
+ handlePublish () {
},
// 更多操作触发
- handleCommand(command, row) {
+ handleCommand (command, row) {
switch (command) {
case 'handleDetail':
this.handleDetail(row)
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index 0c06322..97aab0f 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -2,28 +2,14 @@
-
-
-
+
@@ -34,157 +20,95 @@
- 新增
+ 新增
- 修改
+ 修改
- 删除
+ 删除
- 导出
+ 导出
-
-
-
- 下载安装包
+ 下载安装包
- 修改
+ 修改
- 详情
+ 详情
- 删除
+ 删除
-
-
-
-
-
-
-
@@ -229,7 +153,7 @@
-
-
-
-
+
-
+
@@ -43,73 +25,44 @@
- 新增
+ 新增
- 修改
+ 修改
- 批量发布
+ 批量发布
- 批量删除
+ 批量删除
-
@@ -117,25 +70,23 @@
{{ parseTime(scope.row.updateTime) }}
-
+
-
+
-
-
{{ parseTime(scope.row.createTime) }}
@@ -143,26 +94,14 @@
-
+
-
+
-
+
@@ -184,88 +123,47 @@
- 下架
+ 下架
- 发布
+ 发布
- 详情
+ 详情
- 下载安装包
+ 下载安装包
- 修改
+ 修改
- 删除
+ 删除
-
-
-
-
@@ -273,7 +171,7 @@
-
+
@@ -283,65 +181,40 @@
-
-
+
-
-
-
-
-
-
-
-
@@ -356,32 +229,22 @@
-
+
-
+
-
@@ -419,7 +281,7 @@ export default {
AddPack,
DetailModal
},
- data() {
+ data () {
return {
// 遮罩层
loading: true,
@@ -462,7 +324,7 @@ export default {
pageNum: 1,
pageSize: 10,
sysApkName: null,
- appCode: Cookies.get('Admin-Application-Id')
+ appCode: Cookies.get('Admin-Application-appCode')
},
// 表单校验
rules: {
@@ -508,13 +370,13 @@ export default {
}
}
},
- created() {
+ created () {
this.getList()
this.getEnvironmentList()
},
methods: {
/** 查询发布列表列表 */
- getList(type) {
+ getList (type) {
this.loading = true
listPublish(this.queryParams).then(response => {
@@ -527,14 +389,14 @@ export default {
}
},
// 取消按钮
- cancel() {
+ cancel () {
this.open = false
this.loading = false
this.reset()
},
// 表单重置
- reset() {
+ reset () {
this.form = {
id: null,
applyId: Cookies.get('Admin-Application-Id'),
@@ -566,30 +428,30 @@ export default {
this.resetForm('form')
},
/** 搜索按钮操作 */
- handleQuery() {
+ handleQuery () {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
- resetQuery() {
+ resetQuery () {
this.resetForm('queryForm')
this.handleQuery()
},
// 多选框选中数据
- handleSelectionChange(selection) {
+ handleSelectionChange (selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
- handleAdd() {
+ handleAdd () {
this.reset()
this.open = true
this.title = '添加发布列表'
this.getEnvironmentList()
},
/** 修改按钮操作 */
- handleUpdate(row) {
+ handleUpdate (row) {
this.reset()
this.getEnvironmentList()
const id = row.id || this.ids
@@ -601,7 +463,7 @@ export default {
},
/** 查询参数列表 */
- getPackList(id) {
+ getPackList (id) {
getINFO(id).then(response => {
this.form.sysApkName = response.data.sysApkName
this.open = true
@@ -610,7 +472,7 @@ export default {
},
/** 提交按钮 */
- submitForm() {
+ submitForm () {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
@@ -637,7 +499,7 @@ export default {
// 发布按钮
- pubLishForm() {
+ pubLishForm () {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
@@ -663,9 +525,9 @@ export default {
},
/** 删除按钮操作 */
- handleDelete(row) {
+ handleDelete (row) {
const ids = row.id || this.ids
- this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项？,请确定数据是已下架状态才能删除！').then(function() {
+ this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项？,请确定数据是已下架状态才能删除！').then(function () {
return delPublish(ids)
}).then(() => {
this.getList()
@@ -674,17 +536,17 @@ export default {
})
},
/** 导出按钮操作 */
- handleExport() {
+ handleExport () {
this.download('deployment/publish/export', {
...this.queryParams
}, `publish_${new Date().getTime()}.xlsx`)
},
/** 弹出包选择框*/
- handlePackOpen() {
+ handlePackOpen () {
this.packOpen = true
},
- addPack(e) {
+ addPack (e) {
this.form.apkId = e.apkId
this.form.version = e.version
this.form.systemType = e.sysType
@@ -695,20 +557,20 @@ export default {
/** 关闭包选择框*/
- closeAddPack() {
+ closeAddPack () {
this.packOpen = false
},
/** 查询环境维护列表 */
- getEnvironmentList() {
+ getEnvironmentList () {
listEnvironment(this.queryParamsEnvironment).then(response => {
this.environmentList = response.rows
})
},
// 选择系统做一些逻辑判断
- changeSys() {
+ changeSys () {
// this.form.systemType = sysType
this.form.apkId = null
this.form.version = null
@@ -718,29 +580,29 @@ export default {
console.log(this.form, 99999999)
},
/**下载安装包*/
- handleDownload() {
+ handleDownload () {
},
/**下架*/
- handleDown(row) {
+ handleDown (row) {
soldPublish(row.id).then(response => {
this.$modal.msgSuccess('下架成功')
this.getList()
})
},
/**发布*/
- handlePublish(id) {
+ handlePublish (id) {
publish(id).then(response => {
this.$modal.msgSuccess('发布成功')
this.getList()
})
},
/**详情*/
- handleDetail(row) {
+ handleDetail (row) {
this.detailId = row.id
this.openDetail = true
},
- closeDetailModal() {
+ closeDetailModal () {
this.openDetail = false
}
@@ -755,7 +617,7 @@ export default {
}
}
-.el-tag + .el-tag {
+.el-tag+.el-tag {
margin-left: 10px
}
From 8279e4cbd418df51fd312bd21a10eef700a676af Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 9 May 2024 09:55:16 +0800
Subject: [PATCH 115/118] =?UTF-8?q?H5=E7=A6=BB=E7=BA=BF=E5=8C=85=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E5=AE=89=E5=85=A8=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sf/common/utils/openssl/AES256Util.java | 109 ++++++++++++++++++
.../DeploymentModuleListController.java | 57 +++++----
.../domain/rqs/ModuleListByCoreRequest.java | 3 +
3 files changed, 149 insertions(+), 20 deletions(-)
create mode 100644 sf-common/src/main/java/com/sf/common/utils/openssl/AES256Util.java
diff --git a/sf-common/src/main/java/com/sf/common/utils/openssl/AES256Util.java b/sf-common/src/main/java/com/sf/common/utils/openssl/AES256Util.java
new file mode 100644
index 0000000..0058a2c
--- /dev/null
+++ b/sf-common/src/main/java/com/sf/common/utils/openssl/AES256Util.java
@@ -0,0 +1,109 @@
+package com.sf.common.utils.openssl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AES256Util {
+ private static final String ALGORITHM = "AES/ECB/PKCS5Padding";
+
+ public static Cipher initAESCipher(String key, int cipherMode) throws Exception {
+ Cipher cipher = Cipher.getInstance(ALGORITHM);
+ SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
+ cipher.init(cipherMode, secretKeySpec);
+
+ return cipher;
+ }
+
+ /**
+ * 加密文件
+ *
+ * @return
+ */
+ public static InputStream encryptFile(String key, InputStream inputStream) throws Exception {
+ Cipher cipher = initAESCipher(key, Cipher.ENCRYPT_MODE);
+ CipherInputStream cipherInputStream = new CipherInputStream(inputStream, cipher);
+
+ return cipherInputStream;
+ }
+
+ /**
+ * 解密文件
+ *
+ * @param encryptedFile
+ * @param sourceFile
+ */
+ public static String decryptFile(String key, File encryptedFile, File sourceFile) {
+ InputStream inputStream = null;
+ OutputStream outputStream = null;
+ CipherOutputStream cipherOutputStream = null;
+ try {
+ inputStream = new FileInputStream(encryptedFile);
+ outputStream = new FileOutputStream(sourceFile);
+ Cipher cipher = initAESCipher(key, Cipher.DECRYPT_MODE);
+ cipherOutputStream = new CipherOutputStream(outputStream, cipher);
+ byte[] buffer = new byte[1024];
+ int n = -1;
+ int count = 0;
+ while ((n = inputStream.read(buffer)) != -1) {
+ count += n;
+ cipherOutputStream.write(buffer, 0, n);
+ cipherOutputStream.flush();
+ }
+
+ } catch (Exception e) {
+ return e.getLocalizedMessage();
+ }
+ if (cipherOutputStream != null) {
+ try {
+ cipherOutputStream.close();
+ } catch (IOException e) {
+ return e.getLocalizedMessage();
+ }
+ }
+ if (outputStream != null) {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ return e.getLocalizedMessage();
+ }
+ }
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ return e.getLocalizedMessage();
+ }
+ }
+
+ return "";
+ }
+
+// public static void main(String[] args) throws Exception {
+// File sourceFile = new File("/Users/a1234/Downloads/dist.zip");
+// InputStream encryptInputStream = encryptFile("efghijklmnopqrstuvwxyz0123456789", new FileInputStream(sourceFile));
+// OutputStream outputStream = new FileOutputStream(new File("/Users/a1234/Downloads/x.zip"));
+// byte[] buffer = new byte[1024];
+// int n = -1;
+// int count = 0;
+// while ((n = encryptInputStream.read(buffer)) != -1) {
+// count += n;
+// outputStream.write(buffer, 0, n);
+// }
+// outputStream.flush();
+// System.out.println(count);
+//
+// decryptFile("efghijklmnopqrstuvwxyz0123456789", new File("/Users/a1234/Downloads/x.zip"), new File("/Users/a1234/Downloads/y.zip"));
+// }
+}
+
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index 32ad186..e1846bb 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -1,14 +1,15 @@
package com.sf.system.deployment.controller;
+import java.io.InputStream;
+import java.net.URL;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-
import com.sf.common.enums.RequestHeaderEnums;
-import com.sf.common.utils.StringUtils;
import com.sf.common.utils.http.RequestUtils;
import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -28,14 +29,13 @@ import com.sf.common.core.page.TableDataInfo;
/**
* H5模块包Controller
- *
+ *
* @author ztzh
* @date 2024-04-22
*/
@RestController
@RequestMapping("/deployment/module")
-public class DeploymentModuleListController extends BaseController
-{
+public class DeploymentModuleListController extends BaseController {
@Autowired
private IDeploymentModuleListService deploymentModuleListService;
@@ -44,19 +44,18 @@ public class DeploymentModuleListController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deployment:module:list')")
@GetMapping("/list")
- public TableDataInfo list(DeploymentModuleList deploymentModuleList)
- {
+ public TableDataInfo list(DeploymentModuleList deploymentModuleList) {
deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
startPage();
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
return getDataTable(list);
}
+
/**
* 查询H5模块包列表
*/
@GetMapping("/qurey/list")
- public AjaxResult queryByCore(ModuleListByCoreRequest request)
- {
+ public AjaxResult queryByCore(ModuleListByCoreRequest request) {
DeploymentModuleList deploymentModuleList = new DeploymentModuleList();
deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
deploymentModuleList.setSysType(request.getSysType());
@@ -64,14 +63,36 @@ public class DeploymentModuleListController extends BaseController
return success(list);
}
+ /**
+ * 查询模块包列表
+ */
+ @GetMapping("/qurey/file")
+ public AjaxResult queryByCore(ModuleListByCoreRequest request, HttpServletResponse response) {
+ DeploymentModuleList deploymentModuleList = new DeploymentModuleList();
+ deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ deploymentModuleList.setSysType(request.getSysType());
+ deploymentModuleList.setModuleType(request.getModuleType());
+ List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
+ if (list.isEmpty() && null == list.get(0)) {
+ throw new SecurityException("无可用模块包");
+ }
+
+ try {
+ InputStream inputStream = new URL(list.get(0).getModuleUrl()).openStream();
+ FileCopyUtils.copy(inputStream, response.getOutputStream());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return success(null);
+ }
+
/**
* 导出H5模块包列表
*/
@PreAuthorize("@ss.hasPermi('deployment:module:export')")
@Log(title = "H5模块包", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DeploymentModuleList deploymentModuleList)
- {
+ public void export(HttpServletResponse response, DeploymentModuleList deploymentModuleList) {
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
ExcelUtil util = new ExcelUtil(DeploymentModuleList.class);
util.exportExcel(response, list, "H5模块包数据");
@@ -82,8 +103,7 @@ public class DeploymentModuleListController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deployment:module:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(deploymentModuleListService.selectDeploymentModuleListById(id));
}
@@ -93,8 +113,7 @@ public class DeploymentModuleListController extends BaseController
@PreAuthorize("@ss.hasPermi('deployment:module:add')")
@Log(title = "H5模块包", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList)
- {
+ public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList) {
deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList));
}
@@ -105,8 +124,7 @@ public class DeploymentModuleListController extends BaseController
@PreAuthorize("@ss.hasPermi('deployment:module:edit')")
@Log(title = "H5模块包", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DeploymentModuleList deploymentModuleList)
- {
+ public AjaxResult edit(@RequestBody DeploymentModuleList deploymentModuleList) {
return toAjax(deploymentModuleListService.updateDeploymentModuleList(deploymentModuleList));
}
@@ -115,9 +133,8 @@ public class DeploymentModuleListController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deployment:module:remove')")
@Log(title = "H5模块包", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(deploymentModuleListService.deleteDeploymentModuleListByIds(ids));
}
}
diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java
index 998f1f2..30adbdb 100755
--- a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java
@@ -13,4 +13,7 @@ public class ModuleListByCoreRequest {
@NotBlank
private String sysType;
+
+ @NotBlank
+ private String moduleType;
}
From 1063187101e92589a3cd54b961108cc63a2aab95 Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 9 May 2024 10:16:17 +0800
Subject: [PATCH 116/118] =?UTF-8?q?H5=E7=A6=BB=E7=BA=BF=E5=8C=85=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E5=AE=89=E5=85=A8=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/DeploymentModuleListController.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index e1846bb..3d752ed 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -6,6 +6,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.sf.common.enums.RequestHeaderEnums;
import com.sf.common.utils.http.RequestUtils;
+import com.sf.common.utils.openssl.AES256Util;
import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,7 +80,9 @@ public class DeploymentModuleListController extends BaseController {
try {
InputStream inputStream = new URL(list.get(0).getModuleUrl()).openStream();
- FileCopyUtils.copy(inputStream, response.getOutputStream());
+// InputStream inputStream = Files.newInputStream(Paths.get("/Users/a1234/Downloads/dist.zip"));
+ InputStream inputStream1 = AES256Util.encryptFile("efghijklmnopqrstuvwxyz0123456789", inputStream);
+ FileCopyUtils.copy(inputStream1, response.getOutputStream());
} catch (Exception e) {
throw new RuntimeException(e);
}
From 7ee1884c729ed8b8b2c73c3882ecea07e1fd4889 Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 9 May 2024 16:51:12 +0800
Subject: [PATCH 117/118] =?UTF-8?q?H5=E7=A6=BB=E7=BA=BF=E5=8C=85=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E5=AE=89=E5=85=A8=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sf/common/enums/RequestHeaderEnums.java | 5 ++++
.../DeploymentModuleListController.java | 26 ++++++++++++++++---
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
index ec004a2..eed566a 100644
--- a/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
+++ b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java
@@ -15,6 +15,11 @@ public enum RequestHeaderEnums
* 通知完成指令，用于客户端收到通知消息的确认
*/
APP_CODE("appCode"),
+
+ /**
+ * 通知完成指令，用于客户端收到通知消息的确认 Authorization
+ */
+ AUTHORIZATION("Authorization"),
;
private static Map map = new HashMap<>();
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index 3d752ed..6ced34c 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -3,10 +3,14 @@ package com.sf.system.deployment.controller;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
+
+import com.sf.common.core.redis.RedisCache;
import com.sf.common.enums.RequestHeaderEnums;
import com.sf.common.utils.http.RequestUtils;
import com.sf.common.utils.openssl.AES256Util;
+import com.sf.common.utils.uuid.UUID;
import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +43,8 @@ import com.sf.common.core.page.TableDataInfo;
public class DeploymentModuleListController extends BaseController {
@Autowired
private IDeploymentModuleListService deploymentModuleListService;
+ @Autowired
+ private RedisCache redisCache;
/**
* 查询H5模块包列表
@@ -71,24 +77,36 @@ public class DeploymentModuleListController extends BaseController {
public AjaxResult queryByCore(ModuleListByCoreRequest request, HttpServletResponse response) {
DeploymentModuleList deploymentModuleList = new DeploymentModuleList();
deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+ String authorization = RequestUtils.getHeader(RequestHeaderEnums.AUTHORIZATION.getCode());
deploymentModuleList.setSysType(request.getSysType());
deploymentModuleList.setModuleType(request.getModuleType());
List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList);
if (list.isEmpty() && null == list.get(0)) {
throw new SecurityException("无可用模块包");
}
-
try {
- InputStream inputStream = new URL(list.get(0).getModuleUrl()).openStream();
-// InputStream inputStream = Files.newInputStream(Paths.get("/Users/a1234/Downloads/dist.zip"));
- InputStream inputStream1 = AES256Util.encryptFile("efghijklmnopqrstuvwxyz0123456789", inputStream);
+ String password = UUID.randomUUID().toString().trim().replaceAll("-", "");
+ //加密
+ InputStream inputStream1 = AES256Util.encryptFile(password, new URL(list.get(0).getModuleUrl()).openStream());
FileCopyUtils.copy(inputStream1, response.getOutputStream());
+ redisCache.setCacheObject(authorization + request.getModuleType(), password, 3000, TimeUnit.MINUTES);
} catch (Exception e) {
throw new RuntimeException(e);
}
return success(null);
}
+ /**
+ * 获取压缩包密码
+ */
+ @GetMapping("/qurey/ZipCore")
+ public AjaxResult queryZipCore(ModuleListByCoreRequest request) {
+ String authorization = RequestUtils.getHeader(RequestHeaderEnums.AUTHORIZATION.getCode());
+ String cacheObject = redisCache.getCacheObject(authorization + request.getModuleType());
+ return success(cacheObject);
+ }
+
+
/**
* 导出H5模块包列表
*/
From 89a9feac61096d82aa29adce18f3dce8c5ab067b Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 9 May 2024 17:09:20 +0800
Subject: [PATCH 118/118] =?UTF-8?q?H5=E7=A6=BB=E7=BA=BF=E5=8C=85=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E5=AE=89=E5=85=A8=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deployment/controller/DeploymentModuleListController.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
index 6ced34c..fbcdc89 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java
@@ -103,7 +103,8 @@ public class DeploymentModuleListController extends BaseController {
public AjaxResult queryZipCore(ModuleListByCoreRequest request) {
String authorization = RequestUtils.getHeader(RequestHeaderEnums.AUTHORIZATION.getCode());
String cacheObject = redisCache.getCacheObject(authorization + request.getModuleType());
- return success(cacheObject);
+ return success(UUID.randomUUID().toString().trim().replaceAll("-", "") + cacheObject + UUID.randomUUID().toString().trim().replaceAll("-", ""))
+ ;
}
{{ scope.row.platform === '0'?'安卓':'IOS' }}
+
+
+ ![]()
+
+
+ 密码:{{ scope.row.verifyCode }}
+-
+
+
+
+
+
+
+
+
+
+
+新增文件
+
+
+
+
+
+
+
+
+
+
+ 灰度
+ 正式
+
+
+ 非强制升级
+ 强制升级
+
+
+
+
+
+ 白名单
+ 时间窗
+
+
+
+
+
+
+
+
+
+
+
+
+ 开发环境
+ 测试发布
+ 生产发布
+
+
+ 灰度发布
+ 全量发布
+ 回滚发布
+
+
+
+
+
+
+
+
+
+
+
+ 下载验证
+
+
+
+
+
+
+
+ 白名单客户
+ 普通客户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/whiteListManagement/index.vue b/sf-ui/src/views/FDS/whiteListManagement/index.vue
index 240f07a..f2f4e0a 100644
--- a/sf-ui/src/views/FDS/whiteListManagement/index.vue
+++ b/sf-ui/src/views/FDS/whiteListManagement/index.vue
@@ -1,6 +1,6 @@
发布详情
+
+
+
+
+ 安装包11111
+
+
+ 安装包1111.excel
+ 58.1kb
+
+
+ 安卓
+ 登录模块
+
+
+ 说明说明
+
+
+
+
+
+ 发布环境
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+
+
+ 说明说明
+
+
+
+ 说明说明
+
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+ 说明说明
+
+
+
+
+
-
+
Date: Tue, 9 Apr 2024 10:09:33 +0800
Subject: [PATCH 011/118] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=AB=AF=E5=8F=A3?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/Dockerfile | 1 +
sf-ui/nginx.conf | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
create mode 100644 sf-ui/nginx.conf
diff --git a/sf-ui/Dockerfile b/sf-ui/Dockerfile
index 73e5a8c..ab69170 100644
--- a/sf-ui/Dockerfile
+++ b/sf-ui/Dockerfile
@@ -1,3 +1,4 @@
FROM registry.zsmarter.com/public/nginx:1.22.1
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
COPY ./sf-ui/dist /app/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/sf-ui/nginx.conf b/sf-ui/nginx.conf
new file mode 100644
index 0000000..3846ef2
--- /dev/null
+++ b/sf-ui/nginx.conf
@@ -0,0 +1,43 @@
+
+worker_processes 1;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ include mime.types;
+ default_type application/octet-stream;
+ sendfile on;
+ keepalive_timeout 65;
+
+ #gzip on;
+
+ server {
+ listen 80;
+ server_name localhost;
+ charset utf-8;
+
+ #access_log logs/host.access.log main;
+
+ location / {
+ root html;
+ index index.html index.htm;
+ }
+
+ location /stage-api/ {
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://localhost:22009/;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+
+ }
+
+}
From c35aeb87e417bf6d6a7fa411f63acc631e200b55 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 9 Apr 2024 10:12:20 +0800
Subject: [PATCH 012/118] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=AB=AF=E5=8F=A3?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-ui/Dockerfile b/sf-ui/Dockerfile
index ab69170..9aff0c3 100644
--- a/sf-ui/Dockerfile
+++ b/sf-ui/Dockerfile
@@ -1,4 +1,4 @@
FROM registry.zsmarter.com/public/nginx:1.22.1
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
COPY ./sf-ui/dist /app/nginx/html
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY ./nginx.conf /etc/nginx/nginx.conf
From 6dff4049f10716c0291d262f7b8f2cba80240570 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 9 Apr 2024 10:24:23 +0800
Subject: [PATCH 013/118] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=AB=AF=E5=8F=A3?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sf-ui/Dockerfile b/sf-ui/Dockerfile
index 9aff0c3..63f7f12 100644
--- a/sf-ui/Dockerfile
+++ b/sf-ui/Dockerfile
@@ -1,4 +1,5 @@
FROM registry.zsmarter.com/public/nginx:1.22.1
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
COPY ./sf-ui/dist /app/nginx/html
-COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./sf-ui/nginx.conf /etc/nginx/nginx.conf
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
From ea8225fee41aeee7ee928c2f319c0262d9a21e53 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 9 Apr 2024 10:49:14 +0800
Subject: [PATCH 014/118] =?UTF-8?q?nginx=E9=85=8D=E7=BD=AE=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/nginx.conf | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sf-ui/nginx.conf b/sf-ui/nginx.conf
index 3846ef2..7fa2ea0 100644
--- a/sf-ui/nginx.conf
+++ b/sf-ui/nginx.conf
@@ -18,19 +18,22 @@ http {
server_name localhost;
charset utf-8;
- #access_log logs/host.access.log main;
-
location / {
root html;
+ try_files $uri $uri/ @router;
index index.html index.htm;
}
+ location @router {
+ rewrite ^.*$ /index.html last;
+ }
+
location /stage-api/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass http://localhost:22009/;
+ proxy_pass http://192.168.1.23:22009/;
}
error_page 500 502 503 504 /50x.html;
From 00155a756b8e9da931acd9da56c39fec2d24cd54 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 9 Apr 2024 11:19:37 +0800
Subject: [PATCH 015/118] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 1 +
sf-ui/Dockerfile | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index bc2de8a..e784929 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
FROM openjdk:8
# 复制jar文件到路径
COPY ./sf-admin/target/sf-admin.jar /usr/local/sf-admin.jar
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
# 指定路径
WORKDIR /usr/local
diff --git a/sf-ui/Dockerfile b/sf-ui/Dockerfile
index 63f7f12..2004e11 100644
--- a/sf-ui/Dockerfile
+++ b/sf-ui/Dockerfile
@@ -2,4 +2,6 @@ FROM registry.zsmarter.com/public/nginx:1.22.1
COPY ./sf-ui/dist /app/nginx/html
COPY ./sf-ui/nginx.conf /etc/nginx/nginx.conf
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
From aeaa548df36ec191d891ad139aa3fefd0daeb135 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 9 Apr 2024 11:38:15 +0800
Subject: [PATCH 016/118] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-ui/Dockerfile b/sf-ui/Dockerfile
index 2004e11..0a63bc2 100644
--- a/sf-ui/Dockerfile
+++ b/sf-ui/Dockerfile
@@ -2,6 +2,6 @@ FROM registry.zsmarter.com/public/nginx:1.22.1
COPY ./sf-ui/dist /app/nginx/html
COPY ./sf-ui/nginx.conf /etc/nginx/nginx.conf
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
From 97cf321b57e6066e56af8bafa873ac47f16c71c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Tue, 9 Apr 2024 14:44:39 +0800
Subject: [PATCH 017/118] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=99=BD?=
=?UTF-8?q?=E5=90=8D=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=AE=89=E8=A3=85?=
=?UTF-8?q?=E5=8C=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=9A=E6=AC=A1?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E7=BB=84=E4=BB=B6=E6=98=BE=E9=9A=90=E7=9A=84=E5=88=A4?=
=?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/router/index.js | 34 +-
.../src/views/FDS/installationList/index.vue | 453 ++++++++++--------
sf-ui/src/views/FDS/publishList/index.vue | 412 ++++++++--------
.../views/FDS/whiteListManagement/index.vue | 411 ++++++++++------
4 files changed, 758 insertions(+), 552 deletions(-)
diff --git a/sf-ui/src/router/index.js b/sf-ui/src/router/index.js
index 71907b6..9cb90ef 100644
--- a/sf-ui/src/router/index.js
+++ b/sf-ui/src/router/index.js
@@ -1,11 +1,10 @@
import Vue from 'vue'
import Router from 'vue-router'
-
-Vue.use(Router)
-
/* Layout */
import Layout from '@/layout'
+Vue.use(Router)
+
/**
* Note: 路由配置项
*
@@ -20,12 +19,12 @@ import Layout from '@/layout'
* roles: ['admin', 'common'] // 访问路由的角色权限
* permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限
* meta : {
- noCache: true // 如果设置为true，则不会被 缓存(默认 false)
- title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
- icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
- breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
- activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
- }
+ noCache: true // 如果设置为true，则不会被 缓存(默认 false)
+ title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
+ icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
+ breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
+ }
*/
// 公共路由
@@ -161,12 +160,25 @@ export const dynamicRoutes = [
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
}
]
+ },
+ {
+ path: '/publishLish/add',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: 'index/:jobId(\\d+)',
+ component: () => import('@/views/monitor/job/log'),
+ name: 'PublishAdd',
+ meta: { title: '新建发布', activeMenu: '/FDS/publishList' }
+ }
+ ]
}
]
// 防止连续点击多次路由报错
-let routerPush = Router.prototype.push;
-let routerReplace = Router.prototype.replace;
+let routerPush = Router.prototype.push
+let routerReplace = Router.prototype.replace
// push
Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(err => err)
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 0d56ca2..1dd00be 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -1,21 +1,20 @@
+
下架
- 下架
+
+ 修改
- 详情
- 下载安装包
- 删除
+ @click="handleEdit(scope.row)"
+ >修改
+
+
+ 更多
+
+ 详情
+
+ 下载安装包
+
+
+ 删除
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 手动添加
- 批量添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/whiteListManagement/index.vue b/sf-ui/src/views/FDS/whiteListManagement/index.vue
index f2f4e0a..f2d2205 100644
--- a/sf-ui/src/views/FDS/whiteListManagement/index.vue
+++ b/sf-ui/src/views/FDS/whiteListManagement/index.vue
@@ -1,11 +1,11 @@
-
-
+
-
+
-
+
-
+
- 搜索
+ 搜索
重置
@@ -69,188 +68,164 @@
新建
+ icon="el-icon-plus"
+ plain
+ size="mini"
+ type="primary"
+ @click="handleAdd"
+ >新建
+
批量删除
+ :disabled="multiple"
+ icon="el-icon-plus"
+ plain
+ size="mini"
+ type="info"
+ @click="handleDelete"
+ >批量删除
+
-
-
-
-
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
+
下载安装包
- 下载安装包
+
+ 编辑
- 详情
- 编辑
+
+ 详情
+
+ 删除
+ icon="el-icon-delete"
+ size="mini"
+ type="text"
+ @click="handleDelete(scope.row)"
+ >删除
+
-
-
-
-
-
-
- 下载安装包
- 编辑
- 详情
- 删除
-
-
-
-
-
-
-
+
+
+
在线上传
+ label="1"
+ >在线上传
+
离线上传
-
+ label="2"
+ >离线上传
+
-
-
+
-
-
+
-
-
+
+ 上传文件
+
-
-
+
-
-
+
+
Android
+ label="Android"
+ >Android
+
鸿蒙
-
+ label="鸿蒙"
+ >鸿蒙
+
IOS
+ label="IOS"
+ >IOS
+
-
-
+
+
-
+
离线上传
安装包11111
+ >安装包11111
+
安装包1111.excel
58.1kb
安卓
- 登录模块
+ 登录模块
上传时间2024-04-07 17：43
已上传
刮刮乐
@@ -293,9 +269,10 @@
diff --git a/sf-ui/src/views/FDS/publishList/index.vue b/sf-ui/src/views/FDS/publishList/index.vue
index c00a70b..d91685e 100644
--- a/sf-ui/src/views/FDS/publishList/index.vue
+++ b/sf-ui/src/views/FDS/publishList/index.vue
@@ -1,8 +1,8 @@
-
+
-
+
-
+
- 搜索
+ 搜索
重置
@@ -53,84 +53,90 @@
新增
+ >新增
+
批量发布
+ >批量发布
+
批量删除
+ :disabled="multiple"
+ icon="el-icon-plus"
+ plain
+ size="mini"
+ type="info"
+ @click="handleDelete"
+ >批量删除
+
-
-
-
+
-
-
+
-
-
+
{{ parseTime(scope.row.createTime) }}
-
+
-
+
{{ parseTime(scope.row.createTime) }}
-
-
+
{{ scope.row.platform === '0'?'安卓':'IOS' }}
-
+ prop="platform"
+ >
+
+ {{ scope.row.platform === '0' ? '安卓' : 'IOS' }}
+
密码:{{ scope.row.verifyCode }}
-
-
-
+
-
+
- 搜索
+ 搜索
重置
@@ -49,115 +49,136 @@
新增
+ icon="el-icon-plus"
+ plain
+ size="mini"
+ type="primary"
+ @click="handleAdd"
+ >新增
+
批量发布
+ >批量发布
+
批量删除
+ >批量删除
+
-
+
{{ parseTime(scope.row.createTime) }}
-
+
-
+
下架
- 下架
+
+ 预览
- 预览
+
+ 发布
- 发布
+
+
+ 修改
- 名单配置
+
+
+ 修改
+
+ 删除
+ icon="el-icon-delete"
+ size="mini"
+ type="text"
+ @click="handleDelete(scope.row)"
+ >删除
+
-
-
-
+
+
+
-
-
+
+
-
-
+
-
-
+
+
手动添加
+ :label="1"
+ >手动添加
+
批量添加
+ :label="2"
+ >批量添加
+
-
-
-
+
+
+
+ 上传文件
+
-
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/publishList/setting/detail.vue b/sf-ui/src/views/FDS/publishList/detail.vue
similarity index 52%
rename from sf-ui/src/views/FDS/publishList/setting/detail.vue
rename to sf-ui/src/views/FDS/publishList/detail.vue
index 8950194..089cf50 100644
--- a/sf-ui/src/views/FDS/publishList/setting/detail.vue
+++ b/sf-ui/src/views/FDS/publishList/detail.vue
@@ -9,76 +9,55 @@
-
+
安装包11111
-
+
安装包1111.excel
58.1kb
-
+
安卓
登录模块
-
+
说明说明
-
-
发布环境
-
+
说明说明
-
-
说明说明
-
+
+ 说明说明
说明说明
-
- 说明说明
-
-
+
说明说明
-
-
说明说明
-
- 说明说明
-
-
- 说明说明
-
-
-
-
+
说明说明
-
-
-
说明说明
-
-
+
说明说明
-
-
说明说明
-
+
+
说明说明
-
-
说明说明
-
+
说明说明
-
-
说明说明
+
+ 说明说明
+ 说明说明
+
@@ -89,16 +68,12 @@
-
diff --git a/sf-ui/src/views/FDS/whiteListManagement/add.vue b/sf-ui/src/views/FDS/whiteListManagement/add.vue
new file mode 100644
index 0000000..51112f3
--- /dev/null
+++ b/sf-ui/src/views/FDS/whiteListManagement/add.vue
@@ -0,0 +1,123 @@
+
+
-
-
-
- 手动添加
-
- 批量添加
-
-
-
-
-
-
-
-
-
- 上传文件
-
-
-
-
-
-
-
-
-
diff --git a/sf-ui/src/views/FDS/whiteListManagement/components/detail.vue b/sf-ui/src/views/FDS/whiteListManagement/components/detail.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/sf-ui/src/views/FDS/whiteListManagement/components/add.vue b/sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue
similarity index 74%
rename from sf-ui/src/views/FDS/whiteListManagement/components/add.vue
rename to sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue
index 5b9198d..c63b1d8 100644
--- a/sf-ui/src/views/FDS/whiteListManagement/components/add.vue
+++ b/sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue
@@ -6,21 +6,11 @@
v-on="$listeners"
>
-
-
+
-
-
-
-
-
-
+
From 8fb318f5d95fef60255f87564d0108c0b0fe04ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Thu, 11 Apr 2024 09:22:50 +0800
Subject: [PATCH 020/118] =?UTF-8?q?feat:=20=E6=8F=90=E4=BA=A4=E7=83=AD?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E7=9A=84=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/FDS/whiteListManagement/index.vue | 22 +-
sf-ui/src/views/index.vue | 949 +-----------------
2 files changed, 9 insertions(+), 962 deletions(-)
diff --git a/sf-ui/src/views/FDS/whiteListManagement/index.vue b/sf-ui/src/views/FDS/whiteListManagement/index.vue
index 66abde6..0fb6fc5 100644
--- a/sf-ui/src/views/FDS/whiteListManagement/index.vue
+++ b/sf-ui/src/views/FDS/whiteListManagement/index.vue
@@ -110,13 +110,6 @@
@click="handleDown(scope.row)"
>下架
- 预览
-
{
})
},
- /** 预览按钮操作 */
- handleView() {
- const configIds = row.configId || this.ids
- this.$modal.confirm('是否确认预览编号为"' + configIds + '"的数据项？').then(function() {
- //这里写发布操作
- return delConfig(configIds)
- }).then(() => {
- this.getList()
- this.$modal.msgSuccess('预览成功')
- }).catch(() => {
- })
- },
-
+
+
/** 查看详情按钮操作 */
handleDetail(row) {
if (row.type == 1) {
diff --git a/sf-ui/src/views/index.vue b/sf-ui/src/views/index.vue
index f7ec05c..784e888 100644
--- a/sf-ui/src/views/index.vue
+++ b/sf-ui/src/views/index.vue
@@ -1,963 +1,26 @@
Date: Thu, 11 Apr 2024 13:51:18 +0800
Subject: [PATCH 023/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=88=91=E7=9A=84=E8=B4=AD=E4=B9=B0?=
=?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8E=E5=AE=89=E8=A3=85=E5=8C=85=E5=90=8E?=
=?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/pom.xml | 8 +-
.../mapper/deploy/SysApkInfoMapper.xml | 113 ++++++
.../mapper/goods/GoodsMessagesMapper.xml | 118 ++++++
.../mapper/index/ApplyListInfoMapper.xml | 87 +++++
.../common/exception/BusinessException.java | 77 ++++
.../sf/common/utils/SnowflakeIdWorker.java | 152 ++++++++
sf-order/pom.xml | 34 ++
.../java/com/sf/order/domain/OrderInfo.java | 367 ++++++++++++++++++
.../sf/order/domain/dto/OrderCreateDto.java | 59 +++
.../sf/order/domain/req/OrderListreqVo.java | 22 ++
.../sf/order/domain/res/OrderListResVo.java | 53 +++
.../com/sf/order/mapper/OrderInfoMapper.java | 67 ++++
.../sf/order/service/IOrderInfoService.java | 73 ++++
.../service/impl/OrderInfoServiceImpl.java | 137 +++++++
.../mapper/order/OrderInfoMapper.xml | 172 ++++++++
sf-ui/src/api/deploy/INFO.js | 44 +++
sf-ui/src/api/goods/goods.js | 44 +++
sf-ui/src/views/deploy/INFO/add.vue | 199 ++++++++++
sf-ui/src/views/deploy/INFO/index.vue | 332 ++++++++++++++++
sf-ui/src/views/goods/goods/index.vue | 348 +++++++++++++++++
20 files changed, 2505 insertions(+), 1 deletion(-)
create mode 100644 sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
create mode 100644 sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml
create mode 100644 sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
create mode 100644 sf-common/src/main/java/com/sf/common/exception/BusinessException.java
create mode 100644 sf-common/src/main/java/com/sf/common/utils/SnowflakeIdWorker.java
create mode 100644 sf-order/pom.xml
create mode 100644 sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
create mode 100644 sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
create mode 100644 sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
create mode 100644 sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
create mode 100644 sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
create mode 100644 sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
create mode 100644 sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
create mode 100644 sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
create mode 100644 sf-ui/src/api/deploy/INFO.js
create mode 100644 sf-ui/src/api/goods/goods.js
create mode 100644 sf-ui/src/views/deploy/INFO/add.vue
create mode 100644 sf-ui/src/views/deploy/INFO/index.vue
create mode 100644 sf-ui/src/views/goods/goods/index.vue
diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 1f2a15f..781eeae 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -60,7 +60,13 @@
com.smarterFramework
sf-file
-
+
+ com.smarterFramework
+ sf-order
+ 1.0.0
+ compile
+
+
diff --git a/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
new file mode 100644
index 0000000..d1a60cf
--- /dev/null
+++ b/sf-admin/src/main/resources/mapper/deploy/SysApkInfoMapper.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+ select id, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO
+
+
+
+
+
+
+
+ insert into SYS_APK_INFO
+
+ uploading_type,
+ sys_apk_name,
+ version,
+ sys_apk,
+ sys_apk_size,
+ sys_type,
+ uploading_status,
+ uploading_log_id,
+ order_num,
+ is_delete,
+ created,
+ modified,
+ create_time,
+ update_time,
+
+
+ #{uploadingType},
+ #{sysApkName},
+ #{version},
+ #{sysApk},
+ #{sysApkSize},
+ #{sysType},
+ #{uploadingStatus},
+ #{uploadingLogId},
+ #{orderNum},
+ #{isDelete},
+ #{created},
+ #{modified},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+ update SYS_APK_INFO
+
+ uploading_type = #{uploadingType},
+ sys_apk_name = #{sysApkName},
+ version = #{version},
+ sys_apk = #{sysApk},
+ sys_apk_size = #{sysApkSize},
+ sys_type = #{sysType},
+ uploading_status = #{uploadingStatus},
+ uploading_log_id = #{uploadingLogId},
+ order_num = #{orderNum},
+ is_delete = #{isDelete},
+ created = #{created},
+ modified = #{modified},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from SYS_APK_INFO where id = #{id}
+
+
+
+ delete from SYS_APK_INFO where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml b/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml
new file mode 100644
index 0000000..ffa20fa
--- /dev/null
+++ b/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+ select id, goods_code, stock_id, review_status, product_title, product_picture, original_price, product_desc, order_num, is_delete, created, modified, create_time, update_time, goods_type, goods_spec from GOODS_MESSAGES
+
+
+
+
+
+
+
+
+ insert into GOODS_MESSAGES
+
+ goods_code,
+ stock_id,
+ review_status,
+ product_title,
+ product_picture,
+ original_price,
+ product_desc,
+ order_num,
+ is_delete,
+ created,
+ modified,
+ create_time,
+ update_time,
+ goods_type,
+ goods_spec,
+
+
+ #{goodsCode},
+ #{stockId},
+ #{reviewStatus},
+ #{productTitle},
+ #{productPicture},
+ #{originalPrice},
+ #{productDesc},
+ #{orderNum},
+ #{isDelete},
+ #{created},
+ #{modified},
+ #{createTime},
+ #{updateTime},
+ #{goodsType},
+ #{goodsSpec},
+
+
+
+
+ update GOODS_MESSAGES
+
+ goods_code = #{goodsCode},
+ stock_id = #{stockId},
+ review_status = #{reviewStatus},
+ product_title = #{productTitle},
+ product_picture = #{productPicture},
+ original_price = #{originalPrice},
+ product_desc = #{productDesc},
+ order_num = #{orderNum},
+ is_delete = #{isDelete},
+ created = #{created},
+ modified = #{modified},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+ goods_type = #{goodsType},
+ goods_spec = #{goodsSpec},
+
+ where id = #{id}
+
+
+
+ delete from GOODS_MESSAGES where id = #{id}
+
+
+
+ delete from GOODS_MESSAGES where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml b/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
new file mode 100644
index 0000000..9bac81d
--- /dev/null
+++ b/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+ select id, app_name, app_desc, picture, order_num, is_delete, created, modified, create_time, update_time from APPLY_LIST_INFO
+
+
+
+
+
+
+
+ insert into APPLY_LIST_INFO
+
+ app_name,
+ app_desc,
+ picture,
+ order_num,
+ is_delete,
+ created,
+ modified,
+ create_time,
+ update_time,
+
+
+ #{appName},
+ #{appDesc},
+ #{picture},
+ #{orderNum},
+ #{isDelete},
+ #{created},
+ #{modified},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+ update APPLY_LIST_INFO
+
+ app_name = #{appName},
+ app_desc = #{appDesc},
+ picture = #{picture},
+ order_num = #{orderNum},
+ is_delete = #{isDelete},
+ created = #{created},
+ modified = #{modified},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from APPLY_LIST_INFO where id = #{id}
+
+
+
+ delete from APPLY_LIST_INFO where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
new file mode 100644
index 0000000..26ba14a
--- /dev/null
+++ b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
@@ -0,0 +1,77 @@
+package com.sf.common.exception;
+
+
+import com.sf.common.enums.ErrorCodeTypeEnum;
+
+/**
+ * @author : yswjme@163.com
+ * @Title : BusinessException.java
+ * @Package : com.zsmarter.ai.word.exception
+ * @Descript : 业务运行时异常
+ * @date : 2020-06-29 04:59:44
+ * @vsersion : V1.0
+ */
+public class BusinessException extends RuntimeException {
+
+ private static final long serialVersionUID = 4693786499059513760L;
+
+ private ErrorCodeTypeEnum errorCodeTypeEnum;
+
+ private final String errorDescription;
+
+ private String errorCode;
+
+ public BusinessException(String errorDescription) {
+ super(errorDescription);
+ this.errorDescription = errorDescription;
+ }
+
+ public BusinessException(String errorDescription, Throwable t) {
+ super(errorDescription, t);
+ this.errorDescription = errorDescription;
+ }
+
+ public BusinessException(String code, String errorDescription) {
+ super(errorDescription);
+ this.errorDescription = errorDescription;
+ this.errorCode = code;
+ }
+
+ public BusinessException(String code, String errorDescription, Throwable t) {
+ super(errorDescription, t);
+ this.errorDescription = errorDescription;
+ this.errorCode = code;
+ }
+
+ public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription) {
+ super(errorDescription);
+ this.errorDescription = errorDescription;
+ this.errorCode = code;
+ this.errorCodeTypeEnum = errorCodeTypeEnum;
+ }
+
+ public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription, Throwable t) {
+ super(errorDescription, t);
+ this.errorDescription = errorDescription;
+ this.errorCode = code;
+ this.errorCodeTypeEnum = errorCodeTypeEnum;
+ }
+
+ public String getErrorDescription() {
+ return this.errorDescription;
+ }
+
+ public String getErrorCode() {
+ return errorCode;
+ }
+
+ public String getErrorTitle() {
+ return "业务校验失败!";
+ }
+
+ public ErrorCodeTypeEnum getErrorCodeTypeEnum() {
+ return errorCodeTypeEnum;
+ }
+
+
+}
diff --git a/sf-common/src/main/java/com/sf/common/utils/SnowflakeIdWorker.java b/sf-common/src/main/java/com/sf/common/utils/SnowflakeIdWorker.java
new file mode 100644
index 0000000..31257ae
--- /dev/null
+++ b/sf-common/src/main/java/com/sf/common/utils/SnowflakeIdWorker.java
@@ -0,0 +1,152 @@
+package com.sf.common.utils;
+
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Tiwtter.SnowFlake的结构如下(每部分用-分开):
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截) + * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号
+ * 加起来刚好64位，为一个Long型。
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。 + * @author yswjme@163.com + * @date : + * + */ +@Component +public class SnowflakeIdWorker { + + /** 开始时间截 (2018-01-01) ，不可修改 */ + private final long twepoch = 1420041600000L; + + /** 机器id所占的位数 */ + private final long workerIdBits = 5L; + + /** 数据标识id所占的位数 */ + private final long datacenterIdBits = 5L; + + /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */ + private final long maxWorkerId = -1L ^ (-1L << workerIdBits); + + /** 支持的最大数据标识id，结果是31 */ + private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + + /** 序列在id中占的位数 */ + private final long sequenceBits = 12L; + + /** 机器ID向左移12位 */ + private final long workerIdShift = sequenceBits; + + /** 数据标识id向左移17位(12+5) */ + private final long datacenterIdShift = sequenceBits + workerIdBits; + + /** 时间截向左移22位(5+5+12) */ + private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; + + /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */ + private final long sequenceMask = -1L ^ (-1L << sequenceBits); + + /** 工作机器ID(0~31) */ + private long workerId; + + /** 数据中心ID(0~31) */ + private long datacenterId; + + /** 毫秒内序列(0~4095) */ + private long sequence = 0L; + + /** 上次生成ID的时间截 */ + private long lastTimestamp = -1L; + + /** + * 构造函数 + * + * @param workerId 工作ID (0~31) + * @param datacenterId 数据中心ID (0~31) + */ + public SnowflakeIdWorker(long workerId, long datacenterId) { + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException(String.format( + "worker Id can't be greater than %d or less than 0", + maxWorkerId)); + } + if (datacenterId > maxDatacenterId || datacenterId < 0) { + throw new IllegalArgumentException(String.format( + "datacenter Id can't be greater than %d or less than 0", + maxDatacenterId)); + } + this.workerId = workerId; + this.datacenterId = datacenterId; + } + + public SnowflakeIdWorker() { + }; + + /** + * 获得下一个ID (该方法是线程安全的) + * + * @return SnowflakeId + */ + public synchronized long nextId() { + long timestamp = timeGen(); + + // 如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常 + if (timestamp < lastTimestamp) { + throw new RuntimeException( + String.format( + "Clock moved backwards. Refusing to generate id for %d milliseconds", + lastTimestamp - timestamp)); + } + + // 如果是同一时间生成的，则进行毫秒内序列 + if (lastTimestamp == timestamp) { + sequence = (sequence + 1) & sequenceMask; + // 毫秒内序列溢出 + if (sequence == 0) { + // 阻塞到下一个毫秒,获得新的时间戳 + timestamp = tilNextMillis(lastTimestamp); + } + }else {// 时间戳改变，毫秒内序列重置 + sequence = 0L; + } + + // 上次生成ID的时间截 + lastTimestamp = timestamp; + + // 移位并通过或运算拼到一起组成64位的ID + return ((timestamp - twepoch) << timestampLeftShift) // + | (datacenterId << datacenterIdShift) // + | (workerId << workerIdShift) // + | sequence; + } + + /** + * 阻塞到下一个毫秒，直到获得新的时间戳 + * + * @param lastTimestamp + * 上次生成ID的时间截 + * @return 当前时间戳 + */ + protected long tilNextMillis(long lastTimestamp) { + long timestamp = timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + /** + * 返回以毫秒为单位的当前时间 + * + * @return 当前时间(毫秒) + */ + protected long timeGen() { + return System.currentTimeMillis(); + } + + +} diff --git a/sf-order/pom.xml b/sf-order/pom.xml new file mode 100644 index 0000000..08b9c37 --- /dev/null +++ b/sf-order/pom.xml @@ -0,0 +1,34 @@ + +
+
+ smarterFramework
+ com.smarterFramework
+ 1.0.0
+
+ 4.0.0
+
+ sf-order
+
+
+ order订单模块
+
+
+
+
+
+
+ com.smarterFramework
+ sf-common
+
+
+ io.swagger.core.v3
+ swagger-annotations
+ 2.1.2
+ compile
+
+
+
+
+
\ No newline at end of file
diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
new file mode 100644
index 0000000..6e165a8
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
@@ -0,0 +1,367 @@
+package com.sf.order.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sf.common.annotation.Excel;
+import com.sf.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 订单基础信息对象 ORDER_INFO
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+public class OrderInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ /**
+ * 订单编号
+ */
+ @Excel(name = "订单编号")
+ private Long orderNo;
+
+ /**
+ * 订单状态:
+ * 0:待支付
+ * 1:已付款
+ * 2:支付超时系统结束
+ * 3:已完成
+ */
+ @Excel(name = "订单状态: 0:待支付 1:已付款 2:支付超时系统结束 3:已完成 ")
+ private Long orderStatus;
+
+ /**
+ * 支付方式:0-点券 1-现金
+ */
+ @Excel(name = "支付方式:0-点券 1-现金")
+ private Long payType;
+
+ /**
+ * 支付渠道(支付方式为现金时)
+ * 0:微信
+ * 1:支付宝
+ */
+ @Excel(name = "支付渠道(支付方式为现金时) 0:微信 1:支付宝")
+ private Long payChannel;
+
+ /**
+ * 订单金额
+ */
+ @Excel(name = "订单金额")
+ private Long orderAmt;
+
+ /**
+ * 运费
+ */
+ @Excel(name = "运费")
+ private Long freightAmt;
+
+ /**
+ * 总金额
+ */
+ @Excel(name = "总金额")
+ private Long payAmt;
+
+ /**
+ * 实际支付金额
+ */
+ @Excel(name = "实际支付金额")
+ private Long reallyAmt;
+
+ /**
+ * 收件方式
+ * ：0-自提
+ * 1-快递 2-配送
+ */
+ @Excel(name = "收件方式：0-自提 1-快递 2-配送")
+ private Long receiveType;
+
+ /**
+ * 商品Id
+ */
+ @Excel(name = "商品Id")
+ private Long goodsId;
+
+ /**
+ * 商户Id
+ */
+ @Excel(name = "商户Id")
+ private Long businessId;
+
+ /**
+ * 收货地址配置Id
+ */
+ @Excel(name = "收货地址配置Id")
+ private Long receiveAddrId;
+
+ /**
+ * 支付时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date payTime;
+
+ /**
+ * 订单创建人
+ */
+ @Excel(name = "订单创建人")
+ private Long createUserId;
+
+ /**
+ * 最后一次更新操作人
+ */
+ @Excel(name = "最后一次更新操作人")
+ private Long updateUserId;
+
+ /**
+ * 逻辑删除标识
+ * 0:未删除
+ * 1:已删除
+ */
+ @Excel(name = "逻辑删除标识 0:未删除 1:已删除")
+ private Long isDelete;
+
+ /**
+ * 快递单号
+ */
+ @Excel(name = "快递单号")
+ private String trackNo;
+
+ /**
+ * 订单类型0:自动1:手动
+ */
+ @Excel(name = "订单类型0:自动1:手动")
+ private Long orderType;
+
+ /**
+ * 平台外部订单号
+ */
+ @Excel(name = "平台外部订单号")
+ private Long outOrderNo;
+
+ /**
+ * 平台支付返回值
+ */
+ @Excel(name = "平台支付返回值")
+ private String payData;
+
+ /**
+ * 减免金额(优惠券抵扣)
+ */
+ @Excel(name = "减免金额(优惠券抵扣)")
+ private Long reductionAmout;
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setOrderNo(Long orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ public Long getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderStatus(Long orderStatus) {
+ this.orderStatus = orderStatus;
+ }
+
+ public Long getOrderStatus() {
+ return orderStatus;
+ }
+
+ public void setPayType(Long payType) {
+ this.payType = payType;
+ }
+
+ public Long getPayType() {
+ return payType;
+ }
+
+ public void setPayChannel(Long payChannel) {
+ this.payChannel = payChannel;
+ }
+
+ public Long getPayChannel() {
+ return payChannel;
+ }
+
+ public void setOrderAmt(Long orderAmt) {
+ this.orderAmt = orderAmt;
+ }
+
+ public Long getOrderAmt() {
+ return orderAmt;
+ }
+
+ public void setFreightAmt(Long freightAmt) {
+ this.freightAmt = freightAmt;
+ }
+
+ public Long getFreightAmt() {
+ return freightAmt;
+ }
+
+ public void setPayAmt(Long payAmt) {
+ this.payAmt = payAmt;
+ }
+
+ public Long getPayAmt() {
+ return payAmt;
+ }
+
+ public void setReallyAmt(Long reallyAmt) {
+ this.reallyAmt = reallyAmt;
+ }
+
+ public Long getReallyAmt() {
+ return reallyAmt;
+ }
+
+ public void setReceiveType(Long receiveType) {
+ this.receiveType = receiveType;
+ }
+
+ public Long getReceiveType() {
+ return receiveType;
+ }
+
+ public void setGoodsId(Long goodsId) {
+ this.goodsId = goodsId;
+ }
+
+ public Long getGoodsId() {
+ return goodsId;
+ }
+
+ public void setBusinessId(Long businessId) {
+ this.businessId = businessId;
+ }
+
+ public Long getBusinessId() {
+ return businessId;
+ }
+
+ public void setReceiveAddrId(Long receiveAddrId) {
+ this.receiveAddrId = receiveAddrId;
+ }
+
+ public Long getReceiveAddrId() {
+ return receiveAddrId;
+ }
+
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
+ }
+
+ public Date getPayTime() {
+ return payTime;
+ }
+
+ public void setCreateUserId(Long createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Long getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setUpdateUserId(Long updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public Long getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setIsDelete(Long isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public Long getIsDelete() {
+ return isDelete;
+ }
+
+ public void setTrackNo(String trackNo) {
+ this.trackNo = trackNo;
+ }
+
+ public String getTrackNo() {
+ return trackNo;
+ }
+
+ public void setOrderType(Long orderType) {
+ this.orderType = orderType;
+ }
+
+ public Long getOrderType() {
+ return orderType;
+ }
+
+ public void setOutOrderNo(Long outOrderNo) {
+ this.outOrderNo = outOrderNo;
+ }
+
+ public Long getOutOrderNo() {
+ return outOrderNo;
+ }
+
+ public void setPayData(String payData) {
+ this.payData = payData;
+ }
+
+ public String getPayData() {
+ return payData;
+ }
+
+ public void setReductionAmout(Long reductionAmout) {
+ this.reductionAmout = reductionAmout;
+ }
+
+ public Long getReductionAmout() {
+ return reductionAmout;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("orderNo", getOrderNo())
+ .append("orderStatus", getOrderStatus())
+ .append("payType", getPayType())
+ .append("payChannel", getPayChannel())
+ .append("orderAmt", getOrderAmt())
+ .append("freightAmt", getFreightAmt())
+ .append("payAmt", getPayAmt())
+ .append("reallyAmt", getReallyAmt())
+ .append("receiveType", getReceiveType())
+ .append("goodsId", getGoodsId())
+ .append("businessId", getBusinessId())
+ .append("receiveAddrId", getReceiveAddrId())
+ .append("createTime", getCreateTime())
+ .append("payTime", getPayTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateUserId", getUpdateUserId())
+ .append("isDelete", getIsDelete())
+ .append("updateTime", getUpdateTime())
+ .append("trackNo", getTrackNo())
+ .append("orderType", getOrderType())
+ .append("outOrderNo", getOutOrderNo())
+ .append("payData", getPayData())
+ .append("reductionAmout", getReductionAmout())
+ .toString();
+ }
+}
diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
new file mode 100644
index 0000000..0359751
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
@@ -0,0 +1,59 @@
+package com.sf.order.domain.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author : ztzh
+ * @since : 2023/7/27
+ */
+@Schema(description = "下单")
+public class OrderCreateDto {
+
+ @Schema(description = "商品id")
+ @NotNull(message = "商品id不能为空")
+ private Long goodsId;
+
+ @Schema(description = "数量")
+ @NotNull(message = "数量不能唯恐")
+ private Long count;
+
+ @Schema(description = "金额")
+ @NotNull(message = "金额不能为空")
+ private Long amount;
+
+ @Schema(description = "用户id")
+ @NotNull(message = "用户id不能空")
+ private Long userId;
+
+ public Long getGoodsId() {
+ return goodsId;
+ }
+
+ public void setGoodsId(Long goodsId) {
+ this.goodsId = goodsId;
+ }
+ public Long getCount() {
+ return count;
+ }
+
+ public void setCount(Long count) {
+ this.count = count;
+ }
+
+ public Long getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Long amount) {
+ this.amount = amount;
+ }
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+}
diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
new file mode 100644
index 0000000..3cbbbd8
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
@@ -0,0 +1,22 @@
+package com.sf.order.domain.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class OrderListreqVo {
+ /**
+ * 主键id
+ */
+ private Long userId;
+
+ /**
+ * 订单类型
+ */
+ private Long orderStatus;
+
+ private Integer pageSize;
+
+ private Integer pageNo;
+
+}
diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
new file mode 100644
index 0000000..502a641
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -0,0 +1,53 @@
+package com.sf.order.domain.res;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 活动信息详情
+ *
+ */
+@Data
+@Schema(name = "OrderListResVo", description = "订单列表")
+public class OrderListResVo {
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 订单编号
+ */
+ private String orderNo;
+
+ /**
+ * 订单状态:
+ * 0:待支付
+ * 1:已付款
+ * 2:支付超时系统结束
+ * 3:已完成
+ */
+ private Long orderStatus;
+
+ /**
+ * 订单金额
+ */
+ private Long orderAmt;
+
+ /**
+ * 商品标题
+ */
+ private String productTitle;
+
+ /**
+ * 商品规格
+ */
+ private Integer goodsSpec;
+ /**
+ * 商品数量
+ */
+ private Integer goodsCount = 1;
+
+}
diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
new file mode 100644
index 0000000..b4f9f31
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
@@ -0,0 +1,67 @@
+package com.sf.order.mapper;
+
+import com.sf.order.domain.OrderInfo;
+import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.res.OrderListResVo;
+
+import java.util.List;
+
+
+/**
+ * 订单基础信息Mapper接口
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+public interface OrderInfoMapper {
+ /**
+ * 查询订单基础信息
+ *
+ * @param id 订单基础信息主键
+ * @return 订单基础信息
+ */
+ public OrderInfo selectOrderInfoById(Long id);
+
+ /**
+ * 查询订单基础信息列表
+ *
+ * @param orderInfo 订单基础信息
+ * @return 订单基础信息集合
+ */
+ public List selectOrderInfoList(OrderInfo orderInfo);
+
+
+ List queryList(OrderListreqVo vo);
+
+ /**
+ * 新增订单基础信息
+ *
+ * @param orderInfo 订单基础信息
+ * @return 结果
+ */
+ public int insertOrderInfo(OrderInfo orderInfo);
+
+ /**
+ * 修改订单基础信息
+ *
+ * @param orderInfo 订单基础信息
+ * @return 结果
+ */
+ public int updateOrderInfo(OrderInfo orderInfo);
+
+ /**
+ * 删除订单基础信息
+ *
+ * @param id 订单基础信息主键
+ * @return 结果
+ */
+ public int deleteOrderInfoById(Long id);
+
+ /**
+ * 批量删除订单基础信息
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteOrderInfoByIds(Long[] ids);
+}
diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
new file mode 100644
index 0000000..c63358f
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
@@ -0,0 +1,73 @@
+package com.sf.order.service;
+
+
+import com.sf.order.domain.OrderInfo;
+import com.sf.order.domain.dto.OrderCreateDto;
+import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.res.OrderListResVo;
+
+import java.util.List;
+
+/**
+ * 订单基础信息Service接口
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+public interface IOrderInfoService
+{
+ /**
+ * 查询订单基础信息
+ *
+ * @param id 订单基础信息主键
+ * @return 订单基础信息
+ */
+ public OrderInfo selectOrderInfoById(Long id);
+
+ /**
+ * 查询订单基础信息列表
+ *
+ * @param orderInfo 订单基础信息
+ * @return 订单基础信息集合
+ */
+ public List selectOrderInfoList(OrderInfo orderInfo);
+
+ /**
+ * 查询订单基础信息列表
+ */
+ List queryList(OrderListreqVo vo);
+
+ /**
+ * 新增订单基础信息
+ *
+ * @param orderInfo 订单基础信息
+ * @return 结果
+ */
+ public int createOrder(OrderCreateDto orderInfo);
+
+ /**
+ * 修改订单基础信息
+ *
+ * @param orderInfo 订单基础信息
+ * @return 结果
+ */
+ public int updateOrderInfo(OrderInfo orderInfo);
+
+ /**
+ * 批量删除订单基础信息
+ *
+ * @param ids 需要删除的订单基础信息主键集合
+ * @return 结果
+ */
+ public int deleteOrderInfoByIds(Long[] ids);
+
+ /**
+ * 删除订单基础信息信息
+ *
+ * @param id 订单基础信息主键
+ * @return 结果
+ */
+ public int deleteOrderInfoById(Long id);
+
+ void orderPay(Long orderId);
+}
diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
new file mode 100644
index 0000000..315b818
--- /dev/null
+++ b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -0,0 +1,137 @@
+package com.sf.order.service.impl;
+
+import java.util.List;
+
+import com.sf.common.exception.BusinessException;
+import com.sf.common.utils.DateUtils;
+import com.sf.common.utils.SnowflakeIdWorker;
+import com.sf.order.domain.OrderInfo;
+import com.sf.order.domain.dto.OrderCreateDto;
+import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.res.OrderListResVo;
+import com.sf.order.mapper.OrderInfoMapper;
+import com.sf.order.service.IOrderInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 订单基础信息Service业务层处理
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+@Service
+public class OrderInfoServiceImpl implements IOrderInfoService
+{
+ @Resource
+ private OrderInfoMapper orderInfoMapper;
+ @Resource
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ /**
+ * 查询订单基础信息
+ *
+ * @param id 订单基础信息主键
+ * @return 订单基础信息
+ */
+ @Override
+ public OrderInfo selectOrderInfoById(Long id)
+ {
+ return orderInfoMapper.selectOrderInfoById(id);
+ }
+
+ /**
+ * 查询订单基础信息列表
+ *
+ * @param orderInfo 订单基础信息
+ * @return 订单基础信息
+ */
+ @Override
+ public List selectOrderInfoList(OrderInfo orderInfo)
+ {
+ return orderInfoMapper.selectOrderInfoList(orderInfo);
+ }
+ public List queryList(OrderListreqVo vo)
+ {
+ return orderInfoMapper.queryList(vo);
+ }
+
+ /**
+ * 新增订单基础信息
+ *
+ * @param orderCreateDto 订单基础信息
+ * @return 结果
+ */
+ @Override
+ public int createOrder(OrderCreateDto orderCreateDto)
+ {
+ OrderInfo orderInfo = new OrderInfo();
+ orderInfo.setOrderNo(snowflakeIdWorker.nextId());
+ orderInfo.setPayType(0L);
+ orderInfo.setReceiveType(0L);
+ orderInfo.setOrderStatus(0l);
+ orderInfo.setCreateUserId(orderCreateDto.getUserId());
+ orderInfo.setUpdateUserId(orderCreateDto.getUserId());
+ orderInfo.setGoodsId(orderCreateDto.getGoodsId());
+ orderInfo.setOrderAmt(orderCreateDto.getAmount());
+ orderInfo.setPayAmt(orderCreateDto.getAmount());
+ orderInfo.setCreateTime(DateUtils.getNowDate());
+ orderInfo.setUpdateTime(DateUtils.getNowDate());
+ return orderInfoMapper.insertOrderInfo(orderInfo);
+ }
+
+ /**
+ * 修改订单基础信息
+ *
+ * @param orderInfo 订单基础信息
+ * @return 结果
+ */
+ @Override
+ public int updateOrderInfo(OrderInfo orderInfo)
+ {
+ orderInfo.setUpdateTime(DateUtils.getNowDate());
+ return orderInfoMapper.updateOrderInfo(orderInfo);
+ }
+ @Override
+ public void orderPay(Long orderId) {
+ OrderInfo updateOrder = this.selectOrderInfoById(orderId);
+ if (updateOrder == null) {
+ throw new BusinessException("订单缺失！");
+ }
+// if (!OrderInfoConstant.ORDER_WAITING_FOR_PAYMENT.equals(orderInfo.getOrderStatus())) {
+// throw new BusinessException("订单状态异常！");
+// }
+ updateOrder.setOrderStatus(1L);
+ updateOrder.setPayTime(DateUtils.getNowDate());
+ // 修改订单状态
+ if (1>this.updateOrderInfo(updateOrder)) {
+ throw new BusinessException("支付异常，请联系管理员!");
+ }
+ }
+
+ /**
+ * 批量删除订单基础信息
+ *
+ * @param ids 需要删除的订单基础信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteOrderInfoByIds(Long[] ids)
+ {
+ return orderInfoMapper.deleteOrderInfoByIds(ids);
+ }
+
+ /**
+ * 删除订单基础信息信息
+ *
+ * @param id 订单基础信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteOrderInfoById(Long id)
+ {
+ return orderInfoMapper.deleteOrderInfoById(id);
+ }
+
+}
diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
new file mode 100644
index 0000000..811f46a
--- /dev/null
+++ b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+ select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+ select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+
+
+
+
+
+
+ insert into ORDER_INFO
+
+ id,
+ order_no,
+ order_status,
+ pay_type,
+ pay_channel,
+ order_amt,
+ freight_amt,
+ pay_amt,
+ really_amt,
+ receive_type,
+ goods_id,
+ business_id,
+ receive_addr_id,
+ create_time,
+ pay_time,
+ create_user_id,
+ update_user_id,
+ is_delete,
+ update_time,
+ track_no,
+ order_type,
+ out_order_no,
+ pay_data,
+ reduction_amout,
+
+
+ #{id},
+ #{orderNo},
+ #{orderStatus},
+ #{payType},
+ #{payChannel},
+ #{orderAmt},
+ #{freightAmt},
+ #{payAmt},
+ #{reallyAmt},
+ #{receiveType},
+ #{goodsId},
+ #{businessId},
+ #{receiveAddrId},
+ #{createTime},
+ #{payTime},
+ #{createUserId},
+ #{updateUserId},
+ #{isDelete},
+ #{updateTime},
+ #{trackNo},
+ #{orderType},
+ #{outOrderNo},
+ #{payData},
+ #{reductionAmout},
+
+
+
+
+ update ORDER_INFO
+
+ order_no = #{orderNo},
+ order_status = #{orderStatus},
+ pay_type = #{payType},
+ pay_channel = #{payChannel},
+ order_amt = #{orderAmt},
+ freight_amt = #{freightAmt},
+ pay_amt = #{payAmt},
+ really_amt = #{reallyAmt},
+ receive_type = #{receiveType},
+ goods_id = #{goodsId},
+ business_id = #{businessId},
+ receive_addr_id = #{receiveAddrId},
+ create_time = #{createTime},
+ pay_time = #{payTime},
+ create_user_id = #{createUserId},
+ update_user_id = #{updateUserId},
+ is_delete = #{isDelete},
+ update_time = #{updateTime},
+ track_no = #{trackNo},
+ order_type = #{orderType},
+ out_order_no = #{outOrderNo},
+ pay_data = #{payData},
+ reduction_amout = #{reductionAmout},
+
+ where id = #{id}
+
+
+
+ delete from ORDER_INFO where id = #{id}
+
+
+
+ delete from ORDER_INFO where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/sf-ui/src/api/deploy/INFO.js b/sf-ui/src/api/deploy/INFO.js
new file mode 100644
index 0000000..1a71d94
--- /dev/null
+++ b/sf-ui/src/api/deploy/INFO.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询安装包管理（新）列表
+export function listINFO(query) {
+ return request({
+ url: '/deploy/INFO/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询安装包管理（新）详细
+export function getINFO(id) {
+ return request({
+ url: '/deploy/INFO/' + id,
+ method: 'get'
+ })
+}
+
+// 新增安装包管理（新）
+export function addINFO(data) {
+ return request({
+ url: '/deploy/INFO',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改安装包管理（新）
+export function updateINFO(data) {
+ return request({
+ url: '/deploy/INFO',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除安装包管理（新）
+export function delINFO(id) {
+ return request({
+ url: '/deploy/INFO/' + id,
+ method: 'delete'
+ })
+}
diff --git a/sf-ui/src/api/goods/goods.js b/sf-ui/src/api/goods/goods.js
new file mode 100644
index 0000000..68f58bc
--- /dev/null
+++ b/sf-ui/src/api/goods/goods.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询商品信息列表
+export function listGoods(query) {
+ return request({
+ url: '/goods/goods/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询商品信息详细
+export function getGoods(id) {
+ return request({
+ url: '/goods/goods/' + id,
+ method: 'get'
+ })
+}
+
+// 新增商品信息
+export function addGoods(data) {
+ return request({
+ url: '/goods/goods',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改商品信息
+export function updateGoods(data) {
+ return request({
+ url: '/goods/goods',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除商品信息
+export function delGoods(id) {
+ return request({
+ url: '/goods/goods/' + id,
+ method: 'delete'
+ })
+}
diff --git a/sf-ui/src/views/deploy/INFO/add.vue b/sf-ui/src/views/deploy/INFO/add.vue
new file mode 100644
index 0000000..c9bc57b
--- /dev/null
+++ b/sf-ui/src/views/deploy/INFO/add.vue
@@ -0,0 +1,199 @@
+
+
Date: Thu, 11 Apr 2024 14:12:59 +0800
Subject: [PATCH 024/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/exception/BusinessException.java | 77 -------------------
.../service/impl/OrderInfoServiceImpl.java | 8 +-
2 files changed, 4 insertions(+), 81 deletions(-)
delete mode 100644 sf-common/src/main/java/com/sf/common/exception/BusinessException.java
diff --git a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
deleted file mode 100644
index 26ba14a..0000000
--- a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.sf.common.exception;
-
-
-import com.sf.common.enums.ErrorCodeTypeEnum;
-
-/**
- * @author : yswjme@163.com
- * @Title : BusinessException.java
- * @Package : com.zsmarter.ai.word.exception
- * @Descript : 业务运行时异常
- * @date : 2020-06-29 04:59:44
- * @vsersion : V1.0
- */
-public class BusinessException extends RuntimeException {
-
- private static final long serialVersionUID = 4693786499059513760L;
-
- private ErrorCodeTypeEnum errorCodeTypeEnum;
-
- private final String errorDescription;
-
- private String errorCode;
-
- public BusinessException(String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- }
-
- public BusinessException(String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- }
-
- public BusinessException(String code, String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- }
-
- public BusinessException(String code, String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- }
-
- public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- this.errorCodeTypeEnum = errorCodeTypeEnum;
- }
-
- public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- this.errorCodeTypeEnum = errorCodeTypeEnum;
- }
-
- public String getErrorDescription() {
- return this.errorDescription;
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public String getErrorTitle() {
- return "业务校验失败!";
- }
-
- public ErrorCodeTypeEnum getErrorCodeTypeEnum() {
- return errorCodeTypeEnum;
- }
-
-
-}
diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 315b818..38c43c8 100644
--- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -2,7 +2,7 @@ package com.sf.order.service.impl;
import java.util.List;
-import com.sf.common.exception.BusinessException;
+import com.sf.common.exception.ServiceException;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SnowflakeIdWorker;
import com.sf.order.domain.OrderInfo;
@@ -97,16 +97,16 @@ public class OrderInfoServiceImpl implements IOrderInfoService
public void orderPay(Long orderId) {
OrderInfo updateOrder = this.selectOrderInfoById(orderId);
if (updateOrder == null) {
- throw new BusinessException("订单缺失！");
+ throw new ServiceException("订单缺失！");
}
// if (!OrderInfoConstant.ORDER_WAITING_FOR_PAYMENT.equals(orderInfo.getOrderStatus())) {
-// throw new BusinessException("订单状态异常！");
+// throw new ServiceException("订单状态异常！");
// }
updateOrder.setOrderStatus(1L);
updateOrder.setPayTime(DateUtils.getNowDate());
// 修改订单状态
if (1>this.updateOrderInfo(updateOrder)) {
- throw new BusinessException("支付异常，请联系管理员!");
+ throw new ServiceException("支付异常，请联系管理员!");
}
}
From bf5b5ad0e4be61500d26d7eac429af1b95259f8b Mon Sep 17 00:00:00 2001
From: pengren
Date: Thu, 11 Apr 2024 14:21:57 +0800
Subject: [PATCH 025/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/pom.xml | 6 -
.../order/controller/OrderInfoController.java | 109 ++++++
.../java/com/sf/order/domain/OrderInfo.java | 0
.../sf/order/domain/dto/OrderCreateDto.java | 0
.../sf/order/domain/req/OrderListreqVo.java | 1 -
.../sf/order/domain/res/OrderListResVo.java | 2 -
.../com/sf/order/mapper/OrderInfoMapper.java | 0
.../sf/order/service/IOrderInfoService.java | 0
.../service/impl/OrderInfoServiceImpl.java | 3 +-
.../mapper/order/OrderInfoMapper.xml | 342 +++++++++---------
sf-order/pom.xml | 34 --
11 files changed, 281 insertions(+), 216 deletions(-)
create mode 100644 sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
rename {sf-order => sf-admin}/src/main/java/com/sf/order/domain/OrderInfo.java (100%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java (100%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/domain/req/OrderListreqVo.java (84%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/domain/res/OrderListResVo.java (96%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/mapper/OrderInfoMapper.java (100%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/service/IOrderInfoService.java (100%)
rename {sf-order => sf-admin}/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java (99%)
rename {sf-order => sf-admin}/src/main/resources/mapper/order/OrderInfoMapper.xml (98%)
delete mode 100644 sf-order/pom.xml
diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 781eeae..f411a21 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -60,12 +60,6 @@
com.smarterFramework
sf-file
-
- com.smarterFramework
- sf-order
- 1.0.0
- compile
-
diff --git a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
new file mode 100644
index 0000000..c1e356d
--- /dev/null
+++ b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -0,0 +1,109 @@
+package com.sf.order.controller;
+
+import com.sf.common.annotation.Log;
+import com.sf.common.core.controller.BaseController;
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.page.TableDataInfo;
+import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.poi.ExcelUtil;
+import com.sf.order.domain.OrderInfo;
+import com.sf.order.domain.dto.OrderCreateDto;
+import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.res.OrderListResVo;
+import com.sf.order.service.IOrderInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 订单基础信息Controller
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+@RestController
+@RequestMapping("/order")
+public class OrderInfoController extends BaseController {
+
+ @Autowired
+ private IOrderInfoService orderInfoService;
+
+ /**
+ * 查询订单基础信息列表
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(OrderInfo orderInfo) {
+ startPage();
+ List list = orderInfoService.selectOrderInfoList(orderInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询订单基础信息列表
+ */
+ @GetMapping("/query/list")
+ public TableDataInfo queryList(OrderListreqVo vo) {
+ startPage();
+ List list = orderInfoService.queryList(vo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出订单基础信息列表
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, OrderInfo orderInfo) {
+ List list = orderInfoService.selectOrderInfoList(orderInfo);
+ ExcelUtil util = new ExcelUtil(OrderInfo.class);
+ util.exportExcel(response, list, "订单基础信息数据");
+ }
+
+ /**
+ * 获取订单基础信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(orderInfoService.selectOrderInfoById(id));
+ }
+
+ /**
+ * 新增订单基础信息
+ */
+ @Log(title = "创建订单基础信息", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/createOrder")
+ public AjaxResult createOrder(@RequestBody OrderCreateDto orderCreateDto) {
+ return toAjax(orderInfoService.createOrder(orderCreateDto));
+ }
+
+ /**
+ * 修改订单基础信息
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody OrderInfo orderInfo) {
+ return toAjax(orderInfoService.updateOrderInfo(orderInfo));
+ }
+
+ /**
+ * 支付订单
+ */
+ @Operation(summary = "支付订单")
+ @PostMapping(value = "/pay/{orderId}")
+ private String orderPay(@PathVariable(value = "orderId") Long orderId) {
+ orderInfoService.orderPay(orderId);
+ return null;
+ }
+
+ /**
+ * 删除订单基础信息
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
+ }
+}
diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-admin/src/main/java/com/sf/order/domain/OrderInfo.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
rename to sf-admin/src/main/java/com/sf/order/domain/OrderInfo.java
diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-admin/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
rename to sf-admin/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
similarity index 84%
rename from sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
index 3cbbbd8..52b41c9 100644
--- a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
@@ -1,6 +1,5 @@
package com.sf.order.domain.req;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
similarity index 96%
rename from sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index 502a641..b5cda3e 100644
--- a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -3,8 +3,6 @@ package com.sf.order.domain.res;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.time.LocalDateTime;
-
/**
* 活动信息详情
*
diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
rename to sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
rename to sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
similarity index 99%
rename from sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
rename to sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 38c43c8..b70d05b 100644
--- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -1,7 +1,5 @@
package com.sf.order.service.impl;
-import java.util.List;
-
import com.sf.common.exception.ServiceException;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SnowflakeIdWorker;
@@ -14,6 +12,7 @@ import com.sf.order.service.IOrderInfoService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* 订单基础信息Service业务层处理
diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
similarity index 98%
rename from sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
rename to sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index 811f46a..e9141e7 100644
--- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -1,172 +1,172 @@
-
-
-
-
-
-
-
-
- select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
- select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
-
-
-
-
-
-
- insert into ORDER_INFO
-
- id,
- order_no,
- order_status,
- pay_type,
- pay_channel,
- order_amt,
- freight_amt,
- pay_amt,
- really_amt,
- receive_type,
- goods_id,
- business_id,
- receive_addr_id,
- create_time,
- pay_time,
- create_user_id,
- update_user_id,
- is_delete,
- update_time,
- track_no,
- order_type,
- out_order_no,
- pay_data,
- reduction_amout,
-
-
- #{id},
- #{orderNo},
- #{orderStatus},
- #{payType},
- #{payChannel},
- #{orderAmt},
- #{freightAmt},
- #{payAmt},
- #{reallyAmt},
- #{receiveType},
- #{goodsId},
- #{businessId},
- #{receiveAddrId},
- #{createTime},
- #{payTime},
- #{createUserId},
- #{updateUserId},
- #{isDelete},
- #{updateTime},
- #{trackNo},
- #{orderType},
- #{outOrderNo},
- #{payData},
- #{reductionAmout},
-
-
-
-
- update ORDER_INFO
-
- order_no = #{orderNo},
- order_status = #{orderStatus},
- pay_type = #{payType},
- pay_channel = #{payChannel},
- order_amt = #{orderAmt},
- freight_amt = #{freightAmt},
- pay_amt = #{payAmt},
- really_amt = #{reallyAmt},
- receive_type = #{receiveType},
- goods_id = #{goodsId},
- business_id = #{businessId},
- receive_addr_id = #{receiveAddrId},
- create_time = #{createTime},
- pay_time = #{payTime},
- create_user_id = #{createUserId},
- update_user_id = #{updateUserId},
- is_delete = #{isDelete},
- update_time = #{updateTime},
- track_no = #{trackNo},
- order_type = #{orderType},
- out_order_no = #{outOrderNo},
- pay_data = #{payData},
- reduction_amout = #{reductionAmout},
-
- where id = #{id}
-
-
-
- delete from ORDER_INFO where id = #{id}
-
-
-
- delete from ORDER_INFO where id in
-
- #{id}
-
-
+
+
+
+
+
+
+
+
+ select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+ select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+
+
+
+
+
+
+ insert into ORDER_INFO
+
+ id,
+ order_no,
+ order_status,
+ pay_type,
+ pay_channel,
+ order_amt,
+ freight_amt,
+ pay_amt,
+ really_amt,
+ receive_type,
+ goods_id,
+ business_id,
+ receive_addr_id,
+ create_time,
+ pay_time,
+ create_user_id,
+ update_user_id,
+ is_delete,
+ update_time,
+ track_no,
+ order_type,
+ out_order_no,
+ pay_data,
+ reduction_amout,
+
+
+ #{id},
+ #{orderNo},
+ #{orderStatus},
+ #{payType},
+ #{payChannel},
+ #{orderAmt},
+ #{freightAmt},
+ #{payAmt},
+ #{reallyAmt},
+ #{receiveType},
+ #{goodsId},
+ #{businessId},
+ #{receiveAddrId},
+ #{createTime},
+ #{payTime},
+ #{createUserId},
+ #{updateUserId},
+ #{isDelete},
+ #{updateTime},
+ #{trackNo},
+ #{orderType},
+ #{outOrderNo},
+ #{payData},
+ #{reductionAmout},
+
+
+
+
+ update ORDER_INFO
+
+ order_no = #{orderNo},
+ order_status = #{orderStatus},
+ pay_type = #{payType},
+ pay_channel = #{payChannel},
+ order_amt = #{orderAmt},
+ freight_amt = #{freightAmt},
+ pay_amt = #{payAmt},
+ really_amt = #{reallyAmt},
+ receive_type = #{receiveType},
+ goods_id = #{goodsId},
+ business_id = #{businessId},
+ receive_addr_id = #{receiveAddrId},
+ create_time = #{createTime},
+ pay_time = #{payTime},
+ create_user_id = #{createUserId},
+ update_user_id = #{updateUserId},
+ is_delete = #{isDelete},
+ update_time = #{updateTime},
+ track_no = #{trackNo},
+ order_type = #{orderType},
+ out_order_no = #{outOrderNo},
+ pay_data = #{payData},
+ reduction_amout = #{reductionAmout},
+
+ where id = #{id}
+
+
+
+ delete from ORDER_INFO where id = #{id}
+
+
+
+ delete from ORDER_INFO where id in
+
+ #{id}
+
+
\ No newline at end of file
diff --git a/sf-order/pom.xml b/sf-order/pom.xml
deleted file mode 100644
index 08b9c37..0000000
--- a/sf-order/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- smarterFramework
- com.smarterFramework
- 1.0.0
-
- 4.0.0
-
- sf-order
-
-
- order订单模块
-
-
-
-
-
-
- com.smarterFramework
- sf-common
-
-
- io.swagger.core.v3
- swagger-annotations
- 2.1.2
- compile
-
-
-
-
-
\ No newline at end of file
From cbb976637547bd0f92d1cd5ac37951db0454d0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Thu, 11 Apr 2024 14:55:21 +0800
Subject: [PATCH 026/118] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=B0?=
=?UTF-8?q?=E7=9A=84=E5=AE=89=E8=A3=85=E5=8C=85=E6=96=B0=E5=A2=9E=EF=BC=8C?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=A0=E9=81=93=E7=AE=A1=E7=90=86=E5=92=8C?=
=?UTF-8?q?APP=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/views/FDS/appManagement/add.vue | 120 +++++++++
sf-ui/src/views/FDS/appManagement/index.vue | 207 +++++++++++++++
sf-ui/src/views/FDS/channelManagement/add.vue | 120 +++++++++
.../src/views/FDS/channelManagement/index.vue | 210 +++++++++++++++
sf-ui/src/views/FDS/installationList/add.vue | 247 +++++++++---------
.../src/views/FDS/installationList/detail.vue | 12 +-
.../src/views/FDS/installationList/index.vue | 166 ++++++------
7 files changed, 857 insertions(+), 225 deletions(-)
create mode 100644 sf-ui/src/views/FDS/appManagement/add.vue
create mode 100644 sf-ui/src/views/FDS/appManagement/index.vue
create mode 100644 sf-ui/src/views/FDS/channelManagement/add.vue
create mode 100644 sf-ui/src/views/FDS/channelManagement/index.vue
diff --git a/sf-ui/src/views/FDS/appManagement/add.vue b/sf-ui/src/views/FDS/appManagement/add.vue
new file mode 100644
index 0000000..b415f0d
--- /dev/null
+++ b/sf-ui/src/views/FDS/appManagement/add.vue
@@ -0,0 +1,120 @@
+
+
-
-
\ No newline at end of file
diff --git a/sf-ui/src/views/components/home/list.vue b/sf-ui/src/views/components/home/list.vue
new file mode 100644
index 0000000..f70c78a
--- /dev/null
+++ b/sf-ui/src/views/components/home/list.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+ 进入
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf-ui/src/views/indexNew.vue b/sf-ui/src/views/indexNew.vue
new file mode 100644
index 0000000..6a2aabf
--- /dev/null
+++ b/sf-ui/src/views/indexNew.vue
@@ -0,0 +1,291 @@
+
+
-
-
-
+
+ {{ item.label }}
-
-
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
上传文件
-
-
+
+
-
-
-
+
+ {{ item.label }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
提交
重置
@@ -73,7 +75,7 @@ import { addINFO, updateINFO } from '@/api/FDS/installList'
export default {
name: 'InstallAdd',
- dicts: ['sys_yes_no'],
+ dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
data() {
return {
formData: {
@@ -87,56 +89,34 @@ export default {
field108: undefined
},
rules: {
- field102: [{
- required: true,
- message: '上传方式不能为空',
- trigger: 'change'
- }],
- field103: [{
- required: true,
- message: '请输入安装包名称',
- trigger: 'blur'
- }],
- field107: [{
- required: true,
- message: '请输入模块包名称',
- trigger: 'blur'
- }],
- field105: [],
- field106: []
+ uploadingType: [
+ { required: true, message: '上传类型不能为空', trigger: 'change' }
+ ],
+ sysApkName: [
+ { required: true, message: '安装包名称不能为空', trigger: 'blur' }
+ ],
+ version: [
+ { required: true, message: '版本号不能为空', trigger: 'blur' }
+ ],
+ sysType: [
+ { required: true, message: '安装包类型不能为空', trigger: 'change' }
+ ]
},
field101Action: 'https://jsonplaceholder.typicode.com/posts/',
field101fileList: [],
- field102Options: [{
- 'label': '在线上传',
- 'value': 1
- }, {
- 'label': '离线上传',
- 'value': 2
- }],
- field106Options: [{
- 'label': 'Android',
- 'value': 'Android'
- }, {
- 'label': 'IOS',
- 'value': 'IOS'
- }, {
- 'label': '鸿蒙',
- 'value': 'HarmonyOS'
- }],
activeTabs: '1'
}
},
computed: {},
mounted() {
- this.activeTabs = this.$route.params.activeTabs
+ this.activeTabs = this.$route.query.activeTabs
},
methods: {
/** 提交按钮 */
submitForm() {
this.$refs['elForm'].validate(valid => {
if (valid) {
- if (this.form.configId != undefined) {
+ if (this.form.id != undefined) {
updateINFO(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.closeModal()
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 6d6546b..24aa39f 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -183,7 +183,7 @@ import { delINFO, listINFO } from '@/api/FDS/installList'
export default {
name: 'InstallationList',
- dicts: ['sys_yes_no'],
+ dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
data() {
return {
// 遮罩层
From 1f7755386d322709160ab1559320b4d77f35e264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Fri, 12 Apr 2024 09:42:28 +0800
Subject: [PATCH 034/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=99=BD?=
=?UTF-8?q?=E5=90=8D=E5=8D=95=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/router/index.js | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sf-ui/src/router/index.js b/sf-ui/src/router/index.js
index cf29d37..d892652 100644
--- a/sf-ui/src/router/index.js
+++ b/sf-ui/src/router/index.js
@@ -100,7 +100,7 @@ export const dynamicRoutes = [
{
path: 'role/:userId(\\d+)',
// component: () => import('@/views/system/user/authRole'),
- component: (resolve) => require(['@/views/system/user/authRole'],resolve),
+ component: (resolve) => require(['@/views/system/user/authRole'], resolve),
name: 'AuthRole',
meta: { title: '分配角色', activeMenu: '/system/user' }
}
@@ -221,46 +221,46 @@ export const dynamicRoutes = [
},
{
- path: '/build/WhiteList',
+ path: '/build/whiteListManagement',
component: Layout,
hidden: true,
- permissions: ['build:WhiteList:add'],
+ permissions: ['build:whiteListManagement:add'],
children: [
{
path: 'add',
component: () => import('@/views/FDS/whiteListManagement/add'),
- name: 'WhiteListAdd',
- meta: { title: '新增白名单', activeMenu: '/build/whiteList' }
+ name: 'WhiteListManagementAdd',
+ meta: { title: '新增白名单', activeMenu: '/build/whiteListManagement' }
}
]
},
{
- path: '/build/WhiteList',
+ path: '/build/whiteListManagement',
component: Layout,
hidden: true,
- permissions: ['build:WhiteList:detail'],
+ permissions: ['build:whiteListManagement:detail'],
children: [
{
path: 'detail',
component: () => import('@/views/FDS/whiteListManagement/detail'),
- name: 'WhiteListDetail',
- meta: { title: '白名单详情', activeMenu: '/build/whiteList' }
+ name: 'WhiteListManagementDetail',
+ meta: { title: '白名单详情', activeMenu: '/build/whiteListManagement' }
}
]
},
{
- path: '/build/WhiteList',
+ path: '/build/whiteListManagement',
component: Layout,
hidden: true,
- permissions: ['build:WhiteList:addConfig'],
+ permissions: ['build:whiteListManagement:addConfig'],
children: [
{
path: 'addConfig',
component: () => import('@/views/FDS/whiteListManagement/addConfig'),
- name: 'WhiteListAdd',
- meta: { title: '新增白名单配置', activeMenu: '/build/whiteList' }
+ name: 'WhiteListManagementConfigAdd',
+ meta: { title: '新增白名单配置', activeMenu: '/build/whiteListManagement' }
}
]
}
From 2a908a3b0f7d4772a8fbfa8e819d299a4e122741 Mon Sep 17 00:00:00 2001
From: yin fuxian
Date: Fri, 12 Apr 2024 10:51:10 +0800
Subject: [PATCH 035/118] =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=90=8E=E5=82=A8=E5=AD=98=E9=A1=B9=E7=9B=AE=E5=BA=94=E7=94=A8?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/store/getters.js | 1 +
sf-ui/src/store/modules/user.js | 22 +++++++++++++++--
sf-ui/src/utils/application.js | 30 ++++++++++++++++++++++++
sf-ui/src/views/components/home/card.vue | 5 ++--
sf-ui/src/views/indexNew.vue | 3 +--
5 files changed, 55 insertions(+), 6 deletions(-)
create mode 100644 sf-ui/src/utils/application.js
diff --git a/sf-ui/src/store/getters.js b/sf-ui/src/store/getters.js
index 5920c6e..46e2bee 100644
--- a/sf-ui/src/store/getters.js
+++ b/sf-ui/src/store/getters.js
@@ -11,6 +11,7 @@ const getters = {
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permissions: state => state.user.permissions,
+ applicationId: state => state.user.applicationId,
permission_routes: state => state.permission.routes,
topbarRouters:state => state.permission.topbarRouters,
defaultRoutes:state => state.permission.defaultRoutes,
diff --git a/sf-ui/src/store/modules/user.js b/sf-ui/src/store/modules/user.js
index 75c0c57..7b8ffd8 100644
--- a/sf-ui/src/store/modules/user.js
+++ b/sf-ui/src/store/modules/user.js
@@ -1,5 +1,6 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getApplicationId, setApplicationId, removeApplicationId } from '@/utils/application'
const user = {
state: {
@@ -7,7 +8,9 @@ const user = {
name: '',
avatar: '',
roles: [],
- permissions: []
+ permissions: [],
+ applicationId: getApplicationId(),
+ applicationInfo: {}, // 用户选中的项目/应用
},
mutations: {
@@ -25,7 +28,12 @@ const user = {
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
- }
+ },
+ SET_APPLICATION: (state, applicationInfo) => {
+ const { id } = applicationInfo;
+ state.applicationId = id;
+ state.applicationInfo = applicationInfo;
+ },
},
actions: {
@@ -74,6 +82,8 @@ const user = {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
+ commit('SET_APPLICATION', {})
+ removeApplicationId()
removeToken()
resolve()
}).catch(error => {
@@ -86,9 +96,17 @@ const user = {
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
+ commit('SET_APPLICATION', {})
+ removeApplicationId()
removeToken()
resolve()
})
+ },
+
+ // 设置选中的项目应用信息
+ SetApplication({ commit }, applicationInfo) {
+ commit('SET_APPLICATION', applicationInfo)
+ setApplicationId(applicationInfo?.id);
}
}
}
diff --git a/sf-ui/src/utils/application.js b/sf-ui/src/utils/application.js
new file mode 100644
index 0000000..250e16d
--- /dev/null
+++ b/sf-ui/src/utils/application.js
@@ -0,0 +1,30 @@
+import Cookies from "js-cookie";
+
+const ApplicationKey = "Admin-Application-Id";
+
+/**
+ * 获取应用项目ID
+ * 该函数从Cookie中检索与应用项目相关的关键信息。
+ * @returns {string} 返回从Cookie中获取的应用项目ID。
+ */
+export function getApplicationId() {
+ return Cookies.get(ApplicationKey);
+}
+
+/**
+ * 设置应用项目ID到Cookie中
+ * @param {string} ApplicationId - 需要设置的应用项目ID。
+ * @return {boolean|Object} 返回Cookie设置的结果。成功则返回true，失败则返回设置失败的对象。
+ */
+export function setApplicationId(ApplicationId) {
+ return Cookies.set(ApplicationKey, ApplicationId);
+}
+
+/**
+ * 移除应用ID的Cookie
+ * 本函数用于删除与应用相关的ID Cookie。
+ * @returns {boolean} 返回删除操作的结果。如果删除成功，则返回true；如果删除失败，则返回false。
+ */
+export function removeApplicationId() {
+ return Cookies.remove(ApplicationKey);
+}
\ No newline at end of file
diff --git a/sf-ui/src/views/components/home/card.vue b/sf-ui/src/views/components/home/card.vue
index ba83e37..cf925aa 100644
--- a/sf-ui/src/views/components/home/card.vue
+++ b/sf-ui/src/views/components/home/card.vue
@@ -15,7 +15,7 @@
:size="100"
/> -->
@@ -75,12 +75,13 @@ export default {
flex-flow: column;
justify-content: space-evenly;
}
- .title {
+ .card-title {
font-size: 16px;
font-weight: bold;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ color: #707070;
}
.time {
font-size: 14px;
diff --git a/sf-ui/src/views/indexNew.vue b/sf-ui/src/views/indexNew.vue
index 6a2aabf..ffd9574 100644
--- a/sf-ui/src/views/indexNew.vue
+++ b/sf-ui/src/views/indexNew.vue
@@ -163,8 +163,7 @@ export default {
// });
// },
async handleEnter(row) {
- // TODO
- // 此处需要储存项目id，供后续的网关服务、部署服务使用
+ this.$store.dispatch('SetApplication', row);
let routes = this.routes;
if (this.routes.length === 0) {
routes = await this.$store.dispatch('GenerateRoutes');
From 58e0e2c7aaae8efff9191ce563b1cfec1ebff1a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Fri, 12 Apr 2024 11:49:20 +0800
Subject: [PATCH 036/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AE=89?=
=?UTF-8?q?=E8=A3=85=E5=8C=85=E6=A8=A1=E5=9D=97=E5=87=BA=E7=8E=B0=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/components/ImageUpload/index.vue | 192 +++++++++---------
sf-ui/src/router/index.js | 22 +-
.../src/views/FDS/channelManagement/index.vue | 4 +-
sf-ui/src/views/FDS/installationList/add.vue | 79 ++++---
.../src/views/FDS/installationList/detail.vue | 30 ++-
sf-ui/src/views/FDS/installationList/edit.vue | 183 +++++++++++++++++
.../src/views/FDS/installationList/index.vue | 39 +++-
7 files changed, 390 insertions(+), 159 deletions(-)
create mode 100644 sf-ui/src/views/FDS/installationList/edit.vue
diff --git a/sf-ui/src/components/ImageUpload/index.vue b/sf-ui/src/components/ImageUpload/index.vue
index e0140f5..bbafc40 100644
--- a/sf-ui/src/components/ImageUpload/index.vue
+++ b/sf-ui/src/components/ImageUpload/index.vue
@@ -1,49 +1,50 @@
-
+
+ 上传文件
-
+
-
-
@@ -107,7 +107,7 @@
// import { listINFO, getINFO, delINFO, addINFO, updateINFO } from "@/api/deploy/INFO";
export default {
name: 'ChannelManagement',
- dicts: ['sys_yes_no'],
+ dicts: ['sys_yes_no', 'uploading_status'],
data() {
return {
// 遮罩层
diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue
index c7c6eb9..09ef41f 100644
--- a/sf-ui/src/views/FDS/installationList/add.vue
+++ b/sf-ui/src/views/FDS/installationList/add.vue
@@ -30,15 +30,21 @@
-
- 上传文件
-
+
+
-
+
@@ -61,7 +67,7 @@
提交
- 重置
+ 取 消
@@ -71,7 +77,7 @@
+
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 24aa39f..1ac9418 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -129,14 +129,14 @@
-
Date: Fri, 12 Apr 2024 12:54:25 +0800
Subject: [PATCH 037/118] =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
=?UTF-8?q?=E5=8D=8E=E4=B8=BA=E8=B4=A6=E5=8F=B7=E5=85=8D=E5=AF=86=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 10 +-
sf-admin/pom.xml | 6 +
.../controller/system/SysLoginController.java | 5 +-
.../sf/framework/config/SecurityConfig.java | 2 +-
.../web/service/SysLoginService.java | 32 +++-
.../web/service/SysPasswordService.java | 3 +
sf-oauth/pom.xml | 32 ++++
.../java/com/sf/oauth/config/AuthConfig.java | 41 ++++
.../java/com/sf/oauth/config/AuthSource.java | 76 ++++++++
.../oauth/controller/RestAuthController.java | 143 ++++++++++++++
.../com/sf/oauth/domain/AuthCallback.java | 42 +++++
.../java/com/sf/oauth/domain/AuthToken.java | 42 +++++
.../java/com/sf/oauth/domain/AuthUser.java | 79 ++++++++
.../com/sf/oauth/enums/AuthDefaultSource.java | 47 +++++
.../com/sf/oauth/enums/AuthPlatformInfo.java | 51 +++++
.../com/sf/oauth/enums/AuthUserGender.java | 45 +++++
.../sf/oauth/enums/scope/AuthHuaweiScope.java | 44 +++++
.../com/sf/oauth/enums/scope/AuthScope.java | 23 +++
.../com/sf/oauth/exception/AuthException.java | 46 +++++
.../sf/oauth/request/AuthDefaultRequest.java | 177 ++++++++++++++++++
.../sf/oauth/request/AuthHuaweiRequest.java | 168 +++++++++++++++++
.../com/sf/oauth/request/AuthRequest.java | 76 ++++++++
.../com/sf/oauth/service/IAuthService.java | 15 ++
.../oauth/service/impl/IAuthServiceImpl.java | 62 ++++++
.../java/com/sf/oauth/utils/AuthChecker.java | 79 ++++++++
.../com/sf/oauth/utils/AuthScopeUtils.java | 44 +++++
.../java/com/sf/oauth/utils/AuthUtils.java | 127 +++++++++++++
27 files changed, 1507 insertions(+), 10 deletions(-)
create mode 100644 sf-oauth/pom.xml
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/config/AuthConfig.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/config/AuthSource.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/controller/RestAuthController.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/domain/AuthCallback.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/domain/AuthToken.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/domain/AuthUser.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/enums/AuthDefaultSource.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/enums/AuthPlatformInfo.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/enums/AuthUserGender.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/enums/scope/AuthHuaweiScope.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/enums/scope/AuthScope.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/exception/AuthException.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/request/AuthDefaultRequest.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/request/AuthHuaweiRequest.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/request/AuthRequest.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/service/IAuthService.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/service/impl/IAuthServiceImpl.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/utils/AuthChecker.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/utils/AuthScopeUtils.java
create mode 100644 sf-oauth/src/main/java/com/sf/oauth/utils/AuthUtils.java
diff --git a/pom.xml b/pom.xml
index 9649529..cb31587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,13 @@
${sf.version}
+
+
+ com.smarterFramework
+ sf-oauth
+ ${sf.version}
+
+
com.smarterFramework
@@ -200,7 +207,8 @@
sf-file
sf-common
sf-apijson
-
+ sf-oauth
+
pom
diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 781eeae..276a779 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -60,6 +60,12 @@
com.smarterFramework
sf-file
+
+
+ com.smarterFramework
+ sf-oauth
+
+
com.smarterFramework
sf-order
diff --git a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
index cc05d23..2bfa6b5 100644
--- a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
+++ b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
@@ -48,9 +48,10 @@ public class SysLoginController
public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session)
{
AjaxResult ajax = AjaxResult.success();
+ loginService.validateCaptcha(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
// 生成令牌
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid(), session);
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
+ session);
ajax.put(Constants.TOKEN, token);
return ajax;
}
diff --git a/sf-framework/src/main/java/com/sf/framework/config/SecurityConfig.java b/sf-framework/src/main/java/com/sf/framework/config/SecurityConfig.java
index 3585a87..801c068 100644
--- a/sf-framework/src/main/java/com/sf/framework/config/SecurityConfig.java
+++ b/sf-framework/src/main/java/com/sf/framework/config/SecurityConfig.java
@@ -112,7 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// 过滤请求
.authorizeRequests()
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
- .antMatchers("/login", "/register", "/captchaImage").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage","/oauth/**").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
index 9054eb0..737f482 100644
--- a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
+++ b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
@@ -1,6 +1,7 @@
package com.sf.framework.web.service;
import javax.annotation.Resource;
+import javax.security.auth.message.AuthException;
import javax.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,7 @@ import com.sf.framework.manager.factory.AsyncFactory;
import com.sf.framework.security.context.AuthenticationContextHolder;
import com.sf.system.service.ISysConfigService;
import com.sf.system.service.ISysUserService;
+import org.springframework.util.Assert;
/**
* 登录校验方法
@@ -56,19 +58,18 @@ public class SysLoginService
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private SysPermissionService permissionService;
+
/**
* 登录验证
- *
+ *
* @param username 用户名
* @param password 密码
- * @param code 验证码
- * @param uuid 唯一标识
* @return 结果
*/
- public String login(String username, String password, String code, String uuid, HttpSession session)
+ public String login(String username, String password, HttpSession session)
{
- // 验证码校验
- validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck(username, password);
// 用户验证
@@ -105,6 +106,25 @@ public class SysLoginService
return tokenService.createToken(loginUser);
}
+ /**
+ * 无密码登录
+ * @param userName
+ * @return
+ * @author zoukun
+ */
+ public String noPwdLogin(String userName, HttpSession session){
+ SysUser user = userService.selectUserByUserName(userName);
+ Assert.notNull(user,MessageUtils.message("user.not.exists"));
+ LoginUser loginUser = new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+ // 记录登陆信息
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_SUCCESS,
+ MessageUtils.message("user.login.success")));
+ recordLoginInfo(loginUser.getUserId());
+ ApijsonUtils.buildFormSession(session, String.valueOf(loginUser.getUserId()));
+ return tokenService.createToken(loginUser);
+ }
+
+
/**
* 校验验证码
*
diff --git a/sf-framework/src/main/java/com/sf/framework/web/service/SysPasswordService.java b/sf-framework/src/main/java/com/sf/framework/web/service/SysPasswordService.java
index 2c48b60..ab9cf6e 100644
--- a/sf-framework/src/main/java/com/sf/framework/web/service/SysPasswordService.java
+++ b/sf-framework/src/main/java/com/sf/framework/web/service/SysPasswordService.java
@@ -1,6 +1,8 @@
package com.sf.framework.web.service;
import java.util.concurrent.TimeUnit;
+
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
@@ -23,6 +25,7 @@ import com.sf.framework.security.context.AuthenticationContextHolder;
*
* @author ztzh
*/
+@Slf4j
@Component
public class SysPasswordService
{
diff --git a/sf-oauth/pom.xml b/sf-oauth/pom.xml
new file mode 100644
index 0000000..aa73cb3
--- /dev/null
+++ b/sf-oauth/pom.xml
@@ -0,0 +1,32 @@
+
+
+
+ smarterFramework
+ com.smarterFramework
+ 1.0.0
+
+ 4.0.0
+
+ sf-oauth
+
+
+ oauth三方登录认证模块
+
+
+
+
+
+
+ com.smarterFramework
+ sf-common
+
+
+ com.smarterFramework
+ sf-framework
+
+
+
+
+
\ No newline at end of file
diff --git a/sf-oauth/src/main/java/com/sf/oauth/config/AuthConfig.java b/sf-oauth/src/main/java/com/sf/oauth/config/AuthConfig.java
new file mode 100644
index 0000000..3a30f11
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/config/AuthConfig.java
@@ -0,0 +1,41 @@
+package com.sf.oauth.config;
+
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 配置类
+ *
+ * @author zoukun
+ */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthConfig {
+
+ /**
+ * 客户端id：对应各平台的appKey
+ */
+ private String clientId;
+
+ /**
+ * 客户端Secret：对应各平台的appSecret
+ */
+ private String clientSecret;
+
+ /**
+ * 登录成功后的回调地址
+ */
+ private String redirectUri;
+
+ /**
+ * 支持自定义授权平台的 scope 内容
+ */
+ private List scopes;
+
+ private boolean ignoreCheckState;
+
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/config/AuthSource.java b/sf-oauth/src/main/java/com/sf/oauth/config/AuthSource.java
new file mode 100644
index 0000000..15e6412
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/config/AuthSource.java
@@ -0,0 +1,76 @@
+package com.sf.oauth.config;
+
+import com.sf.oauth.exception.AuthException;
+import com.sf.oauth.request.AuthDefaultRequest;
+
+/**
+ * OAuth平台的API地址的统一接口，提供以下方法：
+ * 1) {@link AuthSource#authorize()}: 获取授权url. 必须实现
+ * 2) {@link AuthSource#accessToken()}: 获取accessToken的url. 必须实现
+ * 3) {@link AuthSource#userInfo()}: 获取用户信息的url. 必须实现
+ * 4) {@link AuthSource#revoke()}: 获取取消授权的url. 非必须实现接口（部分平台不支持）
+ * 5) {@link AuthSource#refresh()}: 获取刷新授权的url. 非必须实现接口（部分平台不支持）
+ *
+
+ com.smarterFramework
+ sf-order
+ ${sf.version}
+
+
com.smarterFramework
diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 276a779..067964b 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -69,8 +69,6 @@
com.smarterFramework
sf-order
- 1.0.0
- compile
From 778fe88d7c2ebc03141de7e38ef258c8412dd2c2 Mon Sep 17 00:00:00 2001
From: pengren
Date: Fri, 12 Apr 2024 13:58:57 +0800
Subject: [PATCH 039/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/index/ApplyListInfoMapper.xml | 3 +-
.../common/exception/BusinessException.java | 77 ----
sf-order/pom.xml | 34 --
.../java/com/sf/order/domain/OrderInfo.java | 367 ------------------
.../sf/order/domain/dto/OrderCreateDto.java | 59 ---
.../sf/order/domain/req/OrderListreqVo.java | 22 --
.../sf/order/domain/res/OrderListResVo.java | 53 ---
.../com/sf/order/mapper/OrderInfoMapper.java | 67 ----
.../sf/order/service/IOrderInfoService.java | 73 ----
.../service/impl/OrderInfoServiceImpl.java | 137 -------
.../mapper/order/OrderInfoMapper.xml | 172 --------
11 files changed, 2 insertions(+), 1062 deletions(-)
delete mode 100644 sf-common/src/main/java/com/sf/common/exception/BusinessException.java
delete mode 100644 sf-order/pom.xml
delete mode 100644 sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
delete mode 100644 sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
delete mode 100644 sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
delete mode 100644 sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
delete mode 100644 sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
delete mode 100644 sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
delete mode 100644 sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
delete mode 100644 sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
diff --git a/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml b/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
index 9bac81d..bcc6625 100644
--- a/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml
@@ -23,7 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
deleted file mode 100644
index 26ba14a..0000000
--- a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.sf.common.exception;
-
-
-import com.sf.common.enums.ErrorCodeTypeEnum;
-
-/**
- * @author : yswjme@163.com
- * @Title : BusinessException.java
- * @Package : com.zsmarter.ai.word.exception
- * @Descript : 业务运行时异常
- * @date : 2020-06-29 04:59:44
- * @vsersion : V1.0
- */
-public class BusinessException extends RuntimeException {
-
- private static final long serialVersionUID = 4693786499059513760L;
-
- private ErrorCodeTypeEnum errorCodeTypeEnum;
-
- private final String errorDescription;
-
- private String errorCode;
-
- public BusinessException(String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- }
-
- public BusinessException(String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- }
-
- public BusinessException(String code, String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- }
-
- public BusinessException(String code, String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- }
-
- public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription) {
- super(errorDescription);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- this.errorCodeTypeEnum = errorCodeTypeEnum;
- }
-
- public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription, Throwable t) {
- super(errorDescription, t);
- this.errorDescription = errorDescription;
- this.errorCode = code;
- this.errorCodeTypeEnum = errorCodeTypeEnum;
- }
-
- public String getErrorDescription() {
- return this.errorDescription;
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public String getErrorTitle() {
- return "业务校验失败!";
- }
-
- public ErrorCodeTypeEnum getErrorCodeTypeEnum() {
- return errorCodeTypeEnum;
- }
-
-
-}
diff --git a/sf-order/pom.xml b/sf-order/pom.xml
deleted file mode 100644
index 08b9c37..0000000
--- a/sf-order/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- smarterFramework
- com.smarterFramework
- 1.0.0
-
- 4.0.0
-
- sf-order
-
-
- order订单模块
-
-
-
-
-
-
- com.smarterFramework
- sf-common
-
-
- io.swagger.core.v3
- swagger-annotations
- 2.1.2
- compile
-
-
-
-
-
\ No newline at end of file
diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
deleted file mode 100644
index 6e165a8..0000000
--- a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
+++ /dev/null
@@ -1,367 +0,0 @@
-package com.sf.order.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sf.common.annotation.Excel;
-import com.sf.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 订单基础信息对象 ORDER_INFO
- *
- * @author ztzh
- * @date 2024-04-09
- */
-public class OrderInfo extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- private Long id;
-
- /**
- * 订单编号
- */
- @Excel(name = "订单编号")
- private Long orderNo;
-
- /**
- * 订单状态:
- * 0:待支付
- * 1:已付款
- * 2:支付超时系统结束
- * 3:已完成
- */
- @Excel(name = "订单状态: 0:待支付 1:已付款 2:支付超时系统结束 3:已完成 ")
- private Long orderStatus;
-
- /**
- * 支付方式:0-点券 1-现金
- */
- @Excel(name = "支付方式:0-点券 1-现金")
- private Long payType;
-
- /**
- * 支付渠道(支付方式为现金时)
- * 0:微信
- * 1:支付宝
- */
- @Excel(name = "支付渠道(支付方式为现金时) 0:微信 1:支付宝")
- private Long payChannel;
-
- /**
- * 订单金额
- */
- @Excel(name = "订单金额")
- private Long orderAmt;
-
- /**
- * 运费
- */
- @Excel(name = "运费")
- private Long freightAmt;
-
- /**
- * 总金额
- */
- @Excel(name = "总金额")
- private Long payAmt;
-
- /**
- * 实际支付金额
- */
- @Excel(name = "实际支付金额")
- private Long reallyAmt;
-
- /**
- * 收件方式
- * ：0-自提
- * 1-快递 2-配送
- */
- @Excel(name = "收件方式：0-自提 1-快递 2-配送")
- private Long receiveType;
-
- /**
- * 商品Id
- */
- @Excel(name = "商品Id")
- private Long goodsId;
-
- /**
- * 商户Id
- */
- @Excel(name = "商户Id")
- private Long businessId;
-
- /**
- * 收货地址配置Id
- */
- @Excel(name = "收货地址配置Id")
- private Long receiveAddrId;
-
- /**
- * 支付时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date payTime;
-
- /**
- * 订单创建人
- */
- @Excel(name = "订单创建人")
- private Long createUserId;
-
- /**
- * 最后一次更新操作人
- */
- @Excel(name = "最后一次更新操作人")
- private Long updateUserId;
-
- /**
- * 逻辑删除标识
- * 0:未删除
- * 1:已删除
- */
- @Excel(name = "逻辑删除标识 0:未删除 1:已删除")
- private Long isDelete;
-
- /**
- * 快递单号
- */
- @Excel(name = "快递单号")
- private String trackNo;
-
- /**
- * 订单类型0:自动1:手动
- */
- @Excel(name = "订单类型0:自动1:手动")
- private Long orderType;
-
- /**
- * 平台外部订单号
- */
- @Excel(name = "平台外部订单号")
- private Long outOrderNo;
-
- /**
- * 平台支付返回值
- */
- @Excel(name = "平台支付返回值")
- private String payData;
-
- /**
- * 减免金额(优惠券抵扣)
- */
- @Excel(name = "减免金额(优惠券抵扣)")
- private Long reductionAmout;
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setOrderNo(Long orderNo) {
- this.orderNo = orderNo;
- }
-
- public Long getOrderNo() {
- return orderNo;
- }
-
- public void setOrderStatus(Long orderStatus) {
- this.orderStatus = orderStatus;
- }
-
- public Long getOrderStatus() {
- return orderStatus;
- }
-
- public void setPayType(Long payType) {
- this.payType = payType;
- }
-
- public Long getPayType() {
- return payType;
- }
-
- public void setPayChannel(Long payChannel) {
- this.payChannel = payChannel;
- }
-
- public Long getPayChannel() {
- return payChannel;
- }
-
- public void setOrderAmt(Long orderAmt) {
- this.orderAmt = orderAmt;
- }
-
- public Long getOrderAmt() {
- return orderAmt;
- }
-
- public void setFreightAmt(Long freightAmt) {
- this.freightAmt = freightAmt;
- }
-
- public Long getFreightAmt() {
- return freightAmt;
- }
-
- public void setPayAmt(Long payAmt) {
- this.payAmt = payAmt;
- }
-
- public Long getPayAmt() {
- return payAmt;
- }
-
- public void setReallyAmt(Long reallyAmt) {
- this.reallyAmt = reallyAmt;
- }
-
- public Long getReallyAmt() {
- return reallyAmt;
- }
-
- public void setReceiveType(Long receiveType) {
- this.receiveType = receiveType;
- }
-
- public Long getReceiveType() {
- return receiveType;
- }
-
- public void setGoodsId(Long goodsId) {
- this.goodsId = goodsId;
- }
-
- public Long getGoodsId() {
- return goodsId;
- }
-
- public void setBusinessId(Long businessId) {
- this.businessId = businessId;
- }
-
- public Long getBusinessId() {
- return businessId;
- }
-
- public void setReceiveAddrId(Long receiveAddrId) {
- this.receiveAddrId = receiveAddrId;
- }
-
- public Long getReceiveAddrId() {
- return receiveAddrId;
- }
-
- public void setPayTime(Date payTime) {
- this.payTime = payTime;
- }
-
- public Date getPayTime() {
- return payTime;
- }
-
- public void setCreateUserId(Long createUserId) {
- this.createUserId = createUserId;
- }
-
- public Long getCreateUserId() {
- return createUserId;
- }
-
- public void setUpdateUserId(Long updateUserId) {
- this.updateUserId = updateUserId;
- }
-
- public Long getUpdateUserId() {
- return updateUserId;
- }
-
- public void setIsDelete(Long isDelete) {
- this.isDelete = isDelete;
- }
-
- public Long getIsDelete() {
- return isDelete;
- }
-
- public void setTrackNo(String trackNo) {
- this.trackNo = trackNo;
- }
-
- public String getTrackNo() {
- return trackNo;
- }
-
- public void setOrderType(Long orderType) {
- this.orderType = orderType;
- }
-
- public Long getOrderType() {
- return orderType;
- }
-
- public void setOutOrderNo(Long outOrderNo) {
- this.outOrderNo = outOrderNo;
- }
-
- public Long getOutOrderNo() {
- return outOrderNo;
- }
-
- public void setPayData(String payData) {
- this.payData = payData;
- }
-
- public String getPayData() {
- return payData;
- }
-
- public void setReductionAmout(Long reductionAmout) {
- this.reductionAmout = reductionAmout;
- }
-
- public Long getReductionAmout() {
- return reductionAmout;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("orderNo", getOrderNo())
- .append("orderStatus", getOrderStatus())
- .append("payType", getPayType())
- .append("payChannel", getPayChannel())
- .append("orderAmt", getOrderAmt())
- .append("freightAmt", getFreightAmt())
- .append("payAmt", getPayAmt())
- .append("reallyAmt", getReallyAmt())
- .append("receiveType", getReceiveType())
- .append("goodsId", getGoodsId())
- .append("businessId", getBusinessId())
- .append("receiveAddrId", getReceiveAddrId())
- .append("createTime", getCreateTime())
- .append("payTime", getPayTime())
- .append("createUserId", getCreateUserId())
- .append("updateUserId", getUpdateUserId())
- .append("isDelete", getIsDelete())
- .append("updateTime", getUpdateTime())
- .append("trackNo", getTrackNo())
- .append("orderType", getOrderType())
- .append("outOrderNo", getOutOrderNo())
- .append("payData", getPayData())
- .append("reductionAmout", getReductionAmout())
- .toString();
- }
-}
diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
deleted file mode 100644
index 0359751..0000000
--- a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.sf.order.domain.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : ztzh
- * @since : 2023/7/27
- */
-@Schema(description = "下单")
-public class OrderCreateDto {
-
- @Schema(description = "商品id")
- @NotNull(message = "商品id不能为空")
- private Long goodsId;
-
- @Schema(description = "数量")
- @NotNull(message = "数量不能唯恐")
- private Long count;
-
- @Schema(description = "金额")
- @NotNull(message = "金额不能为空")
- private Long amount;
-
- @Schema(description = "用户id")
- @NotNull(message = "用户id不能空")
- private Long userId;
-
- public Long getGoodsId() {
- return goodsId;
- }
-
- public void setGoodsId(Long goodsId) {
- this.goodsId = goodsId;
- }
- public Long getCount() {
- return count;
- }
-
- public void setCount(Long count) {
- this.count = count;
- }
-
- public Long getAmount() {
- return amount;
- }
-
- public void setAmount(Long amount) {
- this.amount = amount;
- }
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-}
diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
deleted file mode 100644
index 3cbbbd8..0000000
--- a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.sf.order.domain.req;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Data
-public class OrderListreqVo {
- /**
- * 主键id
- */
- private Long userId;
-
- /**
- * 订单类型
- */
- private Long orderStatus;
-
- private Integer pageSize;
-
- private Integer pageNo;
-
-}
diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
deleted file mode 100644
index 502a641..0000000
--- a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.sf.order.domain.res;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 活动信息详情
- *
- */
-@Data
-@Schema(name = "OrderListResVo", description = "订单列表")
-public class OrderListResVo {
- /**
- * 主键id
- */
- private Long id;
-
- /**
- * 订单编号
- */
- private String orderNo;
-
- /**
- * 订单状态:
- * 0:待支付
- * 1:已付款
- * 2:支付超时系统结束
- * 3:已完成
- */
- private Long orderStatus;
-
- /**
- * 订单金额
- */
- private Long orderAmt;
-
- /**
- * 商品标题
- */
- private String productTitle;
-
- /**
- * 商品规格
- */
- private Integer goodsSpec;
- /**
- * 商品数量
- */
- private Integer goodsCount = 1;
-
-}
diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
deleted file mode 100644
index b4f9f31..0000000
--- a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.sf.order.mapper;
-
-import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.req.OrderListreqVo;
-import com.sf.order.domain.res.OrderListResVo;
-
-import java.util.List;
-
-
-/**
- * 订单基础信息Mapper接口
- *
- * @author ztzh
- * @date 2024-04-09
- */
-public interface OrderInfoMapper {
- /**
- * 查询订单基础信息
- *
- * @param id 订单基础信息主键
- * @return 订单基础信息
- */
- public OrderInfo selectOrderInfoById(Long id);
-
- /**
- * 查询订单基础信息列表
- *
- * @param orderInfo 订单基础信息
- * @return 订单基础信息集合
- */
- public List selectOrderInfoList(OrderInfo orderInfo);
-
-
- List queryList(OrderListreqVo vo);
-
- /**
- * 新增订单基础信息
- *
- * @param orderInfo 订单基础信息
- * @return 结果
- */
- public int insertOrderInfo(OrderInfo orderInfo);
-
- /**
- * 修改订单基础信息
- *
- * @param orderInfo 订单基础信息
- * @return 结果
- */
- public int updateOrderInfo(OrderInfo orderInfo);
-
- /**
- * 删除订单基础信息
- *
- * @param id 订单基础信息主键
- * @return 结果
- */
- public int deleteOrderInfoById(Long id);
-
- /**
- * 批量删除订单基础信息
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteOrderInfoByIds(Long[] ids);
-}
diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
deleted file mode 100644
index c63358f..0000000
--- a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.sf.order.service;
-
-
-import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
-import com.sf.order.domain.res.OrderListResVo;
-
-import java.util.List;
-
-/**
- * 订单基础信息Service接口
- *
- * @author ztzh
- * @date 2024-04-09
- */
-public interface IOrderInfoService
-{
- /**
- * 查询订单基础信息
- *
- * @param id 订单基础信息主键
- * @return 订单基础信息
- */
- public OrderInfo selectOrderInfoById(Long id);
-
- /**
- * 查询订单基础信息列表
- *
- * @param orderInfo 订单基础信息
- * @return 订单基础信息集合
- */
- public List selectOrderInfoList(OrderInfo orderInfo);
-
- /**
- * 查询订单基础信息列表
- */
- List queryList(OrderListreqVo vo);
-
- /**
- * 新增订单基础信息
- *
- * @param orderInfo 订单基础信息
- * @return 结果
- */
- public int createOrder(OrderCreateDto orderInfo);
-
- /**
- * 修改订单基础信息
- *
- * @param orderInfo 订单基础信息
- * @return 结果
- */
- public int updateOrderInfo(OrderInfo orderInfo);
-
- /**
- * 批量删除订单基础信息
- *
- * @param ids 需要删除的订单基础信息主键集合
- * @return 结果
- */
- public int deleteOrderInfoByIds(Long[] ids);
-
- /**
- * 删除订单基础信息信息
- *
- * @param id 订单基础信息主键
- * @return 结果
- */
- public int deleteOrderInfoById(Long id);
-
- void orderPay(Long orderId);
-}
diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
deleted file mode 100644
index 315b818..0000000
--- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.sf.order.service.impl;
-
-import java.util.List;
-
-import com.sf.common.exception.BusinessException;
-import com.sf.common.utils.DateUtils;
-import com.sf.common.utils.SnowflakeIdWorker;
-import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
-import com.sf.order.domain.res.OrderListResVo;
-import com.sf.order.mapper.OrderInfoMapper;
-import com.sf.order.service.IOrderInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * 订单基础信息Service业务层处理
- *
- * @author ztzh
- * @date 2024-04-09
- */
-@Service
-public class OrderInfoServiceImpl implements IOrderInfoService
-{
- @Resource
- private OrderInfoMapper orderInfoMapper;
- @Resource
- private SnowflakeIdWorker snowflakeIdWorker;
-
- /**
- * 查询订单基础信息
- *
- * @param id 订单基础信息主键
- * @return 订单基础信息
- */
- @Override
- public OrderInfo selectOrderInfoById(Long id)
- {
- return orderInfoMapper.selectOrderInfoById(id);
- }
-
- /**
- * 查询订单基础信息列表
- *
- * @param orderInfo 订单基础信息
- * @return 订单基础信息
- */
- @Override
- public List selectOrderInfoList(OrderInfo orderInfo)
- {
- return orderInfoMapper.selectOrderInfoList(orderInfo);
- }
- public List queryList(OrderListreqVo vo)
- {
- return orderInfoMapper.queryList(vo);
- }
-
- /**
- * 新增订单基础信息
- *
- * @param orderCreateDto 订单基础信息
- * @return 结果
- */
- @Override
- public int createOrder(OrderCreateDto orderCreateDto)
- {
- OrderInfo orderInfo = new OrderInfo();
- orderInfo.setOrderNo(snowflakeIdWorker.nextId());
- orderInfo.setPayType(0L);
- orderInfo.setReceiveType(0L);
- orderInfo.setOrderStatus(0l);
- orderInfo.setCreateUserId(orderCreateDto.getUserId());
- orderInfo.setUpdateUserId(orderCreateDto.getUserId());
- orderInfo.setGoodsId(orderCreateDto.getGoodsId());
- orderInfo.setOrderAmt(orderCreateDto.getAmount());
- orderInfo.setPayAmt(orderCreateDto.getAmount());
- orderInfo.setCreateTime(DateUtils.getNowDate());
- orderInfo.setUpdateTime(DateUtils.getNowDate());
- return orderInfoMapper.insertOrderInfo(orderInfo);
- }
-
- /**
- * 修改订单基础信息
- *
- * @param orderInfo 订单基础信息
- * @return 结果
- */
- @Override
- public int updateOrderInfo(OrderInfo orderInfo)
- {
- orderInfo.setUpdateTime(DateUtils.getNowDate());
- return orderInfoMapper.updateOrderInfo(orderInfo);
- }
- @Override
- public void orderPay(Long orderId) {
- OrderInfo updateOrder = this.selectOrderInfoById(orderId);
- if (updateOrder == null) {
- throw new BusinessException("订单缺失！");
- }
-// if (!OrderInfoConstant.ORDER_WAITING_FOR_PAYMENT.equals(orderInfo.getOrderStatus())) {
-// throw new BusinessException("订单状态异常！");
-// }
- updateOrder.setOrderStatus(1L);
- updateOrder.setPayTime(DateUtils.getNowDate());
- // 修改订单状态
- if (1>this.updateOrderInfo(updateOrder)) {
- throw new BusinessException("支付异常，请联系管理员!");
- }
- }
-
- /**
- * 批量删除订单基础信息
- *
- * @param ids 需要删除的订单基础信息主键
- * @return 结果
- */
- @Override
- public int deleteOrderInfoByIds(Long[] ids)
- {
- return orderInfoMapper.deleteOrderInfoByIds(ids);
- }
-
- /**
- * 删除订单基础信息信息
- *
- * @param id 订单基础信息主键
- * @return 结果
- */
- @Override
- public int deleteOrderInfoById(Long id)
- {
- return orderInfoMapper.deleteOrderInfoById(id);
- }
-
-}
diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
deleted file mode 100644
index 811f46a..0000000
--- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
-
-
-
-
- select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
- select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
-
-
-
-
-
-
- insert into ORDER_INFO
-
- id,
- order_no,
- order_status,
- pay_type,
- pay_channel,
- order_amt,
- freight_amt,
- pay_amt,
- really_amt,
- receive_type,
- goods_id,
- business_id,
- receive_addr_id,
- create_time,
- pay_time,
- create_user_id,
- update_user_id,
- is_delete,
- update_time,
- track_no,
- order_type,
- out_order_no,
- pay_data,
- reduction_amout,
-
-
- #{id},
- #{orderNo},
- #{orderStatus},
- #{payType},
- #{payChannel},
- #{orderAmt},
- #{freightAmt},
- #{payAmt},
- #{reallyAmt},
- #{receiveType},
- #{goodsId},
- #{businessId},
- #{receiveAddrId},
- #{createTime},
- #{payTime},
- #{createUserId},
- #{updateUserId},
- #{isDelete},
- #{updateTime},
- #{trackNo},
- #{orderType},
- #{outOrderNo},
- #{payData},
- #{reductionAmout},
-
-
-
-
- update ORDER_INFO
-
- order_no = #{orderNo},
- order_status = #{orderStatus},
- pay_type = #{payType},
- pay_channel = #{payChannel},
- order_amt = #{orderAmt},
- freight_amt = #{freightAmt},
- pay_amt = #{payAmt},
- really_amt = #{reallyAmt},
- receive_type = #{receiveType},
- goods_id = #{goodsId},
- business_id = #{businessId},
- receive_addr_id = #{receiveAddrId},
- create_time = #{createTime},
- pay_time = #{payTime},
- create_user_id = #{createUserId},
- update_user_id = #{updateUserId},
- is_delete = #{isDelete},
- update_time = #{updateTime},
- track_no = #{trackNo},
- order_type = #{orderType},
- out_order_no = #{outOrderNo},
- pay_data = #{payData},
- reduction_amout = #{reductionAmout},
-
- where id = #{id}
-
-
-
- delete from ORDER_INFO where id = #{id}
-
-
-
- delete from ORDER_INFO where id in
-
- #{id}
-
-
-
\ No newline at end of file
From 2efac23978e6c772f6f409caf9d39bfed0d40966 Mon Sep 17 00:00:00 2001
From: pengren
Date: Fri, 12 Apr 2024 14:06:38 +0800
Subject: [PATCH 040/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-admin/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 067964b..3603c72 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -66,10 +66,6 @@
sf-oauth
-
- com.smarterFramework
- sf-order
-
From aa13c22813c2a2c00bdcc15bcc55431345c596e2 Mon Sep 17 00:00:00 2001
From: yin fuxian
Date: Fri, 12 Apr 2024 15:09:52 +0800
Subject: [PATCH 041/118] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/permission.js | 17 +++++++++++++++--
sf-ui/src/store/modules/user.js | 9 +++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/sf-ui/src/permission.js b/sf-ui/src/permission.js
index 4af59ff..73fd6bf 100644
--- a/sf-ui/src/permission.js
+++ b/sf-ui/src/permission.js
@@ -5,10 +5,12 @@ import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isRelogin } from '@/utils/request'
+import { getApplicationId } from './utils/application'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register']
+const needApplicationList = ['/build/installationList', '/build/whiteListManagement', '/build/publish']
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -25,7 +27,9 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then(() => {
isRelogin.show = false
if (to.path === '/index') {
- next()
+ next();
+ } else if (checkApplication(to.path)) {
+ next({ path: '/' })
} else {
store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
@@ -40,7 +44,12 @@ router.beforeEach((to, from, next) => {
})
})
} else {
- next()
+ if (checkApplication(to.path)) {
+ next({ path: '/' })
+ NProgress.done()
+ } else {
+ next()
+ }
}
}
} else {
@@ -55,6 +64,10 @@ router.beforeEach((to, from, next) => {
}
})
+function checkApplication(path) {
+ return needApplicationList.includes(path) && !getApplicationId();
+}
+
router.afterEach(() => {
NProgress.done()
})
diff --git a/sf-ui/src/store/modules/user.js b/sf-ui/src/store/modules/user.js
index 7b8ffd8..a53c413 100644
--- a/sf-ui/src/store/modules/user.js
+++ b/sf-ui/src/store/modules/user.js
@@ -31,7 +31,7 @@ const user = {
},
SET_APPLICATION: (state, applicationInfo) => {
const { id } = applicationInfo;
- state.applicationId = id;
+ state.applicationId = id || '';
state.applicationInfo = applicationInfo;
},
},
@@ -106,7 +106,12 @@ const user = {
// 设置选中的项目应用信息
SetApplication({ commit }, applicationInfo) {
commit('SET_APPLICATION', applicationInfo)
- setApplicationId(applicationInfo?.id);
+ const { id } = applicationInfo || {};
+ if (id) {
+ setApplicationId(applicationInfo.id);
+ } else {
+ removeApplicationId();
+ }
}
}
}
From 09c37a069bb70f4491b3773738a3d441bd167a63 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Fri, 12 Apr 2024 15:46:15 +0800
Subject: [PATCH 042/118] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/sf/web/controller/system/SysLoginController.java | 3 +--
.../java/com/sf/framework/web/service/SysLoginService.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
index 2bfa6b5..27c4781 100644
--- a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
+++ b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
@@ -48,10 +48,9 @@ public class SysLoginController
public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session)
{
AjaxResult ajax = AjaxResult.success();
- loginService.validateCaptcha(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
- session);
+ loginBody.getCode(),loginBody.getUuid(), session);
ajax.put(Constants.TOKEN, token);
return ajax;
}
diff --git a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
index 737f482..6ad43d9 100644
--- a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
+++ b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
@@ -68,8 +68,10 @@ public class SysLoginService
* @param password 密码
* @return 结果
*/
- public String login(String username, String password, HttpSession session)
+ public String login(String username, String password, String code, String uuid, HttpSession session)
{
+ // 验证码校验
+ validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck(username, password);
// 用户验证
From 2a9933b1ba40617cc7adfcaffbc2c50957f62900 Mon Sep 17 00:00:00 2001
From: yin fuxian
Date: Fri, 12 Apr 2024 15:09:52 +0800
Subject: [PATCH 043/118] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/permission.js | 17 +++++++++++++++--
sf-ui/src/store/modules/user.js | 9 +++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/sf-ui/src/permission.js b/sf-ui/src/permission.js
index 4af59ff..73fd6bf 100644
--- a/sf-ui/src/permission.js
+++ b/sf-ui/src/permission.js
@@ -5,10 +5,12 @@ import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isRelogin } from '@/utils/request'
+import { getApplicationId } from './utils/application'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register']
+const needApplicationList = ['/build/installationList', '/build/whiteListManagement', '/build/publish']
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -25,7 +27,9 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then(() => {
isRelogin.show = false
if (to.path === '/index') {
- next()
+ next();
+ } else if (checkApplication(to.path)) {
+ next({ path: '/' })
} else {
store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
@@ -40,7 +44,12 @@ router.beforeEach((to, from, next) => {
})
})
} else {
- next()
+ if (checkApplication(to.path)) {
+ next({ path: '/' })
+ NProgress.done()
+ } else {
+ next()
+ }
}
}
} else {
@@ -55,6 +64,10 @@ router.beforeEach((to, from, next) => {
}
})
+function checkApplication(path) {
+ return needApplicationList.includes(path) && !getApplicationId();
+}
+
router.afterEach(() => {
NProgress.done()
})
diff --git a/sf-ui/src/store/modules/user.js b/sf-ui/src/store/modules/user.js
index 7b8ffd8..a53c413 100644
--- a/sf-ui/src/store/modules/user.js
+++ b/sf-ui/src/store/modules/user.js
@@ -31,7 +31,7 @@ const user = {
},
SET_APPLICATION: (state, applicationInfo) => {
const { id } = applicationInfo;
- state.applicationId = id;
+ state.applicationId = id || '';
state.applicationInfo = applicationInfo;
},
},
@@ -106,7 +106,12 @@ const user = {
// 设置选中的项目应用信息
SetApplication({ commit }, applicationInfo) {
commit('SET_APPLICATION', applicationInfo)
- setApplicationId(applicationInfo?.id);
+ const { id } = applicationInfo || {};
+ if (id) {
+ setApplicationId(applicationInfo.id);
+ } else {
+ removeApplicationId();
+ }
}
}
}
From ceeeea9bca6ced4fd9de7c6c52c48dc411f833b5 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Fri, 12 Apr 2024 15:46:15 +0800
Subject: [PATCH 044/118] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/sf/web/controller/system/SysLoginController.java | 3 +--
.../java/com/sf/framework/web/service/SysLoginService.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
index 2bfa6b5..27c4781 100644
--- a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
+++ b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
@@ -48,10 +48,9 @@ public class SysLoginController
public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session)
{
AjaxResult ajax = AjaxResult.success();
- loginService.validateCaptcha(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
- session);
+ loginBody.getCode(),loginBody.getUuid(), session);
ajax.put(Constants.TOKEN, token);
return ajax;
}
diff --git a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
index 737f482..6ad43d9 100644
--- a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
+++ b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
@@ -68,8 +68,10 @@ public class SysLoginService
* @param password 密码
* @return 结果
*/
- public String login(String username, String password, HttpSession session)
+ public String login(String username, String password, String code, String uuid, HttpSession session)
{
+ // 验证码校验
+ validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck(username, password);
// 用户验证
From af78ff681935ab7771163d151d1541359310855e Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Fri, 12 Apr 2024 18:03:51 +0800
Subject: [PATCH 045/118] =?UTF-8?q?=E8=B0=83=E6=95=B4nginx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/nginx.conf | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/sf-ui/nginx.conf b/sf-ui/nginx.conf
index fd3b825..b646e88 100644
--- a/sf-ui/nginx.conf
+++ b/sf-ui/nginx.conf
@@ -11,31 +11,41 @@ http {
sendfile on;
keepalive_timeout 65;
- #gzip on;
+ gzip on;
server {
listen 80;
server_name localhost;
- charset utf-8;
location / {
- root /app/nginx/html;
- try_files $uri $uri/ @router;
- index index.html index.htm;
- }
-
- location @router {
- rewrite ^.*$ /index.html last;
+ root /app/nginx/html;
+ index index.html;
+ # try_files $uri $uri/ /index.html;
+ if ($request_filename ~* ^.*?.(html|htm)$) {
+ add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate";
+ }
}
location /stage-api/ {
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header REMOTE-HOST $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass http://192.168.1.23:22009/;
+ proxy_ignore_client_abort on;
+ client_max_body_size 600M;
+ client_body_buffer_size 600M;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-NginX-Proxy true;
+ add_header Access-Control-Allow-Origin $http_origin;
+ add_header Access-Control-Allow-Method GET,POST,OPTIONS;
+ add_header Access-Control-Allow-Headers version,location,lat,long,device,did,macaws_sign;
+ proxy_pass http://zt-sac-java:7781/;
}
+
+ location /file {
+ alias /file;
+ }
+
+ #error_page 404 /404.html;
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
From 9e9242bb8dd81304df060035dfd87288b6519dda Mon Sep 17 00:00:00 2001
From: ztzh_xieyun
Date: Fri, 12 Apr 2024 18:08:55 +0800
Subject: [PATCH 046/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?=
=?UTF-8?q?=E7=BD=91=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/vue.config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-ui/vue.config.js b/sf-ui/vue.config.js
index a22ab37..16212b1 100644
--- a/sf-ui/vue.config.js
+++ b/sf-ui/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.1.23:22009`,
+ target: `http://172.24.0.2:7781`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
From 86dbb5179372ed6a7b0ede1f9daf72bfec61960d Mon Sep 17 00:00:00 2001
From: ztzh_xieyun
Date: Fri, 12 Apr 2024 18:17:35 +0800
Subject: [PATCH 047/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E5=90=8E?=
=?UTF-8?q?=E7=AB=AFip=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/nginx.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sf-ui/nginx.conf b/sf-ui/nginx.conf
index b646e88..17defe3 100644
--- a/sf-ui/nginx.conf
+++ b/sf-ui/nginx.conf
@@ -37,7 +37,7 @@ http {
add_header Access-Control-Allow-Origin $http_origin;
add_header Access-Control-Allow-Method GET,POST,OPTIONS;
add_header Access-Control-Allow-Headers version,location,lat,long,device,did,macaws_sign;
- proxy_pass http://zt-sac-java:7781/;
+ proxy_pass http://172.24.0.2:7781/;
}
From c40002ca5bcb4951fd6be4c95346c20aaef252f2 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Fri, 12 Apr 2024 18:27:27 +0800
Subject: [PATCH 048/118] =?UTF-8?q?=E8=B0=83=E6=95=B4nginx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/nginx.conf | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/sf-ui/nginx.conf b/sf-ui/nginx.conf
index 17defe3..b701f98 100644
--- a/sf-ui/nginx.conf
+++ b/sf-ui/nginx.conf
@@ -11,41 +11,31 @@ http {
sendfile on;
keepalive_timeout 65;
- gzip on;
+ #gzip on;
server {
listen 80;
server_name localhost;
+ charset utf-8;
location / {
- root /app/nginx/html;
- index index.html;
- # try_files $uri $uri/ /index.html;
- if ($request_filename ~* ^.*?.(html|htm)$) {
- add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate";
- }
+ root /app/nginx/html;
+ try_files $uri $uri/ @router;
+ index index.html index.htm;
+ }
+
+ location @router {
+ rewrite ^.*$ /index.html last;
}
location /stage-api/ {
- proxy_ignore_client_abort on;
- client_max_body_size 600M;
- client_body_buffer_size 600M;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-NginX-Proxy true;
- add_header Access-Control-Allow-Origin $http_origin;
- add_header Access-Control-Allow-Method GET,POST,OPTIONS;
- add_header Access-Control-Allow-Headers version,location,lat,long,device,did,macaws_sign;
- proxy_pass http://172.24.0.2:7781/;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://zt-sac-java:7781/;
}
-
- location /file {
- alias /file;
- }
-
- #error_page 404 /404.html;
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
From 8f96699299e3cf8f4a9a27b2e81478b7520ea971 Mon Sep 17 00:00:00 2001
From: pengren
Date: Mon, 15 Apr 2024 11:47:31 +0800
Subject: [PATCH 049/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order/controller/OrderInfoController.java | 20 +++++++---------
...rderListreqVo.java => OrderListReqVo.java} | 2 +-
.../sf/order/domain/res/OrderListResVo.java | 4 ++++
.../com/sf/order/mapper/OrderInfoMapper.java | 4 ++--
.../sf/order/service/IOrderInfoService.java | 4 ++--
.../service/impl/OrderInfoServiceImpl.java | 4 ++--
.../mapper/order/OrderInfoMapper.xml | 24 +++++++++++++++----
7 files changed, 39 insertions(+), 23 deletions(-)
rename sf-admin/src/main/java/com/sf/order/domain/req/{OrderListreqVo.java => OrderListReqVo.java} (89%)
diff --git a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
index c1e356d..d887548 100644
--- a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
+++ b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -3,12 +3,14 @@ package com.sf.order.controller;
import com.sf.common.annotation.Log;
import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.domain.entity.SysUser;
import com.sf.common.core.page.TableDataInfo;
import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.SecurityUtils;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import com.sf.order.service.IOrderInfoService;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,21 +37,15 @@ public class OrderInfoController extends BaseController {
* 查询订单基础信息列表
*/
@GetMapping("/list")
- public TableDataInfo list(OrderInfo orderInfo) {
+ public TableDataInfo list(OrderListReqVo vo) {
startPage();
- List list = orderInfoService.selectOrderInfoList(orderInfo);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ vo.setUserId(user.getUserId());
+ List list = orderInfoService.queryList(vo);
+ logger.info("prderList"+list);
return getDataTable(list);
}
- /**
- * 查询订单基础信息列表
- */
- @GetMapping("/query/list")
- public TableDataInfo queryList(OrderListreqVo vo) {
- startPage();
- List list = orderInfoService.queryList(vo);
- return getDataTable(list);
- }
/**
* 导出订单基础信息列表
diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
similarity index 89%
rename from sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
index 52b41c9..98b755a 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
@@ -3,7 +3,7 @@ package com.sf.order.domain.req;
import lombok.Data;
@Data
-public class OrderListreqVo {
+public class OrderListReqVo {
/**
* 主键id
*/
diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index b5cda3e..7d13bd1 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -38,6 +38,10 @@ public class OrderListResVo {
* 商品标题
*/
private String productTitle;
+ /**
+ * 图片
+ */
+ private String productPicture;
/**
* 商品规格
diff --git a/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
index b4f9f31..dfb2950 100644
--- a/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
+++ b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
@@ -1,7 +1,7 @@
package com.sf.order.mapper;
import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import java.util.List;
@@ -31,7 +31,7 @@ public interface OrderInfoMapper {
public List selectOrderInfoList(OrderInfo orderInfo);
- List queryList(OrderListreqVo vo);
+ List queryList(OrderListReqVo vo);
/**
* 新增订单基础信息
diff --git a/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
index c63358f..26210aa 100644
--- a/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
+++ b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
@@ -3,7 +3,7 @@ package com.sf.order.service;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import java.util.List;
@@ -35,7 +35,7 @@ public interface IOrderInfoService
/**
* 查询订单基础信息列表
*/
- List queryList(OrderListreqVo vo);
+ List queryList(OrderListReqVo vo);
/**
* 新增订单基础信息
diff --git a/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 834cb65..5e3edda 100644
--- a/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -5,7 +5,7 @@ import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SnowflakeIdWorker;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import com.sf.order.mapper.OrderInfoMapper;
import com.sf.order.service.IOrderInfoService;
@@ -51,7 +51,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
{
return orderInfoMapper.selectOrderInfoList(orderInfo);
}
- public List queryList(OrderListreqVo vo)
+ public List queryList(OrderListReqVo vo)
{
return orderInfoMapper.queryList(vo);
}
diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index e9141e7..e2a305d 100644
--- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -30,12 +30,23 @@
+
select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
- select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+ SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
+ FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
+
+
-
insert into ORDER_INFO
From 1d276d5862b4b6175d8d0fba5d76ee4f7814d5f9 Mon Sep 17 00:00:00 2001
From: pengren
Date: Mon, 15 Apr 2024 11:47:31 +0800
Subject: [PATCH 050/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order/controller/OrderInfoController.java | 20 +++++++---------
...rderListreqVo.java => OrderListReqVo.java} | 2 +-
.../sf/order/domain/res/OrderListResVo.java | 4 ++++
.../com/sf/order/mapper/OrderInfoMapper.java | 4 ++--
.../sf/order/service/IOrderInfoService.java | 4 ++--
.../service/impl/OrderInfoServiceImpl.java | 4 ++--
.../mapper/order/OrderInfoMapper.xml | 24 +++++++++++++++----
7 files changed, 39 insertions(+), 23 deletions(-)
rename sf-admin/src/main/java/com/sf/order/domain/req/{OrderListreqVo.java => OrderListReqVo.java} (89%)
diff --git a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
index c1e356d..d887548 100644
--- a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
+++ b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -3,12 +3,14 @@ package com.sf.order.controller;
import com.sf.common.annotation.Log;
import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.domain.entity.SysUser;
import com.sf.common.core.page.TableDataInfo;
import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.SecurityUtils;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import com.sf.order.service.IOrderInfoService;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,21 +37,15 @@ public class OrderInfoController extends BaseController {
* 查询订单基础信息列表
*/
@GetMapping("/list")
- public TableDataInfo list(OrderInfo orderInfo) {
+ public TableDataInfo list(OrderListReqVo vo) {
startPage();
- List list = orderInfoService.selectOrderInfoList(orderInfo);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ vo.setUserId(user.getUserId());
+ List list = orderInfoService.queryList(vo);
+ logger.info("prderList"+list);
return getDataTable(list);
}
- /**
- * 查询订单基础信息列表
- */
- @GetMapping("/query/list")
- public TableDataInfo queryList(OrderListreqVo vo) {
- startPage();
- List list = orderInfoService.queryList(vo);
- return getDataTable(list);
- }
/**
* 导出订单基础信息列表
diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
similarity index 89%
rename from sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
index 52b41c9..98b755a 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
@@ -3,7 +3,7 @@ package com.sf.order.domain.req;
import lombok.Data;
@Data
-public class OrderListreqVo {
+public class OrderListReqVo {
/**
* 主键id
*/
diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index b5cda3e..7d13bd1 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -38,6 +38,10 @@ public class OrderListResVo {
* 商品标题
*/
private String productTitle;
+ /**
+ * 图片
+ */
+ private String productPicture;
/**
* 商品规格
diff --git a/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
index b4f9f31..dfb2950 100644
--- a/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
+++ b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
@@ -1,7 +1,7 @@
package com.sf.order.mapper;
import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import java.util.List;
@@ -31,7 +31,7 @@ public interface OrderInfoMapper {
public List selectOrderInfoList(OrderInfo orderInfo);
- List queryList(OrderListreqVo vo);
+ List queryList(OrderListReqVo vo);
/**
* 新增订单基础信息
diff --git a/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
index c63358f..26210aa 100644
--- a/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
+++ b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
@@ -3,7 +3,7 @@ package com.sf.order.service;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import java.util.List;
@@ -35,7 +35,7 @@ public interface IOrderInfoService
/**
* 查询订单基础信息列表
*/
- List queryList(OrderListreqVo vo);
+ List queryList(OrderListReqVo vo);
/**
* 新增订单基础信息
diff --git a/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 834cb65..5e3edda 100644
--- a/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -5,7 +5,7 @@ import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SnowflakeIdWorker;
import com.sf.order.domain.OrderInfo;
import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
import com.sf.order.domain.res.OrderListResVo;
import com.sf.order.mapper.OrderInfoMapper;
import com.sf.order.service.IOrderInfoService;
@@ -51,7 +51,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
{
return orderInfoMapper.selectOrderInfoList(orderInfo);
}
- public List queryList(OrderListreqVo vo)
+ public List queryList(OrderListReqVo vo)
{
return orderInfoMapper.queryList(vo);
}
diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index e9141e7..e2a305d 100644
--- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -30,12 +30,23 @@
+
select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
- select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+ SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
+ FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
+
+
-
insert into ORDER_INFO
From 2f77f047a5d56a7b5cb6312830f7ddebf9f7b9ea Mon Sep 17 00:00:00 2001
From: pengren
Date: Mon, 15 Apr 2024 13:50:51 +0800
Subject: [PATCH 051/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/sf/order/domain/req/OrderListReqVo.java | 6 +++++-
.../main/java/com/sf/order/domain/res/OrderListResVo.java | 2 +-
.../src/main/resources/mapper/order/OrderInfoMapper.xml | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
index 98b755a..c0e0d17 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
@@ -1,9 +1,13 @@
package com.sf.order.domain.req;
+import com.sf.common.core.domain.BaseEntity;
import lombok.Data;
@Data
-public class OrderListReqVo {
+public class OrderListReqVo extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
/**
* 主键id
*/
diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index 7d13bd1..1c7a63d 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -46,7 +46,7 @@ public class OrderListResVo {
/**
* 商品规格
*/
- private Integer goodsSpec;
+ private String goodsSpec;
/**
* 商品数量
*/
diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index e2a305d..207b139 100644
--- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -44,7 +44,7 @@
select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
+
SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
@@ -77,10 +77,10 @@
From c3ee24aeccf7358c4b4157e635cd255c1273eeb7 Mon Sep 17 00:00:00 2001
From: pengren
Date: Mon, 15 Apr 2024 13:50:51 +0800
Subject: [PATCH 052/118] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/sf/order/domain/req/OrderListReqVo.java | 6 +++++-
.../main/java/com/sf/order/domain/res/OrderListResVo.java | 2 +-
.../src/main/resources/mapper/order/OrderInfoMapper.xml | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
index 98b755a..c0e0d17 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
@@ -1,9 +1,13 @@
package com.sf.order.domain.req;
+import com.sf.common.core.domain.BaseEntity;
import lombok.Data;
@Data
-public class OrderListReqVo {
+public class OrderListReqVo extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
/**
* 主键id
*/
diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index 7d13bd1..1c7a63d 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -46,7 +46,7 @@ public class OrderListResVo {
/**
* 商品规格
*/
- private Integer goodsSpec;
+ private String goodsSpec;
/**
* 商品数量
*/
diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index e2a305d..207b139 100644
--- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -44,7 +44,7 @@
select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
+
SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
@@ -77,10 +77,10 @@
From 0e1238636acf69e21d0d1ea35d25bb8a89515438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Mon, 15 Apr 2024 17:51:38 +0800
Subject: [PATCH 053/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8E=9F?=
=?UTF-8?q?=E5=9E=8B=E7=99=BD=E5=90=8D=E5=8D=95=E7=9A=84=E9=83=A8=E5=88=86?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/router/index.js | 15 ++
.../FDS/publishList/components/addPack.vue | 43 ++---
sf-ui/src/views/FDS/publishList/index.vue | 156 +++++++++--------
.../src/views/FDS/whiteListManagement/add.vue | 59 ++++---
.../FDS/whiteListManagement/addConfig.vue | 86 ++++------
.../components/editWhiteList.vue | 61 +++----
.../views/FDS/whiteListManagement/detail.vue | 135 +++++----------
.../views/FDS/whiteListManagement/edit.vue | 140 ++++++++++++++++
.../FDS/whiteListManagement/equepDetail.vue | 131 ++++++---------
.../views/FDS/whiteListManagement/index.vue | 157 +++++++++---------
sf-ui/vue.config.js | 80 ++++-----
11 files changed, 555 insertions(+), 508 deletions(-)
create mode 100644 sf-ui/src/views/FDS/whiteListManagement/edit.vue
diff --git a/sf-ui/src/router/index.js b/sf-ui/src/router/index.js
index 771b17a..b119016 100644
--- a/sf-ui/src/router/index.js
+++ b/sf-ui/src/router/index.js
@@ -266,6 +266,21 @@ export const dynamicRoutes = [
]
},
+ {
+ path: '/build/whiteList',
+ component: Layout,
+ hidden: true,
+ permissions: ['build:whiteListManagement:equepDetail'],
+ children: [
+ {
+ path: 'equepDetail',
+ component: () => import('@/views/FDS/whiteListManagement/equepDetail'),
+ name: 'WhiteListManagementEquepDetail',
+ meta: { title: '白名单设备详情', activeMenu: '/build/whiteListManagement' }
+ }
+ ]
+ },
+
{
path: '/build/whiteList',
component: Layout,
diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue
index 7523554..713d6b6 100644
--- a/sf-ui/src/views/FDS/publishList/components/addPack.vue
+++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue
@@ -9,11 +9,11 @@
>
@@ -33,14 +33,14 @@
-
-
+
+
+
+
diff --git a/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue b/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue
index dbb9e8c..4cd8978 100644
--- a/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue
+++ b/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue
@@ -3,11 +3,11 @@
@@ -19,13 +19,13 @@
批量删除
@@ -39,41 +39,45 @@
编辑
删除
-
From d6d992ca44a021c3d44dcb6856b74b83f11fc508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Tue, 23 Apr 2024 16:38:09 +0800
Subject: [PATCH 079/118] =?UTF-8?q?fix:=20=E5=AF=B9=E6=8E=A5=E5=8F=91?=
=?UTF-8?q?=E5=B8=83=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/store/modules/user.js | 35 ++-
sf-ui/src/utils/application.js | 41 ++-
sf-ui/src/views/FDS/installationList/add.vue | 22 +-
.../src/views/FDS/installationList/detail.vue | 8 +-
sf-ui/src/views/FDS/installationList/edit.vue | 22 +-
.../src/views/FDS/installationList/index.vue | 68 ++---
.../FDS/publishList/components/addPack.vue | 24 +-
sf-ui/src/views/deployment/module/index.vue | 153 ++++++------
.../deployment/publish/component/detail.vue | 235 ++++++++++++++++++
sf-ui/src/views/deployment/publish/index.vue | 112 +++++++--
10 files changed, 526 insertions(+), 194 deletions(-)
create mode 100644 sf-ui/src/views/deployment/publish/component/detail.vue
diff --git a/sf-ui/src/store/modules/user.js b/sf-ui/src/store/modules/user.js
index a53c413..70fa8da 100644
--- a/sf-ui/src/store/modules/user.js
+++ b/sf-ui/src/store/modules/user.js
@@ -1,6 +1,12 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import { getApplicationId, setApplicationId, removeApplicationId } from '@/utils/application'
+import { getInfo, login, logout } from '@/api/login'
+import { getToken, removeToken, setToken } from '@/utils/auth'
+import {
+ getApplicationId,
+ removeApplicationId,
+ removeApplicationName,
+ setApplicationId,
+ setApplicationName
+} from '@/utils/application'
const user = {
state: {
@@ -10,7 +16,7 @@ const user = {
roles: [],
permissions: [],
applicationId: getApplicationId(),
- applicationInfo: {}, // 用户选中的项目/应用
+ applicationInfo: {} // 用户选中的项目/应用
},
mutations: {
@@ -30,10 +36,10 @@ const user = {
state.permissions = permissions
},
SET_APPLICATION: (state, applicationInfo) => {
- const { id } = applicationInfo;
- state.applicationId = id || '';
- state.applicationInfo = applicationInfo;
- },
+ const { id } = applicationInfo
+ state.applicationId = id || ''
+ state.applicationInfo = applicationInfo
+ }
},
actions: {
@@ -59,7 +65,7 @@ const user = {
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ const avatar = (user.avatar == '' || user.avatar == null) ? require('@/assets/images/profile.jpg') : process.env.VUE_APP_BASE_API + user.avatar
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
@@ -106,11 +112,16 @@ const user = {
// 设置选中的项目应用信息
SetApplication({ commit }, applicationInfo) {
commit('SET_APPLICATION', applicationInfo)
- const { id } = applicationInfo || {};
+ const { id, appName } = applicationInfo || {}
if (id) {
- setApplicationId(applicationInfo.id);
+ setApplicationId(applicationInfo.id)
} else {
- removeApplicationId();
+ removeApplicationId()
+ }
+ if (appName) {
+ setApplicationName(applicationInfo.appName)
+ } else {
+ removeApplicationName()
}
}
}
diff --git a/sf-ui/src/utils/application.js b/sf-ui/src/utils/application.js
index 250e16d..bb027b2 100644
--- a/sf-ui/src/utils/application.js
+++ b/sf-ui/src/utils/application.js
@@ -1,6 +1,7 @@
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
-const ApplicationKey = "Admin-Application-Id";
+const ApplicationKey = 'Admin-Application-Id'
+const ApplicationKeywords = 'Admin-Application-Name'
/**
* 获取应用项目ID
@@ -8,7 +9,16 @@ const ApplicationKey = "Admin-Application-Id";
* @returns {string} 返回从Cookie中获取的应用项目ID。
*/
export function getApplicationId() {
- return Cookies.get(ApplicationKey);
+ return Cookies.get(ApplicationKey)
+}
+
+/**
+ * 获取应用项目ID
+ * 该函数从Cookie中检索与应用项目相关的关键信息。
+ * @returns {string} 返回从Cookie中获取的应用项目ID。
+ */
+export function getApplicationName() {
+ return Cookies.get(ApplicationKeywords)
}
/**
@@ -17,7 +27,16 @@ export function getApplicationId() {
* @return {boolean|Object} 返回Cookie设置的结果。成功则返回true，失败则返回设置失败的对象。
*/
export function setApplicationId(ApplicationId) {
- return Cookies.set(ApplicationKey, ApplicationId);
+ return Cookies.set(ApplicationKey, ApplicationId)
+}
+
+/**
+ * 设置应用项目名称到Cookie中
+ * @param {string} ApplicationId - 需要设置的应用项目名称。
+ * @return {boolean|Object} 返回Cookie设置的结果。成功则返回true，失败则返回设置失败的对象。
+ */
+export function setApplicationName(ApplicationName) {
+ return Cookies.set(ApplicationKeywords, ApplicationName)
}
/**
@@ -26,5 +45,15 @@ export function setApplicationId(ApplicationId) {
* @returns {boolean} 返回删除操作的结果。如果删除成功，则返回true；如果删除失败，则返回false。
*/
export function removeApplicationId() {
- return Cookies.remove(ApplicationKey);
-}
\ No newline at end of file
+ return Cookies.remove(ApplicationKey)
+}
+
+/**
+ * 移除应用Name的Cookie
+ * 本函数用于删除与应用相关的Name Cookie。
+ * @returns {boolean} 返回删除操作的结果。如果删除成功，则返回true；如果删除失败，则返回false。
+ */
+export function removeApplicationName() {
+ return Cookies.remove(ApplicationKeywords)
+}
+
diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue
index df18c95..3f20339 100644
--- a/sf-ui/src/views/FDS/installationList/add.vue
+++ b/sf-ui/src/views/FDS/installationList/add.vue
@@ -8,15 +8,15 @@
@@ -199,12 +237,10 @@
From f7727ac37f220ba425860551d2e35f9284e6ae0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Tue, 9 Apr 2024 17:55:01 +0800
Subject: [PATCH 018/118] =?UTF-8?q?fix:=20=E6=8A=BD=E7=A6=BB=E7=99=BD?=
=?UTF-8?q?=E5=90=8D=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=EF=BC=8C=E6=8A=8A=E6=96=B0=E5=A2=9E=E7=99=BD=E5=90=8D=E5=8D=95?=
=?UTF-8?q?=EF=BC=8C=E7=99=BD=E5=90=8D=E5=8D=95=E9=85=8D=E7=BD=AE=E7=9A=84?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BB=A5=E7=BB=84=E5=BB=BA=E6=96=B9=E5=BC=8F?=
=?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E6=8C=89=E7=85=A7=E6=96=B0=E7=89=88?=
=?UTF-8?q?=E7=9A=84=E5=8E=9F=E5=9E=8B=E5=9B=BE=EF=BC=8C=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8E=92=E7=89=88=EF=BC=8C=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E9=83=A8=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/assets/images/code.png | Bin 0 -> 213 bytes
.../src/views/FDS/installationList/index.vue | 203 ++++---
sf-ui/src/views/FDS/publishList/index.vue | 509 +++++++++++++-----
.../src/views/FDS/publishList/setting/add.vue | 76 +--
.../views/FDS/publishList/setting/detail.vue | 25 +-
.../whiteListManagement/components/add.vue | 107 ++++
.../components/addConfig.vue | 156 ++++++
.../whiteListManagement/components/detail.vue | 0
.../views/FDS/whiteListManagement/index.vue | 321 ++++-------
9 files changed, 883 insertions(+), 514 deletions(-)
create mode 100644 sf-ui/src/assets/images/code.png
create mode 100644 sf-ui/src/views/FDS/whiteListManagement/components/add.vue
create mode 100644 sf-ui/src/views/FDS/whiteListManagement/components/addConfig.vue
create mode 100644 sf-ui/src/views/FDS/whiteListManagement/components/detail.vue
diff --git a/sf-ui/src/assets/images/code.png b/sf-ui/src/assets/images/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..9111a07582f90040f7cd4eb76cc45db547dad98c
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^lYw{wBQuaR+kg58kYY)9^mSxl*x1kgCy^D%XDkkK
zcVbv~PUa<$!xrEZ;_8!GsA=H9617?oBwZ5Z7tG-B>_!@pli=y%7~*j}IYENenPJ0!
z_D1@(%~(i0~9KFnG)l`j%d`5$HY!22WQ%mvv4F
FO#snNNFM+I
literal 0
HcmV?d00001
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 1dd00be..35832ae 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -2,60 +2,60 @@
@@ -68,24 +68,24 @@
新建
批量删除
@@ -94,7 +94,6 @@
下载安装包
编辑
详情
删除
在线上传
离线上传
@@ -187,17 +186,17 @@
上传文件
@@ -208,18 +207,18 @@
Android
鸿蒙
IOS
@@ -227,10 +226,10 @@
@@ -248,7 +247,7 @@
离线上传
安装包11111
安装包1111.excel
@@ -344,10 +343,10 @@ export default {
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.dataList = response.rows
- this.total = response.total
- this.loading = false
- }
+ this.dataList = response.rows
+ this.total = response.total
+ this.loading = false
+ }
)
},
@@ -355,10 +354,10 @@ export default {
getConfigList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.configList = response.rows
- this.total = response.total
- this.loading = false
- }
+ this.configList = response.rows
+ this.total = response.total
+ this.loading = false
+ }
)
},
diff --git a/sf-ui/src/views/FDS/publishList/index.vue b/sf-ui/src/views/FDS/publishList/index.vue
index d91685e..9746e32 100644
--- a/sf-ui/src/views/FDS/publishList/index.vue
+++ b/sf-ui/src/views/FDS/publishList/index.vue
@@ -4,32 +4,32 @@
@@ -37,10 +37,10 @@
@@ -53,35 +53,35 @@
新增
批量发布
批量删除
@@ -95,9 +95,9 @@
-
-
-
-
-
下架
修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下载验证
+
+
+
+
+
+
+ 白名单客户
+ 普通客户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 安装包11111
+
+
+ 安装包1111.excel
+ 58.1kb
+
+
+ 安卓
+ 登录模块
+
+
+ 说明说明
+ 发布环境
+
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
+
+ 说明说明
+ 说明说明
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
@@ -294,6 +449,9 @@ export default {
addOpen: false,
// 是否显示白名单配置弹出框
configOpen: false,
+
+ packOpen: false,
+
// 日期范围
dateRange: [],
// 查询参数
@@ -306,6 +464,42 @@ export default {
},
// 表单参数
form: {},
+ url: require('@/assets/images/code.png'),
+ srcList: [
+ require('@/assets/images/code.png')
+ ],
+ list: {
+ rule: {
+ regularRule: false,
+ customRule: false
+ },
+ // headerOperations: [],
+ packId: '', // 安装包ID
+ grayFlag: '0', // 发布类型: 0灰度 1正式
+ upgradeMode: '0', //
+ releaseDestType: '0', // 发布条件： 0白名单 1时间窗
+ headerOperations: [// 自定义规则
+ // {
+ // 'scope': '', // 范围：region地区 platform平台
+ // 'inclued': '', // 是否包含 1包含 2不包含
+ // 'condition': '', // 发布条件
+ // 'desp': ''// 备注
+ // }
+ ],
+ grayUserNum: '', // 灰度人数
+ numType: '0',
+ expiryTime: '', // 灰度结束时间
+ desp: '',
+ releaseRuleId: '', // 常用规则
+ // deviceListId: '', // 设备白名单
+ whiteListId: '',// 用户白名单id
+ enableVerify: false, //是否开启下载验证
+ imprint: '', //版本说明
+ versionNumber: '',
+ AppName: '', //APP名称
+ platform: 'android' //系统
+ },
+ whiteOptions: [],
// 表单校验
rules: {
configName: [
@@ -328,10 +522,10 @@ export default {
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.configList = response.rows
- this.total = response.total
- this.loading = false
- }
+ this.configList = response.rows
+ this.total = response.total
+ this.loading = false
+ }
)
},
// 取消按钮
@@ -371,10 +565,7 @@ export default {
this.reset()
// 使用ES6+语法
this.reset()
- const type = 'add'
- this.$router.push({
- name: 'PublishAdd'
- })
+ this.addOpen = true
},
// 多选框选中数据
@@ -428,7 +619,7 @@ export default {
},
/**查看详情*/
handleDetail() {
-
+ this.configOpen = true
},
/**下载安装包*/
handleDownload() {
@@ -443,7 +634,32 @@ export default {
handlePublish() {
},
-
+ /** 在上传之前进行校验 */
+ beforeAvatarUpload(file) {
+ const formatList = file.name.split('.')
+ const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
+ if (!isFormat) {
+ this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
+ }
+ const isLt2M = file.size / 1024 / 1024 < 5
+ if (!isLt2M) {
+ this.$message.error(`上传文件大小不能超过5M!`)
+ }
+ return isLt2M && isFormat
+ },
+ /** 上传文件 */
+ handleSuccess(file) {
+ this.fileList = []
+ const nameList = file.context.path.split('/')
+ this.fileList.push({
+ name: file.context.name || nameList[nameList.length - 1],
+ url: file.context.path
+ })
+ this.addFormData.path = file.context.path
+ },
+ beforeRemove(files, filesList) {
+ return this.$confirm(`确定要移除${files.name}？`)
+ },
// 更多操作触发
handleCommand(command, row) {
switch (command) {
@@ -460,8 +676,25 @@ export default {
default:
break
}
+ },
+
+ /** 弹出包选择框*/
+ handlePackOpen() {
+ this.packOpen = true
}
}
}
+
diff --git a/sf-ui/src/views/FDS/publishList/setting/add.vue b/sf-ui/src/views/FDS/publishList/setting/add.vue
index 727a89b..25d59a3 100644
--- a/sf-ui/src/views/FDS/publishList/setting/add.vue
+++ b/sf-ui/src/views/FDS/publishList/setting/add.vue
@@ -3,18 +3,18 @@
-
@@ -121,8 +132,7 @@
// import { getWhiteList, getReleaseRuleList, getDictionaryList, getInstallTaskAdd, getTypeList } from '@/api/FDS'
export default {
name: 'InstallationAdd',
- components: {
- },
+ components: {},
data() {
var checkHeader = (rule, value, callback) => {
if (this.list.rule.customRule) {
@@ -174,10 +184,10 @@ export default {
releaseRuleId: '', // 常用规则
// deviceListId: '', // 设备白名单
whiteListId: '',// 用户白名单id
- enableVerify:false, //是否开启下载验证
- imprint:'', //版本说明
- versionNumber:'',
- AppName:'', //APP名称
+ enableVerify: false, //是否开启下载验证
+ imprint: '', //版本说明
+ versionNumber: '',
+ AppName: '' //APP名称
},
whiteOptions: [],
releaseOptions: [],
@@ -214,8 +224,7 @@ export default {
}
}
},
- computed: {
- },
+ computed: {},
watch: {
'list.rule.regularRule'(newR, oldR) { // 常用规则
if (this.list.rule.customRule && newR) {
@@ -370,27 +379,32 @@ export default {
}
diff --git a/sf-ui/src/views/FDS/installationList/detail.vue b/sf-ui/src/views/FDS/installationList/detail.vue
new file mode 100644
index 0000000..2870eb7
--- /dev/null
+++ b/sf-ui/src/views/FDS/installationList/detail.vue
@@ -0,0 +1,77 @@
+
+
-
-
-
- 在线上传
-
- 离线上传
-
-
-
-
-
-
-
-
-
- 上传文件
-
-
-
-
-
-
- Android
-
- 鸿蒙
-
- IOS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 离线上传
- 安装包11111
-
- 安装包1111.excel
- 58.1kb
- 安卓
- 登录模块
- 上传时间2024-04-07 17：43
- 已上传
- 刮刮乐
- 日志日志
-
-
-
-
-
+
diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue
new file mode 100644
index 0000000..7523554
--- /dev/null
+++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue
@@ -0,0 +1,128 @@
+
+ {{ scope.row.platform === '0' ? '安卓' : 'IOS' }}
@@ -120,10 +120,7 @@
{{ parseTime(scope.row.createTime) }}
- ![]()
-
-
- 密码:{{ scope.row.verifyCode }}
--
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 安卓
+ IOS
+ 鸿蒙
+
+
+
+
+ 新增文件
-
-
+
-
-
-
-
@@ -26,7 +26,9 @@
强制升级
-
@@ -35,17 +37,21 @@
-
-
-
开发环境
@@ -77,8 +83,11 @@
下载验证
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 35832ae..bedec9e 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -160,118 +160,13 @@
:total="total"
@pagination="getList"
/>
-
-
- 安装包详情
+
+
+
+
+ 离线上传
+ 安装包11111
+
+ 安装包1111.excel
+ 58.1kb
+ 安卓
+ 登录模块
+ 上传时间2024-04-07 17：43
+ 已上传
+ 刮刮乐
+ 日志日志
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue b/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue
new file mode 100644
index 0000000..638a13f
--- /dev/null
+++ b/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue
@@ -0,0 +1,194 @@
+、
+
+ 新增文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/whiteListManagement/components/addConfig.vue b/sf-ui/src/views/FDS/whiteListManagement/components/addConfig.vue
deleted file mode 100644
index 4fe4c38..0000000
--- a/sf-ui/src/views/FDS/whiteListManagement/components/addConfig.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
- 白名单配置
+
+
+
+
+ 手动添加
+
+ 批量添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传文件
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sf-ui/src/views/deploy/INFO/index.vue b/sf-ui/src/views/deploy/INFO/index.vue
new file mode 100644
index 0000000..797a3b0
--- /dev/null
+++ b/sf-ui/src/views/deploy/INFO/index.vue
@@ -0,0 +1,332 @@
+
+ - 领取阿里云通用云产品1888优惠券 --
-https://www.aliyun.com/minisite/goods?userCode=brki8iof -
- 领取腾讯云通用云产品2860优惠券 -
-https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console -
- 阿里云服务器折扣区 ->☛☛点我进入☚☚ - 腾讯云服务器秒杀区 ->☛☛点我进入☚☚
-- 云产品通用红包，可叠加官网常规优惠使用。(仅限新用户) -
-
-
SAC后台管理框架
-- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了SAC管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 -
-- 当前版本: v{{ version }} -
-
-
-
技术选型
-后端技术
--
-
- SpringBoot -
- Spring Security -
- JWT -
- MyBatis -
- Druid -
- Fastjson -
- ... -
前端技术
--
-
- Vue -
- Vuex -
- Element-ui -
- Axios -
- Sass -
- Quill -
- ... -
- 联系信息
-
-
-
- 更新日志
-
- -
-
- 支持登录IP黑名单限制 -
- 新增监控页面图标显示 -
- 操作日志新增消耗时间属性 -
- 屏蔽定时任务bean违规的字符 -
- 日志管理使用索引提升查询性能 -
- 日志注解支持排除指定的请求参数 -
- 支持自定义隐藏属性列过滤子对象 -
- 升级oshi到最新版本6.4.3 -
- 升级druid到最新版本1.2.16 -
- 升级fastjson到最新版2.0.34 -
- 升级spring-boot到最新版本2.5.15 -
- 升级element-ui到最新版本2.15.13 -
- 移除apache/commons-fileupload依赖 -
- 修复页面切换时布局错乱的问题 -
- 修复匿名注解Anonymous空指针问题 -
- 修复路由跳转被阻止时内部产生报错信息问题 -
- 修复isMatchedIp的参数判断产生空指针的问题 -
- 修复用户多角色数据权限可能出现权限抬升的情况 -
- 修复开启TopNav后一级菜单路由参数设置无效问题 -
- 修复DictTag组件value没有匹配的值时则展示value -
- 优化文件下载出现的异常 -
- 优化选择图标组件高亮回显 -
- 优化弹窗后导航栏偏移的问题 -
- 优化修改密码日志存储明文问题 -
- 优化页签栏关闭其他出现的异常问题 -
- 优化页签关闭左侧选项排除首页选项 -
- 优化关闭当前tab页跳转最右侧tab页 -
- 优化缓存列表清除操作提示不变的问题 -
- 优化字符未使用下划线不进行驼峰式处理 -
- 优化用户导入更新时需获取用户编号问题 -
- 优化侧边栏的平台标题与VUE_APP_TITLE保持同步 -
- 优化导出Excel时设置dictType属性重复查缓存问题 -
- 连接池Druid支持新的配置connectTimeout和socketTimeout -
- 其他细节优化 -
-
-
- 定时任务违规的字符 -
- 重置时取消部门选中 -
- 新增返回警告消息提示 -
- 忽略不必要的属性数据返回 -
- 修改参数键名时移除前缓存配置 -
- 导入更新用户数据前校验数据权限 -
- 兼容Excel下拉框内容过多无法显示的问题 -
- 升级echarts到最新版本5.4.0 -
- 升级core-js到最新版本3.25.3 -
- 升级oshi到最新版本6.4.0 -
- 升级kaptcha到最新版2.3.3 -
- 升级druid到最新版本1.2.15 -
- 升级fastjson到最新版2.0.20 -
- 升级pagehelper到最新版1.4.6 -
- 优化弹窗内容过多展示不全问题 -
- 优化swagger-ui静态资源使用缓存 -
- 开启TopNav没有子菜单隐藏侧边栏 -
- 删除fuse无效选项maxPatternLength -
- 优化导出对象的子列表为空会出现[]问题 -
- 优化编辑头像时透明部分会变成黑色问题 -
- 优化小屏幕上修改头像界面布局错位的问题 -
- 修复代码生成勾选属性无效问题 -
- 修复文件上传组件格式验证问题 -
- 修复回显数据字典数组异常问题 -
- 修复sheet超出最大行数异常问题 -
- 修复Log注解GET请求记录不到参数问题 -
- 修复调度日志点击多次数据不变化的问题 -
- 修复主题颜色在Drawer组件不会加载问题 -
- 修复文件名包含特殊字符的文件无法下载问题 -
- 修复table中更多按钮切换主题色未生效修复问题 -
- 修复某些特性的环境生成代码变乱码TXT文件问题 -
- 修复代码生成图片/文件/单选时选择必填无法校验问题 -
- 修复某些特性的情况用户编辑对话框中角色和部门无法修改问题 -
- 其他细节优化 -
-
-
- 数据逻辑删除不进行唯一验证 -
- Excel注解支持导出对象的子列表方法 -
- Excel注解支持自定义隐藏属性列 -
- Excel注解支持backgroundColor属性设置背景色 -
- 支持配置密码最大错误次数/锁定时间 -
- 登录日志新增解锁账户功能 -
- 通用下载方法新增config配置选项 -
- 支持多权限字符匹配角色数据权限 -
- 页面内嵌iframe切换tab不刷新数据 -
- 操作日志记录支持排除敏感属性字段 -
- 修复多文件上传报错出现的异常问题 -
- 修复图片预览组件src属性为null值控制台报错问题 -
- 升级oshi到最新版本6.2.2 -
- 升级fastjson到最新版2.0.14 -
- 升级pagehelper到最新版1.4.3 -
- 升级core-js到最新版本3.25.2 -
- 升级element-ui到最新版本2.15.10 -
- 优化任务过期不执行调度 -
- 优化字典数据使用store存取 -
- 优化修改资料头像被覆盖的问题 -
- 优化修改用户登录账号重复验证 -
- 优化代码生成同步后值NULL问题 -
- 优化定时任务支持执行父类方法 -
- 优化用户个人信息接口防止修改部门 -
- 优化布局设置使用el-drawer抽屉显示 -
- 优化没有权限的用户编辑部门缺少数据 -
- 优化日志注解记录限制请求地址的长度 -
- 优化excel/scale属性导出单元格数值类型 -
- 优化日志操作中重置按钮时重复查询的问题 -
- 优化多个相同角色数据导致权限SQL重复问题 -
- 优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） -
- 其他细节优化 -
-
-
- 新增缓存列表菜单功能 -
- 代码生成树表新增(展开/折叠) -
- Excel注解支持color字体颜色 -
- 新增Anonymous匿名访问不鉴权注解 -
- 用户头像上传限制只能为图片格式 -
- 接口使用泛型使其看到响应属性字段 -
- 检查定时任务bean所在包名是否为白名单配置 -
- 添加页签openPage支持传递参数 -
- 用户缓存信息添加部门ancestors祖级列表 -
- 升级element-ui到最新版本2.15.8 -
- 升级oshi到最新版本6.1.6 -
- 升级druid到最新版本1.2.11 -
- 升级fastjson到最新版2.0.8 -
- 升级spring-boot到最新版本2.5.14 -
- 降级jsencrypt版本兼容IE浏览器 -
- 删除多余的salt字段 -
- 新增获取不带后缀文件名称方法 -
- 新增获取配置文件中的属性值方法 -
- 新增内容编码/解码方便插件集成使用 -
- 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） -
- 优化设置分页参数默认值 -
- 优化对空字符串参数处理的过滤 -
- 优化显示顺序orderNum类型为整型 -
- 优化表单构建按钮不显示正则校验 -
- 优化字典数据回显样式下拉框显示值 -
- 优化R响应成功状态码与全局保持一致 -
- 优化druid开启wall过滤器出现的异常问题 -
- 优化用户管理左侧树型组件增加选中高亮保持 -
- 优化新增用户与角色信息&用户与岗位信息逻辑 -
- 优化默认不启用压缩文件缓存防止node_modules过大 -
- 修复字典数据显示不全问题 -
- 修复操作日志查询类型条件为0时会查到所有数据 -
- 修复Excel注解prompt/combo同时使用不生效问题 -
- 其他细节优化 -
-
-
- 前端支持设置是否需要防止数据重复提交 -
- 开启TopNav没有子菜单情况隐藏侧边栏 -
- 侧边栏菜单名称过长悬停显示标题 -
- 用户访问控制时校验数据权限，防止越权 -
- 导出Excel时屏蔽公式，防止CSV注入风险 -
- 组件ImagePreview支持多图预览显示 -
- 组件ImageUpload支持多图同时选择上传 -
- 组件FileUpload支持多文件同时选择上传 -
- 服务监控新增运行参数信息显示 -
- 定时任务目标字符串过滤特殊字符 -
- 定时任务目标字符串验证包名白名单 -
- 代码生成列表图片支持预览 -
- 代码生成编辑修改打开新页签 -
- 代码生成新增Java类型Boolean -
- 代码生成子表支持日期/字典配置 -
- 代码生成同步保留必填/类型选项 -
- 升级oshi到最新版本6.1.2 -
- 升级fastjson到最新版1.2.80 -
- 升级pagehelper到最新版1.4.1 -
- 升级spring-boot到最新版本2.5.11 -
- 升级spring-boot-mybatis到最新版2.2.2 -
- 添加遗漏的分页参数合理化属性 -
- 修改npm即将过期的注册源地址 -
- 修复分页组件请求两次问题 -
- 修复通用文件下载接口跨域问题 -
- 修复Xss注解字段值为空时的异常问题 -
- 修复选项卡点击右键刷新丢失参数问题 -
- 修复表单清除元素位置未垂直居中问题 -
- 修复服务监控中运行参数显示条件错误 -
- 修复导入Excel时字典字段类型为Long转义为空问题 -
- 修复登录超时刷新页面跳转登录页面还提示重新登录问题 -
- 优化加载字典缓存数据 -
- 优化IP地址获取到多个的问题 -
- 优化任务队列满时任务拒绝策略 -
- 优化文件上传兼容Weblogic环境 -
- 优化定时任务默认保存到内存中执行 -
- 优化部门修改缩放后出现的错位问题 -
- 优化Excel格式化不同类型的日期对象 -
- 优化菜单表关键字导致的插件报错问题 -
- 优化Oracle用户头像列为空时不显示问题 -
- 优化页面若未匹配到字典标签则返回原字典值 -
- 优化修复登录失效后多次请求提示多次弹窗问题 -
- 其他细节优化 -
-
-
- 新增Vue3前端代码生成模板 -
- 新增图片预览组件 -
- 新增压缩插件实现打包Gzip -
- 自定义xss校验注解实现 -
- 自定义文字复制剪贴指令 -
- 代码生成预览支持复制内容 -
- 路由支持单独配置菜单或角色权限 -
- 用户管理部门查询选择节点后分页参数初始 -
- 修复用户分配角色属性错误 -
- 修复打包后字体图标偶现的乱码问题 -
- 修复菜单管理重置表单出现的错误 -
- 修复版本差异导致的懒加载报错问题 -
- 修复Cron组件中周回显问题 -
- 修复定时任务多参数逗号分隔的问题 -
- 修复根据ID查询列表可能出现的主键溢出问题 -
- 修复tomcat配置参数已过期问题 -
- 升级clipboard到最新版本2.0.8 -
- 升级oshi到最新版本v5.8.6 -
- 升级fastjson到最新版1.2.79 -
- 升级spring-boot到最新版本2.5.8 -
- 升级log4j2到2.17.1，防止漏洞风险 -
- 优化下载解析blob异常提示 -
- 优化代码生成字典组重复问题 -
- 优化查询用户的角色组&岗位组代码 -
- 优化定时任务cron表达式小时设置24 -
- 优化用户导入提示溢出则显示滚动条 -
- 优化防重复提交标识组合为(key+url+header) -
- 优化分页方法设置成通用方便灵活调用 -
- 其他细节优化 -
-
-
- 新增配套并同步的Vue3前端版本 -
- 新增通用方法简化模态/缓存/下载/权限/页签使用 -
- 优化导出数据/使用通用下载方法 -
- Excel注解支持自定义数据处理器 -
- Excel注解支持导入导出标题信息 -
- Excel导入支持@Excels注解 -
- 新增组件data-dict，简化数据字典使用 -
- 新增Jaxb依赖，防止jdk8以上出现的兼容错误 -
- 生产环境使用路由懒加载提升页面响应速度 -
- 修复五级以上菜单出现的404问题 -
- 防重提交注解支持配置间隔时间/提示消息 -
- 日志注解新增是否保存响应参数 -
- 任务屏蔽违规字符&参数忽略双引号中的逗号 -
- 升级SpringBoot到最新版本2.5.6 -
- 升级pagehelper到最新版1.4.0 -
- 升级spring-boot-mybatis到最新版2.2.0 -
- 升级oshi到最新版本v5.8.2 -
- 升级druid到最新版1.2.8 -
- 升级velocity到最新版本2.3 -
- 升级fastjson到最新版1.2.78 -
- 升级axios到最新版本0.24.0 -
- 升级dart-sass到版本1.32.13 -
- 升级core-js到最新版本3.19.1 -
- 升级jsencrypt到最新版本3.2.1 -
- 升级js-cookie到最新版本3.0.1 -
- 升级file-saver到最新版本2.0.5 -
- 升级sass-loader到最新版本10.1.1 -
- 升级element-ui到最新版本2.15.6 -
- 新增sendGet无参请求方法 -
- 禁用el-tag组件的渐变动画 -
- 代码生成点击预览重置激活tab -
- AjaxResult重写put方法，以方便链式调用 -
- 优化登录/验证码请求headers不设置token -
- 优化用户个人信息接口防止修改用户名 -
- 优化Cron表达式生成器关闭时销毁避免缓存 -
- 优化注册成功提示消息类型success -
- 优化aop语法，使用spring自动注入注解 -
- 优化记录登录信息，移除不必要的修改 -
- 优化mybatis全局默认的执行器 -
- 优化Excel导入图片可能出现的异常 -
- 修复代码生成模板主子表删除缺少事务 -
- 修复日志记录可能出现的转换异常 -
- 修复代码生成复选框字典遗漏问题 -
- 修复关闭xss功能导致可重复读RepeatableFilter失效 -
- 修复字符串无法被反转义问题 -
- 修复后端主子表代码模板方法名生成错误问题 -
- 修复xss过滤后格式出现的异常 -
- 修复swagger没有指定dataTypeClass导致启动出现warn日志 -
- 其他细节优化 -
-
-
- 参数管理支持配置验证码开关 -
- 新增是否开启用户注册功能 -
- 定时任务支持在线生成cron表达式 -
- 菜单管理支持配置路由参数 -
- 支持自定义注解实现接口限流 -
- Excel注解支持Image图片导入 -
- 自定义弹层溢出滚动样式 -
- 自定义可拖动弹窗宽度指令 -
- 自定义可拖动弹窗高度指令 -
- 修复任意账户越权问题 -
- 修改时检查用户数据权限范围 -
- 修复保存配置主题颜色失效问题 -
- 新增暗色菜单风格主题 -
- 菜单&部门新增展开/折叠功能 -
- 页签新增关闭左侧&添加图标 -
- 顶部菜单排除隐藏的默认路由 -
- 顶部菜单同步系统主题样式 -
- 跳转路由高亮相对应的菜单栏 -
- 代码生成主子表多选行数据 -
- 日期范围支持添加多组 -
- 升级element-ui到最新版本2.15.5 -
- 升级oshi到最新版本v5.8.0 -
- 升级commons.io到最新版本v2.11.0 -
- 定时任务屏蔽ldap远程调用 -
- 定时任务屏蔽http(s)远程调用 -
- 补充定时任务表字段注释 -
- 定时任务对检查异常进行事务回滚 -
- 启用父部门状态排除顶级节点 -
- 富文本新增上传文件大小限制 -
- 默认首页使用keep-alive缓存 -
- 修改代码生成字典回显样式 -
- 自定义分页合理化传入参数 -
- 修复字典组件值为整形不显示问题 -
- 修复定时任务日志执行状态显示 -
- 角色&菜单新增字段属性提示信息 -
- 修复角色分配用户页面参数类型错误提醒 -
- 优化布局设置动画特效 -
- 优化异常处理信息 -
- 优化错误token导致的解析异常 -
- 密码框新增显示切换密码图标 -
- 定时任务新增更多操作 -
- 更多操作按钮添加权限控制 -
- 导入用户样式优化 -
- 提取通用方法到基类控制器 -
- 优化使用权限工具获取用户信息 -
- 优化用户不能删除自己 -
- 优化XSS跨站脚本过滤 -
- 优化代码生成模板 -
- 验证码默认20s超时 -
- BLOB下载时清除URL对象引用 -
- 代码生成导入表按创建时间排序 -
- 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 -
- 修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题 -
- 多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复 -
- 其他细节优化 -
-
-
- 角色管理新增分配用户功能 -
- 用户管理新增分配角色功能 -
- 日志列表支持排序操作 -
- 优化参数&字典缓存操作 -
- 系统布局配置支持动态标题开关 -
- 菜单路由配置支持内链访问 -
- 默认访问后端首页新增提示语 -
- 富文本默认上传返回url类型 -
- 新增自定义弹窗拖拽指令 -
- 全局注册常用通用组件 -
- 全局挂载字典标签组件 -
- ImageUpload组件支持多图片上传 -
- FileUpload组件支持多文件上传 -
- 文件上传组件添加数量限制属性 -
- 富文本编辑组件添加类型属性 -
- 富文本组件工具栏配置视频 -
- 封装通用iframe组件 -
- 限制超级管理员不允许操作 -
- 用户信息长度校验限制 -
- 分页组件新增pagerCount属性 -
- 添加bat脚本执行应用 -
- 升级oshi到最新版本v5.7.4 -
- 升级element-ui到最新版本2.15.2 -
- 升级pagehelper到最新版1.3.1 -
- 升级commons.io到最新版本v2.10.0 -
- 升级commons.fileupload到最新版本v1.4 -
- 升级swagger到最新版本v3.0.0 -
- 修复关闭confirm提示框控制台报错问题 -
- 修复存在的SQL注入漏洞问题 -
- 定时任务屏蔽rmi远程调用 -
- 修复用户搜索分页变量错误 -
- 修复导出角色数据范围翻译缺少仅本人 -
- 修复表单构建选择下拉选择控制台报错问题 -
- 优化图片工具类读取文件 -
- 其他细节优化 -
-
-
- 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单） -
- 布局设置支持保存&重置配置 -
- 修复树表数据显示不全&加载慢问题 -
- 新增IE浏览器版本过低提示页面 -
- 用户登录后记录最后登录IP&时间 -
- 页面导出按钮点击之后添加遮罩 -
- 富文本编辑器支持自定义上传地址 -
- 富文本编辑组件新增readOnly属性 -
- 页签TagsView新增关闭右侧功能 -
- 显隐列组件加载初始默认隐藏列 -
- 关闭头像上传窗口还原默认图片 -
- 个人信息添加手机&邮箱重复验证 -
- 代码生成模板导出按钮点击后添加遮罩 -
- 代码生成模板树表操作列添加新增按钮 -
- 代码生成模板修复主子表字段重名问题 -
- 升级fastjson到最新版1.2.76 -
- 升级druid到最新版本v1.2.6 -
- 升级mybatis到最新版3.5.6 阻止远程代码执行漏洞 -
- 升级oshi到最新版本v5.6.0 -
- velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞 -
- 数据监控页默认账户密码防止越权访问 -
- 修复firefox下表单构建拖拽会新打卡一个选项卡 -
- 修正后端导入表权限标识 -
- 修正前端操作日志&登录日志权限标识 -
- 设置Redis配置HashKey序列化 -
- 删除操作日志记录信息 -
- 上传媒体类型添加视频格式 -
- 修复请求形参未传值记录日志异常问题 -
- 优化xss校验json请求条件 -
- 树级结构更新子节点使用replaceFirst -
- 优化ExcelUtil空值处理 -
- 日志记录过滤BindingResult对象，防止异常 -
- 修改主题后mini类型按钮无效问题 -
- 优化通用下载完成后删除节点 -
- 通用Controller添加响应返回消息 -
- 其他细节优化 -
-
-
- 代码生成模板支持主子表 -
- 表格右侧工具栏组件支持显隐列 -
- 图片组件添加预览&移除功能 -
- Excel注解支持Image图片导出 -
- 操作按钮组调整为朴素按钮样式 -
- 代码生成支持文件上传组件 -
- 代码生成日期控件区分范围 -
- 代码生成数据库文本类型生成表单文本域 -
- 用户手机邮箱&菜单组件修改允许空字符串 -
- 升级SpringBoot到最新版本2.2.13 提升启动速度 -
- 升级druid到最新版本v1.2.4 -
- 升级fastjson到最新版1.2.75 -
- 升级element-ui到最新版本2.15.0 -
- 修复IE11浏览器报错问题 -
- 优化多级菜单之间切换无法缓存的问题 -
- 修复四级菜单无法显示问题 -
- 修正侧边栏静态路由丢失问题 -
- 修复角色管理-编辑角色-功能权限显示异常 -
- 配置文件新增redis数据库索引属性 -
- 权限工具类增加admin判断 -
- 角色非自定义权限范围清空选择值 -
- 修复导入数据为负浮点数时丢失精度问题 -
- 移除path-to-regexp正则匹配插件 -
- 修复生成树表代码异常 -
- 修改ip字段长度防止ipv6地址长度不够 -
- 防止get请求参数值为false或0等特殊值会导致无法正确的传参 -
- 登录后push添加catch防止出现检查错误 -
- 其他细节优化 -
-
-
- 新增缓存监控功能 -
- 支持主题风格配置 -
- 修复多级菜单之间切换无法缓存的问题 -
- 多级菜单自动配置组件 -
- 代码生成预览支持高亮显示 -
- 支持Get请求映射Params参数 -
- 删除用户和角色解绑关联 -
- 去除用户手机邮箱部门必填验证 -
- Excel支持注解align对齐方式 -
- Excel支持导入Boolean型数据 -
- 优化头像样式，鼠标移入悬停遮罩 -
- 代码生成预览提供滚动机制 -
- 代码生成删除多余的数字float类型 -
- 修正转换字符串的目标字符集属性 -
- 回显数据字典防止空值报错 -
- 日志记录增加过滤多文件场景 -
- 修改缓存Set方法可能导致嵌套的问题 -
- 移除前端一些多余的依赖 -
- 防止安全扫描YUI出现的风险提示 -
- 修改node-sass为dart-sass -
- 升级SpringBoot到最新版本2.1.18 -
- 升级poi到最新版本4.1.2 -
- 升级oshi到最新版本v5.3.6 -
- 升级bitwalker到最新版本1.21 -
- 升级axios到最新版本0.21.0 -
- 升级element-ui到最新版本2.14.1 -
- 升级vue到最新版本2.6.12 -
- 升级vuex到最新版本3.6.0 -
- 升级vue-cli到版本4.5.9 -
- 升级vue-router到最新版本3.4.9 -
- 升级vue-cli到最新版本4.4.6 -
- 升级vue-cropper到最新版本0.5.5 -
- 升级clipboard到最新版本2.0.6 -
- 升级core-js到最新版本3.8.1 -
- 升级echarts到最新版本4.9.0 -
- 升级file-saver到最新版本2.0.4 -
- 升级fuse.js到最新版本6.4.3 -
- 升级js-beautify到最新版本1.13.0 -
- 升级js-cookie到最新版本2.2.1 -
- 升级path-to-regexp到最新版本6.2.0 -
- 升级quill到最新版本1.3.7 -
- 升级screenfull到最新版本5.0.2 -
- 升级sortablejs到最新版本1.10.2 -
- 升级vuedraggable到最新版本2.24.3 -
- 升级chalk到最新版本4.1.0 -
- 升级eslint到最新版本7.15.0 -
- 升级eslint-plugin-vue到最新版本7.2.0 -
- 升级lint-staged到最新版本10.5.3 -
- 升级runjs到最新版本4.4.2 -
- 升级sass-loader到最新版本10.1.0 -
- 升级script-ext-html-webpack-plugin到最新版本2.1.5 -
- 升级svg-sprite-loader到最新版本5.1.1 -
- 升级vue-template-compiler到最新版本2.6.12 -
- 其他细节优化 -
-
-
- 阻止任意文件下载漏洞 -
- 代码生成支持上传控件 -
- 新增图片上传组件 -
- 调整默认首页 -
- 升级druid到最新版本v1.2.2 -
- mapperLocations配置支持分隔符 -
- 权限信息调整 -
- 调整sql默认时间 -
- 解决代码生成没有bit类型的问题 -
- 升级pagehelper到最新版1.3.0 -
-
-
- 升级springboot版本到2.1.17 提升安全性 -
- 升级oshi到最新版本v5.2.5 -
- 升级druid到最新版本v1.2.1 -
- 升级jjwt到版本0.9.1 -
- 升级fastjson到最新版1.2.74 -
- 修改sass为node-sass，避免el-icon图标乱码 -
- 代码生成支持同步数据库 -
- 代码生成支持富文本控件 -
- 代码生成页面时不忽略remark属性 -
- 代码生成添加select必填选项 -
- Excel导出类型NUMERIC支持精度浮点类型 -
- Excel导出targetAttr优化获取值，防止get方法不规范 -
- Excel注解支持自动统计数据总和 -
- Excel注解支持设置BigDecimal精度&舍入规则 -
- 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动） -
- 允许用户分配到部门父节点 -
- 菜单新增是否缓存keep-alive -
- 表格操作列间距调整 -
- 限制系统内置参数不允许删除 -
- 富文本组件优化，支持自定义高度&图片冲突问题 -
- 富文本工具栏样式对齐 -
- 导入excel整形值校验优化 -
- 修复页签关闭所有时固定标签路由不刷新问题 -
- 表单构建布局型组件新增按钮 -
- 左侧菜单文字过长显示省略号 -
- 修正根节点为子部门时，树状结构显示问题 -
- 修正调用目标字符串最大长度 -
- 修正菜单提示信息错误 -
- 修正定时任务执行一次权限标识 -
- 修正数据库字符串类型nvarchar -
- 优化递归子节点 -
- 优化数据权限判断 -
- 其他细节优化 -
-
-
- 表格工具栏右侧添加刷新&显隐查询组件 -
- 后端支持CORS跨域请求 -
- 代码生成支持选择上级菜单 -
- 代码生成支持自定义路径 -
- 代码生成支持复选框 -
- Excel导出导入支持dictType字典类型 -
- Excel支持分割字符串组内容 -
- 验证码类型支持（数组计算、字符验证） -
- 升级vue-cli版本到4.4.4 -
- 修改 node-sass 为 dart-sass -
- 表单类型为Integer/Long设置整形默认值 -
- 代码生成器默认mapper路径与默认mapperScan路径不一致 -
- 优化防重复提交拦截器 -
- 优化上级菜单不能选择自己 -
- 修复角色的权限分配后，未实时生效问题 -
- 修复在线用户日志记录类型 -
- 修复富文本空格和缩进保存后不生效问题 -
- 修复在线用户判断逻辑 -
- 唯一限制条件只返回单条数据 -
- 添加获取当前的环境配置方法 -
- 超时登录后页面跳转到首页 -
- 全局异常状态汉化拦截处理 -
- HTML过滤器改为将html转义 -
- 检查字符支持小数点&降级改成异常提醒 -
- 其他细节优化 -
-
-
- 单应用调整为多模块项目 -
- 升级element-ui版本到2.13.2 -
- 删除babel，提高编译速度。 -
- 新增菜单默认主类目 -
- 编码文件名修改为uuid方式 -
- 定时任务cron表达式验证 -
- 角色权限修改时已有权限未自动勾选异常修复 -
- 防止切换权限用户后登录出现404 -
- Excel支持sort导出排序 -
- 创建用户不允许选择超级管理员角色 -
- 修复代码生成导入表结构出现异常页面不提醒问题 -
- 修复代码生成点击多次表修改数据不变化的问题 -
- 修复头像上传成功二次打开无法改变裁剪框大小和位置问题 -
- 修复布局为small者mini用户表单显示错位问题 -
- 修复热部署导致的强换异常问题 -
- 修改用户管理复选框宽度，防止部分浏览器出现省略号 -
- IpUtils工具，清除Xss特殊字符，防止Xff注入攻击 -
- 生成domain 如果是浮点型 统一用BigDecimal -
- 定时任务调整label-width，防止部署出现错位 -
- 调整表头固定列默认样式 -
- 代码生成模板调整，字段为String并且必填则加空串条件 -
- 代码生成字典Integer/Long使用parseInt -
- - 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序 - -
- 修正岗位导出权限注解 -
- 禁止加密密文返回前端 -
- 修复代码生成页面中的查询条件创建时间未生效的问题 -
- 修复首页搜索菜单外链无法点击跳转问题 -
- 修复菜单管理选择图标，backspace删除时不过滤数据 -
- 用户管理部门分支节点不可检查&显示计数 -
- 数据范围过滤属性调整 -
- 其他细节优化 -
-
-
- 升级fastjson到最新版1.2.70 修复高危安全漏洞 -
- dev启动默认打开浏览器 -
- vue-cli使用默认source-map -
- slidebar eslint报错优化 -
- 当tags-view滚动关闭右键菜单 -
- 字典管理添加缓存读取 -
- 参数管理支持缓存操作 -
- 支持一级菜单（和主页同级）在main区域显示 -
- 限制外链地址必须以http(s)开头 -
- tagview & sidebar 主题颜色与element ui(全局)同步 -
- 修改数据源类型优先级，先根据方法，再根据类 -
- 支持是否需要设置token属性，自定义返回码消息。 -
- swagger请求前缀加入配置。 -
- 登录地点设置内容过长则隐藏显示 -
- 修复定时任务执行一次按钮后不提示消息问题 -
- 修改上级部门（选择项排除本身和下级） -
- 通用http发送方法增加参数 contentType 编码类型 -
- 更换IP地址查询接口 -
- 修复页签变量undefined -
- 添加校验部门包含未停用的子部门 -
- 修改定时任务详情下次执行时间日期显示错误 -
- 角色管理查询设置默认排序字段 -
- swagger添加enable参数控制是否启用 -
- 只对json类型请求构建可重复读取inputStream的request -
- 修改代码生成字典字段int类型没有自动选中问题 -
- vuex用户名取值修正 -
- 表格树模板去掉多余的) -
- 代码生成序号修正 -
- 全屏情况下不调整上外边距 -
- 代码生成Date字段添加默认格式 -
- 用户管理角色选择权限控制 -
- 修复路由懒加载报错问题 -
- 模板sql.vm添加菜单状态 -
- 设置用户名称不能修改 -
- dialog添加append-to-body属性，防止ie遮罩 -
- 菜单区分状态和显示隐藏功能 -
- 升级fastjson到最新版1.2.68 修复安全加固 -
- 修复代码生成如果选择字典类型缺失逗号问题 -
- 登录请求params更换为data，防止暴露url -
- 日志返回时间格式处理 -
- 添加handle控制允许拖动的元素 -
- 布局设置点击扩大范围 -
- 代码生成列属性排序查询 -
- 代码生成列支持拖动排序 -
- 修复时间格式不支持ios问题 -
- 表单构建添加父级class，防止冲突 -
- 定时任务并发属性修正 -
- 角色禁用&菜单隐藏不查询权限 -
- 其他细节优化 -
-
-
- 系统监控新增定时任务功能 -
- 添加一个打包Web工程bat -
- 修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag -
- 修复点击退出登录有时会无提示问题 -
- 修复防重复提交注解无效问题 -
- 修复通知公告批量删除异常问题 -
- 添加菜单时路由地址必填限制 -
- 代码生成字段描述可编辑 -
- 修复用户修改个人信息导致缓存不过期问题 -
- 个人信息创建时间获取正确属性值 -
- 操作日志详细显示正确类型 -
- 导入表单击行数据时选中对应的复选框 -
- 批量替换表前缀逻辑调整 -
- 固定重定向路径表达式 -
- 升级element-ui版本到2.13.0 -
- 操作日志排序调整 -
- 修复charts切换侧边栏或者缩放窗口显示bug -
- 其他细节优化 -
-
-
- 新增表单构建 -
- 代码生成支持树表结构 -
- 新增用户导入 -
- 修复动态加载路由页面刷新问题 -
- 修复地址开关无效问题 -
- 汉化错误提示页面 -
- 代码生成已知问题修改 -
- 修复多数据源下配置关闭出现异常处理 -
- 添加HTML过滤器，用于去除XSS漏洞隐患 -
- 修复上传头像控制台出现异常 -
- 修改用户管理分页不正确的问题 -
- 修复验证码记录提示错误 -
- 修复request.js缺少Message引用 -
- 修复表格时间为空出现的异常 -
- 添加Jackson日期反序列化时区配置 -
- 调整根据用户权限加载菜单数据树形结构 -
- 调整成功登录不恢复按钮，防止多次点击 -
- 修改用户个人资料同步缓存信息 -
- 修复页面同时出现el-upload和Editor不显示处理 -
- 修复在角色管理页修改菜单权限偶尔未选中问题 -
- 配置文件新增redis密码属性 -
- 设置mybatis全局的配置文件 -
- 其他细节优化 -
-
-
- 新增代码生成 -
- 新增@RepeatSubmit注解，防止重复提交 -
- 新增菜单主目录添加/删除操作 -
- 日志记录过滤特殊对象，防止转换异常 -
- 修改代码生成路由脚本错误 -
- 用户上传头像实时同步缓存，无需重新登录 -
- 调整切换页签后不重新加载数据 -
- 添加jsencrypt实现参数的前端加密 -
- 系统退出删除用户缓存记录 -
- 其他细节优化 -
-
-
- 新增在线用户管理 -
- 新增按钮组功能实现（批量删除、导出、清空） -
- 新增查询条件重置按钮 -
- 新增Swagger全局Token配置 -
- 新增后端参数校验 -
- 修复字典管理页面的日期查询异常 -
- 修改时间函数命名防止冲突 -
- 去除菜单上级校验，默认为顶级 -
- 修复用户密码无法修改问题 -
- 修复菜单类型为按钮时不显示权限标识 -
- 其他细节优化 -
-
-
- SAC前后端分离系统正式发布 -
- 捐赠支持
-
-
- 
- 你可以请作者喝杯咖啡表示鼓励
-
-
- 你可以请作者喝杯咖啡表示鼓励
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新建
+
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+ 下载安装包
+
+ 编辑
+
+ 详情
+
+ 删除
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/goods/goods/index.vue b/sf-ui/src/views/goods/goods/index.vue
new file mode 100644
index 0000000..819c794
--- /dev/null
+++ b/sf-ui/src/views/goods/goods/index.vue
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
From 2623d5634087d78d2bf5ee756bf75e4dd0f02a4a Mon Sep 17 00:00:00 2001
From: pengren + * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截) + * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号
+ * 加起来刚好64位，为一个Long型。
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。 + * @author yswjme@163.com + * @date : + * + */ +@Component +public class SnowflakeIdWorker { + + /** 开始时间截 (2018-01-01) ，不可修改 */ + private final long twepoch = 1420041600000L; + + /** 机器id所占的位数 */ + private final long workerIdBits = 5L; + + /** 数据标识id所占的位数 */ + private final long datacenterIdBits = 5L; + + /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */ + private final long maxWorkerId = -1L ^ (-1L << workerIdBits); + + /** 支持的最大数据标识id，结果是31 */ + private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + + /** 序列在id中占的位数 */ + private final long sequenceBits = 12L; + + /** 机器ID向左移12位 */ + private final long workerIdShift = sequenceBits; + + /** 数据标识id向左移17位(12+5) */ + private final long datacenterIdShift = sequenceBits + workerIdBits; + + /** 时间截向左移22位(5+5+12) */ + private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; + + /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */ + private final long sequenceMask = -1L ^ (-1L << sequenceBits); + + /** 工作机器ID(0~31) */ + private long workerId; + + /** 数据中心ID(0~31) */ + private long datacenterId; + + /** 毫秒内序列(0~4095) */ + private long sequence = 0L; + + /** 上次生成ID的时间截 */ + private long lastTimestamp = -1L; + + /** + * 构造函数 + * + * @param workerId 工作ID (0~31) + * @param datacenterId 数据中心ID (0~31) + */ + public SnowflakeIdWorker(long workerId, long datacenterId) { + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException(String.format( + "worker Id can't be greater than %d or less than 0", + maxWorkerId)); + } + if (datacenterId > maxDatacenterId || datacenterId < 0) { + throw new IllegalArgumentException(String.format( + "datacenter Id can't be greater than %d or less than 0", + maxDatacenterId)); + } + this.workerId = workerId; + this.datacenterId = datacenterId; + } + + public SnowflakeIdWorker() { + }; + + /** + * 获得下一个ID (该方法是线程安全的) + * + * @return SnowflakeId + */ + public synchronized long nextId() { + long timestamp = timeGen(); + + // 如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常 + if (timestamp < lastTimestamp) { + throw new RuntimeException( + String.format( + "Clock moved backwards. Refusing to generate id for %d milliseconds", + lastTimestamp - timestamp)); + } + + // 如果是同一时间生成的，则进行毫秒内序列 + if (lastTimestamp == timestamp) { + sequence = (sequence + 1) & sequenceMask; + // 毫秒内序列溢出 + if (sequence == 0) { + // 阻塞到下一个毫秒,获得新的时间戳 + timestamp = tilNextMillis(lastTimestamp); + } + }else {// 时间戳改变，毫秒内序列重置 + sequence = 0L; + } + + // 上次生成ID的时间截 + lastTimestamp = timestamp; + + // 移位并通过或运算拼到一起组成64位的ID + return ((timestamp - twepoch) << timestampLeftShift) // + | (datacenterId << datacenterIdShift) // + | (workerId << workerIdShift) // + | sequence; + } + + /** + * 阻塞到下一个毫秒，直到获得新的时间戳 + * + * @param lastTimestamp + * 上次生成ID的时间截 + * @return 当前时间戳 + */ + protected long tilNextMillis(long lastTimestamp) { + long timestamp = timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + /** + * 返回以毫秒为单位的当前时间 + * + * @return 当前时间(毫秒) + */ + protected long timeGen() { + return System.currentTimeMillis(); + } + + +} diff --git a/sf-order/pom.xml b/sf-order/pom.xml new file mode 100644 index 0000000..08b9c37 --- /dev/null +++ b/sf-order/pom.xml @@ -0,0 +1,34 @@ + +
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/deploy/INFO/index.vue b/sf-ui/src/views/deploy/INFO/index.vue
new file mode 100644
index 0000000..797a3b0
--- /dev/null
+++ b/sf-ui/src/views/deploy/INFO/index.vue
@@ -0,0 +1,332 @@
+
+ 新增安装包
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传文件
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新建
+
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+ 下载安装包
+
+ 编辑
+
+ 详情
+
+ 删除
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/goods/goods/index.vue b/sf-ui/src/views/goods/goods/index.vue
new file mode 100644
index 0000000..819c794
--- /dev/null
+++ b/sf-ui/src/views/goods/goods/index.vue
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
From cfee6f1704a811853b2c46c03ddbb30241742618 Mon Sep 17 00:00:00 2001
From: pengren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/appManagement/index.vue b/sf-ui/src/views/FDS/appManagement/index.vue
new file mode 100644
index 0000000..67b220c
--- /dev/null
+++ b/sf-ui/src/views/FDS/appManagement/index.vue
@@ -0,0 +1,207 @@
+
+ 新增渠道
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新建
+
+
+
+ 批量删除
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 下架
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/channelManagement/add.vue b/sf-ui/src/views/FDS/channelManagement/add.vue
new file mode 100644
index 0000000..d80ce25
--- /dev/null
+++ b/sf-ui/src/views/FDS/channelManagement/add.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/channelManagement/index.vue b/sf-ui/src/views/FDS/channelManagement/index.vue
new file mode 100644
index 0000000..30fadde
--- /dev/null
+++ b/sf-ui/src/views/FDS/channelManagement/index.vue
@@ -0,0 +1,210 @@
+
+ 新增渠道
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新建
+
+
+
+ 批量删除
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+ 下架
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue
index cde38a4..95b9c9c 100644
--- a/sf-ui/src/views/FDS/installationList/add.vue
+++ b/sf-ui/src/views/FDS/installationList/add.vue
@@ -2,76 +2,53 @@
新增文件
+ 新增安装包
-
-
-
- 在线上传
-
- 离线上传
+
+
+
+ {{ item.label }}
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
- 上传文件
+ 上传文件
-
-
+
+
-
-
- Android
-
- 鸿蒙
-
- IOS
+
+
+ {{ item.label }}
-
+
+
+ 提交
+ 重置
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From d48e5d8227df4e8472a56801da7153fbc140a7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Fri, 12 Apr 2024 09:27:53 +0800
Subject: [PATCH 033/118] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=A6=BB?=
=?UTF-8?q?=E7=BA=BF=E5=8C=85=E6=A8=A1=E5=9D=97=E7=9A=84=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E4=B8=BA=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C?=
=?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=AD=97=E5=85=B8=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf-ui/src/layout/components/index.js | 2 +-
sf-ui/src/views/FDS/installationList/add.vue | 110 +++++++-----------
.../src/views/FDS/installationList/index.vue | 2 +-
3 files changed, 47 insertions(+), 67 deletions(-)
diff --git a/sf-ui/src/layout/components/index.js b/sf-ui/src/layout/components/index.js
index 9d2424c..d60f9ef 100644
--- a/sf-ui/src/layout/components/index.js
+++ b/sf-ui/src/layout/components/index.js
@@ -1,6 +1,6 @@
export { default as AppMain } from './AppMain'
export { default as Navbar } from './Navbar'
-export { default as NavbarNew } from './NavbarNew'
+// export { default as NavbarNew } from './NavbarNew'
export { default as Settings } from './Settings'
export { default as Sidebar } from './Sidebar/index.vue'
export { default as TagsView } from './TagsView/index.vue'
diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue
index 5fb726f..c7c6eb9 100644
--- a/sf-ui/src/views/FDS/installationList/add.vue
+++ b/sf-ui/src/views/FDS/installationList/add.vue
@@ -8,55 +8,57 @@
+
+
+
+
+ 项目列表
+
+
+
+
+ 卡片
+ 列表
+
+ 新增项目
+
+
-
{{item.appName}}
+ {{item.appName}}
{{item.createTime}}
+
![]()
-
diff --git a/sf-ui/src/router/index.js b/sf-ui/src/router/index.js
index d892652..771b17a 100644
--- a/sf-ui/src/router/index.js
+++ b/sf-ui/src/router/index.js
@@ -176,6 +176,22 @@ export const dynamicRoutes = [
}
]
},
+
+ {
+ path: '/build/install',
+ component: Layout,
+ hidden: true,
+ permissions: ['build:install:edit'],
+ children: [
+ {
+ path: 'edit',
+ component: () => import('@/views/FDS/installationList/edit'),
+ name: 'InstallEdit',
+ meta: { title: '编辑安装包', activeMenu: '/build/installationList' }
+ }
+ ]
+ },
+
{
path: '/build/install',
component: Layout,
@@ -221,7 +237,7 @@ export const dynamicRoutes = [
},
{
- path: '/build/whiteListManagement',
+ path: '/build/whiteList',
component: Layout,
hidden: true,
permissions: ['build:whiteListManagement:add'],
@@ -236,7 +252,7 @@ export const dynamicRoutes = [
},
{
- path: '/build/whiteListManagement',
+ path: '/build/whiteList',
component: Layout,
hidden: true,
permissions: ['build:whiteListManagement:detail'],
@@ -251,7 +267,7 @@ export const dynamicRoutes = [
},
{
- path: '/build/whiteListManagement',
+ path: '/build/whiteList',
component: Layout,
hidden: true,
permissions: ['build:whiteListManagement:addConfig'],
diff --git a/sf-ui/src/views/FDS/channelManagement/index.vue b/sf-ui/src/views/FDS/channelManagement/index.vue
index 30fadde..9cc325b 100644
--- a/sf-ui/src/views/FDS/channelManagement/index.vue
+++ b/sf-ui/src/views/FDS/channelManagement/index.vue
@@ -62,7 +62,7 @@
请上传
- 大小不超过 {{ fileSize }}MB
- 格式为 {{ fileType.join("/") }}
+ 大小不超过 {{ fileSize }}MB
+ 格式为 {{ fileType.join('/') }}
的文件
+ *
+ * @author zoukun
+ */
+public interface AuthSource {
+
+ /**
+ * 授权的api
+ *
+ * @return url
+ */
+ String authorize();
+
+ /**
+ * 获取accessToken的api
+ *
+ * @return url
+ */
+ String accessToken();
+
+ /**
+ * 获取用户信息的api
+ *
+ * @return url
+ */
+ String userInfo();
+
+ /**
+ * 取消授权的api
+ *
+ * @return url
+ */
+ default String revoke() {
+ throw new AuthException("UNSUPPORTED");
+ }
+
+ /**
+ * 刷新授权的api
+ *
+ * @return url
+ */
+ default String refresh() {
+ throw new AuthException("UNSUPPORTED");
+ }
+
+ /**
+ * 获取Source的字符串名字
+ *
+ * @return name
+ */
+ default String getName() {
+ if (this instanceof Enum) {
+ return String.valueOf(this);
+ }
+ return this.getClass().getSimpleName();
+ }
+
+ /**
+ * 平台对应的 AuthRequest 实现类，必须继承自 {@link AuthDefaultRequest}
+ *
+ * @return class
+ */
+ Class getTargetClass();
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/controller/RestAuthController.java b/sf-oauth/src/main/java/com/sf/oauth/controller/RestAuthController.java
new file mode 100644
index 0000000..036574c
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/controller/RestAuthController.java
@@ -0,0 +1,143 @@
+package com.sf.oauth.controller;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.sf.common.constant.Constants;
+import com.sf.common.constant.HttpStatus;
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.oauth.config.AuthConfig;
+import com.sf.oauth.domain.AuthCallback;
+import com.sf.oauth.domain.AuthUser;
+import com.sf.oauth.enums.scope.AuthHuaweiScope;
+import com.sf.oauth.exception.AuthException;
+import com.sf.oauth.request.AuthHuaweiRequest;
+import com.sf.oauth.request.AuthRequest;
+import com.sf.oauth.service.IAuthService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Arrays;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+/**
+ * @author zoukun
+ */
+@Slf4j
+@RestController
+@RequestMapping("/oauth")
+public class RestAuthController {
+
+ @Autowired
+ private IAuthService authService;
+
+ @GetMapping("/authorize/{source}")
+ public void authorize(@PathVariable("source") String source, HttpServletResponse response) throws IOException {
+ log.info("进入render：" + source);
+ AuthRequest authRequest = getAuthRequest(source, EMPTY, EMPTY);
+ String authorizeUrl = authRequest.authorize(UUID.fastUUID().toString());
+ log.info(authorizeUrl);
+ response.sendRedirect(authorizeUrl);
+ }
+
+ /**
+ * oauth平台中配置的授权回调地址
+ * 如在创建华为授权应用时的回调地址为：http://127.0.0.1:8080/oauth/callback/huawei
+ */
+ @RequestMapping("/callback/{source}")
+ public AjaxResult callback(@PathVariable("source") String source, @RequestBody AuthCallback callback, HttpSession session) {
+ log.info("进入callback：" + source + " callback params：" + JSONObject.toJSONString(callback));
+ AuthRequest authRequest = getAuthRequest(source, callback.getClientId(), callback.getClientSecret());
+ AuthUser authUser = authRequest.callback(callback);
+ log.info(JSONObject.toJSONString(authUser));
+ AjaxResult ajax = AjaxResult.success();
+ String token = authService.authLogin(authUser,session);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
+ }
+
+ /*
+ @RequestMapping("/revoke/{source}/{userId}")
+ @ResponseBody
+ public AjaxResult revokeAuth(@PathVariable("source") String source, @PathVariable("userId") String userId) throws IOException {
+ AuthRequest authRequest = getAuthRequest(source.toLowerCase());
+
+ AuthUser user = userService.getByUuid(uuid);
+ if (null == user) {
+ return Response.error("用户不存在");
+ }
+ AjaxResult
+ * 参考：https://developer.huawei.com/consumer/cn/doc/development/HMSCore-Guides-V5/server-dev-0000001050039664-V5#ZH-CN_TOPIC_0000001050039664__section1618418855716
+ */
+ SCOPE_DRIVE("https://www.huawei.com/auth/drive", "只允许访问由应用程序创建或打开的文件", false),
+ SCOPE_DRIVE_READONLY("https://www.huawei.com/auth/drive.readonly", "只允许访问由应用程序创建或打开的文件", false),
+ SCOPE_DRIVE_METADATA("https://www.huawei.com/auth/drive.metadata", "只允许访问由应用程序创建或打开的文件", false),
+ SCOPE_DRIVE_METADATA_READONLY("https://www.huawei.com/auth/drive.metadata.readonly", "只允许访问由应用程序创建或打开的文件", false),
+
+
+ ;
+
+ private final String scope;
+ private final String description;
+ private final boolean isDefault;
+
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/enums/scope/AuthScope.java b/sf-oauth/src/main/java/com/sf/oauth/enums/scope/AuthScope.java
new file mode 100644
index 0000000..52ef1d4
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/enums/scope/AuthScope.java
@@ -0,0 +1,23 @@
+package com.sf.oauth.enums.scope;
+
+/**
+ * 各个平台 scope 类的统一接口
+ *
+ * @author zoukun
+ */
+public interface AuthScope {
+
+ /**
+ * 获取字符串 {@code scope}，对应为各平台实际使用的 {@code scope}
+ *
+ * @return String
+ */
+ String getScope();
+
+ /**
+ * 判断当前 {@code scope} 是否为各平台默认启用的
+ *
+ * @return boolean
+ */
+ boolean isDefault();
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/exception/AuthException.java b/sf-oauth/src/main/java/com/sf/oauth/exception/AuthException.java
new file mode 100644
index 0000000..b0f6959
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/exception/AuthException.java
@@ -0,0 +1,46 @@
+package com.sf.oauth.exception;
+
+
+import com.sf.oauth.config.AuthSource;
+
+/**
+ * 授权异常
+ *
+ * @author zoukun
+ */
+public class AuthException extends RuntimeException {
+
+ private int errorCode;
+ private String errorMsg;
+
+ public AuthException(String errorMsg) {
+ super(errorMsg);
+ this.errorMsg = errorMsg;
+ }
+
+ public AuthException(int errorCode, String errorMsg) {
+ super(errorMsg);
+ this.errorCode = errorCode;
+ this.errorMsg = errorMsg;
+ }
+
+ public AuthException(int errorCode, String errorMsg, AuthSource source) {
+ this(errorCode, String.format("%s [%s]", errorMsg, source.getName()));
+ }
+
+ public AuthException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public AuthException(Throwable cause) {
+ super(cause);
+ }
+
+ public int getErrorCode() {
+ return errorCode;
+ }
+
+ public String getErrorMsg() {
+ return errorMsg;
+ }
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/request/AuthDefaultRequest.java b/sf-oauth/src/main/java/com/sf/oauth/request/AuthDefaultRequest.java
new file mode 100644
index 0000000..6a9f991
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/request/AuthDefaultRequest.java
@@ -0,0 +1,177 @@
+package com.sf.oauth.request;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.http.HttpUtil;
+import com.sf.common.constant.HttpStatus;
+import com.sf.oauth.config.AuthConfig;
+import com.sf.oauth.config.AuthSource;
+import com.sf.oauth.exception.AuthException;
+import com.sf.oauth.domain.AuthCallback;
+import com.sf.oauth.domain.AuthToken;
+import com.sf.oauth.domain.AuthUser;
+import com.sf.oauth.utils.AuthChecker;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 默认的request处理类
+ *
+ * @author zoukun
+ */
+@Slf4j
+public abstract class AuthDefaultRequest implements AuthRequest {
+ protected AuthConfig config;
+ protected AuthSource source;
+
+ public AuthDefaultRequest(AuthConfig config, AuthSource source) {
+ this.config = config;
+ this.source = source;
+ if (!AuthChecker.isSupportedAuth(config, source)) {
+ throw new AuthException(HttpStatus.ERROR,"Parameter incomplete", source);
+ }
+ // 校验配置合法性
+ // AuthChecker.checkConfig(config, source);
+ }
+
+ /**
+ * 获取access token
+ *
+ * @param authCallback 授权成功后的回调参数
+ * @return token
+ * @see AuthDefaultRequest#authorize()
+ * @see AuthDefaultRequest#authorize(String)
+ */
+ protected abstract AuthToken getAccessToken(AuthCallback authCallback);
+
+ /**
+ * 使用token换取用户信息
+ *
+ * @param authToken token信息
+ * @return 用户信息
+ * @see AuthDefaultRequest#getAccessToken(AuthCallback)
+ */
+ protected abstract AuthUser getUserInfo(AuthToken authToken);
+
+ /**
+ * 统一的登录入口。当通过{@link AuthDefaultRequest#authorize(String)}授权成功后，会跳转到调用方的相关回调方法中
+ * 方法的入参可以使用{@code AuthCallback}，{@code AuthCallback}类中封装好了OAuth2授权回调所需要的参数
+ *
+ * @param authCallback 用于接收回调参数的实体
+ * @return AuthResponse
+ */
+ @Override
+ public AuthUser callback(AuthCallback authCallback) {
+ try {
+ checkCode(authCallback);
+ if (!config.isIgnoreCheckState()) {
+ AuthChecker.checkState(authCallback.getState(), source);
+ }
+
+ AuthToken authToken = this.getAccessToken(authCallback);
+ return this.getUserInfo(authToken);
+ } catch (Exception e) {
+ log.error("Failed to callback with oauth authorization", e);
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Failed to callback with oauth authorization");
+ }
+ }
+
+ protected void checkCode(AuthCallback authCallback) {
+ AuthChecker.checkCode(source, authCallback);
+ }
+
+
+ /**
+ * 返回授权url，可自行跳转页面
+ *
+ * 不建议使用该方式获取授权地址，不带{@code state}的授权地址，容易受到csrf攻击。
+ * 建议使用{@link AuthDefaultRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验
+ *
+ * @return 返回授权地址
+ * @see AuthDefaultRequest#authorize(String)
+ */
+ @Override
+ public String authorize() {
+ return this.authorize(null);
+ }
+
+ /**
+ * 返回带{@code state}参数的授权url，授权回调时会带上这个{@code state}
+ *
+ * @param state state 验证授权流程的参数，可以防止csrf
+ * @return 返回授权地址
+ */
+ @Override
+ public String authorize(String state) {
+ Map
+ * {@link AuthRequest#authorize()}
+ * {@link AuthRequest#authorize(String)}
+ * {@link AuthRequest#callback(AuthCallback)}
+ * {@link AuthRequest#revoke(AuthToken)}
+ * {@link AuthRequest#refresh(AuthToken)}
+ *
+ * @author zoukun
+ */
+public interface AuthRequest {
+
+ /**
+ * 返回授权url，可自行跳转页面
+ *
+ * 不建议使用该方式获取授权地址，不带{@code state}的授权地址，容易受到csrf攻击。
+ * 建议使用{@link AuthDefaultRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验
+ *
+ * @return 返回授权地址
+ */
+ @Deprecated
+ default String authorize() {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Not Implemented");
+ }
+
+ /**
+ * 返回带{@code state}参数的授权url，授权回调时会带上这个{@code state}
+ *
+ * @param state state 验证授权流程的参数，可以防止csrf
+ * @return 返回授权地址
+ */
+ default String authorize(String state) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Not Implemented");
+ }
+
+ /**
+ * 第三方登录
+ *
+ * @param authCallback 用于接收回调参数的实体
+ * @return 返回登录成功后的用户信息
+ */
+ default AuthUser callback(AuthCallback authCallback) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Not Implemented");
+ }
+
+ /**
+ * 撤销授权
+ *
+ * @param authToken 登录成功后返回的Token信息
+ * @return AjaxResult
+ */
+ default AjaxResult revoke(AuthToken authToken) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Not Implemented");
+ }
+
+ /**
+ * 刷新access token （续期）
+ *
+ * @param authToken 登录成功后返回的Token信息
+ * @return AjaxResult
+ */
+ default AjaxResult refresh(AuthToken authToken) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Not Implemented");
+ }
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/service/IAuthService.java b/sf-oauth/src/main/java/com/sf/oauth/service/IAuthService.java
new file mode 100644
index 0000000..d86faa2
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/service/IAuthService.java
@@ -0,0 +1,15 @@
+package com.sf.oauth.service;
+
+import com.sf.oauth.domain.AuthUser;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 功能描述:
+ *
+ * @author a_kun
+ * @date 2024/4/12 10:21
+ */
+public interface IAuthService {
+ String authLogin(AuthUser authUser, HttpSession session);
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/service/impl/IAuthServiceImpl.java b/sf-oauth/src/main/java/com/sf/oauth/service/impl/IAuthServiceImpl.java
new file mode 100644
index 0000000..82d2cc0
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/service/impl/IAuthServiceImpl.java
@@ -0,0 +1,62 @@
+package com.sf.oauth.service.impl;
+
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.domain.entity.SysUser;
+import com.sf.common.enums.UserStatus;
+import com.sf.common.utils.SecurityUtils;
+import com.sf.common.utils.ip.IpUtils;
+import com.sf.framework.web.service.SysLoginService;
+import com.sf.oauth.domain.AuthUser;
+import com.sf.oauth.exception.AuthException;
+import com.sf.oauth.service.IAuthService;
+import com.sf.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+
+/**
+ * 功能描述:
+ *
+ * @author a_kun
+ * @date 2024/4/12 10:21
+ */
+@Slf4j
+@Service
+public class IAuthServiceImpl implements IAuthService {
+
+ @Autowired
+ private SysLoginService loginService;
+
+ @Autowired
+ private ISysUserService userService;
+
+
+ @Override
+ public String authLogin(AuthUser authUser, HttpSession session) {
+ // TODO 应该要登录后绑定一个平台账号，没有平台账号要创建，保存用户的三方来源，及用户的三方唯一标识和绑定的用户
+ if (authUser != null) {
+ SysUser sysUser = new SysUser();
+ sysUser.setUserName(authUser.getUsername());
+ if (userService.checkUserNameUnique(sysUser)) {
+ // 注册用户后登录
+ sysUser.setNickName(authUser.getNickname());
+ sysUser.setEmail(authUser.getEmail());
+ sysUser.setPhonenumber(authUser.getMobileNumber());
+ sysUser.setSex(authUser.getGender().getCode());
+ sysUser.setAvatar(authUser.getAvatar());
+ sysUser.setPassword(SecurityUtils.encryptPassword("ztzh@sac123"));
+ sysUser.setStatus(UserStatus.OK.getCode());
+ sysUser.setDelFlag("0");
+ sysUser.setLoginIp(IpUtils.getHostIp());
+ sysUser.setLoginDate(new Date());
+ userService.insertUser(sysUser);
+ }
+ // 生成令牌
+ return loginService.noPwdLogin(authUser.getUsername(), session);
+ }
+ throw new AuthException("login error");
+ }
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/utils/AuthChecker.java b/sf-oauth/src/main/java/com/sf/oauth/utils/AuthChecker.java
new file mode 100644
index 0000000..9fe8961
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/utils/AuthChecker.java
@@ -0,0 +1,79 @@
+package com.sf.oauth.utils;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.sf.common.constant.HttpStatus;
+import com.sf.oauth.config.AuthConfig;
+import com.sf.oauth.enums.AuthDefaultSource;
+import com.sf.oauth.config.AuthSource;
+import com.sf.oauth.exception.AuthException;
+import com.sf.oauth.domain.AuthCallback;
+
+/**
+ * 授权配置类的校验器
+ *
+ * @author ZK
+ */
+public class AuthChecker {
+
+ /**
+ * 是否支持第三方登录
+ *
+ * @param config config
+ * @param source source
+ * @return true or false
+ */
+ public static boolean isSupportedAuth(AuthConfig config, AuthSource source) {
+
+ return StrUtil.isNotEmpty(config.getClientId())
+ && StrUtil.isNotEmpty(config.getClientSecret())
+ && null != source;
+ }
+
+ /**
+ * 检查配置合法性。针对部分平台， 对redirect uri有特定要求。一般来说redirect uri都是http://，
+ * 而对于部分平台， redirect uri 必须是https的链接
+ *
+ * @param config config
+ * @param source source
+ */
+ public static void checkConfig(AuthConfig config, AuthSource source) {
+ String redirectUri = config.getRedirectUri();
+ if (StrUtil.isEmpty(redirectUri)) {
+ throw new AuthException(HttpStatus.BAD_REQUEST, "Illegal redirect uri", source);
+ }
+ if (!AuthUtils.isHttpProtocol(redirectUri) && !AuthUtils.isHttpsProtocol(redirectUri)) {
+ throw new AuthException(HttpStatus.BAD_REQUEST, "Illegal redirect uri", source);
+ }
+ }
+
+ /**
+ * 校验回调传回的code
+ *
+ * {@code v1.10.0}版本中改为传入{@code source}和{@code callback}，对于不同平台使用不同参数接受code的情况统一做处理
+ *
+ * @param source 当前授权平台
+ * @param callback 从第三方授权回调回来时传入的参数集合
+ */
+ public static void checkCode(AuthSource source, AuthCallback callback) {
+ if (StrUtil.isEmpty(callback.getCode())) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Illegal code", source);
+ }
+ }
+
+ /**
+ * 校验回调传回的{@code state}，为空或者不存在
+ *
+ * {@code state}不存在的情况只有两种：
+ * 1. {@code state}已使用，被正常清除
+ * 2. {@code state}为前端伪造，本身就不存在
+ *
+ * @param state {@code state}一定不为空
+ * @param source {@code source}当前授权平台
+ */
+ public static void checkState(String state, AuthSource source) {
+ if (StrUtil.isEmpty(state)) {
+ throw new AuthException(HttpStatus.UNAUTHORIZED,"Illegal state", source);
+ }
+ }
+}
diff --git a/sf-oauth/src/main/java/com/sf/oauth/utils/AuthScopeUtils.java b/sf-oauth/src/main/java/com/sf/oauth/utils/AuthScopeUtils.java
new file mode 100644
index 0000000..9350882
--- /dev/null
+++ b/sf-oauth/src/main/java/com/sf/oauth/utils/AuthScopeUtils.java
@@ -0,0 +1,44 @@
+package com.sf.oauth.utils;
+
+import com.sf.oauth.enums.scope.AuthScope;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Scope 工具类，提供对 scope 类的统一操作
+ *
+ * @author zoukun
+ */
+public class AuthScopeUtils {
+
+ /**
+ * 获取 {@link com.sf.oauth.enums.scope.AuthScope} 数组中所有的被标记为 {@code default} 的 scope
+ *
+ * @param scopes scopes
+ * @return List
+ */
+ public static List
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
@@ -39,14 +39,11 @@
-
-
-
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 144cfd4..5094cc1 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -65,6 +65,19 @@
>修改
+
+
+ 批量发布
+
+
+
删除
-
-
-
- 导出
+ >批量删除
@@ -130,6 +132,36 @@
+ 下架
+
+ 发布
+
+
+ 详情
+
+
+ 下载安装包
+
-
-
+
+
+
安卓
@@ -172,10 +208,6 @@
鸿蒙
-
-
-
-
-
+
+
-->
+
+
@@ -294,13 +332,16 @@
import { addPublish, delPublish, getPublish, listPublish, updatePublish } from '@/api/deployment/publish'
import Cookies from 'js-cookie'
import AddPack from '@/views/FDS/publishList/components/addPack.vue'
+import DetailModal from './component/detail.vue'
import { listEnvironment } from '@/api/deployment/environment'
+import { getApplicationName } from '@/utils/application'
export default {
name: 'Publish',
dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'],
components: {
- AddPack
+ AddPack,
+ DetailModal
},
data() {
return {
@@ -323,6 +364,8 @@ export default {
// 是否显示弹出层
open: false,
packOpen: false,
+ openDetail: false,
+ detailId: '',
environmentList: [],
// 查询参数
queryParams: {
@@ -396,14 +439,16 @@ export default {
// 取消按钮
cancel() {
this.open = false
+ this.loading = false
this.reset()
+
},
// 表单重置
reset() {
this.form = {
id: null,
applyId: Cookies.get('Admin-Application-Id'),
- appName: null,
+ appName: getApplicationName(),
systemType: null,
apkId: null,
appStoreAddress: null,
@@ -471,12 +516,14 @@ export default {
delete data.explain
updatePublish(data).then(response => {
this.$modal.msgSuccess('修改成功')
+ this.loading = false
this.open = false
this.getList()
})
} else {
addPublish(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
+ this.loading = false
this.open = false
this.getList()
})
@@ -516,6 +563,7 @@ export default {
/** 关闭包选择框*/
closeAddPack() {
+
this.packOpen = false
},
@@ -530,8 +578,24 @@ export default {
// 选择系统做一些逻辑判断
changeSys(sysType) {
this.form.systemType = sysType
- }
+ },
+ /**下载安装包*/
+ handleDownload() {
+ },
+ /**下架*/
+ handleDown() {
+
+ },
+ /**发布*/
+ handlePublish() {
+
+ },
+ /**详情*/
+ handleDetail(row) {
+ this.detailId = row.id
+ this.openDetail = true
+ }
}
}
From de01e86e76e3f191730a03b46a614720a13d6d2f Mon Sep 17 00:00:00 2001
From: pengren
- 安卓
- IOS
- 鸿蒙
-
+
+ /
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 安卓
- IOS
- 鸿蒙
-
+
+
+
@@ -193,7 +196,7 @@
{{ item.name }}
+ 复制当前的安装包地址
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
diff --git a/sf-ui/src/store/modules/user.js b/sf-ui/src/store/modules/user.js
index 70fa8da..f917886 100644
--- a/sf-ui/src/store/modules/user.js
+++ b/sf-ui/src/store/modules/user.js
@@ -7,6 +7,7 @@ import {
setApplicationId,
setApplicationName
} from '@/utils/application'
+import Cookies from 'js-cookie'
const user = {
state: {
@@ -115,8 +116,10 @@ const user = {
const { id, appName } = applicationInfo || {}
if (id) {
setApplicationId(applicationInfo.id)
+ Cookies.set('Admin-Application-appCode', applicationInfo.appCode)
} else {
removeApplicationId()
+ Cookies.remove('Admin-Application-appCode')
}
if (appName) {
setApplicationName(applicationInfo.appName)
diff --git a/sf-ui/src/utils/request.js b/sf-ui/src/utils/request.js
index 64618e9..66874e2 100644
--- a/sf-ui/src/utils/request.js
+++ b/sf-ui/src/utils/request.js
@@ -27,10 +27,13 @@ service.interceptors.request.use(config => {
const isToken = (config.headers || {}).isToken === false
// 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
- config.headers['appCode'] = Cookies.get('Admin-Application-Id')
+ // applicationInfo
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
+ if (Cookies.get('Admin-Application-appCode')) {
+ config.headers['appCode'] = Cookies.get('Admin-Application-appCode')
+ }
// get请求映射params参数
if (config.method === 'get' && config.params) {
let url = config.url + '?' + tansParams(config.params)
From a275a5c30a744c82306f6ef320cad51f7d839cad Mon Sep 17 00:00:00 2001
From: pengren
+ 请上传
+ 大小不超过 {{ fileSize }}MB
+ 格式为 {{ fileType.join('/') }}
+ 的文件
+
+
+ {{ scope.row.platform === '0' ? '安卓' : 'IOS' }}
-
{{ item.name }}
+ {{ item.name }}