Merge pull request #249 from FederatedAI/feature-fix-master-ip

fix ip
FederatedAI · Dec 17, 2024 · a258075 · a258075
2 parents 6699e32 + ee85a22
commit a258075
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/fate-serving-admin-ui/vue.config.js b/fate-serving-admin-ui/vue.config.js
@@ -65,7 +65,6 @@ module.exports = {
         // eslint-disable-next-line no-dupe-keys
         proxy: {
             '/api': {
-                // target: 'http://127.0.0.1:8350',
                 target: 'http://127.0.0.1:8350/',
                 changeOrigin: true,
                 pathRewrite: {

diff --git a/...serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/common/RouterTableUtils.java b/...serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/common/RouterTableUtils.java
@@ -699,7 +699,7 @@ public static void validateBooleanAndNull() throws JSONException {
     }
 
     public static void main(String[] args) {
-//        String str = "{\"route_table\": {\"default\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":9999,\"useSSL\":false}]},\"10000\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":8889}],\"serving\":[{\"ip\":\"127.0.0.1\",\"port\":8080}]},\"123\":[{\"host\":\"127.0.0.1\",\"port\":8888,\"useSSL\":false,\"negotiationType\":\"\",\"certChainFile\":\"\",\"privateKeyFile\":\"\",\"caFile\":\"\"}]},\"permission\":{\"default_allow\":true}}";
+//        String str = "{\"route_table\": {\"default\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":9999,\"useSSL\":false}]},\"10000\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":8889}],\"serving\":[{\"ip\":\"127.0.0.1\",\"port\":8080}]},\"123\":[{\"host\":\"10.35.27.23\",\"port\":8888,\"useSSL\":false,\"negotiationType\":\"\",\"certChainFile\":\"\",\"privateKeyFile\":\"\",\"caFile\":\"\"}]},\"permission\":{\"default_allow\":true}}";
         String str = "{\"route_table\":{\"default\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":2345}]},\"10000\":{\"default\":[{\"ip\":\"127.0.0.1\",\"port\":8889}],\"serving\":[{\"ip\":\"127.0.0.1\",\"port\":8080}]}},\"permission\":{\"default_allow\":true,\"allow\":[{\"from\":{\"coordinator\":\"9999\",\"role\":\"guest\"},\"to\":{\"coordinator\":\"10000\",\"role\":\"host\"}}],\"deny\":[{\"from\":{\"coordinator\":\"9999\",\"role\":\"guest\"},\"to\":{\"coordinator\":\"10000\",\"role\":\"host\"}}]}}";
         try {
             if (RouteTableJsonValidator.isJSON(str)) {