center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

perf(个人信息): 第三方平台绑定DE用户

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-09-28 11:50:35 +08:00
parent b662480244
commit 0891e0aff0
7 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/ext/AuthMapper.xml
View File

@ -109,7 +109,7 @@
<select id="findWecomUser" resultMap="baseMap"> <select id="findWecomUser" resultMap="baseMap">
select select
user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
from from
sys_user_assist a sys_user_assist a
left join left join
@ -119,7 +119,7 @@
<select id="findDingtalkUser" resultMap="baseMap"> <select id="findDingtalkUser" resultMap="baseMap">
select select
user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
from from
sys_user_assist a sys_user_assist a
left join left join
@ -129,7 +129,7 @@
<select id="findLarkUser" resultMap="baseMap"> <select id="findLarkUser" resultMap="baseMap">
select select
user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
from from
sys_user_assist a sys_user_assist a
left join left join

2
backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
View File

@ -150,7 +150,7 @@ public class XDingtalkServer {
public void bind(@RequestParam("code") String code, @RequestParam("state") String state) { public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
HttpServletResponse response = ServletUtils.response(); HttpServletResponse response = ServletUtils.response();
String url = "/#personal"; String url = "/#person-info/index";
DingtalkXpackService dingtalkXpackService = null; DingtalkXpackService dingtalkXpackService = null;

2
backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
View File

@ -151,7 +151,7 @@ public class XLarkServer {
public void bind(@RequestParam("code") String code, @RequestParam("state") String state) { public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
HttpServletResponse response = ServletUtils.response(); HttpServletResponse response = ServletUtils.response();
String url = "/#personal"; String url = "/#person-info/index";
LarkXpackService larkXpackService = null; LarkXpackService larkXpackService = null;
try { try {

2
backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
View File

@ -156,7 +156,7 @@ public class XWecomServer {
@GetMapping("/bind") @GetMapping("/bind")
public void bind(@RequestParam("code") String code, @RequestParam("state") String state) { public void bind(@RequestParam("code") String code, @RequestParam("state") String state) {
String url = "/#personal"; String url = "/#person-info/index";
HttpServletResponse response = ServletUtils.response(); HttpServletResponse response = ServletUtils.response();
WecomXpackService wecomXpackService = null; WecomXpackService wecomXpackService = null;

2
backend/src/main/resources/db/migration/V40__1.15.sql
View File

@ -126,7 +126,7 @@ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_typ
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4d88-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1663915323000, NULL, NULL, NULL); INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4d88-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1663915323000, NULL, NULL, NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`) VALUES ('379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'bdfcc324-1181-46a6-b681-a453517c4ffa', 'dataset', '2', 'user', 1663915323123, NULL, 'admin', NULL, NULL, NULL); INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`) VALUES ('379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'bdfcc324-1181-46a6-b681-a453517c4ffa', 'dataset', '2', 'user', 1663915323123, NULL, 'admin', NULL, NULL, NULL);
DELETE from `sys_menu` where `menu_id` = 50;

2
frontend/src/layout/components/Topbar.vue
View File

@ -46,7 +46,7 @@
<span><i class="el-icon-arrow-down el-icon--right" /></span> <span><i class="el-icon-arrow-down el-icon--right" /></span>
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/personal"> <router-link to="/person-info/index">
<el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item> <el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
</router-link> </router-link>

6
frontend/src/router/index.js
View File

@ -76,11 +76,7 @@ export const constantRoutes = [
component: () => import('@/views/link'), component: () => import('@/views/link'),
hidden: true hidden: true
}, },
{
path: '/personal',
component: () => import('@/views/system/user/privateForm'),
hidden: true
},
{ {
path: '/preview/:reportId', path: '/preview/:reportId',
component: () => import('@/components/canvas/components/Editor/PreviewEject'), component: () => import('@/components/canvas/components/Editor/PreviewEject'),