From d89e5bad980c572e5af6d5d14f0e7e296518734c Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Sat, 4 Jul 2020 21:35:15 +0800
Subject: [PATCH] =?UTF-8?q?admin-web=20=E6=8E=A5=E5=85=A5=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-web/config/proxy/proxy.dev.js           | 32 +------------------
 admin-web/src/models/login.js                 |  6 ++--
 admin-web/src/services/system.js              |  6 ++--
 .../common/framework/util/DigestUtils.java    |  8 +++++
 4 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/admin-web/config/proxy/proxy.dev.js b/admin-web/config/proxy/proxy.dev.js
index 55c26f8db..171511c87 100644
--- a/admin-web/config/proxy/proxy.dev.js
+++ b/admin-web/config/proxy/proxy.dev.js
@@ -1,40 +1,10 @@
 // 开发环境，的代理配置
 
 module.exports = {
-  '/system-api/': {
+  '/management-api/': {
     target: 'http://127.0.0.1:18083/',
     // target: 'http://180.167.213.26:18083/',
     changeOrigin: true,
     pathRewrite: {},
   },
-  '/product-api/': {
-    // target: 'http://180.167.213.26:18083/',
-    target: 'http://127.0.0.1:18081/',
-    changeOrigin: true,
-    pathRewrite: {},
-  },
-  '/order-api/': {
-    // target: 'http://180.167.213.26:18084/',
-    target: 'http://127.0.0.1:18088/',
-    changeOrigin: true,
-    pathRewrite: {},
-  },
-  '/promotion-api/': {
-    // target: 'http://180.167.213.26:18085/',
-    target: 'http://127.0.0.1:18085/',
-    changeOrigin: true,
-    pathRewrite: {},
-  },
-  '/user-api/': {
-    // target: 'http://180.167.213.26:18085/',
-    target: 'http://127.0.0.1:18082/',
-    changeOrigin: true,
-    pathRewrite: {},
-  },
-  '/pay-api/': {
-    // target: 'http://180.167.213.26:18085/',
-    target: 'http://127.0.0.1:18084/',
-    changeOrigin: true,
-    pathRewrite: {},
-  },
 };
diff --git a/admin-web/src/models/login.js b/admin-web/src/models/login.js
index 3c34efcda..b39cb6e49 100644
--- a/admin-web/src/models/login.js
+++ b/admin-web/src/models/login.js
@@ -1,7 +1,7 @@
 import { routerRedux } from 'dva/router';
 import { stringify } from 'qs';
 import { getFakeCaptcha } from '@/services/api';
-import { oauth2UsernameAuthenticate } from '@/services/system';
+import { passportLogin } from '@/services/system';
 import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
 import { reloadAuthorized } from '@/utils/Authorized';
@@ -16,7 +16,7 @@ export default {
 
   effects: {
     *login({ payload }, { call, put }) {
-      const response = yield call(oauth2UsernameAuthenticate, payload);
+      const response = yield call(passportLogin, payload);
       yield put({
         type: 'changeLoginStatus',
         payload: response,
@@ -28,7 +28,7 @@ export default {
       if (response.code === 0) {
 
         // 保存 token 到 localStorage，发送请求的时候，会自动取 token 放到 header
-        setLoginToken(response.data.token.accessToken, response.data.token.refreshToken);
+        setLoginToken(response.data.authorization.accessToken, response.data.authorization.refreshToken);
         // 此处直接设置为 admin、和 user 角色，因为暂时不做服务控制前段 角色
         setAuthority(['admin', 'user']);
 
diff --git a/admin-web/src/services/system.js b/admin-web/src/services/system.js
index 06a524339..cb39df377 100644
--- a/admin-web/src/services/system.js
+++ b/admin-web/src/services/system.js
@@ -1,10 +1,10 @@
 import {stringify} from '@/utils/request.qs';
 import request from '@/utils/request';
 
-// ========== OAuth2 模块 ==========
+// ========== Passport 模块 ==========
 
-export async function oauth2UsernameAuthenticate(params) {
-  return request(`/system-api/admins/oauth2/username-authenticate?${stringify(params)}`, {
+export async function passportLogin(params) {
+  return request(`/management-api/passport/login?${stringify(params)}`, {
     method: 'POST',
     body: {},
   });
diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/DigestUtils.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/DigestUtils.java
index 9180b1ab6..02f6d21e3 100644
--- a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/DigestUtils.java
+++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/DigestUtils.java
@@ -15,4 +15,12 @@ public class DigestUtils {
         return BCrypt.hashpw(key, salt);
     }
 
+    // TODO 稍后移到单元测试
+    public static void main(String[] args) {
+        String salt = genBcryptSalt();
+        String password = "buzhidao";
+        System.out.println(salt);
+        System.out.println(bcrypt(password, salt));
+    }
+
 }