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/TideUtils.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideController.java | 9 ++++++---
ruoyi-admin/src/main/resources/application-tide.yml | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
4 files changed, 10 insertions(+), 7 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 217ce4f..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
@@ -43,6 +43,8 @@
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);
@@ -52,11 +54,12 @@
@PostMapping("/applicationOrdering")
public JSONObject order (@RequestBody TidePojo tidePojo) {
SysUser user = userService.selectUserByUserName(tidePojo.getPltAccountLogin());
- String randomString = TideUtils.getRandomString(12);
+ String defaultPwd = "I73Kj+Mn$+SI";//榛樿寮�閫氬瘑鐮佸浐瀹氬啓姝�
+// String randomString = TideUtils.getRandomString(12);
//璐﹀彿涓嶅瓨鍦紝鎵ц鏂板鎿嶄綔
if(Objects.isNull(user)){
user = new SysUser();
- String password = SecurityUtils.encryptPassword(randomString);
+ String password = SecurityUtils.encryptPassword(defaultPwd);
user.setPassword(password);
user.setUserName(tidePojo.getPltAccountLogin());
user.setNickName(tidePojo.getEnterpriseName());
@@ -68,7 +71,7 @@
}
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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java
index aea37c7..427f49b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tide/TideUtils.java
@@ -21,9 +21,9 @@
@Component
@Slf4j
public class TideUtils {
- private final static String appId = "19472937-3039-4bf1-8334-13dc20e076e5";
+ private final static String appId = "cdde1d11-eab4-410f-88ad-d9881d08025f";
- private final static String appSecret = "b57bbad60724f810e7bb7e1e7b8791b63eba50e50faef6fa819ade822fac9e4a";
+ private final static String appSecret = "190f5c1725dceaabe84024be1e3ff44fcdafecb6ae3c6ab28f9ec1b794cbb903";
// 鍐呯綉鍦板潃
private final static String ip = "http://58.56.84.138:8083";
diff --git a/ruoyi-admin/src/main/resources/application-tide.yml b/ruoyi-admin/src/main/resources/application-tide.yml
index e28cdf8..5336c09 100644
--- a/ruoyi-admin/src/main/resources/application-tide.yml
+++ b/ruoyi-admin/src/main/resources/application-tide.yml
@@ -8,7 +8,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://10.136.12.71:3306/mes-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://10.136.12.71:3306/wms-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d85e13b..1b5612c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛
- port: 8001
+ port: 8011
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
--
Gitblit v1.9.3