fix: 修复feign远程调用token传递

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java

@@ -34,7 +34,7 @@ public class KiccAppUserDetailsServiceImpl implements KiccUserDetailsService {
 	@Override
 	@SneakyThrows
 	public UserDetails loadUserByUsername(String phone) {
-		R<User> result = remoteUserService.selectByPhone(phone, SecurityConstants.FROM_IN);
+		R<User> result = remoteUserService.selectByPhone(phone);
 		UserDetails userDetails = getUserDetails(result);
 		return userDetails;
 	}

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java

@@ -35,7 +35,7 @@ public class KiccUserDetailsServiceImpl implements KiccUserDetailsService {
 	@Override
 	@SneakyThrows
 	public UserDetails loadUserByUsername(String username) {
-		R<User> result = remoteUserService.selectByUserName(username, SecurityConstants.FROM_IN);
+		R<User> result = remoteUserService.selectByUserName(username);
 		UserDetails userDetails = getUserDetails(result);
 		return userDetails;
 	}

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/util/SecurityUtils.java

@@ -85,7 +85,7 @@ public class SecurityUtils {
 	 */
 	public User openInterfaceTemporaryLoginSession(String userId){
 		RemoteUserService remoteUserService = SpringContextHolderUtil.getBean(RemoteUserService.class);
-		R<User> result = remoteUserService.selectByUserId(userId, SecurityConstants.FROM_IN);
+		R<User> result = remoteUserService.selectByUserId(userId);
 		if (result == null || result.getData() == null) {
 			throw new CheckedException("用户不存在");
 		}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/feign/RemotePushConcernFanService.java

@@ -2,14 +2,11 @@ package com.cloud.kicc.commonbiz.api.feign;
 
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.core.constant.ServiceNameConstants;
 import com.cloud.kicc.system.api.entity.User;
-import feign.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -26,13 +23,13 @@ import java.util.Set;
 @FeignClient(contextId = "remotePushConcernFanService", value = ServiceNameConstants.COMMON_SERVICE)
 public interface RemotePushConcernFanService {
 
-	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/enterpriseUserFanSave", headers = SecurityConstants.HEADER_FROM_IN)
+	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/enterpriseUserFanSave")
 	R enterpriseUserFanSave(@RequestParam("innerEnterpriseUserId") String innerEnterpriseUserId, @RequestBody List<User> userList);
 
-	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/removeUserPushData", headers = SecurityConstants.HEADER_FROM_IN)
+	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/removeUserPushData")
 	R removeUserPushData(@RequestParam("userIds") Set<String> userIds);
 
-	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/bindConcernEnterpriseUser", headers = SecurityConstants.HEADER_FROM_IN)
+	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/bindConcernEnterpriseUser")
 	R bindConcernEnterpriseUser(@RequestParam("userId") String userId, @RequestBody List<User> enterpriseUserList);
 
 }

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java

@@ -26,10 +26,9 @@ public interface RemoteDictService {
 	/**
 	 * 根据 type 查询字典数据
 	 * @param type 字典类型
-	 * @param from 内部调用标志
 	 * @return 返回字典项列表
 	 */
-	@GetMapping(AppConstants.APP_SYSTEM + "/dictData/getDictByType/{type}")
+	@GetMapping(value = AppConstants.APP_SYSTEM + "/dictData/getDictByType/{type}", headers = SecurityConstants.HEADER_FROM_IN)
-	R<List<DictData>> getDictByType(@PathVariable("type") String type, @RequestHeader(SecurityConstants.FROM) String from);
+	R<List<DictData>> getDictByType(@PathVariable("type") String type);
 
 }

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteRegionService.java

@@ -24,10 +24,9 @@ public interface RemoteRegionService {
 	/**
 	 * 通过区域id查询区域信息
 	 * @param regionIds 区域id
-	 * @param from 调用标志
 	 * @return R
 	 */
-	@GetMapping(AppConstants.APP_SYSTEM + "/region/selectByRegionIds/{regionIds}")
+	@GetMapping(value = AppConstants.APP_SYSTEM + "/region/selectByRegionIds/{regionIds}", headers = SecurityConstants.HEADER_FROM_IN)
-	R<List<Region>> selectByRegionIds(@PathVariable("regionIds") String[] regionIds, @RequestHeader(SecurityConstants.FROM) String from);
+	R<List<Region>> selectByRegionIds(@PathVariable("regionIds") String[] regionIds);
 
 }

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java

@@ -24,28 +24,25 @@ public interface RemoteUserService {
 	/**
 	 * 通过用户名查询用户
 	 * @param userName 用户名
-	 * @param from 调用标志
 	 * @return R
 	 */
-	@GetMapping(AppConstants.APP_SYSTEM + "/user/selectByUserName/{userName}")
+	@GetMapping(value = AppConstants.APP_SYSTEM + "/user/selectByUserName/{userName}", headers = SecurityConstants.HEADER_FROM_IN)
-	R<User> selectByUserName(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM) String from);
+	R<User> selectByUserName(@PathVariable("userName") String userName);
 
 	/**
 	 * 通过手机号码查询用户
 	 * @param phone 手机号码
-	 * @param from 调用标志
 	 * @return R
 	 */
-	@GetMapping(AppConstants.APP_SYSTEM +  "/user/selectByPhone/{phone}")
+	@GetMapping(value = AppConstants.APP_SYSTEM +  "/user/selectByPhone/{phone}", headers = SecurityConstants.HEADER_FROM_IN)
-	R<User> selectByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM) String from);
+	R<User> selectByPhone(@PathVariable("phone") String phone);
 
 	/**
 	 * 通过用户ID查询用户
 	 * @param userid 用户id
-	 * @param from 调用标志
 	 * @return R
 	 */
-	@GetMapping(AppConstants.APP_SYSTEM + "/user/getUser/{userId}")
+	@GetMapping(value = AppConstants.APP_SYSTEM + "/user/getUser/{userId}", headers = SecurityConstants.HEADER_FROM_IN)
-	R<User> selectByUserId(@PathVariable("userId") String userid, @RequestHeader(SecurityConstants.FROM) String from);
+	R<User> selectByUserId(@PathVariable("userId") String userid);
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java

@@ -87,7 +87,7 @@ public class MapTaskController {
             mapTask.setBatchCode(batchCode);
 
             JSONObject jsonObject = new JSONObject();
-            R<User> user = remoteUserService.selectByUserId(mapTask.getCourierUserId(), SecurityConstants.FROM_IN);
+            R<User> user = remoteUserService.selectByUserId(mapTask.getCourierUserId());
             Hospital hospital = hospitalService.getById(mapTask.getHospitalId());
             jsonObject.put("hospitalId", hospital.getKlabHospitalAccount());
             if (StrUtil.isNotBlank(mapTask.getOrgId())) {

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java

@@ -83,7 +83,7 @@ public class MapTaskPresetController {
             String batchCode = UUID.fromString(UUID.randomUUID().toString()).toString();
             mapTaskPreset.setBatchCode(batchCode);
             JSONObject jsonObject = new JSONObject();
-            R<User> user = remoteUserService.selectByUserId(mapTaskPreset.getCourierUserId(), SecurityConstants.FROM_IN);
+            R<User> user = remoteUserService.selectByUserId(mapTaskPreset.getCourierUserId());
             if (StrUtil.isNotBlank(mapTaskPreset.getOrginPresetId())) {
                 Hospital hospital = hospitalService.getById(mapTaskPreset.getOrginPresetId());
                 jsonObject.put("hospitalId", hospital.getKlabHospitalAccount());

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java

@@ -59,7 +59,7 @@ public class OrgController {
         Org org = orgService.getById(id);
         resultVo.setResult(org);
         // 查询省市级联名称数据
-        R<List<Region>> result = remoteRegionService.selectByRegionIds(StrUtil.splitToArray(org.getRegionIds(),","), SecurityConstants.FROM_IN);
+        R<List<Region>> result = remoteRegionService.selectByRegionIds(StrUtil.splitToArray(org.getRegionIds(),","));
         resultVo.setExtend(result.getData().stream().map(item -> item.getName()).collect(Collectors.toList()));
         return R.ok(resultVo);
     }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java

@@ -115,7 +115,6 @@ public class PushConcernFanController {
         return R.ok();
     }
 
-    @Inner
     @ApiOperation("创建内部新用户强制关联内部企业")
     @PostMapping("/bindConcernEnterpriseUser")
     public R bindConcernEnterpriseUser(String userId, @Valid @RequestBody List<User> enterpriseUserList) {
@@ -149,7 +148,6 @@ public class PushConcernFanController {
         return R.ok();
     }
 
-    @Inner
     @ApiOperation("内部企业用户粉丝保存")
     @PostMapping("/enterpriseUserFanSave")
     public R enterpriseUserFanSave(String innerEnterpriseUserId, @Valid @RequestBody List<User> userList) {
@@ -216,7 +214,6 @@ public class PushConcernFanController {
         return R.ok();
     }
 
-    @Inner
     @ApiOperation("移除用户推送相关数据")
     @DeleteMapping("/removeUserPushData")
     public R<Boolean> removeUserPushData(@RequestParam Set<String> userIds) {

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java

@@ -117,7 +117,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
         mapLogistic.getMapTask().forEach(mapTask -> {
             if (mapTask.getEnabledCreateReport()) {
                 JSONObject jsonObject = new JSONObject();
-                R<User> user = remoteUserService.selectByUserId(mapTask.getCourierUserId(), SecurityConstants.FROM_IN);
+                R<User> user = remoteUserService.selectByUserId(mapTask.getCourierUserId());
                 Hospital hospital = hospitalService.getById(mapTask.getHospitalId());
                 jsonObject.put("hospitalId", hospital.getKlabHospitalAccount());
                 if (StrUtil.isNotBlank(mapTask.getOrgId())) {
@@ -140,7 +140,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
             mapTask.getMapTaskPreset().forEach(mapTaskPreset -> {
                 JSONObject jsonObject = new JSONObject();
                 if (mapTaskPreset.getEnabledCreateReport()) {
-                    R<User> taskPresetUser = remoteUserService.selectByUserId(mapTaskPreset.getCourierUserId(), SecurityConstants.FROM_IN);
+                    R<User> taskPresetUser = remoteUserService.selectByUserId(mapTaskPreset.getCourierUserId());
                     if (StrUtil.isNotBlank(mapTaskPreset.getOrginPresetId())) {
                         Hospital hospital = hospitalService.getById(mapTaskPreset.getOrginPresetId());
                         jsonObject.put("hospitalId", hospital.getKlabHospitalAccount());

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java

@@ -66,7 +66,7 @@ public class DictDataController {
 
     @GetMapping("/dictType/{dictType}")
     public R dictType(@PathVariable String dictType) {
-        return remoteDictService.getDictByType(dictType, SecurityConstants.FROM_IN);
+        return remoteDictService.getDictByType(dictType);
     }
 
     @SysLog("字典数据新增")