From 69c6968c29089faeda0bc724e6d81c3ccdd5e83f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 25 Mar 2022 15:36:19 +0800
Subject: [PATCH] 1、连接备份库 2、队伍名称返回 3、ftp修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 +++++---
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 2 ++
src/main/resources/application-dev.yml | 16 ++++++++++------
src/main/java/org/springblade/modules/system/entity/User.java | 1 +
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index 362ce4f..eb2ec3b 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -110,6 +110,7 @@
.set("phone", user.getPhone())
.set("workjurisdiction", user.getWorkjurisdiction())
.set("firstlogin", user.getFirstlogin())
+ .set("dwmc", user.getRolename())
.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
.set(TokenConstant.ACCOUNT, user.getAccount())
.set(TokenConstant.USER_NAME, user.getAccount())
@@ -166,4 +167,5 @@
return false;
}
+
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 52123a8..6945cc0 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -151,4 +151,5 @@
@TableField("job_unit")
private String jobUnit;
private String firstlogin;
+ private String rolename;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 2fe0c3a..754b61d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -191,11 +191,13 @@
<select id="getUser" resultMap="userResultMap">
SELECT
- *
+ r.role_name as rolename,
+ u.*
FROM
- blade_user
+ blade_user u
+ LEFT JOIN blade_role r ON u.role_id = r.id
WHERE
- tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
+ u.tenant_id = #{param1} and u.account = #{param2} and u.password = #{param3} and u.is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4bff48c..1558060 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -14,13 +14,17 @@
datasource:
# MySql
- url: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- username: root
- password: ZHba@0112
+# url: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+# username: root
+# password: ZHba@0112
# url: jdbc:mysql://223.82.109.183:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
# username: root
# password: ZHba@0112
+
+ url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: root
+ password: jfpt123
# PostgreSQL
@@ -39,10 +43,10 @@
#ftp 设置
ftp:
sqlConnect: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 172.19.1.30
+ ftpHost: 117.40.91.118
ftpPort: 21
- ftpUserName: yly
- ftpPassword: Yly@123
+ ftpUserName: zhbain
+ ftpPassword: zhbain
ftpPath: yly/qfqk/
localPath: /home/zhongsong/qfqk/
ip: http://47.49.21.216:9000
--
Gitblit v1.9.3