Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
e2653b1c
Commit
e2653b1c
authored
4 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注册时默认企业讯息添加
parent
aff1bff9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
54 additions
and
6 deletions
+54
-6
src/main/java/cn/timer/api/controller/LoginController.java
+30
-2
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
+2
-3
src/main/resources/application-dev.yml
+6
-1
src/main/resources/application-pro.yml
+8
-0
src/main/resources/application-test.yml
+8
-0
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
e2653b1c
...
...
@@ -34,6 +34,7 @@ import cn.timer.api.aspect.lang.annotation.Log;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.bean.jxgl.JxglBasicSetting
;
import
cn.timer.api.bean.kqmk.KqglAssoLeaveRules
;
import
cn.timer.api.bean.qyxx.CmsContent
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
...
...
@@ -140,6 +141,15 @@ public class LoginController {
@Value
(
"${config-8timer.Aliyun.expirationTime_pri}"
)
private
String
expirationTime_pri
;
@Value
(
"${config-8timer.qyxx.title}"
)
private
String
title
;
@Value
(
"${config-8timer.qyxx.author}"
)
private
String
author
;
@Value
(
"${config-8timer.qyxx.cover}"
)
private
String
cover
;
@Value
(
"${config-8timer.qyxx.summary}"
)
private
String
summary
;
@Autowired
private
HttpSession
session
;
...
...
@@ -461,7 +471,7 @@ public class LoginController {
@Autowired
SpmkServiceImpl
SpmkService
;
@Autowired
JxglService
jxglService
;
...
...
@@ -570,7 +580,7 @@ public class LoginController {
}
else
{
System
.
out
.
println
(
"重复初始化数据!"
);
}
JxglBasicSetting
bS
=
jxglService
.
selectAT
(
qyId
);
if
(
bS
==
null
)
{
boolean
res
=
jxglService
.
initJxglBasicSetting
(
qyId
);
...
...
@@ -579,6 +589,24 @@ public class LoginController {
}
}
/********** 默认企业讯息添加 ***********/
CmsContent
cmsContent
=
CmsContent
.
builder
().
build
();
cmsContent
.
setTitle
(
title
);
cmsContent
.
setPublisherName
(
author
);
cmsContent
.
setAuthor
(
author
);
cmsContent
.
setModularid
(
1
);
cmsContent
.
setFmtpath
(
cover
);
cmsContent
.
setSummary
(
summary
);
cmsContent
.
setStatus
(
1
);
cmsContent
.
setOrganizationId
(
qyId
);
cmsContent
.
setReleasestate
(
0
);
cmsContent
.
setAddeddate
(
new
Date
().
getTime
());
cmsContent
.
setReleasetime
(
String
.
valueOf
(
new
Date
().
getTime
()));
cmsContent
.
insert
();
/********** 默认企业讯息添加 ***********/
return
ResultUtil
.
success
(
"注册企业成功"
);
}
catch
(
Exception
e
)
{
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
View file @
e2653b1c
...
...
@@ -34,7 +34,6 @@ import cn.timer.api.bean.qyxx.CmsIsRead;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.dao.qyxx.CmsAnnouncementMapper
;
import
cn.timer.api.dao.qyxx.CmsContentMapper
;
import
cn.timer.api.dao.qyxx.CmsIsReadMapper
;
import
cn.timer.api.dto.qyxx.CmsContentDto
;
...
...
@@ -57,8 +56,8 @@ public class CmsController {
@Autowired
private
CmsIsReadMapper
cmsIsReadMapper
;
@Autowired
private
CmsAnnouncementMapper
cmsAnnouncementMapper
;
//
@Autowired
//
private CmsAnnouncementMapper cmsAnnouncementMapper;
/**
* 查询所有讯息
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.yml
View file @
e2653b1c
...
...
@@ -201,7 +201,12 @@ config-8timer:
two
:
7
three
:
30
init-password
:
123456
# 创建企业默认添加讯息
qyxx
:
title
:
'
欢迎来到8小时'
cover
:
'
https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
summary
:
'
<h1>欢迎来到8小时!可先前往组织管理-组织架构添加公司架构及岗位,再前往员工管理-员工名册添加企业员工。</h1>'
author
:
'
System'
# 客户管理导入服务器保存路径
crm-excel
:
realPath
:
'
D:/excel/'
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
e2653b1c
...
...
@@ -173,6 +173,13 @@ config-8timer:
three
:
30
init-password
:
123456
# 创建企业默认添加讯息
qyxx
:
title
:
'
欢迎来到8小时'
cover
:
'
https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
summary
:
'
<h1>欢迎来到8小时!可先前往组织管理-组织架构添加公司架构及岗位,再前往员工管理-员工名册添加企业员工。</h1>'
author
:
'
System'
# 客户管理导入服务器保存路径
crm-excel
:
realPath
:
'
/data/crm-excel/'
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/application-test.yml
View file @
e2653b1c
...
...
@@ -172,6 +172,13 @@ config-8timer:
three
:
30
init-password
:
123456
# 创建企业默认添加讯息
qyxx
:
title
:
'
欢迎来到8小时'
cover
:
'
https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
summary
:
'
<h1>欢迎来到8小时!可先前往组织管理-组织架构添加公司架构及岗位,再前往员工管理-员工名册添加企业员工。</h1>'
author
:
'
System'
# 客户管理导入服务器保存路径
crm-excel
:
realPath
:
'
/data/crm-excel/'
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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