Merge branch 'master' into fly

wangpengfei

2023-08-14 f84d9c46574a2cd663105859035bc17891270923

 main.go

@@ -1,6 +1,7 @@
package main

import (
   v1 "aps_crm/api/v1"
   "aps_crm/conf"
   "aps_crm/initialize"
   "aps_crm/model"
@@ -36,13 +37,16 @@
   }

   go shutdown()
   logx.Infof("aps-admin start serve...")
   logx.Infof("aps-crm start serve...")
   server := &http.Server{
      Addr:         fmt.Sprintf(":%d", conf.Conf.System.Port),
      Handler:      router.InitRouter(),
      ReadTimeout:  5 * time.Second,
      WriteTimeout: 5 * time.Second,
   }

   go v1.InitProductServiceConn()

   logx.Error(server.ListenAndServe().Error())
}