From b0de8a83471baaf4e584ca47c05ed407a8c70b14 Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Wed, 24 Jan 2024 15:52:39 +0800
Subject: [PATCH] 111

---
 psdc-admin/src/main/resources/application-dev.yml         | 2 +-
 psdc-admin/src/main/resources/application-prod.yml        | 8 ++++----
 psdc-admin/src/main/resources/application.yml             | 2 +-
 psdc-ui/vite.config.js                                    | 2 +-
 .../com/psdc/controller/key/PrivateKeyController.java     | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/psdc-admin/src/main/resources/application-dev.yml b/psdc-admin/src/main/resources/application-dev.yml
index 9f8add9..dac382b 100644
--- a/psdc-admin/src/main/resources/application-dev.yml
+++ b/psdc-admin/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 # 项目相关配置
 psdc:
   # 名称
-  name: psdc
+  name: scmy
   # 版本
   version: 0.0.1
   # 文件路径 示例（ Windows配置D:/energy/uploadPath，Linux配置 /home/energy/uploadPath）
diff --git a/psdc-admin/src/main/resources/application-prod.yml b/psdc-admin/src/main/resources/application-prod.yml
index bd76864..bc4cb76 100644
--- a/psdc-admin/src/main/resources/application-prod.yml
+++ b/psdc-admin/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
 # 项目相关配置
 psdc:
   # 名称
-  name: psdc
+  name: scmy
   # 版本
   version: 0.0.1
   # 文件路径 示例（ Windows配置D:/energy/uploadPath，Linux配置 /home/energy/uploadPath）
@@ -14,7 +14,7 @@ psdc:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8999
+  port: 8088
   servlet:
     # 应用的访问路径
     context-path: /
@@ -54,9 +54,9 @@ spring:
     # 数据库驱动
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://127.0.0.1:3306/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://localhost:3308/scmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: 123456
+    password: root
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
diff --git a/psdc-admin/src/main/resources/application.yml b/psdc-admin/src/main/resources/application.yml
index caf4dfc..90385b2 100644
--- a/psdc-admin/src/main/resources/application.yml
+++ b/psdc-admin/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
\ No newline at end of file
+    active: prod
\ No newline at end of file
diff --git a/psdc-ui/vite.config.js b/psdc-ui/vite.config.js
index ef1f3f9..59a9902 100644
--- a/psdc-ui/vite.config.js
+++ b/psdc-ui/vite.config.js
@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://192.168.10.99:8088',
+          target: 'http://127.0.0.1:8088',
           // target: 'http://192.168.10.33:8999',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
diff --git a/psdc-web/src/main/java/com/psdc/controller/key/PrivateKeyController.java b/psdc-web/src/main/java/com/psdc/controller/key/PrivateKeyController.java
index 3adff74..0e6b28a 100644
--- a/psdc-web/src/main/java/com/psdc/controller/key/PrivateKeyController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/key/PrivateKeyController.java
@@ -1,6 +1,7 @@
 package com.psdc.controller.key;
 
 
+import com.alibaba.fastjson2.JSONObject;
 import com.psdc.core.controller.BaseController;
 import com.psdc.core.domain.AjaxResult;
 import com.psdc.entity.PrivateKey;
@@ -84,7 +85,7 @@ public class PrivateKeyController extends BaseController{
      * @return 是否成功
      */
     @PostMapping("/del")
-    public AjaxResult deleteById(@RequestBody Map<String, Object> requestBody){
+    public AjaxResult deleteById(@RequestBody JSONObject requestBody){
         Integer id = (Integer) requestBody.get("id");
         return privateKeyService.deleteById(id);
     }