From 16c736d3d47443db4cb40c491e5251b6938ddf4b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 八月 2025 14:25:10 +0800
Subject: [PATCH] 浪潮对接：区分yml配置
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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..217ce4f 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,8 +37,8 @@
@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();
@@ -50,17 +51,21 @@
@PostMapping("/applicationOrdering")
public JSONObject order (@RequestBody TidePojo tidePojo) {
- SysUser user = new SysUser();
+ SysUser user = userService.selectUserByUserName(tidePojo.getPltAccountLogin());
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);
+ //璐﹀彿涓嶅瓨鍦紝鎵ц鏂板鎿嶄綔
+ if(Objects.isNull(user)){
+ user = new SysUser();
+ 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);
+ }
Map<String, Object> map = new HashMap<>();
map.put("account", tidePojo.getPltAccountLogin());
map.put("token", randomString);
@@ -71,11 +76,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