Merge branch 'master' into dev
src/key_def.h @@ -2,7 +2,9 @@ #define _KEY_DEF_H_ #define SHM_BUS_MAP_KEY 1 // BUS key #define SHM_BUS_KEY 8 // 网络代理key #define SHM_NET_PROXY_KEY 99 #endif
