调用平台

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.feign.privilege.client.DepartmentClient;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,10 +114,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         usd.setRoleSeqs(personAccount.getRoles());
         //账号
         usd.setUserName(personAccount.getAccountName());
-
-
-
-
+        LinkedHashMap<String, Object> user= this.setcreateUser( usd,  appKey,  product,  token);
 
         //orgcode
 
@@ -127,9 +125,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //平台USERID
 
 
-
-
-
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser,personBasic);
@@ -231,13 +226,34 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     //新增平台用户
-    private ResponseModel<Object> setcreateUser(UserDto userDto, String appKey, String product, String token) {
-        return privilegeFeignClient.create(appKey, product, token, userDto);
+    private    LinkedHashMap<String, Object> setcreateUser(UserDto userDto, String appKey, String product, String token) {
+        ResponseModel<Object> amosUser = privilegeFeignClient.create(appKey, product, token, userDto);
+
+        LinkedHashMap<String, Object> user=new LinkedHashMap<>();
+
+        if (!ObjectUtils.isEmpty(amosUser)) {
+            if(amosUser.getStatus()==200){
+                user = (LinkedHashMap<String, Object>) amosUser.getResult();
+            }else{
+                throw new RuntimeException();
+            }
+        }
+        return user;
     }
 
     //修改平台用户
-    private ResponseModel<Object> update(String userId, UserDto userDto, String appKey, String product, String token) {
-        return privilegeFeignClient.update(userId, appKey, product, token, userDto);
+    private LinkedHashMap<String, Object> update(String userId, UserDto userDto, String appKey, String product, String token) {
+        ResponseModel<Object> amosUser =privilegeFeignClient.update(userId, appKey, product, token, userDto);
+        LinkedHashMap<String, Object> user=new LinkedHashMap<>();
+
+        if (!ObjectUtils.isEmpty(amosUser)) {
+            if(amosUser.getStatus()==200){
+                user = (LinkedHashMap<String, Object>) amosUser.getResult();
+            }else{
+                throw new RuntimeException();
+            }
+        }
+        return user;
     }
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP-WJ
+spring.application.name=AMOS-JXIOP
 server.servlet.context-path=/jxiop
 server.port=33100
 server.uri-encoding=UTF-8
@@ -31,7 +31,6 @@ spring.liquibase.enabled=true
 
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5
-eureka.instance.prefer-ip-address=true
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
@@ -57,3 +56,5 @@ spring.http.encoding.force=true
 
 
 privilege.fegin.name=AMOS-API-PRIVILEGE
+feign.client.config.default.connect-timeout=20000
+feign.client.config.default.read-timeout=20000