Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
roncoo
roncoo-education
提交
d77916c3
R
roncoo-education
项目概览
roncoo
/
roncoo-education
11 个月 前同步成功
通知
146
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roncoo-education
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d77916c3
编写于
3月 24, 2023
作者:
F
fengyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加点播私有化功能
上级
28d93861
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
151 addition
and
211 deletion
+151
-211
roncoo-education-common/roncoo-education-common-service/src/main/java/com/roncoo/education/common/upload/Upload.java
.../main/java/com/roncoo/education/common/upload/Upload.java
+1
-1
roncoo-education-common/roncoo-education-common-video/pom.xml
...oo-education-common/roncoo-education-common-video/pom.xml
+1
-1
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/IFeignSysConfig.java
...oo/education/system/feign/interfaces/IFeignSysConfig.java
+7
-9
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/PayConfig.java
...oncoo/education/system/feign/interfaces/vo/PayConfig.java
+24
-0
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/SysConfig.java
...oncoo/education/system/feign/interfaces/vo/SysConfig.java
+24
-0
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/SysConfigViewVO.java
...education/system/feign/interfaces/vo/SysConfigViewVO.java
+0
-75
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/feign/FeignSysConfigController.java
...ncoo/education/system/feign/FeignSysConfigController.java
+8
-9
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/feign/biz/FeignSysConfigBiz.java
.../roncoo/education/system/feign/biz/FeignSysConfigBiz.java
+19
-34
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminStatBiz.java
...ncoo/education/system/service/admin/biz/AdminStatBiz.java
+13
-20
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminUploadBiz.java
...oo/education/system/service/admin/biz/AdminUploadBiz.java
+3
-14
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/biz/ApiSysConfigBiz.java
...coo/education/system/service/api/biz/ApiSysConfigBiz.java
+5
-16
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/SysConfigCommonBiz.java
...ncoo/education/system/service/biz/SysConfigCommonBiz.java
+33
-0
roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/api/biz/ApiOrderPayBiz.java
...roncoo/education/user/service/api/biz/ApiOrderPayBiz.java
+4
-13
roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/auth/biz/AuthOrderPayBiz.java
...ncoo/education/user/service/auth/biz/AuthOrderPayBiz.java
+9
-19
未找到文件。
roncoo-education-common/roncoo-education-common-service/src/main/java/com/roncoo/education/common/upload/Upload.java
浏览文件 @
d77916c3
...
...
@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
import
java.io.Serializable
;
/**
*
交易下单通知
*
上传接口
*
* @author LYQ
*/
...
...
roncoo-education-common/roncoo-education-common-video/pom.xml
浏览文件 @
d77916c3
...
...
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>
com.roncoo
</groupId>
<artifactId>
roncoo-education-common-
cor
e
</artifactId>
<artifactId>
roncoo-education-common-
servic
e
</artifactId>
</dependency>
</dependencies>
...
...
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/IFeignSysConfig.java
浏览文件 @
d77916c3
package
com.roncoo.education.system.feign.interfaces
;
import
com.roncoo.education.common.core.sms.SmsConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfigViewVO
;
import
com.roncoo.education.system.feign.interfaces.vo.PayConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.VodConfig
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
java.util.Map
;
/**
* 系统配置 接口
...
...
@@ -18,15 +16,15 @@ import java.util.Map;
@FeignClient
(
value
=
"system-service"
,
path
=
"/system/sys/config"
)
public
interface
IFeignSysConfig
{
@GetMapping
(
value
=
"/getMapByConfigType/{type}"
)
Map
<
String
,
String
>
getMapByConfigType
(
@PathVariable
(
value
=
"type"
)
Integer
configType
);
@GetMapping
(
value
=
"/getSys"
)
SysConfig
getSys
();
@GetMapping
(
value
=
"/getPay"
)
PayConfig
getPay
();
@GetMapping
(
value
=
"/getSms"
)
SmsConfig
getSms
();
@GetMapping
(
value
=
"/getVod"
)
VodConfig
getVod
();
@GetMapping
(
value
=
"/getByConfigKey/{key}"
)
SysConfigViewVO
getByConfigKey
(
@PathVariable
(
value
=
"key"
)
String
configKey
);
}
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/PayConfig.java
0 → 100644
浏览文件 @
d77916c3
package
com.roncoo.education.system.feign.interfaces.vo
;
import
com.roncoo.education.common.pay.util.AliPayConfig
;
import
com.roncoo.education.common.pay.util.WxPayConfig
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
/**
* 支付配置
*
* @author LYQ
*/
@Data
@Accessors
(
chain
=
true
)
public
class
PayConfig
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
AliPayConfig
aliPayConfig
;
private
WxPayConfig
wxPayConfig
;
}
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/SysConfig.java
0 → 100644
浏览文件 @
d77916c3
package
com.roncoo.education.system.feign.interfaces.vo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
/**
* 系统配置
*
* @author LYQ
*/
@Data
@Accessors
(
chain
=
true
)
public
class
SysConfig
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 网关域名
*/
private
String
websiteDomain
;
}
roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/interfaces/vo/SysConfigViewVO.java
已删除
100644 → 0
浏览文件 @
28d93861
package
com.roncoo.education.system.feign.interfaces.vo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* 系统配置
*
* @author wujing
* @date 2022-08-25
*/
@Data
@Accessors
(
chain
=
true
)
public
class
SysConfigViewVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键ID
*/
private
Long
id
;
/**
* 配置类型(1:站点信息,2:系统信息、3:其他)
*/
private
Integer
configType
;
/**
* 内容类型(1:文本、2:富文本、3图片、4布尔、5枚举)
*/
private
Integer
contentType
;
/**
* 参数名称
*/
private
String
configName
;
/**
* 参数键名
*/
private
String
configKey
;
/**
* 参数键值
*/
private
String
configValue
;
/**
* 配置展示(0:隐藏、1:显示)
*/
private
Boolean
configShow
;
/**
* 备注
*/
private
String
remark
;
/**
* 排序,默认值:100
*/
private
Integer
sort
;
/**
* 创建时间
*/
private
LocalDateTime
gmtCreate
;
/**
* 修改时间
*/
private
LocalDateTime
gmtModified
;
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/feign/FeignSysConfigController.java
浏览文件 @
d77916c3
...
...
@@ -3,15 +3,14 @@ package com.roncoo.education.system.feign;
import
com.roncoo.education.common.core.sms.SmsConfig
;
import
com.roncoo.education.system.feign.biz.FeignSysConfigBiz
;
import
com.roncoo.education.system.feign.interfaces.IFeignSysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfigViewVO
;
import
com.roncoo.education.system.feign.interfaces.vo.PayConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.VodConfig
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.constraints.NotNull
;
import
java.util.Map
;
/**
* 系统配置
...
...
@@ -27,10 +26,14 @@ public class FeignSysConfigController implements IFeignSysConfig {
@NotNull
private
final
FeignSysConfigBiz
biz
;
@Override
public
SysConfig
getSys
()
{
return
biz
.
getSys
();
}
@Override
public
Map
<
String
,
String
>
getMapByConfigType
(
@PathVariable
(
value
=
"type"
)
Integer
configType
)
{
return
biz
.
get
MapByConfigType
(
configType
);
public
PayConfig
getPay
(
)
{
return
biz
.
get
Pay
(
);
}
@Override
...
...
@@ -43,8 +46,4 @@ public class FeignSysConfigController implements IFeignSysConfig {
return
biz
.
getVod
();
}
@Override
public
SysConfigViewVO
getByConfigKey
(
@PathVariable
(
value
=
"key"
)
String
configKey
)
{
return
biz
.
getByConfigKey
(
configKey
);
}
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/feign/biz/FeignSysConfigBiz.java
浏览文件 @
d77916c3
package
com.roncoo.education.system.feign.biz
;
import
cn.hutool.core.collection.CollUtil
;
import
com.roncoo.education.common.core.sms.SmsConfig
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.pay.util.AliPayConfig
;
import
com.roncoo.education.common.pay.util.WxPayConfig
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.system.dao.SysConfigDao
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfig
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfigExample
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfigViewVO
;
import
com.roncoo.education.system.feign.interfaces.vo.PayConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.SysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.VodConfig
;
import
com.roncoo.education.system.service.biz.SysConfigCommonBiz
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Component
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 系统配置
...
...
@@ -28,36 +23,26 @@ import java.util.stream.Collectors;
public
class
FeignSysConfigBiz
extends
BaseBiz
{
@NotNull
private
final
SysConfig
Dao
dao
;
private
final
SysConfig
CommonBiz
sysConfigCommonBiz
;
public
SmsConfig
getSms
()
{
SysConfigExample
example
=
new
SysConfigExample
();
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
return
BeanUtil
.
objToBean
(
map
,
SmsConfig
.
class
);
public
SysConfig
getSys
()
{
return
sysConfigCommonBiz
.
getSysConfig
(
SysConfig
.
class
);
}
public
VodConfig
getVod
()
{
SysConfigExample
example
=
new
SysConfigExample
();
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
return
BeanUtil
.
objToBean
(
map
,
VodConfig
.
class
)
;
public
PayConfig
getPay
()
{
PayConfig
payConfig
=
new
PayConfig
();
payConfig
.
setAliPayConfig
(
sysConfigCommonBiz
.
getSysConfig
(
AliPayConfig
.
class
)
);
payConfig
.
setWxPayConfig
(
sysConfigCommonBiz
.
getSysConfig
(
WxPayConfig
.
class
));
return
payConfig
;
}
public
Map
<
String
,
String
>
getMapByConfigType
(
Integer
configType
)
{
SysConfigExample
example
=
new
SysConfigExample
();
example
.
createCriteria
().
andConfigTypeEqualTo
(
configType
);
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
return
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
public
SmsConfig
getSms
()
{
return
sysConfigCommonBiz
.
getSysConfig
(
SmsConfig
.
class
);
}
public
SysConfigViewVO
getByConfigKey
(
String
configKey
)
{
SysConfigExample
example
=
new
SysConfigExample
();
example
.
createCriteria
().
andConfigKeyEqualTo
(
configKey
);
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
if
(
CollUtil
.
isNotEmpty
(
sysConfigs
))
{
return
BeanUtil
.
copyProperties
(
sysConfigs
.
get
(
0
),
SysConfigViewVO
.
class
);
}
return
null
;
public
VodConfig
getVod
()
{
return
sysConfigCommonBiz
.
getSysConfig
(
VodConfig
.
class
);
}
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminStatBiz.java
浏览文件 @
d77916c3
...
...
@@ -2,22 +2,18 @@ package com.roncoo.education.system.service.admin.biz;
import
cn.hutool.json.JSONObject
;
import
com.roncoo.education.common.core.base.Result
;
import
com.roncoo.education.common.core.
tools.BeanUtil
;
import
com.roncoo.education.common.core.
enums.VodPlatformEnum
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.common.video.impl.polyv.PolyvVodUtil
;
import
com.roncoo.education.system.dao.SysConfigDao
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfig
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfigExample
;
import
com.roncoo.education.system.feign.interfaces.vo.VodConfig
;
import
com.roncoo.education.system.service.admin.resp.StatVodResp
;
import
com.roncoo.education.system.service.biz.SysConfigCommonBiz
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 点播直播统计
...
...
@@ -30,27 +26,24 @@ public class AdminStatBiz extends BaseBiz {
@Autowired
private
SysConfigDao
dao
;
@Autowired
private
SysConfigCommonBiz
sysConfigCommonBiz
;
public
Result
<
StatVodResp
>
vod
()
{
StatVodResp
resp
=
new
StatVodResp
();
VodConfig
vodConfig
=
sysConfigCommonBiz
.
getSysConfig
(
VodConfig
.
class
);
try
{
VodConfig
vodConfig
=
getVod
();
JSONObject
result
=
PolyvVodUtil
.
getUserMain
(
vodConfig
.
getPolyvUserId
(),
vodConfig
.
getPolyvSecretKey
());
resp
.
setTotalSpace
(
result
.
getBigDecimal
(
"totalSpace"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setUsedSpace
(
result
.
getBigDecimal
(
"usedSpace"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setTotalFlow
(
result
.
getBigDecimal
(
"totalFlow"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setUsedFlow
(
result
.
getBigDecimal
(
"usedFlow"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
//resp.setEmail(result.getStr("email"));
if
(
VodPlatformEnum
.
POLYV
.
getCode
().
equals
(
vodConfig
.
getVodPlatform
()))
{
JSONObject
result
=
PolyvVodUtil
.
getUserMain
(
vodConfig
.
getPolyvUserId
(),
vodConfig
.
getPolyvSecretKey
());
resp
.
setTotalSpace
(
result
.
getBigDecimal
(
"totalSpace"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setUsedSpace
(
result
.
getBigDecimal
(
"usedSpace"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setTotalFlow
(
result
.
getBigDecimal
(
"totalFlow"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
resp
.
setUsedFlow
(
result
.
getBigDecimal
(
"usedFlow"
).
divide
(
BigDecimal
.
valueOf
(
1024
*
1024
*
1024
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
// resp.setEmail(result.getStr("email"));
}
}
catch
(
Exception
e
)
{
log
.
error
(
"获取异常"
,
e
);
}
return
Result
.
success
(
resp
);
}
private
VodConfig
getVod
()
{
SysConfigExample
example
=
new
SysConfigExample
();
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
return
BeanUtil
.
objToBean
(
map
,
VodConfig
.
class
);
}
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminUploadBiz.java
浏览文件 @
d77916c3
...
...
@@ -6,21 +6,16 @@ package com.roncoo.education.system.service.admin.biz;
import
cn.hutool.core.util.ObjectUtil
;
import
com.roncoo.education.common.core.base.Result
;
import
com.roncoo.education.common.core.enums.StoragePlatformEnum
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.upload.Upload
;
import
com.roncoo.education.common.upload.UploadFace
;
import
com.roncoo.education.system.dao.SysConfigDao
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfig
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfigExample
;
import
com.roncoo.education.system.service.biz.SysConfigCommonBiz
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 上传接口
...
...
@@ -35,10 +30,10 @@ public class AdminUploadBiz {
private
Map
<
String
,
UploadFace
>
uploadFaceMap
;
@Autowired
private
SysConfig
Dao
sysConfigDao
;
private
SysConfig
CommonBiz
sysConfigCommonBiz
;
public
Result
<
String
>
uploadPic
(
MultipartFile
picFile
)
{
Upload
upload
=
getUploadForSysConfig
(
);
Upload
upload
=
sysConfigCommonBiz
.
getSysConfig
(
Upload
.
class
);
if
(
ObjectUtil
.
isNotEmpty
(
upload
)
||
StringUtils
.
isEmpty
(
upload
.
getStoragePlatform
()))
{
UploadFace
uploadFace
=
uploadFaceMap
.
get
(
StoragePlatformEnum
.
byCode
(
Integer
.
valueOf
(
upload
.
getStoragePlatform
())).
getMode
());
String
fileUrl
=
uploadFace
.
uploadPic
(
picFile
,
upload
);
...
...
@@ -51,10 +46,4 @@ public class AdminUploadBiz {
return
null
;
}
private
Upload
getUploadForSysConfig
()
{
SysConfigExample
example
=
new
SysConfigExample
();
List
<
SysConfig
>
sysConfigs
=
sysConfigDao
.
listByExample
(
example
);
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
return
BeanUtil
.
objToBean
(
map
,
Upload
.
class
);
}
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/biz/ApiSysConfigBiz.java
浏览文件 @
d77916c3
package
com.roncoo.education.system.service.api.biz
;
import
com.roncoo.education.common.cache.CacheRedis
;
import
com.roncoo.education.common.core.base.Result
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.system.dao.SysConfigDao
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfig
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfigExample
;
import
com.roncoo.education.system.service.api.resp.ApiSysConfigWebsiteResp
;
import
com.roncoo.education.system.service.biz.SysConfigCommonBiz
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.cache.annotation.CacheConfig
;
import
org.springframework.cache.annotation.Cacheable
;
import
org.springframework.stereotype.Component
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
/**
* AUTH-系统配置
...
...
@@ -31,16 +24,11 @@ import java.util.stream.Collectors;
public
class
ApiSysConfigBiz
extends
BaseBiz
{
@NotNull
private
final
SysConfigDao
dao
;
@NotNull
private
final
CacheRedis
cacheRedis
;
private
final
SysConfigCommonBiz
sysConfigCommonBiz
;
@Cacheable
public
Result
<
ApiSysConfigWebsiteResp
>
website
()
{
SysConfigExample
example
=
new
SysConfigExample
();
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
example
);
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
ApiSysConfigWebsiteResp
resp
=
BeanUtil
.
objToBean
(
map
,
ApiSysConfigWebsiteResp
.
class
);
ApiSysConfigWebsiteResp
resp
=
sysConfigCommonBiz
.
getSysConfig
(
ApiSysConfigWebsiteResp
.
class
);
// 公安网备案号处理
resp
.
setWebsitePrnNo
(
getNumeric
(
resp
.
getWebsitePrn
()));
return
Result
.
success
(
resp
);
...
...
@@ -48,11 +36,12 @@ public class ApiSysConfigBiz extends BaseBiz {
/**
* 从字符串获取数字
*
* @param str
* @return
*/
private
static
String
getNumeric
(
String
str
)
{
String
regEx
=
"[^0-9]"
;
String
regEx
=
"[^0-9]"
;
Pattern
p
=
Pattern
.
compile
(
regEx
);
Matcher
m
=
p
.
matcher
(
str
);
return
m
.
replaceAll
(
""
).
trim
();
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/SysConfigCommonBiz.java
0 → 100644
浏览文件 @
d77916c3
package
com.roncoo.education.system.service.biz
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.system.dao.SysConfigDao
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfig
;
import
com.roncoo.education.system.dao.impl.mapper.entity.SysConfigExample
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 点播直播统计
*
* @author wujing
*/
@Slf4j
@Component
public
class
SysConfigCommonBiz
extends
BaseBiz
{
@Autowired
private
SysConfigDao
dao
;
public
<
T
>
T
getSysConfig
(
Class
<
T
>
clazz
)
{
List
<
SysConfig
>
sysConfigs
=
dao
.
listByExample
(
new
SysConfigExample
());
Map
<
String
,
String
>
map
=
sysConfigs
.
stream
().
collect
(
Collectors
.
toMap
(
SysConfig:
:
getConfigKey
,
SysConfig:
:
getConfigValue
));
return
BeanUtil
.
objToBean
(
map
,
clazz
);
}
}
roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/api/biz/ApiOrderPayBiz.java
浏览文件 @
d77916c3
...
...
@@ -2,21 +2,17 @@ package com.roncoo.education.user.service.api.biz;
import
cn.hutool.core.util.ObjectUtil
;
import
com.roncoo.education.common.core.enums.BuyTypeEnum
;
import
com.roncoo.education.common.core.enums.ConfigTypeEnum
;
import
com.roncoo.education.common.core.enums.OrderStatusEnum
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.core.tools.Constants
;
import
com.roncoo.education.common.core.tools.JSUtil
;
import
com.roncoo.education.common.pay.PayFace
;
import
com.roncoo.education.common.pay.req.TradeNotifyReq
;
import
com.roncoo.education.common.pay.resp.TradeNotifyResp
;
import
com.roncoo.education.common.pay.util.AliPayConfig
;
import
com.roncoo.education.common.pay.util.TradeStatusEnum
;
import
com.roncoo.education.common.pay.util.WxPayConfig
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.course.feign.interfaces.IFeignUserCourse
;
import
com.roncoo.education.course.feign.interfaces.qo.UserCourseBindingQO
;
import
com.roncoo.education.system.feign.interfaces.IFeignSysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.PayConfig
;
import
com.roncoo.education.user.dao.OrderInfoDao
;
import
com.roncoo.education.user.dao.OrderPayDao
;
import
com.roncoo.education.user.dao.impl.mapper.entity.OrderInfo
;
...
...
@@ -29,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.servlet.http.HttpServletRequest
;
import
javax.validation.constraints.NotNull
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
...
...
@@ -102,13 +97,9 @@ public class ApiOrderPayBiz extends BaseBiz {
}
private
void
getPayConfig
(
TradeNotifyReq
req
)
{
Map
<
String
,
String
>
payConfig
=
cacheRedis
.
getByJson
(
Constants
.
RedisPre
.
PAY
+
ConfigTypeEnum
.
PAY
.
getCode
(),
HashMap
.
class
);
if
(
ObjectUtil
.
isEmpty
(
payConfig
))
{
payConfig
=
feignSysConfig
.
getMapByConfigType
(
ConfigTypeEnum
.
PAY
.
getCode
());
cacheRedis
.
set
(
Constants
.
RedisPre
.
PAY
+
ConfigTypeEnum
.
PAY
.
getCode
(),
payConfig
);
}
req
.
setAliPayConfig
(
BeanUtil
.
objToBean
(
payConfig
,
AliPayConfig
.
class
));
req
.
setWxPayConfig
(
BeanUtil
.
objToBean
(
payConfig
,
WxPayConfig
.
class
));
PayConfig
payConfig
=
feignSysConfig
.
getPay
();
req
.
setAliPayConfig
(
payConfig
.
getAliPayConfig
());
req
.
setWxPayConfig
(
payConfig
.
getWxPayConfig
());
}
/**
...
...
roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/auth/biz/AuthOrderPayBiz.java
浏览文件 @
d77916c3
...
...
@@ -4,20 +4,21 @@ import cn.hutool.core.util.ObjectUtil;
import
com.roncoo.education.common.config.ThreadContext
;
import
com.roncoo.education.common.core.base.BaseException
;
import
com.roncoo.education.common.core.base.Result
;
import
com.roncoo.education.common.core.enums.*
;
import
com.roncoo.education.common.core.enums.OrderStatusEnum
;
import
com.roncoo.education.common.core.enums.PayTypeEnum
;
import
com.roncoo.education.common.core.enums.PutawayEnum
;
import
com.roncoo.education.common.core.enums.StatusIdEnum
;
import
com.roncoo.education.common.core.tools.BeanUtil
;
import
com.roncoo.education.common.core.tools.Constants
;
import
com.roncoo.education.common.core.tools.NOUtil
;
import
com.roncoo.education.common.pay.PayFace
;
import
com.roncoo.education.common.pay.req.TradeOrderReq
;
import
com.roncoo.education.common.pay.resp.TradeOrderResp
;
import
com.roncoo.education.common.pay.util.AliPayConfig
;
import
com.roncoo.education.common.pay.util.PayModelEnum
;
import
com.roncoo.education.common.pay.util.WxPayConfig
;
import
com.roncoo.education.common.service.BaseBiz
;
import
com.roncoo.education.course.feign.interfaces.IFeignCourse
;
import
com.roncoo.education.course.feign.interfaces.vo.CourseViewVO
;
import
com.roncoo.education.system.feign.interfaces.IFeignSysConfig
;
import
com.roncoo.education.system.feign.interfaces.vo.PayConfig
;
import
com.roncoo.education.user.dao.OrderInfoDao
;
import
com.roncoo.education.user.dao.OrderPayDao
;
import
com.roncoo.education.user.dao.UsersDao
;
...
...
@@ -36,9 +37,7 @@ import org.springframework.util.StringUtils;
import
javax.validation.constraints.NotNull
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
/**
* AUTH-订单支付信息表
...
...
@@ -186,13 +185,9 @@ public class AuthOrderPayBiz extends BaseBiz {
}
private
void
getPayConfig
(
TradeOrderReq
orderReq
)
{
Map
<
String
,
String
>
payConfig
=
cacheRedis
.
getByJson
(
Constants
.
RedisPre
.
PAY
+
ConfigTypeEnum
.
PAY
.
getCode
(),
HashMap
.
class
);
if
(
ObjectUtil
.
isEmpty
(
payConfig
))
{
payConfig
=
feignSysConfig
.
getMapByConfigType
(
ConfigTypeEnum
.
PAY
.
getCode
());
cacheRedis
.
set
(
Constants
.
RedisPre
.
PAY
+
ConfigTypeEnum
.
PAY
.
getCode
(),
payConfig
);
}
orderReq
.
setAliPayConfig
(
BeanUtil
.
objToBean
(
payConfig
,
AliPayConfig
.
class
));
orderReq
.
setWxPayConfig
(
BeanUtil
.
objToBean
(
payConfig
,
WxPayConfig
.
class
));
PayConfig
payConfig
=
feignSysConfig
.
getPay
();
orderReq
.
setAliPayConfig
(
payConfig
.
getAliPayConfig
());
orderReq
.
setWxPayConfig
(
payConfig
.
getWxPayConfig
());
}
/**
...
...
@@ -226,11 +221,6 @@ public class AuthOrderPayBiz extends BaseBiz {
}
private
String
getNotifyUrl
(
Integer
payModel
,
String
impl
)
{
String
websiteDomain
=
cacheRedis
.
get
(
Constants
.
RedisPre
.
DOMAIN
);
if
(!
StringUtils
.
hasText
(
websiteDomain
))
{
websiteDomain
=
feignSysConfig
.
getByConfigKey
(
"websiteDomain"
).
getConfigValue
();
cacheRedis
.
set
(
Constants
.
RedisPre
.
DOMAIN
,
websiteDomain
,
1
,
TimeUnit
.
HOURS
);
}
return
NOTIFYURL
.
replace
(
"{domain}"
,
websiteDomain
).
replace
(
"{payModel}"
,
payModel
.
toString
()).
replace
(
"{payImpl}"
,
impl
);
return
NOTIFYURL
.
replace
(
"{domain}"
,
feignSysConfig
.
getSys
().
getWebsiteDomain
()).
replace
(
"{payModel}"
,
payModel
.
toString
()).
replace
(
"{payImpl}"
,
impl
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录