From 19c7a56d73e82b42e6ba5b77a9424f5c8289ad87 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 9 Jun 2021 17:34:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B5=8B=E8=AF=95=E5=AE=9E=E4=BE=8B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20=E5=8F=8A=20=E9=A1=B9=E7=9B=AEtoken=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E7=94=A8=E6=88=B7admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/common/ActDefineStartMap.java | 21 +++++++++ .../controller/WorkFlowController.java | 43 ++----------------- .../java/com/adc/da/util/LoginUserUtil.java | 21 +++++---- adc-da-main/pom.xml | 11 +++++ .../main/resources/application-dev.properties | 2 +- .../src/main/resources/application.properties | 15 ++++++- 6 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java new file mode 100644 index 00000000..82c9b863 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -0,0 +1,21 @@ +package com.adc.da.common; + +import java.util.Map; +import java.util.TreeMap; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2021年06月09日 17:18 + */ +public class ActDefineStartMap { + + // map 添加 新的流程实例 + public static String actDefineStartMap(String type){ + + Map map = new TreeMap<>(); + map.put("1","standardLibraryWkflow"); + + return map.get(type); + } +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 45c2ab16..c6643978 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -56,46 +56,9 @@ public class WorkFlowController { @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/startProcess") public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){ - if(type.equals("1")){ - return this.activiti_define_start("fgrk", LoginUserUtil.getUserId(),id); - }else if(type.equals("2")){ - return this.activiti_define_start("fgjspglc",LoginUserUtil.getUserId(),id); - }else if(type.equals("3")){ - return this.activiti_define_start("projectreview",LoginUserUtil.getUserId(),id); - }else if(type.equals("4")){ - return this.activiti_define_start("qbzxd",LoginUserUtil.getUserId(),id); - }else if(type.equals("5")){ - return this.activiti_define_start("whgxgllc",LoginUserUtil.getUserId(),id); - }else if(type.equals("6")){ - return this.activiti_define_start("qbzxdsqlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("9")){ - return this.activiti_define_start("bzcgsqlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("8")){ - return this.activiti_define_start("zxdyqsplc",LoginUserUtil.getUserId(),id); - }else if(type.equals("10")){ - return this.activiti_define_start("bzhyhqsqlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("11")){ - return this.activiti_define_start("qbzxdpglc",LoginUserUtil.getUserId(),id); - }else if(type.equals("12")){ - return this.activiti_define_start("qbkwlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("13")){ - return this.activiti_define_start("xzyqpglc",LoginUserUtil.getUserId(),id); - }else if(type.equals("7")){ - return this.activiti_define_start("qbfzlc",LoginUserUtil.getUserId(),id); - } - else if(type.equals("15")){ - return this.activiti_define_start("bzfysqlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("16")){ - return this.activiti_define_start("bzhyhhgllc",LoginUserUtil.getUserId(),id); - }else if(type.equals("17")){ - return this.activiti_define_start("qbbalc",LoginUserUtil.getUserId(),id); - }else if(type.equals("18")){ - return this.activiti_define_start("hwfgqdfbjgxlc",LoginUserUtil.getUserId(),id); - }else if(type.equals("19")){ - return this.activiti_define_start("qbfslc","3U5F8UJJVPZB4B4BKN3P",id); - }else if(type.equals("14")){ - return this.activiti_define_start("zcrkjpglc",LoginUserUtil.getUserId(),id); - }else{ + if(StringUtils.isNotBlank(type)){ + return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(),id); + }else { return null; } } diff --git a/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java b/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java index 0ad74f0e..cc5fad43 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java @@ -1,6 +1,7 @@ package com.adc.da.util; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.UnavailableSecurityManagerException; import org.apache.shiro.session.InvalidSessionException; @@ -14,16 +15,18 @@ public class LoginUserUtil { * */ public static String getUserId() { - String userId = null; + String userId = "WY8J26MH23"; try { - Subject subject = SecurityUtils.getSubject(); - Object object=subject.getPrincipal(); - if(object!=null){ - String json = JSONObject.toJSONString(object); - if(json!=null && json.length()>0){ - Map userInfo=JSONObject.parseObject(json, Map.class); - userId=userInfo.get("id").toString(); - } + if(!StringUtils.isNotBlank(userId)){ + Subject subject = SecurityUtils.getSubject(); + Object object=subject.getPrincipal(); + if(object!=null){ + String json = JSONObject.toJSONString(object); + if(json!=null && json.length()>0){ + Map userInfo=JSONObject.parseObject(json, Map.class); + userId=userInfo.get("id").toString(); + } + } } } catch (UnavailableSecurityManagerException e) { } catch (InvalidSessionException e) { diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml index 3da00433..bb363e53 100644 --- a/adc-da-main/pom.xml +++ b/adc-da-main/pom.xml @@ -49,6 +49,17 @@ adc-da-jwtLogin 3.1.0 + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.2.0.RELEASE + + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.2.0.RELEASE + diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 17078fb1..1439004b 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -9,7 +9,7 @@ spring.datasource.password = 1q2w3e4r #============================================== # 应用设置 -spring.application.name=gsar +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 457d9b84..515259e4 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -1,7 +1,6 @@ ############################################## # 项目启动模式 ############################################## -spring.application.name=FotonLAWSSystem spring.profiles.active=dev ############################################## @@ -30,6 +29,20 @@ logging.level.org.springframework=info restPath=/api #server.servlet.context-path=/api +#是否将自己注册到Eureka Server上，默认为true +eureka.client.register-with-eureka=true +##是否从Eureka Server上获取注册信息，默认为true +eureka.client.fetch-registry=true + +#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ +#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ +#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ +eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ +# 请求连接的超时时间 默认的时间为 1 秒 +ribbon.ConnectTimeout=500000 +# 请求处理的超时时间 +ribbon.ReadTimeout=500000 + # =============================== # = DATA SOURCE # ===============================