From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 23 九月 2023 12:39:29 +0800
Subject: [PATCH] 9-23 去鵷雏管理端验证
---
/dev/null | 36 ------------------
sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java | 1
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 69 ++++++++++------------------------
3 files changed, 21 insertions(+), 85 deletions(-)
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java b/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
index 8485701..8327522 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/SysApplication.java
@@ -7,7 +7,6 @@
@SpringBootApplication
@MapperScan("com.yuanchu.limslaboratory.mapper")// 鎵弿Mybatis涓殑mapper鍖�
-@EnableFeignClients("com.yuanchu.limslaboratory.clients") // 鎵弿feign鎺ュ彛鎵�鍦ㄥ寘 閲嶈
public class SysApplication {
public static void main(String[] args) {
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java
deleted file mode 100644
index 8a3df54..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.yuanchu.limslaboratory.clients;
-
-import com.yuanchu.limslaboratory.vo.Result;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-@FeignClient(value = "userservice", url = "${customer.url}")
-public interface UserClient {
-
- @PostMapping("/business/login")
- Result<?> BusynessUserLogin(@RequestBody Map<String, Object> mapData);
-
- @PostMapping("/business/code")
- Result<?> BusynessUserLoginToken(@RequestParam("code") String code);
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
index 4c4dc09..2c5771a 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
@@ -26,55 +26,28 @@
@Component
public class UserLoginUtils {
- @Resource
- private UserClient userClient;
-
- @Value("${login.userID}")
- private String LoginUserID;
-
- @Value("${login.secret}")
- private String LoginSecret;
-
-
-
public Result<Map<String, Object>> LoginExamine(User user){
- Map<String, Object> mapData = new HashMap<>();
- mapData.put("LoginUserID", LoginUserID);
- mapData.put("LoginSecret", LoginSecret);
- Result<?> code = userClient.BusynessUserLogin(mapData);
- if (code.getCode() == 200){
- Result<?> result = userClient.BusynessUserLoginToken(code.getData().toString());
- if (result.getCode() == 200){
- Map data = (Map) result.getData();
- String token = data.get("token").toString();
- data.remove("token");
- HashMap<String, Object> mapRedis = new HashMap<>();
- mapRedis.put("id", user.getId());
- mapRedis.put("account", user.getAccount());
- mapRedis.put("name", user.getName());
- mapRedis.put("enterpriseId", user.getEnterpriseId());
- mapRedis.put("data", data);
- String adminMD5 = SecureUtil.md5(SecureUtil.md5(user.getAccount()));
- // 鏋勫缓
- mapRedis.put("sessionLayerId", adminMD5);
- mapRedis.put("roleId",user.getRoleId());
- //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄�
- RedisUtil.set(token, mapRedis, 120);
- //
- RedisUtil.set("access_token",token,120);
- // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔�
- HashMap<String, Object> map = new HashMap<>();
- String refresh = JwtUtils.sign(user.getAccount());
- map.put("token", token);
- map.put("refresh", refresh);
- RedisUtil.set(user.getAccount(), map, 168);
- return Result.success(map);
- } else {
- return Result.fail(result.getMessage());
- }
- } else {
- return Result.fail(code.getMessage());
- }
+ String token = JwtUtils.sign(user.getAccount());
+ HashMap<String, Object> mapRedis = new HashMap<>();
+ mapRedis.put("id", user.getId());
+ mapRedis.put("account", user.getAccount());
+ mapRedis.put("name", user.getName());
+ mapRedis.put("enterpriseId", user.getEnterpriseId());
+ String adminMD5 = SecureUtil.md5(SecureUtil.md5(user.getAccount()));
+ // 鏋勫缓
+ mapRedis.put("sessionLayerId", adminMD5);
+ mapRedis.put("roleId",user.getRoleId());
+ //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄�
+ RedisUtil.set(token, mapRedis, 120);
+ //
+ RedisUtil.set("access_token",token,120);
+ // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔�
+ HashMap<String, Object> map = new HashMap<>();
+ String refresh = JwtUtils.sign(user.getAccount());
+ map.put("token", token);
+ map.put("refresh", refresh);
+ RedisUtil.set(user.getAccount(), map, 168);
+ return Result.success(map);
}
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java b/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java
deleted file mode 100644
index 52abac8..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/config/FeignConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.yuanchu.limslaboratory.config;
-
-
-import feign.Feign;
-import okhttp3.OkHttpClient;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.concurrent.TimeUnit;
-
-@Configuration
-@ConditionalOnClass(Feign.class)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-public class FeignConfig {
-
- private OkHttpClient okHttpClient;
-
-
- //娉ㄥ叆okhttp
- @Bean
- public OkHttpClient okHttpClient(OkHttpClientFactory okHttpClientFactory,
- FeignHttpClientProperties httpClientProperties) {
- this.okHttpClient = okHttpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation()).connectTimeout(httpClientProperties.getConnectionTimeout(),TimeUnit.SECONDS)
- .followRedirects(httpClientProperties.isFollowRedirects())
- .build();
- return this.okHttpClient;
- }
-
-}
-
--
Gitblit v1.9.3