Merge branch 'refs/heads/master' into dev-0806-wql

hejianhao

2026-08-25 5568cab4c7ebbb7587ae4759ce1a5ac62195c187

Merge branch 'refs/heads/master' into dev-0806-wql

 tcm-training-admin-backend/src/main/resources/application.yml

@@ -20,13 +20,13 @@
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://localhost:3306/tcm_training_admin?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
          username: root
          password: 123456
          password: root
  redis:
    host: localhost
    port: 6379
    database: 0
    timeout: 5s
    password: 123456
#    password: 123456
    lettuce:
      pool:
        # 连接池中的最小空闲连接

 tcm-training-admin/config/env.ts

@@ -1,6 +1,7 @@
export default {
  dev: {
    SERVER_URL: 'http://192.168.110.188:48080/api',
//     SERVER_URL: 'http://192.168.110.188:48080/api',
    SERVER_URL: 'http://221.182.45.100:48080/api',
  },
  test: {
    SERVER_URL: '/api',

 traditionalApp/config/index.js

@@ -1,6 +1,6 @@
export default {
    // BASE_URL: 'http://192.168.110.188:48080',
    BASE_URL: 'https://haizhentong.com',
     BASE_URL: 'http://221.182.45.100:48080',
//    BASE_URL: 'https://haizhentong.com',
    OPENINSTALL_URL: 'https://m.malink.cn/s/7bIzeu',
    APP_STORE_URL: '',
    uploadUrl: "https://haizhentong.com/api/open/file/upload",