修改 获取pda菜单

be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/UserMenus/UserMenuAppService.cs

@@ -57,7 +57,7 @@ public class UserMenuAppService :
     public virtual async Task<List<MenuDto>> GetPdaMenusOfUserAsync(Guid? userId)
     {
         var userMenus = await _repository
-            .GetListAsync(p => p.UserId == userId && p.Portal == PDA_PORTAL).ConfigureAwait(false);
+            .GetListAsync(p => p.UserId == userId && p.Portal == EnumPortal.Pda).ConfigureAwait(false);
 
         var menuCodes = userMenus.Select(p => p.MenuCode).Distinct().ToList();
 
@@ -155,7 +155,7 @@ public class UserMenuAppService :
         var entities = await _menuRepository
             .GetListAsync(p => menuCodes.Contains(p.Code));
 
-        entities = entities.Where(p => p.Status == MenuStatus.Enable && p.Portal == EnumPortal.Web).ToList();
+        entities = entities.Where(p => p.Status == MenuStatus.Enable && p.Portal == EnumPortal.Pda).ToList();
 
         return ObjectMapper.Map<List<Menu>, List<MenuDto>>(entities);
     }

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json

@@ -1,13 +1,13 @@
 {
-  "RemoteServices": {
-    "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" },
-    "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" },
-    "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
-    "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
-    "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
-    "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
-    "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
-    "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
-    "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }
-  }
+  //"RemoteServices": {
+  //  "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" },
+  //  "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" },
+  //  "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
+  //  "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
+  //  "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" },
+  //  "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
+  //  "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
+  //  "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" },
+  //  "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }
+  //}
 }

build/src/docker/publish/conf/settings/appsettings.Development.json

@@ -43,16 +43,16 @@
       "http://localhost:9527"
     ]
   },
-  "AuthServer": {
-    "Audience": "Auth",
-    "Authority": "http://dev.ccwin-in.com:21293/",
-    "ClientId": "Auth_App",
-    "ClientSecret": "1q2w3E*",
-    "RequireHttpsMetadata": "false",
-    "SwaggerClientId": "Auth_App",
-    "SwaggerClientSecret": "1q2w3e*",
-    "UseAuth": "true"
-  },
+    "AuthServer": {
+        "Audience": "Auth",
+        "Authority": "http://dev.ccwin-in.com:21293/",
+        "ClientId": "Auth_App",
+        "ClientSecret": "1q2w3E*",
+        "RequireHttpsMetadata": "false",
+        "SwaggerClientId": "Auth_App",
+        "SwaggerClientSecret": "1q2w3e*",
+        "UseAuth": "true"
+    },
   // "ConnectionStrings": {
   //   "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
   //   "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
@@ -95,12 +95,12 @@
   },
   "IdentityClients": {
     "Default": {
-      "Authority": "http://dev.ccwin-in.com:21293",
-      "ClientId": "Auth_App",
-      "ClientSecret": "1q2w3E*",
-      "GrantType": "client_credentials",
-      "RequireHttps": "false",
-      "Scope": "Auth"
+        "Authority": "http://dev.ccwin-in.com:21293",
+        "ClientId": "Auth_App",
+        "ClientSecret": "1q2w3E*",
+        "GrantType": "client_credentials",
+        "RequireHttps": "false",
+        "Scope": "Auth"
     }
   },
   "IsMultiTenancy": "True",
@@ -110,13 +110,13 @@
   },
   "RemoteServices": {
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:21293/"
+        "BaseUrl": "http://dev.ccwin-in.com:21293/"
     },
     "BaseData": {
       "BaseUrl": "http://dev.ccwin-in.com:21294/"
     },
     "Default": {
-      "BaseUrl": "http://dev.ccwin-in.com:21293/"
+        "BaseUrl": "http://dev.ccwin-in.com:21293/"
     },
     "FileStorage": {
       "BaseUrl": "http://dev.ccwin-in.com:21292/"

build/src/docker/publish/conf/settings/appsettings.json

@@ -48,7 +48,7 @@
   //ids4的建权服务端配置
   "AuthServer": {
     "Audience": "Auth",
-    "Authority": "http://dev.ccwin-in.com:21293/",
+    "Authority": "http://localhost:59093",
     "ClientId": "Auth_App",
     "ClientSecret": "1q2w3E*",
     "RequireHttpsMetadata": "false",
@@ -100,13 +100,13 @@
   //转发地址配置
   "RemoteServices": {
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:59093/"
+      "BaseUrl": "http://localhost:59093/"
     },
     "BaseData": {
       "BaseUrl": "http://dev.ccwin-in.com:59094/"
     },
     "Default": {
-      "BaseUrl": "http://dev.ccwin-in.com:59093"
+      "BaseUrl": "http://localhost:59093/"
     },
     "FileStorage": {
       "BaseUrl": "http://dev.ccwin-in.com:59092/"