From 68b0d9b52145056045b36028d1d621da1c3f2ea1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 20 九月 2024 15:38:29 +0800
Subject: [PATCH] 登录加密
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java | 2 ++
safePlatfrom-out-web/src/main/resources/config/application.yaml | 6 +++++-
safePlatfrom-out-web/src/main/resources/config/application-test.yaml | 50 +++++++++++++++++++++++++-------------------------
3 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
index 1abbf63..caf8ad2 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.accountController;
+import cn.hutool.core.codec.Base64;
import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountAuthService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.MenuRPCRespDTO;
@@ -28,6 +29,7 @@
public ResultVO<UserLoginRPCRespDTO> authLogin(@RequestBody JSONObject loginForm){
String username = loginForm.getString("username");
String password = loginForm.getString("password");
+ password= Base64.decodeStr(password);
return accountAuthService.authLogin(username, password);
}
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
index 2fe542a..c428db0 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -14,9 +14,9 @@
type: com.mysql.cj.jdbc.MysqlXADataSource
emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_dev_out_team
- password: Adsdf675T6AC7yga
+ url: jdbc:mysql://localhost:3306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: password
initialSize: 3
minIdle: 3
maxActive: 10
@@ -26,9 +26,9 @@
testWhileIdle: true
goalmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_dev_out_team
- password: Adsdf675T6AC7yga
+ url: jdbc:mysql://localhost:3306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: password
initialSize: 3
minIdle: 3
maxActive: 10
@@ -38,9 +38,9 @@
testWhileIdle: true
incidentmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_dev_out_team
- password: Adsdf675T6AC7yga
+ url: jdbc:mysql://localhost:3306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: password
initialSize: 3
minIdle: 3
maxActive: 10
@@ -50,9 +50,9 @@
testWhileIdle: true
equipment:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_dev_out_team
- password: Adsdf675T6AC7yga
+ url: jdbc:mysql://localhost:3306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: password
initialSize: 3
minIdle: 3
maxActive: 10
@@ -61,9 +61,9 @@
validationQueryTimeout: 10000
testWhileIdle: true
redis:
- host: 192.168.0.52
- port: 6377
- password: SEF98uvs98dUAUEF90Udssa
+ host: 192.168.2.16
+ port: 6379
+ password: wioowr23923sd3*&
database: 0 # Redis 数据库号，默认为 0
timeout: 15000 # Redis 连接超时时间，单位：毫秒。
lettuce:
@@ -80,17 +80,17 @@
cloud:
nacos:
discovery:
- server-addr: http://192.168.0.52:8848
- namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
- username: gkhy_safeplatform_out
- password: 9485uyJHISes09t
+ server-addr: http://192.168.2.16:8848
+ namespace: 58fd1482-b919-43e8-a82e-d492b310d06f
+ username: nacos
+ password: nacos
enabled: true
register-enabled: true
config:
- server-addr: http://192.168.0.52:8848
- namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
- username: gkhy_safeplatform_out
- password: 9485uyJHISes09t
+ server-addr: http://192.168.2.16:8848
+ namespace: 58fd1482-b919-43e8-a82e-d492b310d06f
+ username: nacos
+ password: nacos
inetutils:
ignored-interfaces:
- VirtualBox Host-Only Network
@@ -108,7 +108,7 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.2.16:8848?namespace=58fd1482-b919-43e8-a82e-d492b310d06f&username=nacos&password=nacos
application:
name: gkhy-safeplatform-out-test
scan:
@@ -135,7 +135,7 @@
# enabled: false
rocketmq:
- name-server: 192.168.0.52:9876
+ name-server: 192.168.2.16:9876
producer:
group: gkhy-safeplatform-guotai
sendMessageTimeout: 300000
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index 640b5fb..2df116b 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -4,11 +4,15 @@
profiles:
#active: uat
#### dev out-dev test uat online-uat guotai-demo
+<<<<<<< Updated upstream
active: guotai-prod
+=======
+ #active: guotai-prod
+>>>>>>> Stashed changes
# active: online-uat 线上预发环境
# active: dev 本地开发环境
# active: out-dev 外包对接环境
-# active: test 内网测试环境
+ active: test #内网测试环境
# active: uat 内网预发环境
logging:
--
Gitblit v1.9.2