diff --git a/examapi/ruoyi-admin/src/main/resources/application-druid.yml b/examapi/ruoyi-admin/src/main/resources/application-druid.yml
index 455e9fa..f41f6f2 100644
--- a/examapi/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/examapi/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,11 +6,11 @@ spring:
druid:
# 主库数据源
master:
- #url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- url: jdbc:mysql://127.0.0.1:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+ #url: jdbc:mysql://127.0.0.1:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
- #password: Sxyanzhu@cf123
- password: haha123321
+ password: Sxyanzhu@cf123
+ #password: haha123321
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/examapi/ruoyi-admin/src/main/resources/application.yml b/examapi/ruoyi-admin/src/main/resources/application.yml
index 3253ade..653cf30 100644
--- a/examapi/ruoyi-admin/src/main/resources/application.yml
+++ b/examapi/ruoyi-admin/src/main/resources/application.yml
@@ -10,6 +10,7 @@ ruoyi:
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
profile: /Users/mac/data/uploadPath/exam
+ #profile: /data/uploadPath/exam
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
diff --git a/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ced92c4..e49b5a0 100644
--- a/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -9,7 +9,6 @@
-
@@ -48,7 +47,7 @@
- select u.user_id, u.user_code,u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -58,7 +57,7 @@
@@ -178,7 +177,7 @@
insert into sys_user(
dept_id,
user_name,
- user_code,
+
nick_name,
email,
avatar,
@@ -193,7 +192,7 @@
)values(
#{deptId},
#{userName},
- #{userCode},
+
#{nickName},
#{email},
#{avatar},