change info

.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": []
+    }
+  ]
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\CNet.sln",
+  "PreviewInSolutionExplorer": false
+}

src/CNet.BLL/T4.DapperExt/Main/1Service.txt

@@ -10,7 +10,3 @@
 
 
 
-
-
-
-

src/CNet.DAL/CNet.DAL.csproj

@@ -33,5 +33,10 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>1Repository.txt</LastGenOutput>
     </None>
+    <None Update="T4.DapperExt\Main\1Repository.txt">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>1Repository.tt</DependentUpon>
+    </None>
   </ItemGroup>
 </Project>

src/CNet.DAL/T4.DapperExt/Main/1Repository.txt

@@ -0,0 +1,12 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     ���ļ������޸�
+//	   �����������ݿ�Ҳ�����޸Ĵ��ļ�
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+
+
+

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";

src/CNet.Model/T4.DapperExt/Main/1Entity.txt

@@ -10,6 +10,3 @@
 
 
 
-
-
-

src/CNet.Web.Admin/src/components/main/main.vue

@@ -7,7 +7,7 @@
           <img v-show="!collapsed" :src="maxLogo" key="max-logo" />
           <img v-show="collapsed" :src="minLogo" key="min-logo" />
         </div> -->
-        <h1 style="color:#fff;text-align:center;">CNet</h1>
+        <h2 style="color:#fff;text-align:center;">异世界重生管理系统</h2>
       </side-menu>
     </Sider>
     <Layout>

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
    */

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({

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/" //跨域请求网址，跨域添加多个
+  }
 }