From 2328cac73e48d2704e4a72b989bccaa33d3d031f Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:38 +0800
Subject: [PATCH] sk项目本地电脑配置
---
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java | 2 +-
skjcmanager/skjcmanager-service-api/skjcmanager-pwd-api/src/main/java/cn/gistack/pwd/fegin/PwdClientFallback.java | 2 ++
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 34 +++++++++++++++++-----------------
skjcmanager/doc/nacos/blade-dev.yaml | 16 ++++++++--------
5 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/skjcmanager/doc/nacos/blade-dev.yaml b/skjcmanager/doc/nacos/blade-dev.yaml
index 8d15f95..ee222f6 100644
--- a/skjcmanager/doc/nacos/blade-dev.yaml
+++ b/skjcmanager/doc/nacos/blade-dev.yaml
@@ -12,11 +12,11 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
+# driver-class-name: com.mysql.cj.jdbc.Driver
#driver-class-name: org.postgresql.Driver
#driver-class-name: oracle.jdbc.OracleDriver
#driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #driver-class-name: dm.jdbc.driver.DmDriver
+ driver-class-name: dm.jdbc.driver.DmDriver
druid:
# MySql、PostgreSQL、SqlServer、DaMeng校验
validation-query: select 1
@@ -41,9 +41,9 @@
datasource:
dev:
# MySql
- url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
- username: root
- password: root
+# url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+# username: root
+# password: root
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex
#username: postgres
@@ -57,6 +57,6 @@
#username: bladex
#password: bladex
# DaMeng
- #url: jdbc:dm://127.0.0.1:5236/BLADEX?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
- #username: BLADEX
- #password: BLADEX
+ url: jdbc:dm://127.0.0.1:5236/YWXT?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ username: SYSDBA
+ password: hbwri@702
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index 9ddd652..145f6b0 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -20,7 +20,7 @@
import cn.gistack.common.utils.Base64Utils;
import cn.gistack.pwd.dto.CBCResultDTO;
import cn.gistack.pwd.dto.ResultDTO;
-import cn.gistack.pwd.fegin.IPwdClient;
+//import cn.gistack.pwd.fegin.IPwdClient;
import cn.gistack.sm.collect.feign.ICollectClient;
import cn.gistack.sm.collect.feign.ICollectClientFallback;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
@@ -78,7 +78,7 @@
private final ICollectClient collectClient;
- private final IPwdClient pwdClient;
+// private final IPwdClient pwdClient;
@Override
@SneakyThrows
@@ -206,23 +206,23 @@
User loginUserInfo = userInfo.getUser();
//获取解密后的Base64字符串
- R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
-
- if (encryptRes.getCode() != 200){
- throw new UserDeniedAuthorizationException("获取密钥失败");
- }
+// R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
+//
+// if (encryptRes.getCode() != 200){
+// throw new UserDeniedAuthorizationException("获取密钥失败");
+// }
//解码Base64
- String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
-
- pwdClient.verify(loginUserInfo.getMaced(),loginUserInfo.getSm4iv(),loginUserInfo.getKeyindexs(),JSONstr,loginUserInfo.getId().toString(),"blade_user");
-
- UserSUPO userSUPO = JSONObject.parseObject(JSONstr, UserSUPO.class);
-
- //若登录用户的电话、角色、部门与原加密数据不符，登录失败
- if (!(loginUserInfo.getPhone().equals(userSUPO.getPhone()) && loginUserInfo.getRoleId().equals(userSUPO.getRoleId()) && loginUserInfo.getDeptId().equals(userSUPO.getDeptId())) ){
- throw new UserDeniedAuthorizationException("用户信息异常，请联系管理员");
- }
+// String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
+//
+// pwdClient.verify(loginUserInfo.getMaced(),loginUserInfo.getSm4iv(),loginUserInfo.getKeyindexs(),JSONstr,loginUserInfo.getId().toString(),"blade_user");
+//
+// UserSUPO userSUPO = JSONObject.parseObject(JSONstr, UserSUPO.class);
+//
+// //若登录用户的电话、角色、部门与原加密数据不符，登录失败
+// if (!(loginUserInfo.getPhone().equals(userSUPO.getPhone()) && loginUserInfo.getRoleId().equals(userSUPO.getRoleId()) && loginUserInfo.getDeptId().equals(userSUPO.getDeptId())) ){
+// throw new UserDeniedAuthorizationException("用户信息异常，请联系管理员");
+// }
return new BladeUserDetails(user.getId(),
user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
index 7d1ed70..154fbff 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -50,7 +50,7 @@
String NACOS_USERNAME = "nacos";
- String NACOS_PASSWORD = "1qaz!QAZ";
+ String NACOS_PASSWORD = "nacos";
/**
* nacos test 地址
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-pwd-api/src/main/java/cn/gistack/pwd/fegin/PwdClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-pwd-api/src/main/java/cn/gistack/pwd/fegin/PwdClientFallback.java
index 094568d..057cb3e 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-pwd-api/src/main/java/cn/gistack/pwd/fegin/PwdClientFallback.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-pwd-api/src/main/java/cn/gistack/pwd/fegin/PwdClientFallback.java
@@ -3,6 +3,7 @@
import cn.gistack.pwd.dto.CBCResultDTO;
import cn.gistack.pwd.dto.ResultDTO;
import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
/**
* @PROJECT_NAME: skjcmanager
@@ -10,6 +11,7 @@
* @USER: aix
* @DATE: 2023/8/14 14:17
*/
+@Component
public class PwdClientFallback implements IPwdClient {
@Override
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java
index 8651d3a..cff49cf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java
@@ -12,7 +12,7 @@
@BladeCloudApplication
@EnableFeignClients({"cn.gistack"})
-@MapperScan({"org.springblade.**.mapper.**","cn.gistack.sm.**.mapper.**"})
+@MapperScan({"org.springblade.**.mapper.**","cn.gistack.sm.**.mapper.**","cn.gistack.sm.skPanorama.mapper.**"})
public class SmApplication {
public static void main(String[] args) {
BladeApplication.run("blade-sm", SmApplication.class, args);
--
Gitblit v1.9.3