From 699a94ef768e72df66f07a1875927d65f47f93ce Mon Sep 17 00:00:00 2001 From: root <123> Date: Mon, 5 Jul 2021 16:15:15 +0800 Subject: [PATCH 01/15] 0705 --- .../java/com/cetc32/dh/controller/rest/AuthController.java | 6 +++--- src/main/resources/mapper/UserVisitMapper.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 91a1f1f..ee1829c 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -175,9 +175,9 @@ public class AuthController { userService.updateLogin(user); return ResponseData.error("账户信息有误或未审核！"); } - if(user.getWebLoginStatus()==1){ - return ResponseData.error("用户网页登录已在线，不能重复登录！"); - } +// if(user.getWebLoginStatus()==1){ +// return ResponseData.error("用户网页登录已在线，不能重复登录！"); +// } return null; } diff --git a/src/main/resources/mapper/UserVisitMapper.xml b/src/main/resources/mapper/UserVisitMapper.xml index 04db6a7..b8428ab 100644 --- a/src/main/resources/mapper/UserVisitMapper.xml +++ b/src/main/resources/mapper/UserVisitMapper.xml @@ -22,7 +22,7 @@ - + insert into uservisit(syscode,username,visit) values(#{sysCode},#{userName},#{visit}) on conflict (syscode,username) do update set visit = uservisit.visit +1 -- Gitee From 3ed51f0651b56ac4c17480e5b82dcf1c8f16e14f Mon Sep 17 00:00:00 2001 From: root <123> Date: Wed, 14 Jul 2021 15:22:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?0714=20=20=E6=B3=9B=E5=8C=96=E6=90=9C?= =?UTF-8?q?=E7=B4=A2%=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/AuthController.java | 9 ++++++--- .../dh/controller/rest/DepartmentController.java | 12 +++++++++++- src/main/resources/mapper/BaseAdminUserMapper.xml | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index ee1829c..b269bbe 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -331,13 +331,13 @@ public class AuthController { @PostMapping(value = "/rejectUser") public ResponseData reject(@RequestBody Map did){ Integer id=did.getOrDefault("id",0); - if(userService.delUser(id,0)>0) + if(userService.deleteInfo(id)>0) { - return ResponseData.success("操作成功！"); + return ResponseData.success("拒绝用户成功！"); } else { - return ResponseData.error("操作失败！"); + return ResponseData.error("拒绝用户失败！"); } } /* @ApiOperation(value = "用户删除（从数据库中删除不可恢复）", notes = "") @@ -372,6 +372,9 @@ public class AuthController { // public PageDataResult getUserList(@RequestBody UserInfo user_info){ public PageDataResult getUserList(@RequestBody Map userInfo){ BaseAdminUser user_info=CreateUser(userInfo); + if(user_info.getSysUserName()!=null&&user_info.getSysUserName().contains("%")){ + return new PageDataResult(0, new ArrayList<>(), user_info.getOffset()); + } // user_info.setUserStatus(1); return new PageDataResult(userService.countUserByCondition(user_info), userService.findUserByCondition(user_info), diff --git a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java index fcbcf9d..a9def5a 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java @@ -142,7 +142,17 @@ public class DepartmentController{ if(department == null){ return ResponseData.error("传入值不能为空！"); } - departmentService.updateByPrimaryKeySelective(department); + Department department_base= departmentService.findByID(department.getId()); + department_base.setName(department.getName()); + List dp=departmentService.findByParentID( department_base.getOrganizationid()); + List result1 = dp.stream() + .filter(item -> item.getName().equals( department_base.getName())) + .collect(Collectors.toList()); + if(result1.size()>0) + { + return ResponseData.error("同级已存在重复名字！"); + } + departmentService.updateByPrimaryKeySelective( department_base); return new ResponseData("更新成功"); } diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index f34d142..8c9e07b 100644 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ b/src/main/resources/mapper/BaseAdminUserMapper.xml @@ -71,7 +71,7 @@ role_id = #{roleId}, - department = #{department} + department = #{department}, areacode = #{areacode}, -- Gitee From e25d263252b6441768f097f66cfe7a6773b8fd84 Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Wed, 21 Jul 2021 17:03:38 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 18 ++++++++++++++---- src/main/resources/mapper/UserVisitMapper.xml | 2 +- src/main/resources/web-util-1.0.jar | Bin 20667 -> 0 bytes 3 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/web-util-1.0.jar diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index bb475b1..c98000a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -56,7 +56,17 @@ upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product -eip: http://192.168.1.5:8080/ -verifyUrl: http://192.168.1.42:8087/rest/auth/verify?token= -passportUrl: http://192.168.1.42:8087/?ReturnUrl= -defaultLoginRequiredEnable: false +eip: http://192.168.1.42:8080/ +#verifyUrl: ${sso.authcenter}/rest/auth/verify?token= +#passportUrl: ${sso.authcenter}/?ReturnUrl= +#defaultLoginRequiredEnable: false +sso: + authcenter: http://192.168.1.42:8087 + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: false + permission: S000^接口用户@/rest/**;*权限管理@/rest/**; + sysurl : http://192.168.1.42:${server.port} + sysname : 认证中心门户 + registerUrl : ${sso.authcenter}/rest/api/sys/sync + #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** diff --git a/src/main/resources/mapper/UserVisitMapper.xml b/src/main/resources/mapper/UserVisitMapper.xml index 04db6a7..b8428ab 100644 --- a/src/main/resources/mapper/UserVisitMapper.xml +++ b/src/main/resources/mapper/UserVisitMapper.xml @@ -22,7 +22,7 @@ - + insert into uservisit(syscode,username,visit) values(#{sysCode},#{userName},#{visit}) on conflict (syscode,username) do update set visit = uservisit.visit +1 diff --git a/src/main/resources/web-util-1.0.jar b/src/main/resources/web-util-1.0.jar deleted file mode 100644 index cb4291c31254779b34976fc21269bf14bc5249cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20667 zcma%jWmFwV(l#1`LvVrw5AN>n?i$?P-QC^Y-5r9vyF0<%9X>KMyEE^8Guf?k?m72I zS9RU)uCDIB^*mCdz#tF+03QJWCKQZi0RAH2@88Aw<+#a(B?Ks?-kTu;eEj(F|7(W$ z*Jk3}62b!fvT_vS0(KFrBEZy$zGuKr0apNo2hCpy9Lf|)k$c)zg=418=~8@u94oA^ z&C2ifLW_Q|*fqoX%%lzz7E0K`K}7Qfgh&h!U1?-k-m-Dw{#(RSg~ zdZ;=BYKuUU05mw71p9OZ3r#@q=!2q8l5K--ik{0~eL`R`4+@?2bXrzj#opB?hME

6BNuITEg<;W9a!7>BK@1B?RhmK3^tYSwj)%mI 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 o Date: Thu, 22 Jul 2021 16:55:02 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/BaseAdminRoleMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/BaseAdminRoleMapper.xml b/src/main/resources/mapper/BaseAdminRoleMapper.xml index 6486ec4..929d66f 100644 --- a/src/main/resources/mapper/BaseAdminRoleMapper.xml +++ b/src/main/resources/mapper/BaseAdminRoleMapper.xml @@ -33,8 +33,9 @@ + + + + +

+ +
+ + + + + + + + + + + +
+
+ + + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e687fdf..8ef17b4 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -50,9 +50,9 @@ - +
  • + 修改密码 +
    • diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 0303096..b546a10 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -1,6 +1,6 @@  - - + + Web用户注册页面 - @@ -47,12 +47,11 @@
    -  +  
    -
    + - - +