diff --git a/web/djy.WebApi/appsettings.Development.json b/web/djy.WebApi/appsettings.Development.json index 42d5383..a7a0761 100644 --- a/web/djy.WebApi/appsettings.Development.json +++ b/web/djy.WebApi/appsettings.Development.json @@ -7,10 +7,10 @@ } }, "AllowedHosts": "*", + "Urls": "http://*:30816", "WebConfig": { - "IdentServerUrl": "http://60.209.125.238:35101", + "IdentServerUrl": "http://60.209.125.238:40501", "WebId": 234, - "IsDev": true, "Area": "山东省|青岛市|市南区", "DesKey": "2Fv6I7oV6AlCFEbN", "jwt_Audience": "admin", @@ -21,22 +21,24 @@ "ShopPower": 1, "ConnName": "sqldb", "cache_time": 10, - "WebHostUrl": "https://zh-userapi.jingyiji.net", - "Redis": "192.168.0.80:6379", - "RedisDb": 2, - "Rbmq_Host": "127.0.0.1:13666", - "Rbmq_UserName": "djy_paas", - "Rbmq_Password": "123qwe", - "Rbmq_Sqlhost": "Data Source =192.168.1.205,1433; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true", - "DapperDbString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;", + "WebHostUrl": "http://192.168.1.83:30816", + "Redis": "192.168.1.83:6379,password=,defaultDatabase=4", + "RedisDb": 4, + "Rbmq_Host": "", + "Rbmq_UserName": "admin", + "Rbmq_Password": "admin", + "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true", + "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;", + "requesterDea": "nbforwarder", "DataConnList": [ + { "SysKey": "AMS", "TitleName": "AMS", "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =47.104.73.97,6762; Initial Catalog=AMS; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "Common", @@ -44,7 +46,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "djydb", @@ -52,7 +54,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =test; Password=test123;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" }, { @@ -61,11 +63,12 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" } + ] } } diff --git a/web/djy.WebApi/appsettings.Prod.json b/web/djy.WebApi/appsettings.Prod.json deleted file mode 100644 index b814f8e..0000000 --- a/web/djy.WebApi/appsettings.Prod.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "WebConfig": { - "IdentServerUrl": "http://djy-identity.myshipping.net", - "WebId": 234, - "Area": "山东省|青岛市|市南区", - "DesKey": "2Fv6I7oV6AlCFEbN", - "jwt_Audience": "admin", - "jwt_Issuer": "shuosoft", - "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0", - "jwt_Expiration": 1440, - "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*", - "ShopPower": 1, - "ConnName": "sqldb", - "cache_time": 10, - "WebHostUrl": "https://zh-userapi.jingyiji.net", - "Redis": "172.1.0.2:6379", - "RedisDb": 0, - "Rbmq_Host": "172.1.0.3:5672", - "Rbmq_UserName": "admin", - "Rbmq_Password": "admin", - "Rbmq_Sqlhost": "Data Source =172.31.85.154; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true", - "DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;", - "DataConnList": [ - - { - "SysKey": "AMS", - "TitleName": "AMS", - "Index": 100, - "DataType": 1, - "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" - }, - { - "SysKey": "Common", - "TitleName": "Common", - "Index": 100, - "DataType": 1, - "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" - }, - { - "SysKey": "djydb", - "TitleName": "pingtai", - "Index": 100, - "DataType": 1, - "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true" - - }, - { - "SysKey": "logsdb", - "TitleName": "日志库", - "Index": 100, - "DataType": 1, - "Status": 0, - "ConnString": "Data Source =172.31.85.154,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true" - - } - - - ] - } -} diff --git a/web/djy.WebApi/appsettings.json b/web/djy.WebApi/appsettings.json index cb6c8e2..a7a0761 100644 --- a/web/djy.WebApi/appsettings.json +++ b/web/djy.WebApi/appsettings.json @@ -7,8 +7,9 @@ } }, "AllowedHosts": "*", + "Urls": "http://*:30816", "WebConfig": { - "IdentServerUrl": "http://djy-identity.myshipping.net", + "IdentServerUrl": "http://60.209.125.238:40501", "WebId": 234, "Area": "山东省|青岛市|市南区", "DesKey": "2Fv6I7oV6AlCFEbN", @@ -20,14 +21,14 @@ "ShopPower": 1, "ConnName": "sqldb", "cache_time": 10, - "WebHostUrl": "https://zh-userapi.jingyiji.net", - "Redis": "172.1.0.2:6379", - "RedisDb": 0, - "Rbmq_Host": "172.1.0.3:5672", + "WebHostUrl": "http://192.168.1.83:30816", + "Redis": "192.168.1.83:6379,password=,defaultDatabase=4", + "RedisDb": 4, + "Rbmq_Host": "", "Rbmq_UserName": "admin", "Rbmq_Password": "admin", - "Rbmq_Sqlhost": "Data Source =172.31.85.154; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true", - "DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;", + "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true", + "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;", "requesterDea": "nbforwarder", "DataConnList": [ @@ -37,7 +38,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "Common", @@ -45,7 +46,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "djydb", @@ -53,7 +54,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" }, { @@ -62,7 +63,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =172.31.85.154,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" } diff --git a/web/djy_IsfApi/appsettings.Development.json b/web/djy_IsfApi/appsettings.Development.json index ff87939..1c97a0c 100644 --- a/web/djy_IsfApi/appsettings.Development.json +++ b/web/djy_IsfApi/appsettings.Development.json @@ -7,36 +7,38 @@ } }, "AllowedHosts": "*", + "Urls": "http://*:30817", "WebConfig": { - "IdentServerUrl": "http://60.209.125.238:35101", + "IdentServerUrl": "http://60.209.125.238:40501", "WebId": 234, - "IsDev": true, - "Area": "ɽʡ|ൺ|", + "Area": "山东省|青岛市|市南区", "DesKey": "2Fv6I7oV6AlCFEbN", "jwt_Audience": "admin", "jwt_Issuer": "shuosoft", "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0", "jwt_Expiration": 1440, - "StrFilte": "H,,,,,ɵ,ɧ,˵,,+,=,-,_,/,*,&,@,.,,,*", + "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*", "ShopPower": 1, "ConnName": "sqldb", "cache_time": 10, - "WebHostUrl": "https://zh-userapi.jingyiji.net", - "Redis": "192.168.0.80:6379", - "RedisDb": 2, - "Rbmq_Host": "127.0.0.1:13666", - "Rbmq_UserName": "djy_paas", - "Rbmq_Password": "123qwe", - "Rbmq_Sqlhost": "Data Source =192.168.1.205,1433; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true", - "DapperDbString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;", + "WebHostUrl": "http://127.0.0.1:30817", + "Redis": "192.168.0.80:6379,password=,defaultDatabase=13", + "RedisDb": 13, + "Rbmq_Host": "", + "Rbmq_UserName": "admin", + "Rbmq_Password": "admin", + "Rbmq_Sqlhost": "Data Source =60.209.125.238; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true", + "DapperDbString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;", + "requesterDea": "nbforwarder", "DataConnList": [ + { "SysKey": "AMS", "TitleName": "AMS", "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "Common", @@ -44,7 +46,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "djydb", @@ -52,20 +54,21 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =test; Password=test123;pooling=true" + "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" }, { "SysKey": "logsdb", - "TitleName": "־", + "TitleName": "日志库", "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =60.209.125.238,28000; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =test; Password=test123;pooling=true" + "ConnString": "Data Source =60.209.125.238,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" } + ] } } diff --git a/web/djy_IsfApi/appsettings.json b/web/djy_IsfApi/appsettings.json index e87a389..a02ba4b 100644 --- a/web/djy_IsfApi/appsettings.json +++ b/web/djy_IsfApi/appsettings.json @@ -7,27 +7,28 @@ } }, "AllowedHosts": "*", + "Urls": "http://*:30817", "WebConfig": { - "IdentServerUrl": "http://djy-identity.myshipping.net", + "IdentServerUrl": "http://60.209.125.238:40501", "WebId": 234, - "Area": "ɽʡ|ൺ|", + "Area": "山东省|青岛市|市南区", "DesKey": "2Fv6I7oV6AlCFEbN", "jwt_Audience": "admin", "jwt_Issuer": "shuosoft", "jwt_Secretkey": "IBFoxBpwAW2rSDIsYiHJL5aZ3Rpr5Uaph4t6Eqm2Fv6I7oV6AlCFEbNWRXyJT653iOFIbWOcOF3sMRSSUelRSbIL6RzOCOfIk3hhxyn9Aj4HxEE08zqlRloA0CWX7MQ0", "jwt_Expiration": 1440, - "StrFilte": "H,,,,,ɵ,ɧ,˵,,+,=,-,_,/,*,&,@,.,,,*", + "StrFilte": "肏,妈妈,操你妈,草泥马,屌,傻逼,骚逼,王八蛋,你妈的,+,=,-,_,/,*,&,@,.,,,*", "ShopPower": 1, "ConnName": "sqldb", "cache_time": 10, - "WebHostUrl": "https://zh-userapi.jingyiji.net", - "Redis": "172.1.0.2:6379", - "RedisDb": 0, - "Rbmq_Host": "172.1.0.3:5672", + "WebHostUrl": "http://192.168.1.83:30817", + "Redis": "192.168.1.83:6379,password=,defaultDatabase=3", + "RedisDb": 3, + "Rbmq_Host": "", "Rbmq_UserName": "admin", "Rbmq_Password": "admin", - "Rbmq_Sqlhost": "Data Source =172.31.85.154; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true", - "DapperDbString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;", + "Rbmq_Sqlhost": "Data Source =192.168.1.83; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true", + "DapperDbString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;", "requesterDea": "nbforwarder", "DataConnList": [ @@ -37,7 +38,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevAMS; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevAMS; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "Common", @@ -45,7 +46,7 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true;" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=DevCommonDB; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true;" }, { "SysKey": "djydb", @@ -53,21 +54,18 @@ "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =123.234.225.158,28000; Initial Catalog=DevDsPingTai; Persist Security Info=True; User ID =dev; Password=dev123;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDsPingTai; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" }, { "SysKey": "logsdb", - "TitleName": "־", + "TitleName": "日志库", "Index": 100, "DataType": 1, "Status": 0, - "ConnString": "Data Source =172.31.85.154,1433; Initial Catalog=djy_logs; Persist Security Info=True; User ID =sa; Password=QDdjy#2020*;pooling=true" + "ConnString": "Data Source =192.168.1.83,32009; Initial Catalog=TestDjyLogs; Persist Security Info=True; User ID =sa; Password=sa@djy.net;pooling=true" } - - - ] } }