diff --git a/Tiobon.CodeGenerator/Program.cs b/Tiobon.CodeGenerator/Program.cs index 4c9269d2..094ffc0b 100644 --- a/Tiobon.CodeGenerator/Program.cs +++ b/Tiobon.CodeGenerator/Program.cs @@ -32,10 +32,10 @@ class Program var basePath = AppContext.BaseDirectory; IServiceCollection services = new ServiceCollection(); - services.AddAutoMapperSetup(); - services.AddSimpleDapperSetup(); services.AddSingleton(new AppSettings(basePath)); + services.AddAutoMapperSetup(); + services.AddSimpleDapperSetup(); services.AddScoped(); services.AddScoped(); services.AddSqlsugarSetup(); diff --git a/Tiobon.CodeGenerator/appsettings.json b/Tiobon.CodeGenerator/appsettings.json index a89ebf4f..c58bbf2f 100644 --- a/Tiobon.CodeGenerator/appsettings.json +++ b/Tiobon.CodeGenerator/appsettings.json @@ -33,13 +33,13 @@ "Kafka": { "Enabled": false, "Servers": "localhost:9092", - "Topic": "EU", - "GroupId": "EU-consumer", + "Topic": "Tiobon", + "GroupId": "Tiobon-consumer", "NumPartitions": 3 //主题分区数量 }, "EventBus": { "Enabled": false, - "SubscriptionClientName": "EU.Core" + "SubscriptionClientName": "Tiobon.Core" }, "AppSettings": { "CachingAOP": { @@ -76,8 +76,8 @@ "Date": "2018-08-28", "SeedDBEnabled": false, //只生成表结构 "SeedDBDataEnabled": false, //生成表,并初始化数据 - "Author": "EU.Core", - "SvcName": "", // /svc/EU + "Author": "Tiobon.Core", + "SvcName": "", // /svc/Tiobon "UseLoadTest": false }, @@ -91,7 +91,7 @@ //备用连接的ConnId配置为主库的ConnId+数字即可,比如主库的ConnId为Main,那么备用连接的ConnId为Mian1 //主库、备用库无需数据库类型一致! //备用库不会有程序维护,需要手动维护 - "MainDB": "WMEU_MSSQL_Main", //当前项目的主库，所对应的连接字符串的Enabled必须为true + "MainDB": "WMTiobon_MSSQL_Main", //当前项目的主库，所对应的连接字符串的Enabled必须为true "DBS": [ /* 对应下边的 DBType @@ -104,21 +104,22 @@ Kdbndp = 6,//人大金仓 */ { - "ConnId": "WMEU_MSSQL_Main", + "ConnId": "WMTiobon_MSSQL_Main", "DBType": 1, "Enabled": true, - "Connection": "Data Source=116.204.98.209;User ID=eu_cloud;Password=qazWESDR,!@#288268;Database=EU_Cloud;Encrypt=True;TrustServerCertificate=True;", + "Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;", + //"Connection": "Data Source=116.204.98.209;User ID=Tiobon;Password=&($!4UGUyU#$2sp9O;Database=Tiobon;Encrypt=True;TrustServerCertificate=True;", "ProviderName": "System.Data.SqlClient" }, { "ConnId": "Main", "DBType": 2, "Enabled": false, - "Connection": "WMEU.db", //sqlite只写数据库名就行 + "Connection": "WMTiobon.db", //sqlite只写数据库名就行 "Slaves": [ { "HitRate": 0, // 值越大，优先级越高 0不使用 - "Connection": "WMEU2.db" + "Connection": "WMTiobon2.db" } ] }, @@ -126,11 +127,11 @@ "ConnId": "Main2", "DBType": 2, "Enabled": false, - "Connection": "WMEU3.db", //sqlite只写数据库名就行 + "Connection": "WMTiobon3.db", //sqlite只写数据库名就行 "Slaves": [ { "HitRate": 0, // 值越大，优先级越高 0不使用 - "Connection": "WMEU4.db" + "Connection": "WMTiobon4.db" } ] }, @@ -139,49 +140,49 @@ "DBType": 1, "Enabled": true, "HitRate": 50, - "Connection": "Data Source=116.204.98.209;User ID=EU;Password=&($!4UGUyU#$2sp9O;Database=EU;Encrypt=True;TrustServerCertificate=True;", + "Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;", "ProviderName": "System.Data.SqlClient" }, { - "ConnId": "WMEU_MSSQL_1", + "ConnId": "WMTiobon_MSSQL_1", "DBType": 1, "Enabled": false, - "Connection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=WMEU_MSSQL_1;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", + "Connection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=WMTiobon_MSSQL_1;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ProviderName": "System.Data.SqlClient" }, { - "ConnId": "WMEU_MSSQL_2", + "ConnId": "WMTiobon_MSSQL_2", "DBType": 1, "Enabled": false, - "Connection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=WMEU_MSSQL_2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", + "Connection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=WMTiobon_MSSQL_2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ProviderName": "System.Data.SqlClient" }, { - "ConnId": "WMEU_MYSQL", + "ConnId": "WMTiobon_MYSQL", "DBType": 0, "Enabled": false, - "Connection": "server=localhost;Database=EU;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;" + "Connection": "server=localhost;Database=Tiobon;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;" }, { - "ConnId": "WMEU_MYSQL_2", + "ConnId": "WMTiobon_MYSQL_2", "DBType": 0, "Enabled": false, - "Connection": "server=localhost;Database=EUcore001;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;" + "Connection": "server=localhost;Database=Tioboncore001;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;" }, { - "ConnId": "WMEU_ORACLE", + "ConnId": "WMTiobon_ORACLE", "DBType": 3, "Enabled": false, "Connection": "Data Source=127.0.0.1/ops;User ID=OPS;Password=123456;Persist Security Info=True;Connection Timeout=60;" }, { - "ConnId": "WMEU_DM", + "ConnId": "WMTiobon_DM", "DBType": 5, "Enabled": false, "Connection": "Server=xxxxx:5236;User Id=xxxxx;PWD=xxxxx;SCHEMA=TESTDBA;" }, { - "ConnId": "WMEU_KDBNDP", + "ConnId": "WMTiobon_KDBNDP", "DBType": 6, "Enabled": false, "Connection": "Server=127.0.0.1;Port=54321;UID=SYSTEM;PWD=system;database=SQLSUGAR4XTEST1;" @@ -189,13 +190,14 @@ ], "Audience": { "Secret": "sdfsdfsrty45634kkhllghtdgdfss345t678fs", //不要太短，16位+ - "SecretFile": "C:\\my-file\\EU.core.audience.secret.txt", //安全。内容就是Secret - "Issuer": "EU.Core", //这个值一定要在自己的项目里修改！！ - "Audience": "wr" //这个值一定要在自己的项目里修改！！ + "SecretFile": "C:\\my-file\\Tiobon.core.audience.secret.txt", //安全。内容就是Secret + "Issuer": "Tiobon.Core", //这个值一定要在自己的项目里修改！！ + "Audience": "wr", //这个值一定要在自己的项目里修改！！ + "ExpirationHour": 72 //过去时长，单位小时 }, "Mongo": { "ConnectionString": "mongodb://nosql.data", - "Database": "EUCoreDb" + "Database": "TiobonCoreDb" }, "Startup": { "Domain": "http://localhost:9291", @@ -212,7 +214,7 @@ "IdentityServer4": { "Enabled": false, // 这里默认是false，表示使用jwt，如果设置为true，则表示系统使用Ids4模式 "AuthorizationUrl": "http://localhost:5004", // 认证中心域名 - "ApiName": "EU.core.api" // 资源服务器 + "ApiName": "Tiobon.core.api" // 资源服务器 }, "Authing": { "Enabled": false, @@ -305,7 +307,7 @@ "HttpStatusCode": 429, //返回状态码 "GeneralRules": [ //api规则,结尾一定要带* { - "Endpoint": "*:/api/EU*", + "Endpoint": "*:/api/Tiobon*", "Period": "1m", "Limit": 20 }, @@ -328,7 +330,7 @@ }, "ConsulSetting": { - "ServiceName": "EUCoreService", + "ServiceName": "TiobonCoreService", "ServiceIP": "localhost", "ServicePort": "9291", "ServiceHealthCheck": "/healthcheck", @@ -348,7 +350,7 @@ "DefaultTimeOut": 15000, // 默认超时时间 "Namespace": "public", // 命名空间 "ListenInterval": 10000, // 监听的频率 - "ServiceName": "EU.Core.Api", // 服务名 + "ServiceName": "Tiobon.Core.Api", // 服务名 "Port": "9291", // 服务端口号 "RegisterEnabled": true // 是否直接注册nacos }, @@ -358,7 +360,7 @@ "ConfigsInfo": [ // 配置的输出elk节点内容 常用语动态标识 { "FiedName": "applicationName", - "FiedValue": "EU.Core.Api" + "FiedValue": "Tiobon.Core.Api" } ] },