'收获客户注册'

src/main/java/com/steerinfo/dil/feign/SSOFeign.java

@@ -4,6 +4,7 @@ package com.steerinfo.dil.feign;
 import feign.HeaderMap;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
@@ -16,7 +17,8 @@ import java.util.Map;
 public interface SSOFeign {
 
     @PostMapping("/icore.icp.web/pass/v1/sysusers/")
-    Map<String,Object> addUser(@HeaderMap Map<String,Object> headerMap,
+    Map<String,Object> addUser(@RequestHeader("Authorization") String token,
+//            @HeaderMap Map<String,Object> headerMap,
                                @RequestParam String userCode,
                                @RequestParam String userName,
                                @RequestParam String orgCode,
@@ -25,8 +27,9 @@ public interface SSOFeign {
                                @RequestParam String companyId,
                                @RequestParam String orgId);
 
-    @PostMapping("pass/v1/sysuserroles/addUserroles")
-    Map<String,Object> addUserroles(@RequestParam String userId,
+    @PostMapping("/icore.icp.web/pass/v1/sysuserroles/")
+    Map<String,Object> addUserroles(@RequestHeader("Authorization") String token,
+                                    @RequestParam String userId,
                                     @RequestParam String userCode,
                                     @RequestParam String roleId);
 

src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -83,24 +83,33 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         rmsConsignee.setUpdateTime(new Date());
         rmsConsignee.setUpdateUsername("admin");
         rmsConsignee.setInsertUpdateRemark("无");
-//        // 调用sso接口
-//        Map<String, Object> tokenMap = tokenFeign.login("admin03", "7c4a8d09ca3762af61e59520943dc26494f8941b");
-//        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
-//        String token = (String) data.get("accessToken");
-//        Map<String,Object> headerMap = new HashMap<>();
-//        // 设置token
-//        headerMap.put("Content-type", "application/x-www-form-urlencoded");
-//        headerMap.put("Authorization","Token" + token);
-//        // 传json格式
-////        String json = JSONUtils.toJSONString(ssoMap);
-////        String s = HttpUtil.doJsonPost("https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/", json, token);
-//        // 传formData格式--URL?参数&参数
-//        Map<String, Object> resultMap = ssoFeign.addUser(headerMap,consigneeCompanyName, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
-//        System.out.println(resultMap);
-//        // 赋权
-//        String userId = (String) resultMap.get("userId");
-//        Map<String, Object> rolesMap = ssoFeign.addUserroles(userId, consigneeCompanyName, "958038344527384576");
-//        System.out.println(rolesMap);
+        // 调用sso接口
+        Map<String, Object> tokenMap = tokenFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+        String token = (String) data.get("accessToken");
+//        String s = System.setProperty("sso.token", token);
+//        System.out.println(s);
+        Map<String,Object> headerMap = new HashMap<>();
+        // 设置token
+        headerMap.put("Content-type", "application/x-www-form-urlencoded");
+        headerMap.put("Authorization","Bearer " + token);
+        // 传json格式
+//        String json = JSONUtils.toJSONString(ssoMap);
+//        String s = HttpUtil.doJsonPost("https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/", json, token);
+        // 传formData格式--URL?参数&参数
+        Map<String, Object> resultMap = ssoFeign.addUser("Bearer " + token,consigneeCompanyName, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
+        System.out.println(resultMap);
+        // 赋权
+        String code = (String) resultMap.get("code");
+        String userId = null;
+        if (("0").equals(code)) {
+            Map<String,Object> userData = (Map<String, Object>) resultMap.get("data");
+            userId = (String) userData.get("userId");
+        }
+        if (userId != null) {
+            Map<String, Object> rolesMap = ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "958038344527384576");
+            System.out.println(rolesMap);
+        }
         int result = 0;
         List<RmsConsignee> rmsRmsConsignees = rmsConsigneeMapper.selectByParameters(map);
         // 新增

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/