From 87a42f758861b43c3fcc21575ba61526af42179b Mon Sep 17 00:00:00 2001
From: zegezy <1098696801@qq.com>
Date: Sun, 1 May 2022 13:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 magic-boot-ui/{.env.preview => .env.demo}                      | 1 -
 magic-boot-ui/.env.development                                 | 3 +--
 magic-boot-ui/.env.production                                  | 2 --
 magic-boot-ui/package.json                                     | 3 ++-
 magic-boot-ui/src/scripts/hasPermission.js                     | 2 +-
 magic-boot-ui/src/scripts/request.js                           | 2 +-
 .../ssssssss/magicboot/interceptor/PermissionInterceptor.java  | 3 ++-
 magic-boot/src/main/resources/application.yml                  | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename magic-boot-ui/{.env.preview => .env.demo} (70%)

diff --git a/magic-boot-ui/.env.preview b/magic-boot-ui/.env.demo
similarity index 70%
rename from magic-boot-ui/.env.preview
rename to magic-boot-ui/.env.demo
index 231c044..46d0046 100644
--- a/magic-boot-ui/.env.preview
+++ b/magic-boot-ui/.env.demo
@@ -1,2 +1 @@
-NODE_ENV = preview
 VITE_APP_BASE_API = 'http://localhost:8081/'
diff --git a/magic-boot-ui/.env.development b/magic-boot-ui/.env.development
index df545d6..46d0046 100644
--- a/magic-boot-ui/.env.development
+++ b/magic-boot-ui/.env.development
@@ -1,2 +1 @@
-ENV = 'development'
-VITE_APP_BASE_API = 'http://localhost:8081/'
\ No newline at end of file
+VITE_APP_BASE_API = 'http://localhost:8081/'
diff --git a/magic-boot-ui/.env.production b/magic-boot-ui/.env.production
index f36aac8..46d0046 100644
--- a/magic-boot-ui/.env.production
+++ b/magic-boot-ui/.env.production
@@ -1,3 +1 @@
-ENV = 'production'
 VITE_APP_BASE_API = 'http://localhost:8081/'
-
diff --git a/magic-boot-ui/package.json b/magic-boot-ui/package.json
index ddfeeba..dcefae2 100644
--- a/magic-boot-ui/package.json
+++ b/magic-boot-ui/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "demo": "vite build --mode demo"
   },
   "dependencies": {
     "axios": "^0.24.0",
diff --git a/magic-boot-ui/src/scripts/hasPermission.js b/magic-boot-ui/src/scripts/hasPermission.js
index eec74f1..f3a0e1e 100644
--- a/magic-boot-ui/src/scripts/hasPermission.js
+++ b/magic-boot-ui/src/scripts/hasPermission.js
@@ -5,7 +5,7 @@ const hasPermission = {
       beforeMount(el, binding) {
         if (binding.value) {
           const permissionList = app.config.globalProperties.$global.user.authorities
-          if (permissionList && permissionList.length && !permissionList.includes(binding.value) && import.meta.env.NODE_ENV != 'preview') {
+          if (permissionList && permissionList.length && !permissionList.includes(binding.value) && import.meta.env.MODE != 'demo') {
             el.style.display = 'none'
           }
         }
diff --git a/magic-boot-ui/src/scripts/request.js b/magic-boot-ui/src/scripts/request.js
index 8ebf99d..1eb181e 100644
--- a/magic-boot-ui/src/scripts/request.js
+++ b/magic-boot-ui/src/scripts/request.js
@@ -84,7 +84,7 @@ service.interceptors.response.use(
           if(currentMessage){
             currentMessage.close()
           }
-          if(res.code == 403 && import.meta.env.NODE_ENV == 'preview'){
+          if(res.code == 403 && import.meta.env.MODE == 'demo'){
             res.message = '演示模式，不允许操作！'
           }
           currentMessage = ElMessage({
diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
index 3ee0223..70c8a11 100644
--- a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
+++ b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
@@ -21,6 +21,7 @@ import org.ssssssss.script.MagicScriptContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -50,7 +51,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce
             return StatusCode.CERTIFICATE_EXPIRED.json();
         } else {
             // TODO
-            List<String> permissions = (List<String>) magicAPIService.execute("post", "/system/security/permissions", null);
+            List<String> permissions = (List<String>) magicAPIService.execute("post", "/system/security/permissions", new HashMap<String, Object>());
             String permission = Objects.toString(info.getOptionValue(Options.PERMISSION), "");
             if (StringUtils.isNotBlank(permission) && !permissions.contains(permission)) {
                 return StatusCode.FORBIDDEN.json();
diff --git a/magic-boot/src/main/resources/application.yml b/magic-boot/src/main/resources/application.yml
index 1294934..384d91d 100644
--- a/magic-boot/src/main/resources/application.yml
+++ b/magic-boot/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://localhost:3307/magic-boot?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://localhost/magic-boot?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: root
     druid: