1.0.0.0811d2

Former-commit-id: 6618c92b9ee84280093a945d76ce229a0ec3d36e
Former-commit-id: 7d13223506d0da9b068bf294ec54ebe38b4bda1c

projects/IoTCenter/Api/SiteController.cs

@@ -35,9 +35,15 @@ namespace IoTCenter.Api.Controllers
             try
             {
                 var username = User.Identity.IsAuthenticated ? this.HttpContext.User.Identity.Name : null;
+                var roles = new List<string>();
                 var permissions = new List<string>();
                 if (User.Identity.IsAuthenticated)
                 {
+                    roles = this._userRepo.ReadOnlyTable()
+                    .Where(o => o.UserName == username)
+                    .SelectMany(o => o.UserRoles)
+                    .Select(o => o.Role.Name)
+                    .ToList();
                     permissions = this._userRepo.ReadOnlyTable()
                     .Where(o => o.UserName == username)
                     .SelectMany(o => o.UserRoles)
@@ -54,6 +60,7 @@ namespace IoTCenter.Api.Controllers
                     copyright = this._settingService.GetSetting("copyright").Value,
                     version = Helper.Instance.GetVersion(),
                     username,
+                    roles,
                     permissions
                 });
             }

projects/IoTCenter/appsettings.Development.json

@@ -1,5 +1,9 @@
 {
-  "AppSettings": {
+  "Logging": {
-    "database": "mysql"
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
   }
 }

projects/IoTCenter/appsettings.json

@@ -8,7 +8,7 @@
     }
   },
   "tableprefix": "iot",
-  "useRedisSignalR": "false",
+  "useRedisSignalR": "true",
   "useConfigServer": "false",
   "useLogServer": "false",
   "useServiceServer": "false",
@@ -66,7 +66,7 @@
   },
   "AppSettings": {
     "database": "mysql",
-    "cache": "memory",
+    "cache": "redis",
     "fileserver": "minio"
   },
   "minio": {

projects/UserCenter/appsettings.Development.json

@@ -1,5 +1,9 @@
 {
-  "AppSettings": {
+  "Logging": {
-    "database": "mysql"
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
   }
 }

projects/UserCenter/appsettings.json

@@ -52,7 +52,7 @@
   },
   "AppSettings": {
     "database": "mysql",
-    "cache": "memory",
+    "cache": "redis",
     "fileserver": "minio"
   },
   "minio": {

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0811d1")]
+[assembly: AssemblyInformationalVersion("1.0.0.0811d2")]

projects/WebMVC/wwwroot/components/shared/layout.html

@@ -284,14 +284,65 @@
                                 </p>
                             </router-link>
                         </li>
-                        <li class="nav-item" v-if="hasPermission('Read-LiveRecord')">
+                        <template v-if="data.roles.indexOf('超级管理员')===0">
-                            <a class="nav-link" href="//JobServer/job">
+                            <li class="nav-header">运维</li>
-                                <i class="far fa-circle nav-icon"></i>
+                            <li class="nav-item">
-                                <p>
+                                <a class="nav-link" target="_blank" href="/JobServer/job">
-                                    定时任务
+                                    <i class="far fa-circle nav-icon"></i>
-                                </p>
+                                    <p>
-                            </a>
+                                        JobServer
-                        </li>
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(9002)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        Portainer
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(9000)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        MinIO
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(9003)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        phpmyadmin
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(8083)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        influxdb
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(9004)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        phpredisadmin
+                                    </p>
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" target="_blank" :href="getHref(8080)">
+                                    <i class="far fa-circle nav-icon"></i>
+                                    <p>
+                                        srs
+                                    </p>
+                                </a>
+                            </li>
+                        </template>
                     </ul>
                 </nav>
             </div>
@@ -345,7 +396,8 @@
                     copyright: '',
                     version: '',
                     username: '',
-                    permissions: []
+                    permissions: [],
+                    roles: []
                 }
             }
         },
@@ -398,6 +450,9 @@
             },
             getGroupLinkClass() {
                 return 'nav-link' + (Enumerable.from(arguments).any(o => o === this.model) ? ' active' : '');
+            },
+            getHref(port) {
+                return window.location.protocol + "//" + window.location.hostname + ":" + port;
             }
         }
     }

publish/src/linux-x64/publish/docker-compose.prod.yml

@@ -11,6 +11,7 @@ services:
         command: bash -c "chmod +x /UserCenter/UserCenter && cd /UserCenter && ./UserCenter"
         depends_on:
             - mysql
+            - redis
         ports:
             - 8010:80
         volumes:
@@ -28,6 +29,7 @@ services:
         command: bash -c "chmod +x /IoTCenter/IoTCenter && cd /IoTCenter && ./IoTCenter"
         depends_on:
             - mysql
+            - redis
         ports:
             - 8011:80
         volumes:

publish/src/linux-x64/publish/docker-compose.yml

@@ -131,6 +131,9 @@ services:
         restart: always
         ports:
             - 6379:6379
+        volumes: 
+            - ./docker/data/redis:/data
+            - ./docker/conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
         networks:
             default:
                 ipv4_address: 172.172.0.40