From 51a0980425fd709bad6a20cb8616711b53803f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 13 Sep 2024 16:36:24 +0800 Subject: [PATCH] =?UTF-8?q?release:=E5=A4=96=E6=94=BE=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/WebController.java | 49 +++++++++++++++++++ .../src/main/resources/bootstrap-std.yaml | 16 +++--- .../src/main/resources/bootstrap.yaml | 24 +++++++-- 3 files changed, 78 insertions(+), 11 deletions(-) diff --git a/itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java b/itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java index 40a303b..623eeb0 100644 --- a/itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java +++ b/itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java @@ -173,6 +173,55 @@ public class WebController { //开始执行登录 String username = AESUtil.aesDecrypt(loginModel.getDxhyu()); log.info("用户{}，登录开始", username); + if (StringUtils.isBlank(itaxAdminConfig.getWhitelist()) || !Arrays.asList(itaxAdminConfig.getWhitelist()).contains(username)){ + log.info("用户{}，登录失败，未配置白名单", username); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write(" \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " 发票系统登陆结果 \n" + + " \n" + + " \n" + + " \n" + + "
\n" + + "

登陆失败

\n" + + " \n" + + "

登录失败，未配置管理员登陆白名单

\n" + + "

请尝试以下解决方案：

\n" + + " \n" + + "
\n" + + " \n" + + ""); + return; + } ReturnT result = userService.findUser(loginModel.getDxhyu(), loginModel.getDxhyp()); log.info("用户{}，登录结果：{}", username, JSON.toJSONString(result)); diff --git a/itaxBase-admin/src/main/resources/bootstrap-std.yaml b/itaxBase-admin/src/main/resources/bootstrap-std.yaml index 2a5df97..b84268e 100644 --- a/itaxBase-admin/src/main/resources/bootstrap-std.yaml +++ b/itaxBase-admin/src/main/resources/bootstrap-std.yaml @@ -4,15 +4,15 @@ spring: nacos: config: # Nacos config 地址 - server-addr: ${nacos.address} + server-addr: 10.18.90.125:33000 # Nacos config 命名空间,对应配置中的名称(sims_order_namespace) - namespace: ${nacos.namespace} + namespace: dxhy-nacos # Nacos config 分组 group: itax-admin # Nacos config 登录用户名 - username: ${nacos.username} + username: admin # Nacos config 登录密码 - password: ${nacos.password} + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: application # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} @@ -27,8 +27,8 @@ spring: # Nacos discovery 配置 discovery: # Nacos discovery 服务地址 - server-addr: ${nacos.address} - username: ${nacos.username} + server-addr: nacos-1.itax.local:33000 + username: admin # Nacos config 登录密码 - password: ${nacos.password} - enabled: off + password: Invoice.nacos.!1 + enabled: off \ No newline at end of file diff --git a/itaxBase-admin/src/main/resources/bootstrap.yaml b/itaxBase-admin/src/main/resources/bootstrap.yaml index 6c5e73a..6b8be80 100644 --- a/itaxBase-admin/src/main/resources/bootstrap.yaml +++ b/itaxBase-admin/src/main/resources/bootstrap.yaml @@ -1,13 +1,31 @@ # 此文件不可少,Spring Cloud读取配置必须 #本机ip地址获取:${spring.cloud.client.ip-address} spring: + security: + oauth2: + client: + registration: + custom: + client-id: ele-cloud + client-secret: ON1DXvYpmEgf97Jhw61Kc4SejfliQN1Z + authorization-grant-type: authorization_code + redirect-uri: http://10.18.90.125:10000/itaxAdmin/singleLogin + provider: + custom: + authorization-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/auth + token-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/token + user-info-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/userinfo + user-name-attribute: email + resourceserver: + jwt: + jwk-set-uri: ${JWK_SET_URI:https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/certs} application: name: itax-admin profiles: # Spring 配置文件读取 - active: @deployType@ + active: std - #active: @deployType@ + #active: std #active: dev jackson: # jackson 日期格式化 @@ -70,7 +88,7 @@ mybatis-plus: #自定义填充策略接口实现 #meta-object-handler: com.baomidou.springboot.xxx #自定义SQL注入器 -# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector + # sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector configuration: map-underscore-to-camel-case: true cache-enabled: false