Merge remote-tracking branch 'origin/jdk17' into jdk17-dev

# Conflicts: # pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDictController.java
pig-mesh · Jul 15, 2024 · 212e1e3 · 212e1e3
2 parents 552797f + db43f98
commit 212e1e3
Show file tree

Hide file tree

Showing 2 changed files with 213 additions and 181 deletions.
diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDictService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDictService.java
@@ -3,6 +3,7 @@
 import com.pig4cloud.pig.admin.api.entity.SysDictItem;
 import com.pig4cloud.pig.common.core.constant.ServiceNameConstants;
 import com.pig4cloud.pig.common.core.util.R;
+import com.pig4cloud.pig.common.feign.annotation.NoToken;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,7 +24,8 @@ public interface RemoteDictService {
 	 * @param type 字典类型
 	 * @return 同类型字典
 	 */
-	@GetMapping("/dict/type/{type}")
+	@NoToken
+	@GetMapping("/dict/remote/type/{type}")
 	R<List<SysDictItem>> getDictByType(@PathVariable("type") String type);
 
 }