From 250446535c918d7884d1cb3fa6ad11638b55d022 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:39:33 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 31 ++++++++-------
Source/UBCS-WEB/src/page/login/sso.vue | 2 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java | 40 ++++++++++++++++---
4 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/sso.vue b/Source/UBCS-WEB/src/page/login/sso.vue
index 3565fc3..2d2f699 100644
--- a/Source/UBCS-WEB/src/page/login/sso.vue
+++ b/Source/UBCS-WEB/src/page/login/sso.vue
@@ -18,6 +18,8 @@
},
methods: {
onLoad() {
+
+ console.log(info);
const loading = this.$loading({
lock: true,
text: 'Loading',
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
index 12b129d..75a3427 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
@@ -28,7 +28,7 @@
* @author ludc
* @date 2023/9/12 9:07
*/
-@Controller
+@RestController
@RequestMapping("/passwordFree")
@Api(value = "鍏嶅瘑鐧诲綍鎺ュ彛", tags = "鍏嶅瘑鐧诲綍鎺ュ彛")
@Slf4j
@@ -38,11 +38,16 @@
@Value("${password-free.sso-redirect-addr}")
private String ssoRedirectAddr;
+ @Value("${password-free.client-id:a104c4fd2f0e4958}")
+ private String clientId;//搴旂敤ID
+
+ @Value("${password-free.secret-key:9fbd170bd83eb869}")
+ private String secretKey;//搴旂敤绉橀挜
+
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
@PostMapping("/login")
- @ResponseBody
public R passwordFreeLogin(@RequestParam("userName") String username, HttpServletRequest request) {
boolean status;
try {
@@ -55,20 +60,41 @@
/**
* 鍗曠偣鐧诲綍
- * @param request
+ * @param empCode
* @return
* @throws Exception
*/
@GetMapping("/ssoLogin")
- public String oaSsoLogin(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) throws IOException, ServletException {
+ public String oaSsoLogin(@RequestParam("empCode") String empCode){
String token;
try {
- token = passwordFreeLoginService.ssoFreeLogin(request);
+ token = passwordFreeLoginService.ssoFreeLogin(empCode);
}catch (Exception e){
throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
}
- redirectAttributes.addFlashAttribute("tokenInfo",token);
- return "redirect:"+ssoRedirectAddr;
+ return token;
+ }
+
+ /**
+ * 鍗曠偣鐧诲綍
+ * @param empCode
+ * @return
+ * @throws Exception
+ */
+ @GetMapping("/test")
+ public String test(@RequestParam("empCode") String empCode){
+ String enStr2;
+ try {
+ // 鍔犲瘑
+ String pwdfree = aesEncrypt("pwdfree", secretKey);
+ String pwdfree2 = aesEncrypt(pwdfree, clientId);
+ // 瑙ｅ瘑
+ String enStr1 = aesDecrypt(empCode, secretKey);
+ enStr2 = aesDecrypt(enStr1, clientId);
+ }catch (Exception e){
+ throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
+ }
+ return enStr2;
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
index 2957fea..8f1409d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
@@ -37,10 +37,10 @@
/**
* 鍗曠偣鐧诲綍
- * @param servletRequest
+ * @param empCode
* @return
* @throws Exception
*/
- String ssoFreeLogin(ServletRequest servletRequest) throws Exception;
+ String ssoFreeLogin(String empCode) throws Exception;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index 01aa00c..dce0809 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -66,6 +66,7 @@
@Value("${password-free.secret-key:9fbd170bd83eb869}")
private String secretKey;//搴旂敤绉橀挜
+
@Autowired
private BladeRedis bladeRedis;
@@ -161,26 +162,26 @@
/**
* 鍗曠偣鐧诲綍
- * @param servletRequest
+ * @param empCode
* @return
* @throws Exception
*/
@Override
- public String ssoFreeLogin(ServletRequest servletRequest) throws Exception {
- HttpServletRequest request = (HttpServletRequest) servletRequest;
- // String empCode = Func.isEmpty(request.getHeader("empCode")) ? request.getParameter("empCode"):request.getHeader("empCode");
- String empCode = "test";
-// if(Func.isBlank(content)){
-// throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
-// }
- //鍔犲瘑
- String str1 = aesEncrypt(empCode, clientId);
- String str2 = aesEncrypt(str1, secretKey);
-
- String enStr1 = aesDecrypt(str2, secretKey);
- String enStr2 = aesDecrypt(enStr1, clientId);
+ public String ssoFreeLogin(String empCode) throws Exception {
+ if(Func.isBlank(empCode)){
+ throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
+ }
+ String enStr2;
+ try {
+ /*String pwdfree = aesEncrypt("pwdfree", secretKey);
+ String s = aesEncrypt(pwdfree, clientId);*/
+ // String enStr1 = aesDecrypt(empCode, secretKey);
+ // enStr2 = aesDecrypt(enStr1, clientId);
+ }catch (Exception e){
+ throw new ServiceException("empCode鍙傛暟瑙ｅ瘑澶辫触锛佸師鍥�:"+e.getCause());
+ }
// 瑙ｅ瘑
- log.debug("鍗曠偣鐧诲綍鍙傛暟瑙ｅ瘑鍚庯細"+enStr2);
+ //log.debug("鍗曠偣鐧诲綍鍙傛暟瑙ｅ瘑鍚庯細"+enStr2);
String token = this.passwordFreeLogin("pwdfree");
return token;
}
--
Gitblit v1.9.3