Mr.Shi
2023-09-14 937099239caa9136759d5d86b8fbcdc73e6b0510
小程序
已添加1个文件
已修改4个文件
72 ■■■■■ 文件已修改
screen_standard/.env.development 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/.env.production 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/vite.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/resources/application-standardLingyang.yml 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/.env.development
@@ -6,11 +6,10 @@
#VITE_BASE_URL='http://192.168.0.35:10021'
# VITE_BASE_PATH='/doumeeplant_api'
<<<<<<< HEAD
# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
=======
VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
# VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
VITE_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant'
screen_standard/.env.production
@@ -1,5 +1,8 @@
NODE_ENV = production
VITE_NAME = '生产环境'
VITE_BASE_CONTEXT = 'screen'
VITE_BASE_PATH = '/api'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
VITE_BASE_PATH = '/doumeeplant'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
# VITE_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant'
screen_standard/vite.config.js
@@ -43,7 +43,7 @@
    // æœ¬åœ°è¿è¡Œé…ç½®ï¼ŒåŠåå‘代理配置
    server: {
      host: '192.168.0.3',
      port: '8080',
      port: '1801',
      cors: true, // é»˜è®¤å¯ç”¨å¹¶å…è®¸ä»»ä½•源
      open: true, // åœ¨æœåŠ¡å™¨å¯åŠ¨æ—¶è‡ªåŠ¨åœ¨æµè§ˆå™¨ä¸­æ‰“å¼€åº”ç”¨ç¨‹åº
      //反向代理配置,注意rewrite写法,开始没看文档在这里踩了坑
server/src/main/resources/application-standardLingyang.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
# WEB服务器配置 æ¼”示环境
server:
  port: 10021
  servlet:
    session:
      timeout: PT3H  #表示12小时
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://192.168.10.147:3306/doumee_mes_standard?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: root
    password: Doumee@168_com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  #  rabbitmq:
  #    host: amqp-cn-7mz2o4ddz00c.cn-hangzhou.amqp-2.net.mq.amqp.aliyuncs.com
  #    port: 5672
  #    username: MjphbXFwLWNuLTdtejJvNGRkejAwYzpMVEFJNXQ3QzFjdXJUNnlleGNoc1hMZWo=
  #    password: RkEwNjMzNUM5MTBENzE2QjQyQzE4OTc1ODREMEU5NzA4ODFBMkQ2NjoxNjUwOTU0NjI4MjYx
  #    virtual-host: mqtest
  #  redis:
  #    #    database: 0
  #    host: r-m5ece8e1y7649odr2xpd.redis.rds.aliyuncs.com
  #    port: 6379
  #    password: doumee:doumee@168
  #    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
  redis:
    #    database: 0
    host: 192.168.10.186
    port: 6379
    password: Doumee@168_com
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: doumee@168.com
debug_model: true
captcha_check: true
# Swagger配置
swagger:
  host:
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
server/src/main/resources/application.yml
@@ -9,7 +9,11 @@
#  application:
#  name: doumeemes
  profiles:
<<<<<<< HEAD
    active: standardTest
=======
    active: standardLingyang
>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
  # JSON返回配置
  jackson:
    # é»˜è®¤æ—¶åŒº