Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
85c9810e
提交
85c9810e
编写于
10月 13, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
9d5c85d0
变更
10
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
180 行增加
和
68 行删除
+180
-68
application-dev.yml
businesscentral-boot/src/main/resources/application-dev.yml
+0
-57
AuthenticationController.java
...b/businesscentral/util/rest/AuthenticationController.java
+60
-0
SimpleTokenUtil.java
...bizlab/businesscentral/util/security/SimpleTokenUtil.java
+1
-1
UAATokenUtil.java
...n/ibizlab/businesscentral/util/security/UAATokenUtil.java
+1
-1
AuthenticationUserService.java
...sinesscentral/util/service/AuthenticationUserService.java
+3
-3
IBZConfigService.java
...bizlab/businesscentral/util/service/IBZConfigService.java
+3
-3
IBZUAAUserService.java
...izlab/businesscentral/util/service/IBZUAAUserService.java
+1
-1
IBZUSERServiceImpl.java
...zlab/businesscentral/util/service/IBZUSERServiceImpl.java
+1
-1
SimpleUserService.java
...izlab/businesscentral/util/service/SimpleUserService.java
+1
-1
application-sys.yml
businesscentral-util/src/main/resources/application-sys.yml
+109
-0
未找到文件。
businesscentral-boot/src/main/resources/application-dev.yml
浏览文件 @
85c9810e
server
:
server
:
port
:
8080
port
:
8080
#zuul网关路由设置
zuul
:
routes
:
loginv7
:
path
:
/v7/login
serviceId
:
${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix
:
false
changepwd
:
path
:
/v7/changepwd
serviceId
:
${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix
:
false
uaa
:
path
:
/uaa/**
serviceId
:
${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix
:
false
config
:
path
:
/config/**
serviceId
:
${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix
:
false
oucore
:
path
:
/ibzorganizations/**
serviceId
:
${ibiz.ref.service.ou:ibzou-api}
stripPrefix
:
false
oudict
:
path
:
/dictionarys/**/Ibzou**
serviceId
:
${ibiz.ref.service.ou:ibzou-api}
stripPrefix
:
false
ou
:
path
:
/ibzdepartments/**
serviceId
:
${ibiz.ref.service.ou:ibzou-api}
stripPrefix
:
false
uaadict
:
path
:
/dictionarys/**/SysOperator
serviceId
:
${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix
:
false
dict
:
path
:
/dictionarys/**
serviceId
:
${ibiz.ref.service.dict:ibzdict-api}
stripPrefix
:
false
disk
:
path
:
/net-disk/**
serviceId
:
${ibiz.ref.service.disk:ibzdisk-api}
stripPrefix
:
false
ou_sys_org
:
path
:
/sysorganizations/**
serviceId
:
${ibiz.ref.service.ou:ibzou-api}
stripPrefix
:
false
ou_sys_dept
:
path
:
/sysdepartments/**
serviceId
:
${ibiz.ref.service.ou:ibzou-api}
stripPrefix
:
false
lite-core
:
path
:
/lite/**
serviceId
:
${ibiz.ref.service.lite:ibzlite-api}
stripPrefix
:
false
sensitive-headers
:
-
Cookie,Set-Cookie,Authorization
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/rest/AuthenticationController.java
0 → 100644
浏览文件 @
85c9810e
package
cn
.
ibizlab
.
businesscentral
.
util
.
rest
;
import
cn.ibizlab.businesscentral.util.security.AuthenticationInfo
;
import
cn.ibizlab.businesscentral.util.security.AuthenticationUser
;
import
cn.ibizlab.businesscentral.util.security.AuthorizationLogin
;
import
cn.ibizlab.businesscentral.util.security.AuthTokenUtil
;
import
cn.ibizlab.businesscentral.util.service.AuthenticationUserService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.security.core.context.SecurityContextHolder
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
@RestController
@RequestMapping
(
"/"
)
@ConditionalOnProperty
(
name
=
"ibiz.enablePermissionValid"
,
havingValue
=
"false"
)
public
class
AuthenticationController
{
@Value
(
"${ibiz.jwt.header:Authorization}"
)
private
String
tokenHeader
;
@Autowired
private
AuthTokenUtil
jwtTokenUtil
;
@Autowired
private
AuthenticationUserService
userDetailsService
;
@PostMapping
(
value
=
"${ibiz.auth.path:v7/login}"
)
public
ResponseEntity
<
AuthenticationInfo
>
login
(
@Validated
@RequestBody
AuthorizationLogin
authorizationLogin
){
userDetailsService
.
resetByUsername
(
authorizationLogin
.
getUsername
());
final
AuthenticationUser
authuserdetail
=
userDetailsService
.
loadUserByLogin
(
authorizationLogin
.
getUsername
(),
authorizationLogin
.
getPassword
());
// 生成令牌
final
String
token
=
jwtTokenUtil
.
generateToken
(
authuserdetail
);
// 返回 token
return
ResponseEntity
.
ok
().
body
(
new
AuthenticationInfo
(
token
,
authuserdetail
));
}
@GetMapping
(
value
=
"${ibiz.auth.account:ibizutil/account}"
)
public
ResponseEntity
<
AuthenticationUser
>
getUserInfo
(){
UserDetails
userDetails
=
(
UserDetails
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
AuthenticationUser
authuserdetail
=
new
AuthenticationUser
();
if
(
userDetails
==
null
){
throw
new
RuntimeException
(
"未能获取用户信息"
);
}
else
if
(
userDetails
instanceof
AuthenticationUser
)
{
authuserdetail
=
(
AuthenticationUser
)
userDetails
;
}
else
{
authuserdetail
=
userDetailsService
.
loadUserByUsername
(
userDetails
.
getUsername
());
}
return
ResponseEntity
.
ok
().
body
(
authuserdetail
);
}
}
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/security/SimpleTokenUtil.java
浏览文件 @
85c9810e
...
@@ -19,7 +19,7 @@ import java.util.Optional;
...
@@ -19,7 +19,7 @@ import java.util.Optional;
import
java.util.function.Function
;
import
java.util.function.Function
;
@Component
@Component
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:
UAA
TokenUtil}'.equals('SimpleTokenUtil')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:
Simple
TokenUtil}'.equals('SimpleTokenUtil')"
)
public
class
SimpleTokenUtil
implements
AuthTokenUtil
,
Serializable
{
public
class
SimpleTokenUtil
implements
AuthTokenUtil
,
Serializable
{
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
...
...
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/security/UAATokenUtil.java
浏览文件 @
85c9810e
...
@@ -30,7 +30,7 @@ import java.util.Map;
...
@@ -30,7 +30,7 @@ import java.util.Map;
import
java.util.function.Function
;
import
java.util.function.Function
;
@Component
@Component
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:
UAA
TokenUtil}'.equals('UAATokenUtil')"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:
Simple
TokenUtil}'.equals('UAATokenUtil')"
)
public
class
UAATokenUtil
implements
AuthTokenUtil
,
Serializable
{
public
class
UAATokenUtil
implements
AuthTokenUtil
,
Serializable
{
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
...
...
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/AuthenticationUserService.java
浏览文件 @
85c9810e
...
@@ -15,12 +15,12 @@ public interface AuthenticationUserService extends UserDetailsService {
...
@@ -15,12 +15,12 @@ public interface AuthenticationUserService extends UserDetailsService {
@Override
@Override
@Cacheable
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
@Cacheable
(
value
=
"
businesscentral
_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByUsername
(
String
username
);
AuthenticationUser
loadUserByUsername
(
String
username
);
@Cacheable
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
@Cacheable
(
value
=
"
businesscentral
_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByLogin
(
String
username
,
String
password
);
AuthenticationUser
loadUserByLogin
(
String
username
,
String
password
);
@CacheEvict
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
@CacheEvict
(
value
=
"
businesscentral
_users"
,
key
=
"'getByUsername:'+#p0"
)
void
resetByUsername
(
String
username
);
void
resetByUsername
(
String
username
);
}
}
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/IBZConfigService.java
浏览文件 @
85c9810e
...
@@ -26,7 +26,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
...
@@ -26,7 +26,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
@Value
(
"${ibiz.admin.userid:0100}"
)
@Value
(
"${ibiz.admin.userid:0100}"
)
private
String
adminuserid
;
private
String
adminuserid
;
@Cacheable
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@Cacheable
(
value
=
"
businesscentral
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
JSONObject
getConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
public
JSONObject
getConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
{
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
@@ -41,7 +41,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
...
@@ -41,7 +41,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
return
JSON
.
parseObject
(
config
.
getCfg
());
return
JSON
.
parseObject
(
config
.
getCfg
());
}
}
@CacheEvict
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@CacheEvict
(
value
=
"
businesscentral
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
boolean
saveConfig
(
String
cfgType
,
String
targetType
,
String
userId
,
JSONObject
config
)
public
boolean
saveConfig
(
String
cfgType
,
String
targetType
,
String
userId
,
JSONObject
config
)
{
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
@@ -52,7 +52,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
...
@@ -52,7 +52,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
return
this
.
saveOrUpdate
(
IBZConfig
.
builder
().
systemId
(
systemId
).
cfgType
(
cfgType
).
targetType
(
targetType
).
userId
(
userId
).
cfg
(
cfg
).
updateDate
(
DataObject
.
getNow
()).
build
());
return
this
.
saveOrUpdate
(
IBZConfig
.
builder
().
systemId
(
systemId
).
cfgType
(
cfgType
).
targetType
(
targetType
).
userId
(
userId
).
cfg
(
cfg
).
updateDate
(
DataObject
.
getNow
()).
build
());
}
}
@CacheEvict
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@CacheEvict
(
value
=
"
businesscentral
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
void
resetConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
public
void
resetConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
{
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
...
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/IBZUAAUserService.java
浏览文件 @
85c9810e
...
@@ -18,7 +18,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
...
@@ -18,7 +18,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
* 实体[IBZUSER] 服务对象接口实现
* 实体[IBZUSER] 服务对象接口实现
*/
*/
@Service
(
"IBZUAAUserService"
)
@Service
(
"IBZUAAUserService"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:
IBZUAA
UserService}'.equals('IBZUAAUserService')"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:
Simple
UserService}'.equals('IBZUAAUserService')"
)
public
class
IBZUAAUserService
implements
AuthenticationUserService
{
public
class
IBZUAAUserService
implements
AuthenticationUserService
{
@Autowired
@Autowired
...
...
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/IBZUSERServiceImpl.java
浏览文件 @
85c9810e
...
@@ -20,7 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
...
@@ -20,7 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
* 实体[IBZUSER] 服务对象接口实现
* 实体[IBZUSER] 服务对象接口实现
*/
*/
@Service
(
"IBZUSERService"
)
@Service
(
"IBZUSERService"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
IBZUAA
UserService}'.equals('IBZUSERService')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
Simple
UserService}'.equals('IBZUSERService')"
)
public
class
IBZUSERServiceImpl
extends
ServiceImpl
<
IBZUSERMapper
,
IBZUSER
>
implements
IBZUSERService
,
AuthenticationUserService
{
public
class
IBZUSERServiceImpl
extends
ServiceImpl
<
IBZUSERMapper
,
IBZUSER
>
implements
IBZUSERService
,
AuthenticationUserService
{
@Value
(
"${ibiz.auth.pwencrymode:0}"
)
@Value
(
"${ibiz.auth.pwencrymode:0}"
)
...
...
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/service/SimpleUserService.java
浏览文件 @
85c9810e
...
@@ -18,7 +18,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
...
@@ -18,7 +18,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
*/
*/
@Primary
@Primary
@Service
(
"SimpleUserService"
)
@Service
(
"SimpleUserService"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
IBZUAA
UserService}'.equals('SimpleUserService')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
Simple
UserService}'.equals('SimpleUserService')"
)
public
class
SimpleUserService
implements
AuthenticationUserService
{
public
class
SimpleUserService
implements
AuthenticationUserService
{
@Override
@Override
...
...
businesscentral-util/src/main/resources/application-sys.yml
0 → 100644
浏览文件 @
85c9810e
#缓存、数据源
spring
:
cache
:
redis
:
time-to-live
:
3600
caffeine
:
spec
:
initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
redis
:
host
:
172.16.240.110
port
:
6379
password
:
database
:
0
lettuce
:
pool
:
max-active
:
32
max-wait
:
300ms
max-idle
:
16
min-idle
:
8
servlet
:
multipart
:
max-file-size
:
100MB
max-request-size
:
100MB
datasource
:
username
:
root
password
:
'
root'
url
:
jdbc:mysql://127.0.0.1:3306/iBizBusinessCentral?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
driver-class-name
:
com.mysql.jdbc.Driver
filters
:
stat,wall,log4j2
#配置初始化大小/最小/最大
initial-size
:
1
min-idle
:
1
max-active
:
20
#获取连接等待超时时间
max-wait
:
60000
#间隔多久进行一次检测,检测需要关闭的空闲连接
time-between-eviction-runs-millis
:
60000
#一个连接在池中最小生存的时间
min-evictable-idle-time-millis
:
300000
validation-query
:
SELECT 1 FROM DUAL
test-while-idle
:
true
test-on-borrow
:
false
test-on-return
:
false
#打开PSCache,并指定每个连接上PSCache的大小。oracle设为true,mysql设为false。分库分表较多推荐设置为false
pool-prepared-statements
:
false
max-pool-prepared-statement-per-connection-size
:
20
isSyncDBSchema
:
false
defaultSchema
:
root
conf
:
classpath:liquibase/master.xml
#Mybatis-plus配置
mybatis-plus
:
global-config
:
refresh-mapper
:
true
db-config
:
# 全局逻辑已删除默认值
logic-delete-value
:
0
# 全局逻辑未删除默认值
logic-not-delete-value
:
1
mapper-locations
:
classpath*:/mapper/*/*/*.xml
configuration
:
jdbc-type-for-null
:
'
null'
map-underscore-to-camel-case
:
false
#阿里sentinel熔断器
feign
:
httpclient
:
enabled
:
true
sentinel
:
enabled
:
true
compression
:
request
:
enabled
:
true
mime-types
:
application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
min-response-size
:
10240
response
:
enabled
:
true
#Log配置
logging
:
level
:
cn.ibizlab.businesscentral
:
debug
org.springframework.boot.autoconfigure
:
ERROR
#zuul网关超时设置
ribbon
:
ReadTimeout
:
60000
ConnectTimeout
:
60000
#系统是否开启权限验证、是否开启缓存
#缓存级别:无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
ibiz
:
enablePermissionValid
:
false
cacheLevel
:
L1
#(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
### jobs
jobs
:
#admin-address: http://127.0.0.1:40005
app-name
:
iBizBusinessCentral
app-port
:
9999
#app-ip: 127.0.0.1
### 启用Gzip压缩
server
:
compression
:
enabled
:
true
mime-types
:
application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
min-response-size
:
10240
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录