diff --git a/README.md b/README.md index 9d0374bd..1cb824a8 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ 默认进行自动构建、发布到MinIO并自动部署到测试服务器 +1. 提交前确保先拉取更新 1. 提交时确保编译通过,提交后检查CI服务器编译是否成功 1. 不需要自动构建和部署的,在提交信息中添加 `[CI SKIP]` 1. 针对特定问题的解决,提交信息中添加问题编号 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index 4e8c7a47..ac327d65 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -94,6 +94,9 @@ + + PreserveNewest + PreserveNewest diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Production.json.backup b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Production.json.backup new file mode 100644 index 00000000..ce836efd --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Production.json.backup @@ -0,0 +1,16 @@ +{ + "ConnectionStrings": { + "Default": "Server=WIN-33SNP5V4K0L,1433;Database=BJABP;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True", + "SettleAccountService": "Server=WIN-33SNP5V4K0L,1433;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", + "WMSBJBMPT": "Server=10.62.101.3,1433;Database=ExChangeCenter;User ID=sa;Password=Microsoft2008;Trusted_Connection=False;TrustServerCertificate=True;", + }, + "AuthServer": { + "Authority": "http://localhost:16082" + }, + "MinIO": { + "EndPoint": "localhost:16084", + "AccessKey": "g0GKnhRGEQHI0uiGBYre", + "SecretKey": "iKGlLz6UBzci3xrERw5Zz1gI77enT5u9agFemHPv", + "BucketName": "default" + } +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip index d3b5cbdd..3985a27f 100644 Binary files a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip and b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip differ diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js index b1834c20..1660e484 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js @@ -1,10 +1,13 @@ import html from "html"; export default { - template: html`导入模板下载 + template: html`导入模板下载
`, setup() { + const download = () => { + window.open(`../assets/导入模版.zip?time=${Date.now()}`); + }; const page = "page"; const createRoute = (path, title, type = "group") => { return { @@ -110,6 +113,7 @@ export default { } }; return { + download, list, props, handleNodeClick,