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
6d8d3b0d
Commit
6d8d3b0d
authored
4 years ago
by
mobh
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
10d9f646
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
75 deletions
+18
-75
src/main/java/cn/timer/api/controller/LoginController.java
+15
-72
src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java
+3
-3
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
6d8d3b0d
package
cn
.
timer
.
api
.
controller
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
...
...
@@ -9,7 +7,6 @@ import java.util.Date;
import
java.util.HashMap
;
import
java.util.List
;
import
javax.management.Query
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -42,7 +39,6 @@ import cn.timer.api.aspect.lang.annotation.Log;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.bean.admin.AdminMenuTemplate
;
import
cn.timer.api.bean.jxgl.JxglBasicSetting
;
import
cn.timer.api.bean.kqmk.KqglAssoBcsz
;
import
cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance
;
import
cn.timer.api.bean.kqmk.KqglAssoLeaveRules
;
import
cn.timer.api.bean.kqmk.KqglAssoLeaveRulesT
;
...
...
@@ -117,26 +113,6 @@ public class LoginController {
@Value
(
"${config-8timer.Aliyun.SECRET}"
)
private
String
SECRET
;
// public static String host;
// public static String PROJECT_ID;
// public static String PROJECT_SECRET;
//
// @Value("${config-8timer.esign.host}")
// private String host_s;
//
// @Value("${config-8timer.esign.PROJECT_ID}")
// private String PROJECT_ID_s;
//
// @Value("${config-8timer.esign.PROJECT_SECRET}")
// private String PROJECT_SECRET_s;
//
// @PostConstruct
// public void init() {
// host = host_s;
// PROJECT_ID = PROJECT_ID_s;
// PROJECT_SECRET = PROJECT_SECRET_s;
// }
@Value
(
"${config-8timer.Aliyun.PROJECT_NAME}"
)
private
String
endpoint
;
...
...
@@ -197,7 +173,7 @@ public class LoginController {
/**
* 发送验证码
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/sendcode"
)
...
...
@@ -291,7 +267,7 @@ public class LoginController {
/**
* 手机号码认证
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/authentication"
)
...
...
@@ -317,39 +293,6 @@ public class LoginController {
return
ResultUtil
.
success
(
"验证码正确"
);
}
/**
* 手机号码认证
*
* @param qyzxEmpLogin
* @return
* @throws IOException
*//*
* @PostMapping(value = "/test")
*
* @ApiOperation(value = "3.测试", httpMethod = "POST", notes = "接口发布说明")
*
* @ApiOperationSupport(order = 3) public void test(HttpServletRequest request,
* HttpServletResponse res) throws IOException {
*
* res.setHeader("content-type","text/html;charset=UTF-8");
* res.setHeader("selfHeader","selfHeaderValue"); //
* res.addHeader("response_code", "123"); //
* res.setContentType("application/octet-stream"); //
* res.addHeader("Content-Length", "0");
*
* res.addHeader("response_code", "100"); res.addHeader("trans_id", "");
* res.addHeader("cmd_code", "NO com");
*
* res.setContentType("application/octet-stream");
* res.addHeader("Content-Length", "0");
*
* res.flushBuffer(); // response.addHeader("response_code",
* "ERROR_INVALID_LIB_NAME"); //
* response.setContentType("application/octet-stream"); //
* response.addHeader("Content-Length", "0"); // response.flushBuffer();
* Logoutput(111); }
*/
@PostMapping
(
value
=
"/updatePwd"
)
@ApiOperation
(
value
=
"4.修改密码(新)"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
4
)
...
...
@@ -398,7 +341,7 @@ public class LoginController {
/**
* 修改密码
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/updatepassword"
)
...
...
@@ -461,7 +404,7 @@ public class LoginController {
/**
* 修改手机号/用户名
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/updatephone"
)
...
...
@@ -735,7 +678,7 @@ public class LoginController {
/**
* 验证码登录
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/code"
)
...
...
@@ -866,9 +809,9 @@ public class LoginController {
int
i
=
0
;
for
(
QyzxAdminMenu
me
:
qyme
)
{
MenuStructureDto
metr
=
MenuStructureDto
.
builder
().
build
();
metr
.
setMenu
_c
ode
(
me
.
getMenuCode
());
metr
.
setMenu
_n
ame
(
me
.
getMenuName
());
metr
.
setSort
_n
umber
(
me
.
getSortNumber
());
metr
.
setMenu
C
ode
(
me
.
getMenuCode
());
metr
.
setMenu
N
ame
(
me
.
getMenuName
());
metr
.
setSort
N
umber
(
me
.
getSortNumber
());
metr
.
setPath
(
""
);
mestrs
.
add
(
metr
);
zdy
[
i
]
=
me
.
getMenuCode
();
...
...
@@ -881,16 +824,16 @@ public class LoginController {
if
(!
ClockInTool
.
useArrayUtils
(
ClockInTool
.
deleteArrayNull
(
zdy
),
adm
.
getMenuCode
()))
{
if
(
adm
.
getDistribution
()
==
0
&&
qyzxEmpLogin1
.
getOrgId
()
==
3
)
{
MenuStructureDto
metr
=
MenuStructureDto
.
builder
().
build
();
metr
.
setMenu
_c
ode
(
adm
.
getMenuCode
());
metr
.
setMenu
_n
ame
(
adm
.
getMenuName
());
metr
.
setSort
_n
umber
(
adm
.
getSortNumber
());
metr
.
setMenu
C
ode
(
adm
.
getMenuCode
());
metr
.
setMenu
N
ame
(
adm
.
getMenuName
());
metr
.
setSort
N
umber
(
adm
.
getSortNumber
());
metr
.
setPath
(
""
);
mestrs
.
add
(
metr
);
}
else
if
(
adm
.
getDistribution
()
==
1
)
{
MenuStructureDto
metr
=
MenuStructureDto
.
builder
().
build
();
metr
.
setMenu
_c
ode
(
adm
.
getMenuCode
());
metr
.
setMenu
_n
ame
(
adm
.
getMenuName
());
metr
.
setSort
_n
umber
(
adm
.
getSortNumber
());
metr
.
setMenu
C
ode
(
adm
.
getMenuCode
());
metr
.
setMenu
N
ame
(
adm
.
getMenuName
());
metr
.
setSort
N
umber
(
adm
.
getSortNumber
());
metr
.
setPath
(
""
);
mestrs
.
add
(
metr
);
}
...
...
@@ -912,7 +855,7 @@ public class LoginController {
/**
* 密码登录
*
* @param
qyzxEmpLogin
* @param
entRegisterDto
* @return
*/
@PostMapping
(
value
=
"/password"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java
View file @
6d8d3b0d
...
...
@@ -11,11 +11,11 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public
class
MenuStructureDto
{
private
String
menu
_c
ode
;
private
String
menu
C
ode
;
private
String
menu
_n
ame
;
private
String
menu
N
ame
;
private
Integer
sort
_n
umber
;
private
Integer
sort
N
umber
;
private
String
path
;
}
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