From f3a52628058d098a8b7ed16676bb32b277068f08 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 29 一月 2021 11:21:18 +0800
Subject: [PATCH] 后台用户
---
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 67 ++++++++++++++-------------------
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 2
2 files changed, 29 insertions(+), 40 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index 9d1429d..a40b0f8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,18 +24,7 @@
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -422,7 +411,7 @@
<workItem from="1611536010905" duration="21843000" />
<workItem from="1611622682269" duration="58745000" />
<workItem from="1611834131869" duration="1431000" />
- <workItem from="1611883117467" duration="4744000" />
+ <workItem from="1611883117467" duration="6336000" />
</task>
<servers />
</component>
@@ -470,10 +459,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
- <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611823693933">
+ <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611889554916">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611823693933" />
+ <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611889554916" />
<state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
<screen x="0" y="0" width="1536" height="824" />
</state>
@@ -482,54 +471,54 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
- <state width="1031" height="366" key="GridCell.Tab.0.bottom" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.0.bottom" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.0.center" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.0.center" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.0.left" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.0.left" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.0.right" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.0.right" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.1.bottom" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.1.bottom" timestamp="1611889836342">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.1.center" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611889836342" />
+ <state width="1031" height="366" key="GridCell.Tab.1.center" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.1.left" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.1.left" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.1.right" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.1.right" timestamp="1611889836341">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.2.bottom" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611889836341" />
+ <state width="1031" height="366" key="GridCell.Tab.2.bottom" timestamp="1611889836342">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.2.center" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611889836342" />
+ <state width="1031" height="366" key="GridCell.Tab.2.center" timestamp="1611889836342">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.2.left" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611889836342" />
+ <state width="1031" height="366" key="GridCell.Tab.2.left" timestamp="1611889836342">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
- <state width="1031" height="366" key="GridCell.Tab.2.right" timestamp="1611888573657">
+ <state width="1031" height="366" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611889836342" />
+ <state width="1031" height="366" key="GridCell.Tab.2.right" timestamp="1611889836342">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
+ <state width="1031" height="366" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611889836342" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
<screen x="0" y="0" width="1536" height="824" />
</state>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 3f00e64..9e2680d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -809,7 +809,7 @@
e.printStackTrace();
log.error("编辑后台用户出错【{}】",e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- return R.fail("手机号已经存在");
+ return R.fail("此手机号已被占用，请更换其他手机号码");
}
}
if (update>0&&null!=roleDO) {
--
Gitblit v1.7.1