From 0cd9d911b8e8634ec04cb82ea07696bb09260b03 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 十二月 2023 13:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 25f8004..84a37de 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -85,7 +85,6 @@
String password = AesEncryptUtil.desEncrypt(umsAdminLoginParam.getPassword());
// String password = umsAdminLoginParam.getPassword();
String token = adminService.login(umsAdminLoginParam.getUsername(), password);
-
if (token == null) {
return CommonResult.validateFailed("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
@@ -365,4 +364,11 @@
public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
return CommonResult.success(adminService.getDepartUser(departId));
}
+
+ @GetMapping(value = "/systemInfo")
+ @ResponseBody
+ public String getImages(HttpServletRequest request, HttpServletResponse response) {
+ return "閬傛槍缁煎悎鎵ф硶骞冲彴";
+
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0