Merge branch 'dev' of http://121.40.98.15:3001/kym/charge-java into dev

admin-web/.env.production

@@ -3,4 +3,6 @@ ENV = production
 
 # 线上环境接口地址
 VITE_API_URL =
-VITE_FILE_URL =
+VITE_FILE_URL =
+
+VITE_PUBLIC_PATH = ./

admin-web/src/views/admin/account/index.vue

@@ -154,9 +154,9 @@ const state = reactive({
       {label: '充电次数', width: 150, prop: 'chargeTimes', resizable: true},
       {label: '总电量（千瓦时）', width: 150, prop: 'totalPower', resizable: true},
       {label: '总金额(元)', width: 150, prop: 'totalMoney', resizable: true},
-      {
-        label: '操作', prop: 'action', width: 180, align: 'center', fixed: 'right',
-      }
+      // {
+      //   label: '操作', prop: 'action', width: 180, align: 'center', fixed: 'right',
+      // }
     ],
   },
 })

admin-web/vite.config.ts

@@ -30,7 +30,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			hmr: true,
 		},
 		build: {
-			outDir: 'dist',
+			outDir: '../admin/src/main/resources/static',
 			chunkSizeWarningLimit: 1500,
 			rollupOptions: {
 				output: {

admin/pom.xml

@@ -47,6 +47,16 @@
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

admin/src/main/java/com/kym/admin/AdminApplication.java

@@ -1,12 +1,15 @@
 package com.kym.admin;
 
-import com.kym.service.wechat.impl.WxPayServiceImpl;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
+
+@Controller
 @SpringBootApplication()
 @ComponentScan(value = {"com.kym"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE))
 @MapperScan(basePackages = {"com.kym.mapper"})
@@ -16,4 +19,10 @@ public class AdminApplication {
         SpringApplication.run(AdminApplication.class, args);
     }
 
+
+    @RequestMapping("/")
+    public String index() {
+        return "redirect:/index.html";
+    }
+
 }

admin/src/main/java/com/kym/admin/config/SaTokenConfigure.java

@@ -23,7 +23,13 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns(
                         "/**/login",
                         "/**/error",
-                        "/**/pullEnStations"
+                        "/**/pullEnStations",
+                        "/**/*.html",
+                        "/**/*.js",
+                        "/**/*.css",
+                        "/**/*.png",
+                        "/**/*.ico",
+                        "/"
                 );
         // TODO: 2023-07-11 具体功能权限校验后续开发
     }

admin/src/main/java/com/kym/admin/config/WebcontextConfig.java

@@ -0,0 +1,19 @@
+package com.kym.admin.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebcontextConfig implements WebMvcConfigurer {
+
+
+    /**
+     * 静态资源文件配置(前端工程)
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+    }
+
+}

admin/src/main/resources/application.yml

@@ -5,11 +5,13 @@ spring:
     name: admin
   main:
     allow-circular-references: true
-
+  lifecycle:
+    timeout-per-shutdown-phase: 20s
 server:
   port: 8080
   servlet:
     context-path: /admin
+  shutdown: graceful
 # PageHelper
 pagehelper:
   propertyName: propertyValue