diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index c217391c..44108963 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -1,15 +1,20 @@ { - //ZRtech123 - "NacosConfig": { - "Listeners": [ + //DOANtech123 + "MqttConfig": { + "ClientId": "shgg-mes-server", + "Server": "192.168.60.251", + "Port": 1883, + "Username": "admin", + "Password": "123456", + "Topics": [ { - "Optional": false, - "DataId": "MesServerConfig", - "Group": "DEFAULT_GROUP" + "Topic": "shgx_tz/device/#", + "QualityOfServiceLevel": "AtLeastOnce" + }, + { + "Topic": "shgx_tz/alert/#", + "QualityOfServiceLevel": "AtLeastOnce" } - ], - // 服务注册必填参数 - "ServerAddresses": [ "http://127.0.0.1:8848" ], // Nacos 服务器地址 - "Namespace": "" // 命名空间(默认 public) + ] } } \ No newline at end of file diff --git a/ZR.Admin.WebApi/appsettings.production.json b/ZR.Admin.WebApi/appsettings.production.json index 3c686daa..f58735a1 100644 --- a/ZR.Admin.WebApi/appsettings.production.json +++ b/ZR.Admin.WebApi/appsettings.production.json @@ -1,4 +1,4 @@ -{ +{ "Logging": { "LogLevel": { "Default": "Information", @@ -6,14 +6,12 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "urls": "http://0.0.0.0:8888", //(app会默认去读)项目启动url,如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { //"Conn": "Data Source=147.116.122.230;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", - //"Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", - "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=ZrAdmin;Port=3308", + "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;AllowLoadLocalInfile=true", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true @@ -23,13 +21,13 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串,注意{dbName}为固定格式,不要填写数据库名 - "Conn": "Data Source=139.224.232.211;User ID=root;Password=123456;Initial Catalog={dbName};", + "Conn": "Data Source=192.168.60.251;User ID=root;Password=123456;Initial Catalog={dbName};", "DbType": 0, "IsAutoCloseConnection": true, "DbName": "ZrAdmin" //代码生成默认连接数据库 }, - "corsUrls": [ "http://localhost:8887", "http://localhost:8888", "http://192.168.60.251:8877" ], //跨域地址(前端启动项目,前后端分离单独部署需要设置),多个用","隔开 + "corsUrls": [ "http://localhost:8887", "http://localhost:8886", "http://192.168.60.251:8877" ], //跨域地址(前端启动项目,前后端分离单独部署需要设置),多个用","隔开 "JwtSettings": { "Issuer": "ZRAdmin.NET", //即token的签发者。 "Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的(群体范围) @@ -37,15 +35,15 @@ "Expire": 10080 //jwt登录过期时间(分)【7天】 }, "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks" ], //自动注入类 - "ShowDbLog": false, //是否打印db日志 + "ShowDbLog": false,//是否打印db日志 "InitDb": false, //是否初始化db "DemoMode": false, //是否演示模式 - "Upload": { - "uploadUrl": "http://localhost:8888", //本地存储资源访问路径 - "localSavePath": "", //本地上传默认文件存储目录 wwwroot - "maxSize": 15, //上传文件大小限制 15M - "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ] - }, + "Upload": { + "uploadUrl": "http://localhost:8888", //本地存储资源访问路径 + "localSavePath": "", //本地上传默认文件存储目录 wwwroot + "maxSize": 15, //上传文件大小限制 15M + "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ] + }, //阿里云存储配置 "ALIYUN_OSS": { "REGIONID": "", //eg:cn-hangzhou @@ -144,21 +142,17 @@ "CaptchaOptions": { "IgnoreCase": true // 比较时是否忽略大小写 }, - "MqttConfig": { - "ClientId": "shgg-mes-server", - "Server": "192.168.23.165", - "Port": 1883, - "Username": "admin", - "Password": "123456", - "Topics": [ + //DOANtech123 + "NacosConfig": { + "Listeners": [ { - "Topic": "devices/#", - "QualityOfServiceLevel": "AtLeastOnce" - }, - { - "Topic": "system/alert", - "QualityOfServiceLevel": "AtLeastOnce" + "Optional": false, + "DataId": "MesServerConfig", + "Group": "DEFAULT_GROUP" } - ] + ], + // 服务注册必填参数 + "ServerAddresses": [ "http://127.0.0.1:8848" ], // Nacos 服务器地址 + "Namespace": "" // 命名空间(默认 public) } }