Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
ae7af772
Commit
ae7af772
authored
Nov 23, 2023
by
lcl
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'V20230915' of
http://192.168.60.201/root/dsk-operate-sys
into V20230915
parents
d0944724
46f5b40f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
10 deletions
+32
-10
CacheController.java
.../java/com/dsk/web/controller/monitor/CacheController.java
+1
-1
application-test.yml
dsk-admin/src/main/resources/application-test.yml
+1
-1
members.vue
...te-ui/src/views/detail/groupAccount/component/members.vue
+16
-1
index.vue
...iews/enterpriseData/components/SearchEnterprise/index.vue
+0
-1
OssFactory.java
dsk-oss/src/main/java/com/dsk/oss/factory/OssFactory.java
+4
-1
SysConfigServiceImpl.java
...ava/com/dsk/system/service/impl/SysConfigServiceImpl.java
+2
-1
SysOssConfigServiceImpl.java
.../com/dsk/system/service/impl/SysOssConfigServiceImpl.java
+8
-0
DskOpenApiUtil.java
...em/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java
+0
-4
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/monitor/CacheController.java
View file @
ae7af772
...
@@ -40,7 +40,7 @@ public class CacheController {
...
@@ -40,7 +40,7 @@ public class CacheController {
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
CAPTCHA_CODE_KEY
,
"验证码"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
CAPTCHA_CODE_KEY
,
"验证码"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
REPEAT_SUBMIT_KEY
,
"防重提交"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
REPEAT_SUBMIT_KEY
,
"防重提交"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
RATE_LIMIT_KEY
,
"限流处理"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
RATE_LIMIT_KEY
,
"限流处理"
));
CACHES
.
add
(
new
SysCache
(
CacheName
s
.
SYS_OSS_CONFIG
,
"OSS配置"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstant
s
.
SYS_OSS_CONFIG
,
"OSS配置"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
PWD_ERR_CNT_KEY
,
"密码错误次数"
));
CACHES
.
add
(
new
SysCache
(
GlobalConstants
.
PWD_ERR_CNT_KEY
,
"密码错误次数"
));
}
}
...
...
dsk-admin/src/main/resources/application-test.yml
View file @
ae7af772
---
# 监控中心配置
---
# 监控中心配置
spring.boot.admin.client
:
spring.boot.admin.client
:
# 增加客户端开关
# 增加客户端开关
enabled
:
tru
e
enabled
:
fals
e
url
:
http://localhost:9090/admin
url
:
http://localhost:9090/admin
instance
:
instance
:
service-host-type
:
IP
service-host-type
:
IP
...
...
dsk-operate-ui/src/views/detail/groupAccount/component/members.vue
View file @
ae7af772
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
@
sort-change=
"sortChange"
@
sort-change=
"sortChange"
>
>
<
template
slot=
"companyName"
slot-scope=
"scope"
>
<
template
slot=
"companyName"
slot-scope=
"scope"
>
<
router-link
:to=
"scope.row.uipId?`/enterprise/$
{encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId
&&
scope.row.companyName" v-html="scope.row.companyName">
</router-link
>
<
div
v-if=
"scope.row.companyId&&scope.row.companyName"
class=
"a-link"
@
click=
"getUipIdByCid(scope.row.companyId)"
v-html=
"scope.row.companyName"
></div
>
<div
v-else
v-html=
"scope.row.companyName || '--'"
></div>
<div
v-else
v-html=
"scope.row.companyName || '--'"
></div>
</
template
>
</
template
>
<
template
slot=
"stockPercent"
slot-scope=
"scope"
>
<
template
slot=
"stockPercent"
slot-scope=
"scope"
>
...
@@ -76,6 +76,7 @@
...
@@ -76,6 +76,7 @@
<
script
>
<
script
>
import
{
memberList
,
memberCount
,
memberListExport
}
from
'@/api/detail/groupAccount/groupAccount'
import
{
memberList
,
memberCount
,
memberListExport
}
from
'@/api/detail/groupAccount/groupAccount'
import
{
getUipIdByCid
}
from
'@/api/macro/macro'
import
dataRegion
from
'@/assets/json/dataRegion'
import
dataRegion
from
'@/assets/json/dataRegion'
import
{
getDictType
}
from
'@/api/main'
import
{
getDictType
}
from
'@/api/main'
import
mixin
from
'../../party-a/mixins/mixin'
import
mixin
from
'../../party-a/mixins/mixin'
...
@@ -479,6 +480,20 @@
...
@@ -479,6 +480,20 @@
this
.
handleQuery
(
params
)
this
.
handleQuery
(
params
)
this
.
$emit
(
'handle-scroll'
)
this
.
$emit
(
'handle-scroll'
)
},
},
getUipIdByCid
(
companyId
){
var
params
=
[
companyId
]
getUipIdByCid
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
&&
res
.
data
.
length
>
0
&&
res
.
data
[
0
].
uipId
){
this
.
$router
.
push
({
path
:
'/enterprise/'
+
this
.
encodeStr
(
companyId
)})
}
else
{
this
.
$router
.
push
({
path
:
'/company/'
+
this
.
encodeStr
(
companyId
)})
}
}
}).
catch
(
error
=>
{
});
},
clickDialog
(){
clickDialog
(){
this
.
exportData
.
dialogExportVisible
=
true
;
this
.
exportData
.
dialogExportVisible
=
true
;
},
},
...
...
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @
ae7af772
...
@@ -3053,7 +3053,6 @@ export default {
...
@@ -3053,7 +3053,6 @@ export default {
}
else
{
}
else
{
this
.
dataEXCEL
.
exportCount
=
2000
;
this
.
dataEXCEL
.
exportCount
=
2000
;
}
}
console
.
log
(
this
.
exportData
)
//企业资质
//企业资质
if
(
this
.
exportData
.
type
===
1
){
if
(
this
.
exportData
.
type
===
1
){
api
.
aptitudeExport
(
this
.
dataEXCEL
).
then
(
res
=>
{
api
.
aptitudeExport
(
this
.
dataEXCEL
).
then
(
res
=>
{
...
...
dsk-oss/src/main/java/com/dsk/oss/factory/OssFactory.java
View file @
ae7af772
...
@@ -30,7 +30,10 @@ public class OssFactory {
...
@@ -30,7 +30,10 @@ public class OssFactory {
*/
*/
public
static
OssClient
instance
()
{
public
static
OssClient
instance
()
{
// 获取redis 默认类型
// 获取redis 默认类型
String
configKey
=
RedisUtils
.
getCacheObject
(
GlobalConstants
.
DEFAULT_CONFIG_KEY
);
String
configKey
=
RedisUtils
.
getCacheObject
(
OssConstant
.
DEFAULT_CONFIG_KEY
);
if
(
StringUtils
.
isEmpty
(
configKey
))
{
configKey
=
RedisUtils
.
getCacheObject
(
GlobalConstants
.
DEFAULT_CONFIG_KEY
);
}
if
(
StringUtils
.
isEmpty
(
configKey
))
{
if
(
StringUtils
.
isEmpty
(
configKey
))
{
throw
new
OssException
(
"文件存储服务类型无法找到!"
);
throw
new
OssException
(
"文件存储服务类型无法找到!"
);
}
}
...
...
dsk-system/src/main/java/com/dsk/system/service/impl/SysConfigServiceImpl.java
View file @
ae7af772
...
@@ -21,6 +21,7 @@ import com.dsk.common.core.domain.model.DskAccessTokenVO;
...
@@ -21,6 +21,7 @@ import com.dsk.common.core.domain.model.DskAccessTokenVO;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.service.ConfigService
;
import
com.dsk.common.core.service.ConfigService
;
import
com.dsk.common.exception.ServiceException
;
import
com.dsk.common.exception.ServiceException
;
import
com.dsk.common.tenant.helper.TenantHelper
;
import
com.dsk.common.utils.JsonUtils
;
import
com.dsk.common.utils.JsonUtils
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.common.utils.redis.CacheUtils
;
import
com.dsk.common.utils.redis.CacheUtils
;
...
@@ -299,7 +300,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
...
@@ -299,7 +300,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
public
List
<
SysConfig
>
queryListByKey
(
String
keyName
)
{
public
List
<
SysConfig
>
queryListByKey
(
String
keyName
)
{
LambdaQueryWrapper
<
SysConfig
>
dsk
=
new
LambdaQueryWrapper
<
SysConfig
>().
likeRight
(
SysConfig:
:
getConfigKey
,
keyName
);
LambdaQueryWrapper
<
SysConfig
>
dsk
=
new
LambdaQueryWrapper
<
SysConfig
>().
likeRight
(
SysConfig:
:
getConfigKey
,
keyName
);
return
baseMapper
.
selectList
(
dsk
);
return
TenantHelper
.
ignore
(()->
baseMapper
.
selectList
(
dsk
)
);
}
}
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/SysOssConfigServiceImpl.java
View file @
ae7af772
...
@@ -2,11 +2,14 @@ package com.dsk.system.service.impl;
...
@@ -2,11 +2,14 @@ package com.dsk.system.service.impl;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.dsk.common.constant.GlobalConstants
;
import
com.dsk.common.constant.TenantConstants
;
import
com.dsk.common.tenant.core.TenantEntity
;
import
com.dsk.common.tenant.core.TenantEntity
;
import
com.dsk.common.tenant.helper.TenantHelper
;
import
com.dsk.common.tenant.helper.TenantHelper
;
import
com.dsk.common.utils.StreamUtils
;
import
com.dsk.common.utils.StreamUtils
;
...
@@ -67,6 +70,11 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
...
@@ -67,6 +70,11 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
RedisUtils
.
setCacheObject
(
OssConstant
.
DEFAULT_CONFIG_KEY
,
configKey
);
RedisUtils
.
setCacheObject
(
OssConstant
.
DEFAULT_CONFIG_KEY
,
configKey
);
}
}
CacheUtils
.
put
(
CacheNames
.
SYS_OSS_CONFIG
,
config
.
getConfigKey
(),
JsonUtils
.
toJsonString
(
config
));
CacheUtils
.
put
(
CacheNames
.
SYS_OSS_CONFIG
,
config
.
getConfigKey
(),
JsonUtils
.
toJsonString
(
config
));
if
(
TenantConstants
.
DEFAULT_TENANT_ID
.
equals
(
config
.
getTenantId
())){
RedisUtils
.
setCacheObject
(
GlobalConstants
.
DEFAULT_CONFIG_KEY
,
configKey
);
CacheUtils
.
put
(
GlobalConstants
.
SYS_OSS_CONFIG
,
config
.
getConfigKey
(),
JsonUtils
.
toJsonString
(
config
));
}
}
}
}
}
}
finally
{
}
finally
{
...
...
dsk-system/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java
View file @
ae7af772
...
@@ -6,20 +6,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...
@@ -6,20 +6,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.dsk.acc.openapi.api.AccClient
;
import
com.dsk.acc.openapi.api.AccClient
;
import
com.dsk.acc.openapi.client.Config
;
import
com.dsk.acc.openapi.client.Config
;
import
com.dsk.acc.openapi.client.util.CommonUtils
;
import
com.dsk.acc.openapi.client.util.CommonUtils
;
import
com.dsk.common.config.DskOpenApiConfig
;
import
com.dsk.common.constant.TenantConstants
;
import
com.dsk.common.constant.TenantConstants
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.exception.ServiceException
;
import
com.dsk.common.tenant.helper.TenantHelper
;
import
com.dsk.common.tenant.helper.TenantHelper
;
import
com.dsk.system.domain.SysConfig
;
import
com.dsk.system.domain.SysConfig
;
import
com.dsk.system.mapper.SysConfigMapper
;
import
com.dsk.system.mapper.SysConfigMapper
;
import
org.apache.commons.collections4.MapUtils
;
import
org.apache.commons.collections4.MapUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.lang.reflect.Field
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment