diff --git a/YLErpWeb/App_Data/FunctionRight.xml b/YLErpWeb/App_Data/FunctionRight.xml
index 29f854dc..0186f1f5 100644
--- a/YLErpWeb/App_Data/FunctionRight.xml
+++ b/YLErpWeb/App_Data/FunctionRight.xml
@@ -9,7 +9,7 @@
-
+
@@ -38,6 +38,8 @@
+
+
@@ -176,26 +178,27 @@
-
+
-
+
-
+
-
-
-
+
+
+
+
diff --git a/YLErpWeb/App_Data/Menus.txt b/YLErpWeb/App_Data/Menus.txt
index 7309773e..8acaf118 100644
--- a/YLErpWeb/App_Data/Menus.txt
+++ b/YLErpWeb/App_Data/Menus.txt
@@ -11,8 +11,10 @@
,SubItems:[
{Name:"期权交易",Rights:["交易管理-交易搜索"],Url:"trade/tradeList"},
{Name:"互换交易",Rights:["交易管理-互换交易"],Url:"swapTrade2/TradeList"},
+ {Name:"收益凭证",Rights:["交易管理-收益凭证"],Url:"v3/product/basic-info"},
{Name:"互换开平仓事件流水",Rights:["交易管理-互换开平仓事件流水"],Url:"swapTrade2/EventList"},
{Name:"交易审批",Rights:["交易管理-交易审批"],Url:"trade/TradeApproval"},
+ {Name:"凭证审批",Rights:["交易管理-凭证审批"],Url:"v3/product/approve"},
{Name:"标的交易",Rights:["交易管理-标的交易"],Url:"exchangetrade/tradelist"},
{Name:"变更记录",Rights:["交易管理-变更记录"],Url:"trade/TradeChange"},
]
@@ -93,6 +95,7 @@
{Name:"簿记账户组",Rights:["系统管理-资产单元"],Url:"assetunit/assetunitgroupList"},
{Name:"对冲账户",Rights:["系统管理-对冲账户"],Url:"exchange_account/exchange_accountList"},
{Name:"审批流程",Rights:["系统管理-审批流程"],Url:"AccountOpeningProcess/Index"},
+ {Name:"凭证审批流程",Rights:["系统管理-凭证审批流程"],Url:"v3/product/product-flow-setting"},
{Name:"数据字典",Rights:["系统管理-数据字典"],Url:"System/Dictionary"},
{Name:"基础缓存",Rights:["系统管理-基础缓存"],Url:"System/ResetCache"},
{Name:"自定义结构",Rights:["系统管理-自定义结构"],Url:"StructureInfo/Index"},
diff --git a/YLErpWeb/appsettings.dev.json b/YLErpWeb/appsettings.dev.json
index 3e91ecd7..6cdb6c81 100644
--- a/YLErpWeb/appsettings.dev.json
+++ b/YLErpWeb/appsettings.dev.json
@@ -7,10 +7,10 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
- "ylcms": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=zszq_yltrs_ylcms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "yladmin": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=zszq_yltrs_admin;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "ylclient": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=zszq_yltrs_client;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "bondoms": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=zszq_bond_oms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;"
+ "ylcms": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=glms_yltrs_ylcms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
+ "yladmin": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=glms_yltrs_admin;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
+ "ylclient": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=glms_yltrs_client;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
+ "bondoms": "server=192.168.2.96;uid=DBAdmin;pooling=true;port=3306;pwd=YieldChain$$2025;database=glms_bond_oms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;"
},
"AppSettings": {
"VirtualPathRoot": "",
@@ -27,7 +27,7 @@
}
},
"KafkaConfig": {
- "BootstrapServers": "139.196.109.225:9092", // Kafka 集群的地址
+ "BootstrapServers": "192.168.2.96:10112", // Kafka 集群的地址
"Acks": -1, // 消息确认方式，可以是 All(-1)、Leader(1)、None(0) 中的一种
"EnableIdempotence": false, // 开启幂等性，确保消息只被发送一次
"MaxInFlight": 5, // 控制生产者在同一时间最多可以发送的未确认消息数
@@ -60,37 +60,32 @@
"YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
"YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
"YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup", //交易日历缓存重新加载消费 Group
+ "YiLian_HolidayResetGroupId": "YiLian_HolidayResetGroup", //交易日历缓存重新加载消费 Group
"YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
- "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup" //交易端同步流水消费组
+ "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup", //交易端同步流水消费组
+ "YiLian_SysUserInfoChangeTopic": "YiLian_SysUserInfoChangeTopic" //管理端系统用户变更
},
"BondOmsInterface": {
- "BaseUrl": "http://192.168.2.96:10023/trs_hub_api",
- "CalculateMarginUrl": "/marginAlgorithm/triggerMarginCalc" //
+ "BaseUrl": "http://192.168.2.96:10114"
},
- "Reg_Report_Url": "http://192.168.2.96:10025/reg_api/",
+ "Reg_Report_Url": "http://192.168.2.96:10019",
"OrcaleDatabaseConfig": {
"Schema": "APEX_040000"
},
"SendKafakaCron": "10 0 * * *",
"MaxThreadPercent": 0.6, //占系统资源最多60%的线程数量
"oa_confg": {
- "BaseUrl": "http://10.250.202.40:13590",
- "SubUrl": "/gateway/oaflow/createOaFlow",
- "SystemToken": "123", //OA系统key
- "SystemName": "ZSZQ_CWYSPJYQRSDZWF", //OA文件类别
- "IsNextFlow": 0, //是否自动提交 默认0
- "FlowId": 723606,
- "UploadUrl": "http://10.250.202.40:13590/gateway/oaflow/uploadDoc"
+ "BaseUrl": "http://ip:port",
+ "SystemKey": "M001", //OA系统key
+ "ObjectClass": "ZSZQ_ZDNX", //OA文件类别
+ "Urgent": 1, //紧急程度，1一般 2紧急 3加急
+ "Issend": 1 //流程是否自动发送，0不发送，1自动发送下一步
},
"GeneralSSO": {
"enable": true, //是否启用通用SSO登录
- "auth_url": "http://127.0.0.1:8888/sso/login", //SSO授权地址
+ "auth_url": "http://192.168.2.96:10117/sso/login", //SSO授权地址
"callback_url": "http://localhost:49462/Account/Callback", //回调处理地址
- "get_user_url": "http://127.0.0.1:8888/sso/getSsoUser" //获取用户信息接口地址
- },
- "ExternalCashFlow": {
- "Token": "50cd1507-5361-4cbc-9368-e848c69bb0f6",
- "BaseUrl": "http://10.99.56.25:8082"
+ "get_user_url": "http://192.168.2.96:10117/sso/getSsoUser" //获取用户信息接口地址
}
-}
\ No newline at end of file
+
+}
diff --git a/YLErpWeb/appsettings.local.json b/YLErpWeb/appsettings.local.json
deleted file mode 100644
index e17bfe4f..00000000
--- a/YLErpWeb/appsettings.local.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "AllowedHosts": "*",
- "ConnectionStrings": {
- "ylcms": "server=139.196.109.225;uid=root;pooling=true;port=3306;pwd=Midnight001!@#$;database=yltrs_ylcms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "yladmin": "server=139.196.109.225;uid=root;pooling=true;port=3306;pwd=Midnight001!@#$;database=yltrs_admin;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "ylclient": "server=139.196.109.225;uid=root;pooling=true;port=3306;pwd=Midnight001!@#$;database=yltrs_client;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;",
- "bondoms": "server=139.196.109.225;uid=root;pooling=true;port=3306;pwd=Midnight001!@#$;database=bond_oms;charset=utf8;Allow User Variables=True;SslMode=none;Connection Timeout=30;IgnoreCommandTransaction=true;"
- // "apex_oracle": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=122.112.205.57)(PORT=11521)))(CONNECT_DATA=(SERVICE_NAME=xe)));User ID=system;Password=oracle;"
- },
- "AppSettings": {
- "VirtualPathRoot": "",
- "UseRightAligned": "",
- "PluginFolder": "D:\\project\\zsza-trs\\Plugins\\build\\ZheShang\\Debug\\net6.0"
- },
- "LibreOffice": {
- "ExePath": "",
- "UserInstallation": ""
- },
- "EPPlus": {
- "ExcelPackage": {
- "LicenseContext": "NonCommercial" //The license context used
- }
- },
- "KafkaConfig": {
- "BootstrapServers": "139.196.109.225:9092", // Kafka 集群的地址
- "Acks": -1, // 消息确认方式，可以是 All(-1)、Leader(1)、None(0) 中的一种
- "EnableAutoCommit": false, //是否自动提交
- "EnableIdempotence": false, // 开启幂等性，确保消息只被发送一次
- "MaxInFlight": 5, // 控制生产者在同一时间最多可以发送的未确认消息数
- "CompressionType": 0, // 消息压缩方式，可以是 None(0)、Gzip(1)、Snappy(2)、Lz4(3)、Zstd(4) 中的一种,
- "MessageTimeoutMs": 3000, // 控制生产者等待消息确认的时间，单位是毫秒
- "ClientRateTopic": "ylClientRateTopic", //客户互换费率生产topic
- "HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic
- "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组
- "ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic
- "OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic
- "AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2)
- "EnableCalcBongd": false, //是否启用kafka计算
- "ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查
- "ReqClientRiskCheckConsumerTopic": "YiLian_OnRspClientRiskCheck", //客户风控检查消费者
- "ReqClientRiskCheckTopicGroupId": "YiLian_ReqClientRiskCheckConsumer1", //客户风控检查消费者
- "ReqClientMonitorTopic": "YiLian_ReqClientMonitor", //客户资金监控
- "OnRspClientMonitorConsumerTopic": "YiLian_OnRspClientMonitor", //客户资金监控消费者
- "ReqClientMonitorTopicGroupId": "YiLian_ReqClientMonitorConsumer1", //客户资金监控消费组
- "ReqClientMonitorSingleTopic": "YiLian_ReqClientMonitorSingle", //单个客户资金监控
- "OnRspClientMonitorSingleConsumerTopic": "YiLian_OnRspClientMonitorSingle", //单个客户资金监控
- "ReqClientMonitorSingleTopicGroupId": "YiLian_ReqClientMonitorSingleConsumer1", //单个客户资金监控
- "TrsExchangeTradeConsumerTopic": "YiLian_HedgingOrder", //TRS对冲交易消费 topic
- "TrsExchangeTradeConsumerTopicGroupId": "YiLian_HedgingOrderGroup1", //TRS对冲交易消费 Group
- "YiLian_ReqHedgingOrderCancelTopic": "YiLian_ReqHedgingOrderCancel", //TRS对冲交易撤单请求消费 topic
- "YiLian_ReqHedgingOrderCancelTopicGroupId": "YiLian_ReqHedgingOrderCancelGroup1", //TRS对冲交易撤单请求消费 Group
- "YiLian_RespHedgingOrderCancelTopic": "YiLian_RespHedgingOrderCancel", //TRS对冲交易撤单请求回应 topic
- "YiLian_ClientInfoChangeTopic": "YiLian_ClientInfoChangeTopic", //客户信息变更通知客户端 topic
- "YiLian_CashCalcConsumerTopic": "YiLian_CashCalc", //客户资金计算 topic
- "YiLian_CashCalcConsumerGroup": "YiLian_CashCalcGroup1", //客户资金计算消费组 topic
- "YiLian_CashNoticeConsumerTopic": "YiLian_CashNotice", //客户资金通知 topic
- "YiLian_CashNoticeConsumerGroup": "YiLian_CashNoticeGroup", //客户资金通知消费组 topic
- "YiLian_HolidayResetTopic": "YiLian_HolidayReset", //交易日历缓存重新加载 topic
- "YiLian_HolidayResetGroupId": "YiLian_HedgingOrderGroup1", //交易日历缓存重新加载消费 Group
- "YiLian_SwapFlowTopic": "YiLian_SwapFlow", //交易端同步流水
- "YiLian_SwapFlowGroup": "YiLian_SwapFlowGroup1", //交易端同步流水消费组
- "YiLian_SysUserInfoChangeTopic": "YiLian_SysUserInfoChangeTopic" //管理端系统用户变更
- },
- "BondOmsInterface": {
- "BaseUrl": "http://trs.yiliantech.com:8080/trs_hub_api"
- },
- "Reg_Report_Url": "http://139.196.109.225:8889",//报送后端地址
- "OrcaleDatabaseConfig": {
- "Schema": "APEX_040000"
- },
- "SendKafakaCron": "10 0 * * *",
- "MaxThreadPercent": 0.6, //占系统资源最多60%的线程数量
- "oa_confg": {
- "BaseUrl": "http://ip:port",
- "SubUrl": "/ZSZQ/fileDraft",
- "SystemKey": "M001", //OA系统key
- "ObjectClass": "ZSZQ_ZDNX", //OA文件类别
- "Urgent": 1, //紧急程度，1一般 2紧急 3加急
- "Issend": 0 //流程是否自动发送，0不发送，1自动发送下一步
- }
-}
\ No newline at end of file