diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 512cb6e4..bb541545 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index b80a9f8e..9492cb15 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -14,55 +14,55 @@ } } }, - "AllowedHosts": "*", - "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", + "AllowedHosts": "*", //允许所有主机 + "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", //跨域 "AppOptions": { - "DBConnectionString": "Server=192.168.7.103; Database=wms_db;User Id=root;password=L8mrCGbPisAa6GNh;port=3306;CharSet=gb2312;Connect Timeout=150;", - "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", - "RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", - "SingleBaseUrl": "http://127.0.0.1:8066/api", - "DBType": "Mysql", - "CompanyId": 1, - "AllowCache": false, - "RedisDirectory": "Test" + "DBConnectionString": "Server=192.168.7.103; Database=wms_db;User Id=root;password=L8mrCGbPisAa6GNh;port=3306;CharSet=gb2312;Connect Timeout=150;", //数据库连接地址 + "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址 + "RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址 + "SingleBaseUrl": "http://127.0.0.1:8066/api", //单点服务连接地址 + "DBType": "Mysql", //数据库类型 + "CompanyId": 1, //公司Id + "AllowCache": false, //允许缓存 + "RedisDirectory": "Test" //redis标记 }, "SoaOptions": { - "ModuleID": 25, - "Url_V3": "https://dev.uc.v3.f2b211.com", //正式http://uc.v3.f2b211.com - "Url": "http://dev.uc.f2b211.com", - "AppId": "100528847652388864", - "AppSecret": "fa950a1fe690fe610338084b49db7db9", - "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4RaUAcPIEzHkMA0dvp51SbvC+ASiitHw9h6sCq8blqh8Cmx+ZfldxmX+sGqUDL40Eo07tQGWpY8WTlUROCOB9PIfZC6Wb+ntM6x8FzvcW5xfiKDfd6tbp5+ztFHVvutde0ceYk4VjOw5Q1wGJENZoQxQGd6/tt/cHbyNKF3HeAPCLJkMriKBXn3k4r4kix5oetVpaacFABBMRS019n/k0S8fg2H+72WaPVJElRk/iCkQwBA6JIKt/iSVXR8qMe+K6NTRnND4j5i7Ai0TgEV8MRlRMRVK7q4MyO0TPky//0HtVULdhb+G/XbF08ZgIgXlFBroQCEEj0RqdLio0Bg9wIDAQAB", - "PrivateKey": "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHhFpQBw8gTMeQwDR2+nnVJu8L4BKKK0fD2HqwKrxuWqHwKbH5l+V3GZf6wapQMvjQSjTu1AZaljxZOVRE4I4H08h9kLpZv6e0zrHwXO9xbnF+IoN93q1unn7O0UdW+6117Rx5iThWM7DlDXAYkQ1mhDFAZ3r+239wdvI0oXcd4A8IsmQyuIoFefeTiviSLHmh61WlppwUAEExFLTX2f+TRLx+DYf7vZZo9UkSVGT+IKRDAEDokgq3+JJVdHyox74ro1NGc0PiPmLsCLROARXwxGVExFUrurgzI7RM+TL//Qe1VQt2Fv4b9dsXTxmAiBeUUGuhAIQSPRGp0uKjQGD3AgMBAAECggEBAI/1MJDjtwdQPwJznKdobTXeJMdFwzrMpbhq34NzIojhfkziWNdFwTzhS6aTzEaXsK3hjTXx6C++jQa39dTIzdJZ/iSTo9IUFnbAWOWcuOv4i40+a/ALFsplNAwYNshNSkh3cH9FAlA4dd+fhY1ERA3/PeZBhB6V0+sa+AH/qwnzFY+lwOeuaUe4PNEjjnBVhzqV8XApca7HZNlrGmiTuO3J/e4k/FAP11iYYIf8e8JtgocinW1LIxJGBcp7Zyof37k4e+s25B0k5MkXiYlvveMsmlEcU+sYm+uLNtu8eG1R3b1qvi0H8ULdwoSParnKSyYMh0WlZTS8Ka3X33WeCOkCgYEA2Cc/nnJkwPaOXLiAbKg7/4hIne1X3rneVVbwCaebKXfSsCSGoVt5b8vBCgbVZNw79d8Z8ZLEf4e26ayLLXRz9QriMPiWyHUEr0XLZ4lq6E1EdZMBZWmjT9VY8NeAkB+eMPfCZLZe3OoVstuNQA0pGVFJgYXmXgcjJcidxzgIqU0CgYEA7EwAA6OP9DoQq4GcBCuIVGBjEWzbVekMt7f+WeLxGl3NYTWiXiaK6WjF/pvFv7AGQIqwOpnbKahWntpPj5DModhjQN8u/yonhzagubQbDTX0jR3w4gVsv/yyGgksPIwAQT/FW9cOqriqw8IGJG92VQw8dy6M1ZP9yK3yc41Q8VMCgYATH3XLaMdtIuL5ZQFHm6KjOsVh42uQstTuq+BUmlVp18X1+2VFxTf7IgWUA4LBh5JucCx1aMylk7Yk+jTd8p2HokzclEGSvneJoh0ardedcaiK1lSbSjs+htt1gztGhOWT43d5PYEq/jKpPi9C6WcnbD+ai+QTkYIUh6kdxOFPSQKBgQDltLfq0azWMUAVSYi+MQd1ZsHHpbfO2x+m1TFodgoFpJxL3JS7y+IMJvMaoJlqz5Y0Vd4dCYYZB/E0uWrQWGXlC3LpFE0edf85HWy/Ogt2GzZhnHKXdciTFfaZAsPDFCIHTBPyRKyYX655YHsSHly9Loj1HwZ/dT8nP5nKpNzDywKBgB3itp7eQ71y+6npr0MUcYF6cgjhPTLL03zVzJdR3ELzPFW+J69MFwqafoGu+xgGu43pDgIR6gVKqYhqfSk28oRl7YtO4fvk6KRcG5zrc1FyDw3S5XpVc5MhsxmBBXZj5ivBkoqxyDAOqu3MDCbHqg1J5inDu2gA8tbsgJ41pTER" + "ModuleID": 25, //系统在单点系统的标记 + "Url_V3": "https://dev.uc.v3.f2b211.com", //正式http://uc.v3.f2b211.com //单点系统的连接地址v3版 + "Url": "http://dev.uc.f2b211.com", //单点系统的连接地址(老版 应该没用了) + "AppId": "100528847652388864", //系统Id + "AppSecret": "fa950a1fe690fe610338084b49db7db9", //系统授权 + "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4RaUAcPIEzHkMA0dvp51SbvC+ASiitHw9h6sCq8blqh8Cmx+ZfldxmX+sGqUDL40Eo07tQGWpY8WTlUROCOB9PIfZC6Wb+ntM6x8FzvcW5xfiKDfd6tbp5+ztFHVvutde0ceYk4VjOw5Q1wGJENZoQxQGd6/tt/cHbyNKF3HeAPCLJkMriKBXn3k4r4kix5oetVpaacFABBMRS019n/k0S8fg2H+72WaPVJElRk/iCkQwBA6JIKt/iSVXR8qMe+K6NTRnND4j5i7Ai0TgEV8MRlRMRVK7q4MyO0TPky//0HtVULdhb+G/XbF08ZgIgXlFBroQCEEj0RqdLio0Bg9wIDAQAB", //公钥 + "PrivateKey": "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHhFpQBw8gTMeQwDR2+nnVJu8L4BKKK0fD2HqwKrxuWqHwKbH5l+V3GZf6wapQMvjQSjTu1AZaljxZOVRE4I4H08h9kLpZv6e0zrHwXO9xbnF+IoN93q1unn7O0UdW+6117Rx5iThWM7DlDXAYkQ1mhDFAZ3r+239wdvI0oXcd4A8IsmQyuIoFefeTiviSLHmh61WlppwUAEExFLTX2f+TRLx+DYf7vZZo9UkSVGT+IKRDAEDokgq3+JJVdHyox74ro1NGc0PiPmLsCLROARXwxGVExFUrurgzI7RM+TL//Qe1VQt2Fv4b9dsXTxmAiBeUUGuhAIQSPRGp0uKjQGD3AgMBAAECggEBAI/1MJDjtwdQPwJznKdobTXeJMdFwzrMpbhq34NzIojhfkziWNdFwTzhS6aTzEaXsK3hjTXx6C++jQa39dTIzdJZ/iSTo9IUFnbAWOWcuOv4i40+a/ALFsplNAwYNshNSkh3cH9FAlA4dd+fhY1ERA3/PeZBhB6V0+sa+AH/qwnzFY+lwOeuaUe4PNEjjnBVhzqV8XApca7HZNlrGmiTuO3J/e4k/FAP11iYYIf8e8JtgocinW1LIxJGBcp7Zyof37k4e+s25B0k5MkXiYlvveMsmlEcU+sYm+uLNtu8eG1R3b1qvi0H8ULdwoSParnKSyYMh0WlZTS8Ka3X33WeCOkCgYEA2Cc/nnJkwPaOXLiAbKg7/4hIne1X3rneVVbwCaebKXfSsCSGoVt5b8vBCgbVZNw79d8Z8ZLEf4e26ayLLXRz9QriMPiWyHUEr0XLZ4lq6E1EdZMBZWmjT9VY8NeAkB+eMPfCZLZe3OoVstuNQA0pGVFJgYXmXgcjJcidxzgIqU0CgYEA7EwAA6OP9DoQq4GcBCuIVGBjEWzbVekMt7f+WeLxGl3NYTWiXiaK6WjF/pvFv7AGQIqwOpnbKahWntpPj5DModhjQN8u/yonhzagubQbDTX0jR3w4gVsv/yyGgksPIwAQT/FW9cOqriqw8IGJG92VQw8dy6M1ZP9yK3yc41Q8VMCgYATH3XLaMdtIuL5ZQFHm6KjOsVh42uQstTuq+BUmlVp18X1+2VFxTf7IgWUA4LBh5JucCx1aMylk7Yk+jTd8p2HokzclEGSvneJoh0ardedcaiK1lSbSjs+htt1gztGhOWT43d5PYEq/jKpPi9C6WcnbD+ai+QTkYIUh6kdxOFPSQKBgQDltLfq0azWMUAVSYi+MQd1ZsHHpbfO2x+m1TFodgoFpJxL3JS7y+IMJvMaoJlqz5Y0Vd4dCYYZB/E0uWrQWGXlC3LpFE0edf85HWy/Ogt2GzZhnHKXdciTFfaZAsPDFCIHTBPyRKyYX655YHsSHly9Loj1HwZ/dT8nP5nKpNzDywKBgB3itp7eQ71y+6npr0MUcYF6cgjhPTLL03zVzJdR3ELzPFW+J69MFwqafoGu+xgGu43pDgIR6gVKqYhqfSk28oRl7YtO4fvk6KRcG5zrc1FyDw3S5XpVc5MhsxmBBXZj5ivBkoqxyDAOqu3MDCbHqg1J5inDu2gA8tbsgJ41pTER" //私钥 }, "ErpOptions": { - "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //原:119.23.206.129 - "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd - "Password": "A1B2C3Dh.", - "ErpId": "ce20210909", - "ZhangTaoId": "6723b1acf19987" + "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //金蝶连接地址 + "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd //金蝶账户名 + "Password": "A1B2C3Dh.", //金蝶密码 + "ErpId": "ce20210909", //金蝶Id + "ZhangTaoId": "6723b1acf19987"//金蝶账套Id }, "OpsOptions": { - "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ - "UserName": "admin", - "PassWord": "888888" + "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ //OPS供应链系统 + "UserName": "admin", //账户名 这是之前链接老ops 需要的用户名密码 现在链接 OPS供应链系统是不需要了 + "PassWord": "888888" //密码 这是之前链接老ops 需要的用户名密码 现在链接 OPS供应链系统是不需要了 }, "LingXingOptions": { - "Url": "https://openapi.lingxing.com", - "AppId": "ak_QGK2J8TssERmu", - "AppSecret": "n/HUKD2wVdTbvhnFZbVBPw==" + "Url": "https://openapi.lingxing.com", //领星连接地址 + "AppId": "ak_QGK2J8TssERmu", //领星Id + "AppSecret": "n/HUKD2wVdTbvhnFZbVBPw==" //领星授权 }, "JuShuiTanOptions": { - "Url": "https://openapi.jushuitan.com", - "AppKey": "17231841286c45f99eb9acf445404349", - "AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9", + "Url": "https://openapi.jushuitan.com",//聚水潭连接地址 + "AppKey": "17231841286c45f99eb9acf445404349",//聚水潭Key + "AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9",//聚水潭授权 "AccessToken": "4605358c37374780a8a4395e6cdb1c3f" //一年后过期(2025/10/18) }, "Qiniu": { - "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", - "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", - "Bucket": "orico-wms-test", //正式 orico-wms - "Url": "https://wmstestfile.f2b211.com/" //测试 https://wmstestfile.f2b211.com/ 正式 https://wmsfile.f2b211.com/ + "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", //七牛云key + "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", //七牛云授权 + "Bucket": "orico-wms-test", //正式 orico-wms //七牛云文件下的文件名 + "Url": "https://wmstestfile.f2b211.com/" //测试 https://wmstestfile.f2b211.com/ 正式 https://wmsfile.f2b211.com/ //访问七牛云文件的链接地址 }, //定时任务配置项 "QuartzJobOptions": { @@ -120,7 +120,7 @@ "QuartzTriggerDescription": "OpsJobTrigger" }, "EmailOptions": { - "SmtpServer": "smtp.qiye.aliyun.com", + "SmtpServer": "smtp.qiye.aliyun.com",//邮箱配置 "SmtpPort": 587, "SenderName": "深圳市元创时代", "SendTitle": "【深圳市元创时代】-产品入库通知", @@ -128,7 +128,7 @@ "SenderEmailPwd": "K4h6GgxZYGMYV1Bb" }, "SmsOptions": { - "AccessKeyId": "LTAI5tBJg6KeDV2V1NiS7Ngi", + "AccessKeyId": "LTAI5tBJg6KeDV2V1NiS7Ngi",//短信配置 "AccessKeySecret": "MAC8bMovSFyCgRQGkfhVcL1jvLJ8cP", "SignName": "深圳市元创时代", "TemplateCode": "SMS_465408787"