From 6d8d3b0db68479b7b43e812ac46f34556acbc8f8 Mon Sep 17 00:00:00 2001
From: mobh <mobh@youlingrc.com>
Date: Fri, 13 Nov 2020 16:53:24 +0800
Subject: [PATCH] 修改代码
---
src/main/java/cn/timer/api/controller/LoginController.java | 87 +++++++++++++++------------------------------------------------------------------------
src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java | 6 +++---
2 files changed, 18 insertions(+), 75 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/LoginController.java b/src/main/java/cn/timer/api/controller/LoginController.java
index 235a38f..fc2110a 100644
--- a/src/main/java/cn/timer/api/controller/LoginController.java
+++ b/src/main/java/cn/timer/api/controller/LoginController.java
@@ -1,7 +1,5 @@
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_code(me.getMenuCode());
- metr.setMenu_name(me.getMenuName());
- metr.setSort_number(me.getSortNumber());
+ metr.setMenuCode(me.getMenuCode());
+ metr.setMenuName(me.getMenuName());
+ metr.setSortNumber(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_code(adm.getMenuCode());
- metr.setMenu_name(adm.getMenuName());
- metr.setSort_number(adm.getSortNumber());
+ metr.setMenuCode(adm.getMenuCode());
+ metr.setMenuName(adm.getMenuName());
+ metr.setSortNumber(adm.getSortNumber());
metr.setPath("");
mestrs.add(metr);
}else if(adm.getDistribution() == 1) {
MenuStructureDto metr = MenuStructureDto.builder().build();
- metr.setMenu_code(adm.getMenuCode());
- metr.setMenu_name(adm.getMenuName());
- metr.setSort_number(adm.getSortNumber());
+ metr.setMenuCode(adm.getMenuCode());
+ metr.setMenuName(adm.getMenuName());
+ metr.setSortNumber(adm.getSortNumber());
metr.setPath("");
mestrs.add(metr);
}
@@ -912,7 +855,7 @@ public class LoginController {
/**
* 密码登录
*
- * @param qyzxEmpLogin
+ * @param entRegisterDto
* @return
*/
@PostMapping(value = "/password")
diff --git a/src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java b/src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java
index 7e09dd5..2e2ead1 100644
--- a/src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java
+++ b/src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java
@@ -11,11 +11,11 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class MenuStructureDto {
- private String menu_code;
+ private String menuCode;
- private String menu_name;
+ private String menuName;
- private Integer sort_number;
+ private Integer sortNumber;
private String path;
}
--
libgit2 0.26.0