ibizdev提交

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd im-app/im-app-wfweb
-      mvn clean package -Pprod
+      cd im-boot
+      mvn clean package
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-wfweb.jar root@172.16.102.61:/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im-app-wfweb.jar >>/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im_appim 流程应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im.jar root@172.16.102.61:/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im.jar >>/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im_apiim 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

im-app/im-app-web/src/main/java/com/ibiz/web/ht/service/BCService.java

-
 package com.ibiz.web.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.ht.domain.BC;

im-app/im-app-web/src/main/java/com/ibiz/web/ht/service/FJService.java

-
 package com.ibiz.web.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.ht.domain.FJ;

im-app/im-app-web/src/main/java/com/ibiz/web/ps/service/PSService.java

-
 package com.ibiz.web.ps.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.ps.domain.PS;

im-app/im-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgDeptService.java

-
 package com.ibiz.web.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.r7rt_org.domain.OrgDept;

im-app/im-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgDeptUserService.java

-
 package com.ibiz.web.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.r7rt_org.domain.OrgDeptUser;

im-app/im-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgService.java

-
 package com.ibiz.web.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.r7rt_org.domain.Org;

im-app/im-app-web/src/main/java/com/ibiz/web/r7rt_org/service/OrgUserService.java

-
 package com.ibiz.web.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.r7rt_org.domain.OrgUser;

im-app/im-app-web/src/main/java/com/ibiz/web/r7rt_wf/service/WFSTEPDATAService.java

-
 package com.ibiz.web.r7rt_wf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.web.r7rt_wf.domain.WFSTEPDATA;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/ht/service/BCService.java

-
 package com.ibiz.wfweb.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.ht.domain.BC;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/ht/service/FJService.java

-
 package com.ibiz.wfweb.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.ht.domain.FJ;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/ht/service/IMService.java

-
 package com.ibiz.wfweb.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.ht.domain.IM;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java

-
 package com.ibiz.wfweb.htwf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.htwf.domain.WFAS;
@@ -239,18 +239,32 @@ public class WFASService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfas.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java

-
 package com.ibiz.wfweb.htwf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.htwf.domain.WFBC;
@@ -239,18 +239,32 @@ public class WFBCService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfbc.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java

-
 package com.ibiz.wfweb.htwf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.htwf.domain.WFBM;
@@ -239,18 +239,32 @@ public class WFBMService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfbm.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java

-
 package com.ibiz.wfweb.htwf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.htwf.domain.WFIM;
@@ -239,18 +239,32 @@ public class WFIMService {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         wfim.setWfinstanceid(wfinstance.getWfinstanceid());

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_org/service/OrgDeptService.java

-
 package com.ibiz.wfweb.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_org.domain.OrgDept;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_org/service/OrgDeptUserService.java

-
 package com.ibiz.wfweb.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_org.domain.OrgDeptUser;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_org/service/OrgService.java

-
 package com.ibiz.wfweb.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_org.domain.Org;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_org/service/OrgUserService.java

-
 package com.ibiz.wfweb.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_org.domain.OrgUser;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_wf/service/WFIAActionService.java

-
 package com.ibiz.wfweb.r7rt_wf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_wf.domain.WFIAAction;

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/r7rt_wf/service/WFSTEPDATAService.java

-
 package com.ibiz.wfweb.r7rt_wf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb.r7rt_wf.domain.WFSTEPDATA;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/ht/service/IMService.java

-
 package com.ibiz.wfweb2.ht.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.ht.domain.IM;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/htwf/service/WFIMService.java

-
 package com.ibiz.wfweb2.htwf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.htwf.domain.WFIM;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_org/service/OrgDeptService.java

-
 package com.ibiz.wfweb2.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_org.domain.OrgDept;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_org/service/OrgDeptUserService.java

-
 package com.ibiz.wfweb2.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_org.domain.OrgDeptUser;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_org/service/OrgService.java

-
 package com.ibiz.wfweb2.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_org.domain.Org;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_org/service/OrgUserService.java

-
 package com.ibiz.wfweb2.r7rt_org.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_org.domain.OrgUser;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_wf/service/WFIAActionService.java

-
 package com.ibiz.wfweb2.r7rt_wf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_wf.domain.WFIAAction;

im-app/im-app-wfweb2/src/main/java/com/ibiz/wfweb2/r7rt_wf/service/WFSTEPDATAService.java

-
 package com.ibiz.wfweb2.r7rt_wf.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -13,13 +12,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import com.ibiz.util.feign.suport.SearchContextFeignEncode;
 import com.ibiz.wfweb2.r7rt_wf.domain.WFSTEPDATA;

im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml

 server:
-  devmode: false
-  port: 8203
+  devmode: true
+  port: 8080
   servlet:
     session:
       cookie:
@@ -17,11 +17,11 @@ spring:
 security:
   cas:
     server:
-      host: https://passport.ibizlab.cn
+      host: http://passportcs.ibizlab.cn
       login: ${security.cas.server.host}/login
       logout: ${security.cas.server.host}/logout
     service:
-      host: http://172.16.102.61:${server.port}
+      host: http://localhost:${server.port}
       login: /login/cas
       logout: /logout
 
@@ -36,7 +36,7 @@ logging:
 
 app:
   web:
-    url: http://172.16.102.61:${server.port}
+    url: http://localhost:${server.port}
     wfstarturl: /#/%s/null/editview
 #    wfviewurl: /#/dewfdataredirectview
     wfviewurl: /#/appwfdataredirectview

im-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 8101
 
 spring:
   application: