diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6e7fb6b4ac7048604883304adbeb6af9f7a98b79..6ce02861026b4ee7e13f199c29ca74a9f78ffd32 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,11 +8,13 @@ updates: - package-ecosystem: "gomod" # See documentation for possible values directory: "/" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" + target-branch: "develop" - package-ecosystem: "github-actions" # Workflow files stored in the # default location of `.github/workflows` directory: "/" schedule: - interval: "daily" \ No newline at end of file + interval: "weekly" + target-branch: "develop" \ No newline at end of file diff --git a/README.md b/README.md index c5421b4c6c73dcd816aa77e0131e0dc838fa91d6..f950a4b3e9c4e115eda2f0e99379286c4c66d24f 100644 --- a/README.md +++ b/README.md @@ -253,6 +253,14 @@ If you are using [apache/dubbo-go](github.com/apache/dubbo-go) and think that it </td> </tr> <tr></tr> + <tr> + <td align="center" valign="middle"> + <a href="http://www.mgtv.com" target="_blank"> + <img width="222px" src="https://ugc.hitv.com/platform_oss/F6077F1AA82542CDBDD88FD518E6E727.png"> + </a> + </td> + </tr> + <tr></tr> </tbody> </table> </div> diff --git a/README_CN.md b/README_CN.md index e7875fca9ce2e89745bfa9ee2ae4ef9d5fd250c9..ff72428d977f8b24c7c60b228108987c823c9efa 100644 --- a/README_CN.md +++ b/README_CN.md @@ -251,6 +251,14 @@ make test </td> </tr> <tr></tr> + <tr> + <td align="center" valign="middle"> + <a href="http://www.mgtv.com" target="_blank"> + <img width="222px" src="https://ugc.hitv.com/platform_oss/F6077F1AA82542CDBDD88FD518E6E727.png"> + </a> + </td> + </tr> + <tr></tr> </tbody> </table> </div> \ No newline at end of file diff --git a/config/router_config.go b/config/router_config.go index ed42577ed3cce2e5a1ab0da290f0d5450553d8fb..ea19b46800d747de763bbb1ee679f8398e440f3d 100644 --- a/config/router_config.go +++ b/config/router_config.go @@ -66,7 +66,7 @@ func initRouterConfig(content []byte, factories map[string]router.FilePriorityRo r, e := factory.NewFileRouter(content) if e == nil { url := r.URL() - routerURLSet.Add(&url) + routerURLSet.Add(url) return nil } logger.Warnf("router config type %s create fail {%v}\n", k, e) diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 0602f076dfbc00129dfdef4f3aa9d70419a1765d..76fc052b6f471c776b9740e480be5023f494633e 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -212,6 +212,9 @@ func (r *zkRegistry) registerTempZookeeperNode(root string, node string) error { r.cltLock.Lock() defer r.cltLock.Unlock() + if r.client == nil{ + return perrors.WithStack(perrors.New("zk client already been closed")) + } err = r.client.Create(root) if err != nil { logger.Errorf("zk.Create(root{%s}) = err{%v}", root, perrors.WithStack(err))