diff --git a/.vs/CNet_Admin/v17/.wsuo b/.vs/CNet_Admin/v17/.wsuo
new file mode 100644
index 0000000..a1b8288
Binary files /dev/null and b/.vs/CNet_Admin/v17/.wsuo differ
diff --git a/.vs/CNet_Admin/v17/DocumentLayout.json b/.vs/CNet_Admin/v17/DocumentLayout.json
new file mode 100644
index 0000000..a770881
--- /dev/null
+++ b/.vs/CNet_Admin/v17/DocumentLayout.json
@@ -0,0 +1,12 @@
+{
+ "Version": 1,
+ "WorkspaceRootPath": "C:\\Users\\18219\\source\\repos\\CNet_Admin\\",
+ "Documents": [],
+ "DocumentGroupContainers": [
+ {
+ "Orientation": 0,
+ "VerticalTabListWidth": 256,
+ "DocumentGroups": []
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..fe4c1e2
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+ "ExpandedNodes": [
+ ""
+ ],
+ "SelectedNode": "\\CNet.sln",
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/src/CNet.BLL/T4.DapperExt/Main/1Service.txt b/src/CNet.BLL/T4.DapperExt/Main/1Service.txt
index 60e5d4a..9340bc2 100644
--- a/src/CNet.BLL/T4.DapperExt/Main/1Service.txt
+++ b/src/CNet.BLL/T4.DapperExt/Main/1Service.txt
@@ -10,7 +10,3 @@
-
-
-
-
diff --git a/src/CNet.DAL/CNet.DAL.csproj b/src/CNet.DAL/CNet.DAL.csproj
index 40aa587..bf0f083 100644
--- a/src/CNet.DAL/CNet.DAL.csproj
+++ b/src/CNet.DAL/CNet.DAL.csproj
@@ -33,5 +33,10 @@
TextTemplatingFileGenerator
1Repository.txt
+
+ True
+ True
+ 1Repository.tt
+
\ No newline at end of file
diff --git a/src/CNet.DAL/T4.DapperExt/Main/1Repository.txt b/src/CNet.DAL/T4.DapperExt/Main/1Repository.txt
new file mode 100644
index 0000000..9340bc2
--- /dev/null
+++ b/src/CNet.DAL/T4.DapperExt/Main/1Repository.txt
@@ -0,0 +1,12 @@
+
+//------------------------------------------------------------------------------
+//
+// ���ļ�������
+// �����������ݿ�Ҳ�����Ĵ��ļ�
+//
+//------------------------------------------------------------------------------
+
+
+
+
+
diff --git a/src/CNet.DBUtility/DbHelper/DbEntity.ttinclude b/src/CNet.DBUtility/DbHelper/DbEntity.ttinclude
index e939fbd..c890eec 100644
--- a/src/CNet.DBUtility/DbHelper/DbEntity.ttinclude
+++ b/src/CNet.DBUtility/DbHelper/DbEntity.ttinclude
@@ -6,7 +6,7 @@
public class Config
{
//数据库类型
- public static readonly string DbType = "SQLite";//MsSql\MySql\SQLite
+ public static readonly string DbType = "MySql";//MsSql\MySql\SQLite
//数据库名sqlserver
//public static readonly string Server = ".";//"127.0.0.1";
@@ -18,10 +18,10 @@
//数据库名mysql
public static readonly string DbDatabase = "CNet";
- //public static readonly string ConnectionString = string.Format("server=localhost;database=CNet;uid=root;pwd=123123;charset=utf8;");
+ public static readonly string ConnectionString = string.Format("server=localhost;database=CNet;uid=root;pwd=root;charset=utf8;");
//sqlite数据库连接
- public static readonly string ConnectionString = string.Format("Data Source=E:\\Study\\DotNet\\CNet_Admin\\src\\db\\CNet.db; Pooling=true;Min Pool Size=1");
+ //public static readonly string ConnectionString = string.Format("Data Source=C:\\Users\\18219\\source\\repos\\CNet_Admin\\src\\db\\CNet.db; Pooling=true;Min Pool Size=1");
//命名空间
public static readonly string Namespace = "CNet.Main";
diff --git a/src/CNet.Model/T4.DapperExt/Main/1Entity.txt b/src/CNet.Model/T4.DapperExt/Main/1Entity.txt
index 20c006b..9340bc2 100644
--- a/src/CNet.Model/T4.DapperExt/Main/1Entity.txt
+++ b/src/CNet.Model/T4.DapperExt/Main/1Entity.txt
@@ -10,6 +10,3 @@
-
-
-
diff --git a/src/CNet.Web.Admin/package-lock.json b/src/CNet.Web.Admin/package-lock.json
index 47a5c72..40532d3 100644
--- a/src/CNet.Web.Admin/package-lock.json
+++ b/src/CNet.Web.Admin/package-lock.json
@@ -8,9 +8,9 @@
"name": "iview-admin",
"version": "2.0.0",
"dependencies": {
- "@vue-office/docx": "^1.3.1",
- "@vue-office/excel": "^1.4.5",
- "@vue-office/pdf": "^1.5.4",
+ "@vue-office/docx": "^1.6.2",
+ "@vue-office/excel": "^1.4.6",
+ "@vue-office/pdf": "^2.0.2",
"@vue/composition-api": "^1.7.2",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^1.0.2",
@@ -31,7 +31,7 @@
"v-org-tree": "^1.0.6",
"view-design": "^4.7.0",
"vue": "^2.6.10",
- "vue-demi": "^0.13.11",
+ "vue-demi": "^0.14.8",
"vue-i18n": "^7.8.0",
"vue-router": "^3.0.1",
"vuedraggable": "^2.16.0",
@@ -2096,14 +2096,14 @@
}
},
"node_modules/@vue-office/docx": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@vue-office/docx/-/docx-1.3.1.tgz",
- "integrity": "sha512-S0FJl3EZOuvqrWq7Cb060KSDVB4fDAlNBh6HI3JBoI7ZwyvG8FTmrfZWwx7svBb/+m70XBp6iM5p6YUsKGsYHQ==",
+ "version": "1.6.2",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/docx/-/docx-1.6.2.tgz",
+ "integrity": "sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==",
"hasInstallScript": true,
"peerDependencies": {
"@vue/composition-api": "^1.7.1",
"vue": "^2.0.0 || >=3.0.0",
- "vue-demi": "^0.13.11"
+ "vue-demi": "^0.14.6"
},
"peerDependenciesMeta": {
"@vue/composition-api": {
@@ -2112,14 +2112,14 @@
}
},
"node_modules/@vue-office/excel": {
- "version": "1.4.5",
- "resolved": "https://registry.npmjs.org/@vue-office/excel/-/excel-1.4.5.tgz",
- "integrity": "sha512-tLX5mYaJdDAA/ZHqrZDZ9UB+P44AF82UA30DUEnpgMXonz+E4PjohGWowgccagqzULc/hKuijt4VWPkJ9ZTmEA==",
+ "version": "1.7.11",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/excel/-/excel-1.7.11.tgz",
+ "integrity": "sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA==",
"hasInstallScript": true,
"peerDependencies": {
"@vue/composition-api": "^1.7.1",
"vue": "^2.0.0 || >=3.0.0",
- "vue-demi": "^0.13.11"
+ "vue-demi": "^0.14.6"
},
"peerDependenciesMeta": {
"@vue/composition-api": {
@@ -2128,14 +2128,14 @@
}
},
"node_modules/@vue-office/pdf": {
- "version": "1.5.4",
- "resolved": "https://registry.npmjs.org/@vue-office/pdf/-/pdf-1.5.4.tgz",
- "integrity": "sha512-mcQY3/nMrwsNLRUeZV8wq13AwXpmY4/mlauJdBCjn5PnbWsW5vpbhxXtmKO6y+4fACxaeypUZyiO1Z1fzCDjoA==",
+ "version": "2.0.9",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/pdf/-/pdf-2.0.9.tgz",
+ "integrity": "sha512-sRjIiMV1CDDFv1Ls4U7zglkjkMr1Ntm16q8Krh0m1Lh7vAdVox1EcgEw4MXU6Mqsz7NB6nppxCPlSms6ue9eIQ==",
"hasInstallScript": true,
"peerDependencies": {
"@vue/composition-api": "^1.7.1",
"vue": "^2.0.0 || >=3.0.0",
- "vue-demi": "^0.13.11"
+ "vue-demi": "^0.14.6"
},
"peerDependenciesMeta": {
"@vue/composition-api": {
@@ -18731,9 +18731,9 @@
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
},
"node_modules/vue-demi": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
- "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+ "version": "0.14.10",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
"hasInstallScript": true,
"bin": {
"vue-demi-fix": "bin/vue-demi-fix.js",
@@ -21583,21 +21583,21 @@
}
},
"@vue-office/docx": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@vue-office/docx/-/docx-1.3.1.tgz",
- "integrity": "sha512-S0FJl3EZOuvqrWq7Cb060KSDVB4fDAlNBh6HI3JBoI7ZwyvG8FTmrfZWwx7svBb/+m70XBp6iM5p6YUsKGsYHQ==",
+ "version": "1.6.2",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/docx/-/docx-1.6.2.tgz",
+ "integrity": "sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==",
"requires": {}
},
"@vue-office/excel": {
- "version": "1.4.5",
- "resolved": "https://registry.npmjs.org/@vue-office/excel/-/excel-1.4.5.tgz",
- "integrity": "sha512-tLX5mYaJdDAA/ZHqrZDZ9UB+P44AF82UA30DUEnpgMXonz+E4PjohGWowgccagqzULc/hKuijt4VWPkJ9ZTmEA==",
+ "version": "1.7.11",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/excel/-/excel-1.7.11.tgz",
+ "integrity": "sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA==",
"requires": {}
},
"@vue-office/pdf": {
- "version": "1.5.4",
- "resolved": "https://registry.npmjs.org/@vue-office/pdf/-/pdf-1.5.4.tgz",
- "integrity": "sha512-mcQY3/nMrwsNLRUeZV8wq13AwXpmY4/mlauJdBCjn5PnbWsW5vpbhxXtmKO6y+4fACxaeypUZyiO1Z1fzCDjoA==",
+ "version": "2.0.9",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/@vue-office/pdf/-/pdf-2.0.9.tgz",
+ "integrity": "sha512-sRjIiMV1CDDFv1Ls4U7zglkjkMr1Ntm16q8Krh0m1Lh7vAdVox1EcgEw4MXU6Mqsz7NB6nppxCPlSms6ue9eIQ==",
"requires": {}
},
"@vue/babel-helper-vue-jsx-merge-props": {
@@ -34921,9 +34921,9 @@
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
},
"vue-demi": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
- "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+ "version": "0.14.10",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
"requires": {}
},
"vue-eslint-parser": {
diff --git a/src/CNet.Web.Admin/src/components/main/main.vue b/src/CNet.Web.Admin/src/components/main/main.vue
index 173107d..c9c3c2a 100644
--- a/src/CNet.Web.Admin/src/components/main/main.vue
+++ b/src/CNet.Web.Admin/src/components/main/main.vue
@@ -7,7 +7,7 @@
![]()
![]()
-->
- CNet
+ 异世界重生管理系统
diff --git a/src/CNet.Web.Admin/src/config/index.js b/src/CNet.Web.Admin/src/config/index.js
index 45fdaab..8573c2d 100644
--- a/src/CNet.Web.Admin/src/config/index.js
+++ b/src/CNet.Web.Admin/src/config/index.js
@@ -2,7 +2,7 @@ export default {
/**
* @description 配置显示在浏览器标签的title
*/
- title: 'CNet-Admin',
+ title: '异世界重生管理系统-Admin',
/**
* @description token在Cookie中存储的天数，默认1天
*/
@@ -19,10 +19,10 @@ export default {
baseUrl: {
// dev: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/',
// pro: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/'
- dev: 'http://localhost:10910/',
+ dev: 'http://localhost:8916/',
pro: 'http://www.gitrk.cn:8916/'
},
- imgurl: 'http://localhost:10910/',
+ imgurl: 'http://localhost:8916/',
/**
* @description 默认打开的首页的路由name值，默认为home
*/
diff --git a/src/CNet.Web.Admin/src/view/Demo/index.vue b/src/CNet.Web.Admin/src/view/Demo/index.vue
index 5b6cdf8..c483b5d 100644
--- a/src/CNet.Web.Admin/src/view/Demo/index.vue
+++ b/src/CNet.Web.Admin/src/view/Demo/index.vue
@@ -28,10 +28,10 @@ export default {
},
methods: {
wordView() {
- this.openNewWindow("/demo/wordview/?filePath=http://localhost:10910/api/WikiMain/GetDocxFile?filePath=/FileUpload/wiki/1.docx");
+ this.openNewWindow("/demo/wordview/?filePath=http://localhost:8916/api/WikiMain/GetDocxFile?filePath=/FileUpload/wiki/1.docx");
},
pdfView() {
- this.openNewWindow("/demo/pdfview/?filePath=http://localhost:10910/api/WikiMain/GetPdfFile?filePath=/FileUpload/wiki/1.pdf");
+ this.openNewWindow("/demo/pdfview/?filePath=http://localhost:8916/api/WikiMain/GetPdfFile?filePath=/FileUpload/wiki/1.pdf");
},
openNewWindow(path) {
const { href } = this.$router.resolve({
diff --git a/src/CNet.Web.Api/appsettings.json b/src/CNet.Web.Api/appsettings.json
index 3c24114..aa2e18a 100644
--- a/src/CNet.Web.Api/appsettings.json
+++ b/src/CNet.Web.Api/appsettings.json
@@ -20,11 +20,13 @@
},
"ConnectionStrings": {
//"connSqlServer": "Data Source=.; Initial Catalog=CNet;User Id=sa;Password=123123;Pooling=true;Min Pool Size=5",
- //"connMySql": "server=localhost;port=3306;database=cnet;SslMode=None;uid=root;pwd=123123;Allow User Variables=true",
+ "connMySql": "server=localhost;port=3306;database=cnet;SslMode=None;uid=root;pwd=root;Allow User Variables=true",
//"connSQLite":"Data Source=E:\\Study\\DotNet\\CNet_Admin\\src\\db\\cnet.db; Pooling=true;Min Pool Size=1" 或 Data Source=|DataDirectory|\\cnet.db;
+ //"connSQLite": "Data Source=C:\\Users\\18219\\source\\repos\\CNet_Admin\\src\\db\\cnet.db; Pooling=true;Min Pool Size=1",
+ //"connStr_Main": "Data Source=C:\\Users\\18219\\source\\repos\\CNet_Admin\\src\\db\\cnet.db; Pooling=true;Min Pool Size=1",
//或"Data Source=../db/LXNSH.db; Pooling=true;Min Pool Size=1"
- "connStr_Main": "server=localhost;port=3306;database=CNet;SslMode=None;uid=root;pwd=123123;Allow User Variables=true"
- //"db_Main": "SqlServer" //SqlServer 、MySql、SQLite
+ "connStr_Main": "server=localhost;port=3306;database=CNet;SslMode=None;uid=root;pwd=root;Allow User Variables=true",
+ "db_Main": "MySql" //SqlServer 、MySql、SQLite
//"RedisExchangeHosts": "127.0.0.1:6379,allowadmin=true"
},
//AppConfigurtaionServices.Configuration["Appsettings:SystemName"];
@@ -36,8 +38,8 @@
"SecretKey": "CNet1220220704112312333333333333312323"
},
"AllowedHosts": "*",
- "Urls": "http://*:8916;"
- //"CorsPaths": {
- // "OriginOne": "http://localhost:8015/" //跨域请求网址，跨域添加多个
- //}
+ "Urls": "http://*:8916;",
+ "CorsPaths": {
+ "OriginOne": "http://localhost:8015/" //跨域请求网址，跨域添加多个
+ }
}