Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

Browse Source 
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
This commit is contained in:
赵正易
2024-03-22 09:11:07 +08:00
parent be26bfedce dac58ddb77
commit f26209ba45
27 changed files with 853 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/appsettings.development.json
View File

@@ -10,13 +10,13 @@
"dbConfigs": [
{
//外网连接服务器
"Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//本地连接服务器
// "Conn": "Data Source=localhost;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.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
// "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
"Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4,
"ConfigId": "0", //多租户唯一标识
@@ -27,7 +27,7 @@
//代码生成数据库配置
"CodeGenDbConfig": {
//代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
"Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};",
"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};",
"DbType": 0,
"IsAutoCloseConnection": true,
"DbName": "ZrAdmin" //代码生成默认连接数据库