Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

skyouc

2025-02-18 ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a

Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

 rsf-admin/src/i18n/en.js

@@ -107,8 +107,6 @@
    menu: {
        dashboard: 'Dashboard',
        settings: 'Settings',
        pakin: 'Pakin',
        basicSettings: 'Basic Setting',
        system: 'System',
        user: 'User',
        role: 'Role',

 rsf-admin/src/i18n/zh.js

@@ -107,8 +107,7 @@
    menu: {
        dashboard: '控制台',
        settings: '个人设置',
        basicSettings: '基础设置',
        pakin: '组托',
        basicInfo: '基础信息',
        system: '系统设置',
        user: '用户管理',
        role: '角色管理',

 rsf-server/src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@
    static-path-pattern: /**
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 34821015
    type: com.alibaba.druid.pool.DruidDataSource

 rsf-server/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:

  profiles:

    active: dev

    active: prod



config:

  system-name: @pom.artifactId@