From 5c756ddaea4cbe51e85027b34691c40da878a4d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 八月 2025 10:27:55 +0800
Subject: [PATCH] 浪潮对接：配置调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java
index 6e341b2..1488545 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java
@@ -20,6 +20,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
@RequestMapping("/tide")
@RestController
@@ -36,12 +37,14 @@
@ApiOperation(value = "鐧诲綍")
@PostMapping("/tideLogin")
- public AjaxResult login(@RequestBody String code) {
- String token = TideUtils.getToken(code);
+ public AjaxResult login(@RequestBody TidePojo tidePojo) {
+ String token = TideUtils.getToken(tidePojo.getCode());
JSONObject userInfo = TideUtils.getUserInfo(token);
JSONObject tenant = JSONObject.parseObject(userInfo.get("tenant").toString());
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
+ log.info("绉熸埛淇℃伅锛歿}",userInfo);
+ log.info("绉熸埛璐﹀彿锛歿}锛岀鎴峰瘑鐮侊細{}",tenant.get("tenantAccount").toString(), tenant.get("tenantPassword").toString());
String generateToken = loginService.login(tenant.get("tenantAccount").toString(), tenant.get("tenantPassword").toString(), null,
IdWorker.get32UUID());
ajax.put(Constants.TOKEN, generateToken);
@@ -50,20 +53,25 @@
@PostMapping("/applicationOrdering")
public JSONObject order (@RequestBody TidePojo tidePojo) {
- SysUser user = new SysUser();
- String randomString = TideUtils.getRandomString(12);
- String password = SecurityUtils.encryptPassword(randomString);
- user.setPassword(password);
- user.setUserName(tidePojo.getPltAccountLogin());
- user.setNickName(tidePojo.getEnterpriseName());
- user.setStatus("0");
- user.setDelFlag("0");
- user.setPostIds(new Long[]{1L});
- user.setRoleId(1L);
- userService.insertUser(user);
+ SysUser user = userService.selectUserByUserName(tidePojo.getPltAccountLogin());
+ String defaultPwd = "I73Kj+Mn$+SI";//榛樿寮�閫氬瘑鐮佸浐瀹氬啓姝�
+// String randomString = TideUtils.getRandomString(12);
+ //璐﹀彿涓嶅瓨鍦紝鎵ц鏂板鎿嶄綔
+ if(Objects.isNull(user)){
+ user = new SysUser();
+ String password = SecurityUtils.encryptPassword(defaultPwd);
+ user.setPassword(password);
+ user.setUserName(tidePojo.getPltAccountLogin());
+ user.setNickName(tidePojo.getEnterpriseName());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setPostIds(new Long[]{1L});
+ user.setRoleId(1L);
+ userService.insertUser(user);
+ }
Map<String, Object> map = new HashMap<>();
map.put("account", tidePojo.getPltAccountLogin());
- map.put("token", randomString);
+ map.put("token", defaultPwd);
map.put("tenantId", user.getUserId());
return TideUtils.getResult(20000, "鎴愬姛", map);
}
@@ -71,11 +79,17 @@
@PostMapping("/cancellation")
public JSONObject cancellation (@RequestBody TidePojo tidePojo) {
log.info("鎵ц浜嗘敞閿�淇℃伅锛�" + tidePojo);
+ if(Objects.nonNull(tidePojo)){
+ SysUser sysUser = userService.selectUserByUserName(tidePojo.getPltAccountLogin());
+ if(Objects.nonNull(sysUser)){
+ userService.deleteUserById(sysUser.getUserId());
+ }
+ }
return TideUtils.getResult(20000, "鎴愬姛", null);
}
public static void main(String[] args) {
- String password = SecurityUtils.encryptPassword("tzvy7lB.");
+ String password = SecurityUtils.encryptPassword("123456Wp!@#");
System.out.println(password);
}
}
--
Gitblit v1.9.3