Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.EntityFrameworkCore/Menus/MenuDbContextModelCreatingExtensions.cs

@@ -27,7 +27,7 @@ public static class MenuDbContextModelCreatingExtensions
             b.Property(q => q.Portal).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.ParentCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.Permission).HasMaxLength(SfsPropertyConst.CodeLength);
-            b.Property(q => q.Component).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Component).HasMaxLength(SfsPropertyConst.DescLength);
             b.Property(q => q.Sort);
             b.Property(q => q.GroupSort);
             b.Property(q => q.CountUrl);

fe/PC/src/api/wms-auth.js

@@ -11,7 +11,7 @@ export function login(data) {
 
 export function token(data) {
   return request({
-    url: baseURL + '/connect/token',
+    url: baseURL + '/token',
     method: 'post',
     data
   })

fe/PC/src/store/modules/user.js

@@ -65,7 +65,11 @@ const actions = {
     let tokenData = qs.stringify(parseData)
     return new Promise((resolve, reject) => {
       // login(loginData).then(response => {
-      token(tokenData).then(response => {
+      let params = {
+        password: password,
+        userName: username
+      }
+      token(params).then(response => {
         const {
           access_token,
           token_type