diff --git a/devcloud/audit/audit/sender.go b/devcloud/audit/audit/sender.go
index 19eb689..0a45215 100644
--- a/devcloud/audit/audit/sender.go
+++ b/devcloud/audit/audit/sender.go
@@ -14,41 +14,43 @@ import (
func (a *EventSender) SendEvent() restful.FilterFunction {
return func(req *restful.Request, resp *restful.Response, fc *restful.FilterChain) {
sr := req.SelectedRoute()
- md := NewMetaData(sr.Metadata())
+ if sr != nil {
+ md := NewMetaData(sr.Metadata())
- // 开关打开，则开启审计
- if md.GetBool(META_AUDIT_KEY) {
+ // 开关打开，则开启审计
+ if md.GetBool(META_AUDIT_KEY) {
- // 获取当前是否需要审计
- e := event.NewEvent()
+ // 获取当前是否需要审计
+ e := event.NewEvent()
- // 用户信息
- tk := token.GetTokenFromCtx(req.Request.Context())
- if tk != nil {
- e.Who = tk.UserName
- e.Namespace = tk.NamespaceName
- }
+ // 用户信息
+ tk := token.GetTokenFromCtx(req.Request.Context())
+ if tk != nil {
+ e.Who = tk.UserName
+ e.Namespace = tk.NamespaceName
+ }
- // ioc 里面获取当前应用的名称
- e.Service = application.Get().AppName
- e.ResourceType = md.GetString(endpoint.META_RESOURCE_KEY)
- e.Action = md.GetString(endpoint.META_ACTION_KEY)
+ // ioc 里面获取当前应用的名称
+ e.Service = application.Get().AppName
+ e.ResourceType = md.GetString(endpoint.META_RESOURCE_KEY)
+ e.Action = md.GetString(endpoint.META_ACTION_KEY)
- // {id} /:id
- e.ResourceId = req.PathParameter("id")
- e.UserAgent = req.Request.UserAgent()
- e.Extras["method"] = sr.Method()
- e.Extras["path"] = sr.Path()
- e.Extras["operation"] = sr.Operation()
+ // {id} /:id
+ e.ResourceId = req.PathParameter("id")
+ e.UserAgent = req.Request.UserAgent()
+ e.Extras["method"] = sr.Method()
+ e.Extras["path"] = sr.Path()
+ e.Extras["operation"] = sr.Operation()
- // 补充处理后的数据
- e.StatusCode = resp.StatusCode()
- // 发送给topic, 使用这个中间件的使用者，需要配置kafka
- err := a.wirter.WriteMessages(context.Background(), e.ToKafkaMessage())
- if err != nil {
- a.log.Error().Msgf("send message error, %s", err)
- } else {
- a.log.Debug().Msgf("send audit event ok, who: %s, resource: %s, action: %s", e.Who, e.ResourceType, e.Action)
+ // 补充处理后的数据
+ e.StatusCode = resp.StatusCode()
+ // 发送给topic, 使用这个中间件的使用者，需要配置kafka
+ err := a.wirter.WriteMessages(context.Background(), e.ToKafkaMessage())
+ if err != nil {
+ a.log.Error().Msgf("send message error, %s", err)
+ } else {
+ a.log.Debug().Msgf("send audit event ok, who: %s, resource: %s, action: %s", e.Who, e.ResourceType, e.Action)
+ }
}
}
diff --git a/devcloud/mcenter/permission/checker.go b/devcloud/mcenter/permission/checker.go
index 1d6c63a..9bd3180 100644
--- a/devcloud/mcenter/permission/checker.go
+++ b/devcloud/mcenter/permission/checker.go
@@ -78,28 +78,31 @@ func (c *Checker) Check(r *restful.Request, w *restful.Response, next *restful.F
// 1. 知道用户当前访问的是哪个接口, 当前url 匹配到的路由是哪个
// SelectedRoute, 它可以返回当前URL适配哪个路有， RouteReader
// 封装了一个函数 来获取Meta信息 NewEntryFromRestRouteReader
- route := endpoint.NewEntryFromRestRouteReader(r.SelectedRoute())
- if route.RequiredAuth {
- // 校验身份
- tk, err := c.CheckToken(r)
- if err != nil {
- response.Failed(w, err)
- return
+ sr := r.SelectedRoute()
+ if sr != nil {
+ route := endpoint.NewEntryFromRestRouteReader(sr)
+ if route.RequiredAuth {
+ // 校验身份
+ tk, err := c.CheckToken(r)
+ if err != nil {
+ response.Failed(w, err)
+ return
+ }
+
+ // 校验权限
+ if err := c.CheckPolicy(r, tk, route); err != nil {
+ response.Failed(w, err)
+ return
+ }
+
+ // 如果校验成功，需要把 用户的身份信息，放到请求的上下文中，方便后面的逻辑获取
+ // context.WithValue 来往ctx 添加 value
+ // key: value, value token对象
+ ctx := context.WithValue(r.Request.Context(), token.CTX_TOKEN_KEY, tk)
+
+ // ctx 生成一个新的，继续往下传递
+ r.Request = r.Request.WithContext(ctx)
}
-
- // 校验权限
- if err := c.CheckPolicy(r, tk, route); err != nil {
- response.Failed(w, err)
- return
- }
-
- // 如果校验成功，需要把 用户的身份信息，放到请求的上下文中，方便后面的逻辑获取
- // context.WithValue 来往ctx 添加 value
- // key: value, value token对象
- ctx := context.WithValue(r.Request.Context(), token.CTX_TOKEN_KEY, tk)
-
- // ctx 生成一个新的，继续往下传递
- r.Request = r.Request.WithContext(ctx)
}
// 请求处理
diff --git a/devcloud/web/docs/README.md b/devcloud/web/docs/README.md
index b5e7e3e..1da68cc 100644
--- a/devcloud/web/docs/README.md
+++ b/devcloud/web/docs/README.md
@@ -22,10 +22,196 @@ import '@arco-design/web-vue/dist/arco.css'
app.use(ArcoVue)
```
+## ajax
+
+如何将表单数据 提交给服务器, 封装的比较友好的js的http客户端, [axios](https://axios-http.com/docs/intro)
+
+```sh
+import axios from 'axios'
+
+// 封装一个axios的实例，http cient实例
+// https://axios-http.com/zh/docs/instance
+const client = axios.create({
+ baseURL: 'http://127.0.0.1:8080',
+ timeout: 3000,
+})
+
+export default client
+```
+
+基于客户端封装的mcenter client
+
+```sh
+import client from './client'
+
+var API = {
+ Login: (data) => {
+ return client.post('/api/devcloud/v1/token', data)
+ },
+}
+
+export default API
+```
+
+## 配置vite代理开发
+
+```js
+// https://vite.dev/config/
+export default defineConfig({
+ plugins: [vue(), vueDevTools()],
+ resolve: {
+ alias: {
+ '@': fileURLToPath(new URL('./src', import.meta.url)),
+ },
+ },
+ server: {
+ proxy: {
+ '/api': 'http://127.0.0.1:8080',
+ },
+ },
+})
+```
+
+去掉baseURL，应用使用代理
+
+```js
+// 封装一个axios的实例，http cient实例
+// https://axios-http.com/zh/docs/instance
+const client = axios.create({
+ timeout: 3000,
+})
+```
+
+## 统一处理 API的 异常
+
+设置axios的中间件, 统一识别并处理报错
+
+```js
+// 拦截API的返回结果, 如果是异常 提取异常信息，并展示
+// 如果正常 则直接返回 API的响应结果
+// https://axios-http.com/zh/docs/interceptors
+client.interceptors.response.use(
+ (data) => {
+ return data.data
+ },
+ (error) => {
+ // 提取错误
+ var msg = error.message
+
+ // 如果有更加详细的信息
+ if (error.response.data.message) {
+ msg = error.response.data.message
+ }
+
+ Message.error(msg)
+ return error
+ },
+)
+```
+
## 登陆页面
+1. UI
+
+```vue
+
+
+
+
+
+
欢迎登录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住
+
+
+ 登录
+
+
+
+
欢迎登录
-
-
+
+
-
-
+
+
@@ -34,18 +39,45 @@
diff --git a/devcloud/web/src/router/index.js b/devcloud/web/src/router/index.js
index eb728be..8fa7843 100644
--- a/devcloud/web/src/router/index.js
+++ b/devcloud/web/src/router/index.js
@@ -7,12 +7,12 @@ const router = createRouter({
routes: [
{
path: '/',
- name: 'home',
+ name: 'HomePage',
component: HomePage,
},
{
path: '/login',
- name: 'login',
+ name: 'LoginPage',
// route level code-splitting
// this generates a separate chunk (About.[hash].js) for this route
// which is lazy-loaded when the route is visited.
diff --git a/devcloud/web/src/storage/app.js b/devcloud/web/src/storage/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/devcloud/web/src/storage/token.js b/devcloud/web/src/storage/token.js
new file mode 100644
index 0000000..5c54647
--- /dev/null
+++ b/devcloud/web/src/storage/token.js
@@ -0,0 +1,3 @@
+import { useStorage } from '@vueuse/core'
+
+export default useStorage('token', {}, localStorage, { mergeDefaults: true })
diff --git a/devcloud/web/vite.config.js b/devcloud/web/vite.config.js
index 4217010..4641b76 100644
--- a/devcloud/web/vite.config.js
+++ b/devcloud/web/vite.config.js
@@ -6,13 +6,15 @@ import vueDevTools from 'vite-plugin-vue-devtools'
// https://vite.dev/config/
export default defineConfig({
- plugins: [
- vue(),
- vueDevTools(),
- ],
+ plugins: [vue(), vueDevTools()],
resolve: {
alias: {
- '@': fileURLToPath(new URL('./src', import.meta.url))
+ '@': fileURLToPath(new URL('./src', import.meta.url)),
+ },
+ },
+ server: {
+ proxy: {
+ '/api': 'http://127.0.0.1:8080',
},
},
})