林颖晨 1 year ago
parent e74c79ec49
commit b0de8a8347
  1. 2
      psdc-admin/src/main/resources/application-dev.yml
  2. 8
      psdc-admin/src/main/resources/application-prod.yml
  3. 2
      psdc-admin/src/main/resources/application.yml
  4. 2
      psdc-ui/vite.config.js
  5. 3
      psdc-web/src/main/java/com/psdc/controller/key/PrivateKeyController.java

@ -1,7 +1,7 @@
# 项目相关配置 # 项目相关配置
psdc: psdc:
# 名称 # 名称
name: psdc name: scmy
# 版本 # 版本
version: 0.0.1 version: 0.0.1
# 文件路径 示例( Windows配置D:/energy/uploadPath,Linux配置 /home/energy/uploadPath) # 文件路径 示例( Windows配置D:/energy/uploadPath,Linux配置 /home/energy/uploadPath)

@ -1,7 +1,7 @@
# 项目相关配置 # 项目相关配置
psdc: psdc:
# 名称 # 名称
name: psdc name: scmy
# 版本 # 版本
version: 0.0.1 version: 0.0.1
# 文件路径 示例( Windows配置D:/energy/uploadPath,Linux配置 /home/energy/uploadPath) # 文件路径 示例( Windows配置D:/energy/uploadPath,Linux配置 /home/energy/uploadPath)
@ -14,7 +14,7 @@ psdc:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口,默认为8080 # 服务器的HTTP端口,默认为8080
port: 8999 port: 8088
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -54,9 +54,9 @@ spring:
# 数据库驱动 # 数据库驱动
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource 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 username: root
password: 123456 password: root
messages: messages:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages

@ -1,3 +1,3 @@
spring: spring:
profiles: profiles:
active: dev active: prod

@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
proxy: { proxy: {
// https://cn.vitejs.dev/config/#server-proxy // https://cn.vitejs.dev/config/#server-proxy
'/dev-api': { '/dev-api': {
target: 'http://192.168.10.99:8088', target: 'http://127.0.0.1:8088',
// target: 'http://192.168.10.33:8999', // target: 'http://192.168.10.33:8999',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')

@ -1,6 +1,7 @@
package com.psdc.controller.key; package com.psdc.controller.key;
import com.alibaba.fastjson2.JSONObject;
import com.psdc.core.controller.BaseController; import com.psdc.core.controller.BaseController;
import com.psdc.core.domain.AjaxResult; import com.psdc.core.domain.AjaxResult;
import com.psdc.entity.PrivateKey; import com.psdc.entity.PrivateKey;
@ -84,7 +85,7 @@ public class PrivateKeyController extends BaseController{
* @return 是否成功 * @return 是否成功
*/ */
@PostMapping("/del") @PostMapping("/del")
public AjaxResult deleteById(@RequestBody Map<String, Object> requestBody){ public AjaxResult deleteById(@RequestBody JSONObject requestBody){
Integer id = (Integer) requestBody.get("id"); Integer id = (Integer) requestBody.get("id");
return privateKeyService.deleteById(id); return privateKeyService.deleteById(id);
} }

Loading…
Cancel
Save