diff --git a/Document/长春市教育灰度测试登记备案会议纪要-2020-08-28.docx b/Document/长春市教育灰度测试登记备案会议纪要-2020-08-28.docx new file mode 100644 index 00000000..c1c01352 Binary files /dev/null and b/Document/长春市教育灰度测试登记备案会议纪要-2020-08-28.docx differ diff --git a/Kettle实例/1.kjb b/Kettle实例/1.kjb index 1cf9be59..b450e30d 100644 --- a/Kettle实例/1.kjb +++ b/Kettle实例/1.kjb @@ -412,7 +412,7 @@ N N Y - C:\Users\Administrator\Desktop\新建文件夹\2 + ${Internal.Entry.Current.Directory}/2 txt N N diff --git a/dsBaseRpc/Config/Config.ini b/dsBaseRpc/Config/Config.ini index b1ff52f7..05c75446 100644 --- a/dsBaseRpc/Config/Config.ini +++ b/dsBaseRpc/Config/Config.ini @@ -6,7 +6,7 @@ user = root pwd = DsideaL147258369 [distribute] #发布功能的配置 -ip = 10.10.14.187 +ip = server.dsmin.com port = 22 user = root pwd = dsideal @@ -29,7 +29,8 @@ project_name = dsBaseRpc # 数据汇集的地址 [dataExchange] -host = http://10.10.14.186:9009 +#host = http://10.10.14.186:9009 +host = http://10.10.14.213:9009 exchangeUrl = /v1/dataex/DataexSet SystemAuthUrl = /v1/dataex/SystemAuth SystemId = BASE_GO diff --git a/dsBaseRpc/main.go b/dsBaseRpc/main.go index d0dcb5c3..2d18e5db 100644 --- a/dsBaseRpc/main.go +++ b/dsBaseRpc/main.go @@ -117,6 +117,12 @@ func main() { //五、开启一个数据上报的协程 go func() { + //异常处理 + defer func() { + if err := recover(); err != nil { + fmt.Printf("%s\n", err) + } + }() DataExchange.DataExchange() }() //六、 注册反射服务 这个服务是CLI使用的 跟服务本身没有关系