Skip to content

Commit

Permalink
feat: 1.开发重置密码功能 2.替换域名
Browse files Browse the repository at this point in the history
  • Loading branch information
JackySoft authored and jianbing.chen committed Dec 18, 2024
1 parent 1d47133 commit 560541e
Show file tree
Hide file tree
Showing 25 changed files with 206 additions and 67 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Marsview is a low code visualization platform for middle and backend development
## Online use 🛸

- 🌍 [Marsview](http://www.marsview.cc/)
- 🌍 [Marsview](https://www.marsview.com.cn/)

| | |
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Marsview 是一款中后台方向的低代码可视化搭建平台,开发者

## 在线使用 🛸

- 🌍 [Marsview](http://www.marsview.cc/)
- 🌍 [Marsview](https://www.marsview.com.cn/)

| | |
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/.env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 本地开发环境走proxy代理,方便解决跨域问题
VITE_BASE_API=/api
# 后台访问地址
VITE_ADMIN_URL=http://admin.marsview.cc
VITE_ADMIN_URL=https://admin.marsview.com.cn
# CDN 地址
VITE_CDN_URL=https://marsview.cdn.bcebos.com
2 changes: 1 addition & 1 deletion packages/admin/.env.production
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 接口地址
VITE_BASE_API=/api
# 后台访问地址
VITE_ADMIN_URL=http://admin.marsview.cc
VITE_ADMIN_URL=https://admin.marsview.com.cn
# CDN 地址
VITE_CDN_URL=https://marsview.cdn.bcebos.com
2 changes: 1 addition & 1 deletion packages/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"
/>
<meta name="keywords" content="Mars, Marsview, 低代码平台, Mars官网, Marsview官网, Marsview低代码, Marsview低代码平台, Mars低代码" />
<link rel="preconnect" href="http://admin.marsview.cc" />
<link rel="preconnect" href="https://admin.marsview.com.cn" />
<link rel="preconnect" href="http://mars-api.marsview.cc" />
<style>
html,
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/src/pages/console/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function Console() {
) : (
!loading && (
<Empty style={{ marginTop: 100 }} description="当前暂无可访问的项目">
<Button type="primary" onClick={() => window.open('http://www.marsview.cc/projects', 'blank')}>
<Button type="primary" onClick={() => window.open('https://www.marsview.com.cn/projects', 'blank')}>
去创建
</Button>
</Empty>
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/src/pages/welcome/welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ function Welcome() {
<div className={style.content}>
<p>
当前需要正确的项目地址才可以访问,如果没有创建项目,请先去Marsview低代码平台{' '}
<a href={`http://www.marsview.cc/projects`} target="_blank">
<a href={`https://www.marsview.com.cn/projects`} target="_blank">
创建
</a>
</p>
<Button type="primary" onClick={() => window.open(`http://www.marsview.cc/projects`, '_blank')}>
<Button type="primary" onClick={() => window.open(`https://www.marsview.com.cn/projects`, '_blank')}>
去创建
</Button>
</div>
Expand Down
8 changes: 4 additions & 4 deletions packages/docs/src/home.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Marsview 是一款中后台方向的低代码可视化搭建平台,**面向前

## 特性

- 项目: 项目创建、项目配置(主题色、菜单布局、系统 Logo、面包屑...)、配置菜单、角色和用户; 基于 RBAC 的权限管理。创建项目后,可以直接通过 http://admin.marsview.cc 去访问配置的项目。
- 项目: 项目创建、项目配置(主题色、菜单布局、系统 Logo、面包屑...)、配置菜单、角色和用户; 基于 RBAC 的权限管理。创建项目后,可以直接通过 https://admin.marsview.com.cn 去访问配置的项目。
- 页面: 页面可以独立存在或配合项目使用。页面包含属性配置、组件拖拽、`JSON` 源码、组件大纲、全局变量、接口管理、页面权限。 页面同时支持其他传统系统通过微服务集成,不管你的系统是 `Vue` 还是 `React`
- 组件: 目前开发的组件有 60+,支持大部分常用的组件,包含:表单、图表、容器、布局、数据展示和场景等几大类组件。
- 自定义组件: 当系统组件无法满足需求时,可通过自定义组件实现,支持在线编译,可以实现基于`Antd`构建的任意元素以及使用`G2Plots`实现的图表功能。
Expand All @@ -16,8 +16,8 @@ Marsview 是一款中后台方向的低代码可视化搭建平台,**面向前

## 项目介绍

1. `editor`项目是面向开发者使用的。提供可视化搭建功能,对应`https://www.marsview.cc`
2. `admin` 项目是面向普通用户访问的。在编辑器端搭建完页面后,点击发布,可通过`http://admin.marsview.cc`访问页面效果。
1. `editor`项目是面向开发者使用的。提供可视化搭建功能,对应`https://www.marsview.com.cn`
2. `admin` 项目是面向普通用户访问的。在编辑器端搭建完页面后,点击发布,可通过`https://admin.marsview.com.cn`访问页面效果。
3. `doc` 对应开发者文档。
4. 后端提供`Java``Koa`两套服务,可自由选择。

Expand All @@ -31,7 +31,7 @@ Marsview 是一款中后台方向的低代码可视化搭建平台,**面向前

## 项目和页面关系

1. 项目是主体,页面是内容载体,项目会包含多个页面,项目创建完以后可以通过`http://admin.marsview.cc`访问。
1. 项目是主体,页面是内容载体,项目会包含多个页面,项目创建完以后可以通过`https://admin.marsview.com.cn`访问。

2. 如果你要开发一个全新的项目,你可以考虑在平台创建一个项目,然后创建菜单,最后给菜单关联页面。

Expand Down
10 changes: 5 additions & 5 deletions packages/docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hero:
link: /home
- theme: alt
text: 在线体验
link: http://www.marsview.cc
link: https://www.marsview.com.cn
target: _blank
- theme: alt
text: GitHub
Expand All @@ -21,19 +21,19 @@ hero:

features:
- icon:
src: http://www.marsview.cc/imgs/m1.png
src: https://www.marsview.com.cn/imgs/m1.png
title: 项目配置
details: 可创建完整项目,支持菜单角色配置、RBAC权限、项目主题等。
- icon:
src: http://www.marsview.cc/imgs/m2.png
src: https://www.marsview.com.cn/imgs/m2.png
title: 权限管理
details: 支持项目权限、页面权限设置,页面支持开发和预览两种模式。
- icon:
src: http://www.marsview.cc/imgs/p1.png
src: https://www.marsview.com.cn/imgs/p1.png
title: 逻辑编排
details: 可配置事件流完成高复杂度需求,比如:接口请求、条件判断、组件联动等。
- icon:
src: http://www.marsview.cc/imgs/p4.png
src: https://www.marsview.com.cn/imgs/p4.png
title: 数据源配置
details: 任何一个组件,都可以配置静态数据、接口请求和变量绑定。
---
4 changes: 2 additions & 2 deletions packages/docs/src/micro.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ new Vue({
name: 'MicroMars',
data() {
return {
url: 'http://admin.marsview.cc/',
url: 'https://admin.marsview.com.cn',
};
},
methods: {
Expand Down Expand Up @@ -105,6 +105,6 @@ new Vue({
},
```

示例:http://admin.marsview.cc/page/stg/149 这是一个数据看板的页面地址,对应的是测试环境,那上面的地址就对应数据看板,当在你的老项目中,点击该菜单时,就会加载该`marsview`页面。
示例:https://admin.marsview.com.cn/page/stg/149 这是一个数据看板的页面地址,对应的是测试环境,那上面的地址就对应数据看板,当在你的老项目中,点击该菜单时,就会加载该`marsview`页面。

如果你们公司的菜单也是动态创建的,那此处可能需要修改为动态路由,比如:`/page/:env/:id`,然后再你们公司后台配置菜单时,配置对应的页面路由即可,比如:`/page/stg/149`
2 changes: 1 addition & 1 deletion packages/docs/src/page/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- 参数支持模板字符串、动态变量。比如:`/api/${id}`
- 接口支持代理,解决跨域问题。

参考示例:[CRUD 调用](http://www.marsview.cc/editor/144/edit)
参考示例:[CRUD 调用](https://www.marsview.com.cn/editor/144/edit)

## 创建接口

Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/page/variable.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

平台已经创建了几个关于变量使用的页面,大家可以参考一下:

1. [计数器](http://www.marsview.cc/editor/147/edit)
1. [计数器](https://www.marsview.com.cn/editor/147/edit)

## 创建变量

Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/project/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 项目

Marsview 支持从零开始创建项目,同时支持一整套完整项目的配置,比如:项目菜单、项目角色、项目权限、项目开发成员等,创建完成后,可以直接通过`http://admin.marsview.cc`访问创建的项目。
Marsview 支持从零开始创建项目,同时支持一整套完整项目的配置,比如:项目菜单、项目角色、项目权限、项目开发成员等,创建完成后,可以直接通过`https://admin.marsview.com.cn`访问创建的项目。

<video width="680" controls>
<source src="https://marsview.cdn.bcebos.com/vedio/project.mp4" type="video/mp4">
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/project/visit.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## 进入访问端

输入后台地址:`http://admin.marsview.cc`,进入访问端。左侧菜单就是我们在创建项目时添加的菜单,点击菜单会跳转到我们关联的页面。
输入后台地址:`https://admin.marsview.com.cn`,进入访问端。左侧菜单就是我们在创建项目时添加的菜单,点击菜单会跳转到我们关联的页面。

![访问端工作台](/project/console.png)

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/.env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 接口地址
VITE_BASE_API=/api
# 后台访问地址
VITE_ADMIN_URL=http://admin.marsview.cc
VITE_ADMIN_URL=https://admin.marsview.com.cn
# CDN 地址
VITE_CDN_URL=https://marsview.cdn.bcebos.com
2 changes: 1 addition & 1 deletion packages/editor/.env.production
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 接口地址
VITE_BASE_API=/api
# 后台访问地址
VITE_ADMIN_URL=http://admin.marsview.cc
VITE_ADMIN_URL=https://admin.marsview.com.cn
# CDN 地址
VITE_CDN_URL=https://marsview.cdn.bcebos.com
2 changes: 1 addition & 1 deletion packages/editor/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"
/>
<meta name="keywords" content="Mars, Marsview, 低代码平台, Mars官网, Marsview官网, Marsview低代码, Marsview低代码平台, Mars低代码" />
<link rel="preconnect" href="http://www.marsview.cc" />
<link rel="preconnect" href="https://www.marsview.com.cn" />
<link rel="preconnect" href="http://mars-api.marsview.cc" />
<style>
* {
Expand Down
15 changes: 15 additions & 0 deletions packages/editor/src/api/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,18 @@ export const getUserAvatar = () => {
export const searchUser = (keyword: string) => {
return request.post(`/user/search`, { keyword });
};

// 密码找回 - 发送邮件
export const createResetLink = (params: { userEmail: string }) => {
return request.post('/user/password/forget', params);
};

// 密码找回 - 获取用户名
export const getAccountByToken = (token: string) => {
return request.post(`/user/password/getUserByToken?resetToken=${token}`);
};

// 密码找回提交
export const resetSubmit = (params: { resetToken: string; userPwd: string }) => {
return request.post('/user/password/reset', params);
};
2 changes: 1 addition & 1 deletion packages/editor/src/packages/Basic/Link/Schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
// 组件默认属性值
props: {
text: '打开Marsview系统',
href: 'http://www.marsview.cc',
href: 'https://www.marsview.com.cn',
target: '_blank',
},
style: {},
Expand Down
22 changes: 6 additions & 16 deletions packages/editor/src/pages/feedback/IssueDetail/index.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,16 @@
}

/* 隐藏滚动条 - Firefox */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}



.header {
display: flex;
justify-content: space-between;
align-items: flex-start;
margin-bottom: 24px;
margin-top: 30px;

}

.title {
Expand Down Expand Up @@ -150,8 +147,8 @@
.statusCard {
width: 220px;
height: 60px;
background-color: white;
border: 1px solid #e5e7eb;
background-color: var(--mars-theme-bg-color);
border: 1px solid var(--mars-theme-border-color);
border-radius: 8px;
padding: 16px;
margin-bottom: 24px;
Expand All @@ -161,7 +158,6 @@
}

.statusChange {

width: 60px;
height: 60px;
background-color: #87d068;
Expand All @@ -178,17 +174,14 @@
color: #fff;
transition: all 0.3s ease;
&:hover {

transform: scale(1.05);

}
}

.statusContent {
display: flex;
justify-content: center;
align-items: center;

}

.statusText {
Expand All @@ -205,7 +198,6 @@

.commentsSection {
margin-top: 24px;
// padding: 0 80px;
}

.commentsHeader {
Expand All @@ -220,10 +212,9 @@
font-weight: 600;
}


.commentCard {
background-color: white;
border: 1px solid #e5e7eb;
background-color: var(--mars-theme-bg-color);
border: 1px solid var(--mars-theme-border-color);
border-radius: 8px;
padding: 16px;
margin-bottom: 16px;
Expand Down Expand Up @@ -269,7 +260,6 @@
color: #1f2937;
}


.replyModule {
display: flex;
align-items: flex-start;
Expand Down
Loading

0 comments on commit 560541e

Please sign in to comment.