From 1be6b41435308c58e8262284fd34a69dd3623a46 Mon Sep 17 00:00:00 2001 From: root <123> Date: Wed, 22 Dec 2021 10:48:32 +0800 Subject: [PATCH 1/3] Merge remote-tracking branch 'origin/sso-xxx' into sso-xxx Conflicts: src/main/java/com/cetc32/dh/controller/rest/AuthController.java src/main/resources/application-dev.yml --- src/main/resources/application-dev.yml | 28 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c98000a..67ddfc1 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8087 + port: 8081 server: connectionTimeout: 18000000 @@ -7,13 +7,15 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://180.184.65.203:5432/dhmanage + #url: jdbc:postgresql://192.168.1.60:5432/dhmanage username: postgres - password: 123456 + #password: 123456 + password: Zdk@824. driver-class-name: org.postgresql.Driver # datasource: - # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 + # url: jdbc:mysql:// :3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 # username: root # password: 123 # initial-size: 1 @@ -48,7 +50,7 @@ generator: javaClient-targetPackage: com.cetc32.dh.mybatis logging: level: - com.cetc32.dh.mybatis: debug + com.cetc32: debug storePath: /root/ upLoadPath: ${storePath}upLoad @@ -56,17 +58,23 @@ upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product -eip: http://192.168.1.42:8080/ +eip: http://192.168.1.209:8080/ +startCode: 000000 #verifyUrl: ${sso.authcenter}/rest/auth/verify?token= #passportUrl: ${sso.authcenter}/?ReturnUrl= #defaultLoginRequiredEnable: false sso: - authcenter: http://192.168.1.42:8087 + authcenter: http://192.168.1.60:8081 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 : 认证中心门户 + permission: S000^接口用户@/rest/auth/**;*权限管理@/**; + sysurl : http://192.168.1.60:${server.port} + sysname : 用户中心 registerUrl : ${sso.authcenter}/rest/api/sys/sync #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** + syscode: S000 + basePermission: S000接口用户 + #单位是毫秒 + tokeAge: 3600000 + -- Gitee From 0fa42bf12063915573932f1ae9871028e180babe Mon Sep 17 00:00:00 2001 From: root <123> Date: Sun, 13 Feb 2022 09:17:38 +0800 Subject: [PATCH 2/3] 2022-02-22 --- .../cetc32/dh/controller/rest/AuthRoleController.java | 10 +++++++--- src/main/resources/application-dev.yml | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java index 72338e5..9428653 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java @@ -49,11 +49,15 @@ public class AuthRoleController { } @ApiOperation(value = "获取角色列表(不分页)", notes = "") - @GetMapping(value = "/list") - public ResponseData getRolesList(){ - return ResponseData.success(adminRoleService.getRoleList()); + @PostMapping(value = "/list") +// public ResponseData getRolesList(){ +// return ResponseData.success(adminRoleService.getRoleList()); +// } + public PageDataResult getRolesList(){ + return new PageDataResult(adminRoleService.getRoleList().size(), adminRoleService.getRoleList(), 0); } + /** *角色新增 * @param newRole diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 67ddfc1..4604254 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,11 +7,11 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://180.184.65.203:5432/dhmanage - #url: jdbc:postgresql://192.168.1.60:5432/dhmanage +# url: jdbc:postgresql://180.184.65.203:5432/dhmanage + url: jdbc:postgresql://192.168.1.60:5432/dhmanage username: postgres - #password: 123456 - password: Zdk@824. + password: 123456 +# password: Zdk@824. driver-class-name: org.postgresql.Driver # datasource: -- Gitee From 47dcfa6e5ee316adeff6a10b6e59124dd41b4c71 Mon Sep 17 00:00:00 2001 From: root <123> Date: Mon, 28 Mar 2022 14:35:16 +0800 Subject: [PATCH 3/3] 2022-03-28 --- .../controller/rest/PritraceController.java | 47 ++++++++++++++++++ .../java/com/cetc32/dh/entity/Pritrace.java | 31 ++++++++++++ .../com/cetc32/dh/mybatis/PritraceMapper.java | 13 +++++ src/main/resources/mapper/PritraceMapper.xml | 48 +++++++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 src/main/java/com/cetc32/dh/controller/rest/PritraceController.java create mode 100644 src/main/java/com/cetc32/dh/entity/Pritrace.java create mode 100644 src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java create mode 100644 src/main/resources/mapper/PritraceMapper.xml diff --git a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java new file mode 100644 index 0000000..8045710 --- /dev/null +++ b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java @@ -0,0 +1,47 @@ +package com.cetc32.dh.controller.rest; + +import com.cetc32.dh.common.response.ResponseData; +import com.cetc32.webutil.common.annotations.LoginRequired; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.cetc32.dh.mybatis.PritraceMapper; +import com.cetc32.dh.entity.Pritrace; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@LoginRequired +@RestController +@RequestMapping("/rest/pritrace") +public class PritraceController { + @Autowired + PritraceMapper pritraceMapper; + + @PostMapping("/insert") + public ResponseData insert(@RequestBody Map map ){ + String user =(String)map.get("user"); + ArrayList departIds =(ArrayList) map.get("departIds"); + Pritrace pritrace = new Pritrace(); + if(user!=null&&user.trim().length() > 0&&departIds!=null&&departIds.size()!=0){ + pritrace.setUser(user); + if(pritraceMapper.deleteByUser(user)<0){ + return ResponseData.error("数据添加失败！"); + }else{ + for(int i=0;i + + + + + + + + + + + + + + + + insert into pritrace + + + + + username, + + + + departid, + + + + + + + + #{user,jdbcType=VARCHAR}, + + + + #{departId,jdbcType=INTEGER}, + + + + + + + delete from pritrace WHERE username =#{user} + + + -- Gitee