Commit 9869bde

committed

显示调整:后端修正调用oauth授权时候的SSL校验;前端为了更美观,让系统退出之前把所有打开的页面都关闭

1 parent 83d8f4f commit 9869bdeCopy full SHA for 9869bde

File tree

4 files changed

+42

-24

lines changed

api/app/Http/Controllers/Admin
- LoginController.php
back.md
element/src/layout/components
- Navbar.vue
front.md

4 files changed

+42

-24

lines changed

`‎api/app/Http/Controllers/Admin/LoginController.php`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ protected function token($data = []){`
`200`	`200`	`$http = new Client();`
`201`	`201`	`$url = env('APP_URL');`
`202`	`202`	`$result = $http->post("$url/oauth/token", [`
`203`		`- 'form_params' => $data`
	`203`	`+ 'form_params' => $data,`
	`204`	`+ "verify" => false`
`204`	`205`	`]);`
`205`	`206`	`$result = json_decode((string) $result->getBody(), true);`
`206`	`207`	`return response()->json([`

`‎back.md`

Lines changed: 17 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## 1.apache的配置`
	`1`	`+## 1.apache的配置`
`2`	`2`	`~~~`
`3`	`3`	`<VirtualHost *:80>`
`4`	`4`	`# 本地目录,注意到后端项目的public目录`
`@@ -19,53 +19,60 @@`
`19`	`19`	`~~~`
`20`	`20`
`21`	`21`
`22`		`-## 2、在后端目录下,安装依赖`
	`22`	`+## 2. 在后端目录下,安装依赖`
`23`	`23`	`~~~`
`24`	`24`	`composer install`
`25`	`25`	`~~~`
`26`	`26`
`27`	`27`	`## 3. 新建数据库`
`28`	`28`	`> 数据库中的字符集为utfmb8--UTF-8 Unicode , 排序规则为utf8mb4_unicode_ci`
`29`	`29`
`30`		`-## 4、复制配置文件,生成项目密匙`
	`30`	`+## 4. 复制配置文件,生成项目密匙`
`31`	`31`
`32`	`32`	`~~~php`
`33`	`33`	`cp .env.example .env`
`34`	`34`	`php artisan key:generate`
`35`	`35`	`~~~`
`36`	`36`
`37`	`37`
`38`		`-## 5.项目配置(数据库和域名配置)`
	`38`	`+## 5.项目配置(数据库和域名配置)`
`39`	`39`	`> .env文件中的APP_URL为后端域名,以http或者https开头`
`40`	`40`	`>`
`41`	`41`	`> 配置.env文件中的DB_DATABASE、DB_USERNAME和DB_PASSWORD 设置数据库`
`42`	`42`	`>`
`43`	`43`
`44`		`-## 6、生成项目所需的数据表`
	`44`	`+## 6. 生成项目所需的数据表`
`45`	`45`
`46`		`-~~~`
	`46`	`+~~~php`
`47`	`47`	`php artisan migrate`
`48`	`48`	`~~~`
`49`	`49`
`50`		`-## 7、生成用户数据和各种结构数据`
	`50`	`+## 7. 生成用户数据和各种结构数据`
`51`	`51`
`52`	`52`	`> 用户名/密码: admin/123456`
`53`	`53`
`54`		`-~~~`
	`54`	`+~~~php`
`55`	`55`	`php artisan db:seed`
`56`	`56`	`~~~`
`57`	`57`
`58`	`58`
`59`		`-## 8、使用OAuth认证,生成passport的密钥`
	`59`	`+## 8. 使用OAuth认证,生成passport的密钥`
`60`	`60`	`~~~php`
`61`	`61`	`php artisan passport:keys`
`62`	`62`	`php artisan passport:client --password`
`63`	`63`	`~~~`
`64`	`64`
`65`	`65`	`> 生成的密匙填写到.env文件中的OAuth认证这一块的PASSPORT_CLIENT_ID和PASSPORT_CLIENT_SECRET的参数`
`66`	`66`
	`67`	`+## 9. 建立图像软连接`
	`68`	`+> linux上要设置相关目录的权限为777 public目录和storage目录`
	`69`	`+~~~`
	`70`	`+php artian storage:link`
	`71`	`+~~~`
	`72`	`+`
`67`	`73`
`68`		`-## 9、消息推送(websocket配置,可以稍后)`
	`74`	`+## 10. 消息推送`
	`75`	`+> 如果需要打开客服功能,必须配置,根据情况可以稍后配置`
`69`	`76`
`70`	`77`	`需要根据要求配置laravel-echo-server,全局安装`
`71`	`78`

`‎element/src/layout/components/Navbar.vue`

Lines changed: 17 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,23 @@ export default {`
`42`	`42`	`this.$store.dispatch('app/toggleSideBar');`
`43`	`43`	`},`
`44`	`44`	`async logout() {`
`45`		`- // if (process.env.VUE_APP_WEBSOCKET === 'ON' && process.env.VUE_APP_SINGLE_LOGIN === 'ON' ) {`
`46`		`- // window.channel.unbind('UserLogin');`
`47`		`- // window.channel = null;`
`48`		`- // }`
`49`		`- await this.$store.dispatch('user/logout');`
`50`		- // this.$router.push(`/login?redirect=${this.$route.fullPath}`);
`51`		- this.$router.push(`/login`);
	`45`	`+ let tab = {`
	`46`	`+ fullPath: "/dashboard",`
	`47`	`+ meta: {`
	`48`	`+ affix: true,`
	`49`	`+ icon: "dashboard",`
	`50`	`+ title: "面板"`
	`51`	`+ },`
	`52`	`+ name: "Dashboard",`
	`53`	`+ path: "/dashboard",`
	`54`	`+ title: "面板"`
	`55`	`+ }`
	`56`	`+ this.$store.dispatch('tagsView/delOthersViews', tab).then(async () => {`
	`57`	`+ // this.$router.push('/dashboard')`
	`58`	`+ await this.$store.dispatch("user/logout");`
	`59`	+ this.$router.push(`/login`);
	`60`	+ // this.$router.push(`/login?redirect=${this.$route.fullPath}`);
	`61`	`+ })`
`52`	`62`	`}`
`53`	`63`	`}`
`54`	`64`	`};`

`‎front.md`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`		`-## 1、安装依赖`
`2`		-`npm install`
	`1`	`+## 1. 安装依赖`
	`2`	+`npm install`
`3`	`3`
`4`		`-## 2、配置后端服务器`
	`4`	`+## 2. 配置后端服务器`
`5`	`5`	`前端位于element目录下,.env.development保存开发时的环境,.env.development保存发布后的环境`
`6`	`6`
`7`	`7`	`配置其中的VUE_APP_BASE_API地址,分别指向开发时的本地后端服务器和发布后线上后端服务器。`
`8`	`8`
`9`		`-## 3、本地开发`
	`9`	`+## 3. 本地开发`
`10`	`10`	`npm run dev`
`11`	`11`
`12`	`12`	`登录用户名和密码使用后端的用户名和密码`
`13`	`13`
`14`		`-## 4、编译打包`
	`14`	`+## 4. 编译打包`
`15`	`15`	`npm run build`
`16`	`16`
`17`		`-程序打包到了element\dist目录`
	`17`	`+程序打包到了element\dist目录`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 9869bde

File tree

4 files changed

4 files changed

`‎api/app/Http/Controllers/Admin/LoginController.php`

`‎back.md`

`‎element/src/layout/components/Navbar.vue`

`‎front.md`

0 commit comments