Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
9ff6ee6d
提交
9ff6ee6d
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
e681e981
变更
13
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
83 行增加
和
35 行删除
+83
-35
config.xml
config.xml
+0
-5
Dockerfile
...urce-app/humanresource-app-pim/src/main/docker/Dockerfile
+1
-1
humanresource-app-pim.yaml
...source-app-pim/src/main/docker/humanresource-app-pim.yaml
+1
-17
application-pim-prod.yml
...ource-app-pim/src/main/resources/application-pim-prod.yml
+32
-0
application-dev.yml
humanresource-boot/src/main/resources/application-dev.yml
+37
-0
SimpleTokenUtil.java
.../ibizlab/humanresource/util/security/SimpleTokenUtil.java
+1
-1
UAATokenUtil.java
.../cn/ibizlab/humanresource/util/security/UAATokenUtil.java
+1
-1
AuthenticationUserService.java
...humanresource/util/service/AuthenticationUserService.java
+3
-3
IBZConfigService.java
.../ibizlab/humanresource/util/service/IBZConfigService.java
+3
-3
IBZUAAUserService.java
...ibizlab/humanresource/util/service/IBZUAAUserService.java
+1
-1
IBZUSERServiceImpl.java
...bizlab/humanresource/util/service/IBZUSERServiceImpl.java
+1
-1
SimpleUserService.java
...ibizlab/humanresource/util/service/SimpleUserService.java
+1
-1
application-sys.yml
humanresource-util/src/main/resources/application-sys.yml
+1
-1
未找到文件。
config.xml
浏览文件 @
9ff6ee6d
...
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Ppim
cd humanresource-app/humanresource-app-pim
mvn -Ppim docker:build
mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
This diff is collapsed.
Click to expand it.
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @
9ff6ee6d
...
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE
10327
EXPOSE
8080
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
This diff is collapsed.
Click to expand it.
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @
9ff6ee6d
...
...
@@ -3,25 +3,9 @@ services:
humanresource-app-pim
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports
:
-
"
10327:10327
"
-
"
8080:8080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10327
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
resources
:
limits
:
...
...
This diff is collapsed.
Click to expand it.
humanresource-app/humanresource-app-pim/src/main/resources/application-pim-prod.yml
浏览文件 @
9ff6ee6d
...
...
@@ -79,5 +79,37 @@ zuul:
path
:
/hrpostrels/**
serviceId
:
${ibiz.ref.service.ibizhumanresources-hrapi:ibizhumanresources-hrapi}
stripPrefix
:
false
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
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
sensitive-headers
:
-
Cookie,Set-Cookie,Authorization
This diff is collapsed.
Click to expand it.
humanresource-boot/src/main/resources/application-dev.yml
浏览文件 @
9ff6ee6d
server
:
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
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
sensitive-headers
:
-
Cookie,Set-Cookie,Authorization
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/security/SimpleTokenUtil.java
浏览文件 @
9ff6ee6d
...
...
@@ -19,7 +19,7 @@ import java.util.Optional;
import
java.util.function.Function
;
@Component
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:
Simple
TokenUtil}'.equals('SimpleTokenUtil')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:
UAA
TokenUtil}'.equals('SimpleTokenUtil')"
)
public
class
SimpleTokenUtil
implements
AuthTokenUtil
,
Serializable
{
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/security/UAATokenUtil.java
浏览文件 @
9ff6ee6d
...
...
@@ -30,7 +30,7 @@ import java.util.Map;
import
java.util.function.Function
;
@Component
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:
Simple
TokenUtil}'.equals('UAATokenUtil')"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:
UAA
TokenUtil}'.equals('UAATokenUtil')"
)
public
class
UAATokenUtil
implements
AuthTokenUtil
,
Serializable
{
private
static
final
long
serialVersionUID
=
-
3301605591108950415L
;
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/service/AuthenticationUserService.java
浏览文件 @
9ff6ee6d
...
...
@@ -15,12 +15,12 @@ public interface AuthenticationUserService extends UserDetailsService {
@Override
@Cacheable
(
value
=
"
humanresource
_users"
,
key
=
"'getByUsername:'+#p0"
)
@Cacheable
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByUsername
(
String
username
);
@Cacheable
(
value
=
"
humanresource
_users"
,
key
=
"'getByUsername:'+#p0"
)
@Cacheable
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByLogin
(
String
username
,
String
password
);
@CacheEvict
(
value
=
"
humanresource
_users"
,
key
=
"'getByUsername:'+#p0"
)
@CacheEvict
(
value
=
"
ibzuaa
_users"
,
key
=
"'getByUsername:'+#p0"
)
void
resetByUsername
(
String
username
);
}
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/service/IBZConfigService.java
浏览文件 @
9ff6ee6d
...
...
@@ -26,7 +26,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
@Value
(
"${ibiz.admin.userid:0100}"
)
private
String
adminuserid
;
@Cacheable
(
value
=
"
humanresource
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@Cacheable
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
JSONObject
getConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
...
@@ -41,7 +41,7 @@ public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> im
return
JSON
.
parseObject
(
config
.
getCfg
());
}
@CacheEvict
(
value
=
"
humanresource
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@CacheEvict
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
boolean
saveConfig
(
String
cfgType
,
String
targetType
,
String
userId
,
JSONObject
config
)
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
...
@@ -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
());
}
@CacheEvict
(
value
=
"
humanresource
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
@CacheEvict
(
value
=
"
ibzrt
_configs"
,
key
=
"'cfgid:'+#p0+'||'+#p1+'||'+#p2"
)
public
void
resetConfig
(
String
cfgType
,
String
targetType
,
String
userId
)
{
if
(
StringUtils
.
isEmpty
(
userId
)||
StringUtils
.
isEmpty
(
cfgType
)||
StringUtils
.
isEmpty
(
targetType
))
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/service/IBZUAAUserService.java
浏览文件 @
9ff6ee6d
...
...
@@ -18,7 +18,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
* 实体[IBZUSER] 服务对象接口实现
*/
@Service
(
"IBZUAAUserService"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:
Simple
UserService}'.equals('IBZUAAUserService')"
)
@ConditionalOnExpression
(
"${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:
IBZUAA
UserService}'.equals('IBZUAAUserService')"
)
public
class
IBZUAAUserService
implements
AuthenticationUserService
{
@Autowired
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/service/IBZUSERServiceImpl.java
浏览文件 @
9ff6ee6d
...
...
@@ -20,7 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
* 实体[IBZUSER] 服务对象接口实现
*/
@Service
(
"IBZUSERService"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
Simple
UserService}'.equals('IBZUSERService')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
IBZUAA
UserService}'.equals('IBZUSERService')"
)
public
class
IBZUSERServiceImpl
extends
ServiceImpl
<
IBZUSERMapper
,
IBZUSER
>
implements
IBZUSERService
,
AuthenticationUserService
{
@Value
(
"${ibiz.auth.pwencrymode:0}"
)
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/service/SimpleUserService.java
浏览文件 @
9ff6ee6d
...
...
@@ -18,7 +18,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
*/
@Primary
@Service
(
"SimpleUserService"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
Simple
UserService}'.equals('SimpleUserService')"
)
@ConditionalOnExpression
(
"(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:
IBZUAA
UserService}'.equals('SimpleUserService')"
)
public
class
SimpleUserService
implements
AuthenticationUserService
{
@Override
...
...
This diff is collapsed.
Click to expand it.
humanresource-util/src/main/resources/application-sys.yml
浏览文件 @
9ff6ee6d
...
...
@@ -90,7 +90,7 @@ ribbon:
#系统是否开启权限验证、是否开启缓存
#缓存级别:无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
ibiz
:
enablePermissionValid
:
fals
e
enablePermissionValid
:
tru
e
cacheLevel
:
L1
#(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
### jobs
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录