From 937099239caa9136759d5d86b8fbcdc73e6b0510 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 14 九月 2023 10:21:44 +0800
Subject: [PATCH] 小程序
---
screen_standard/.env.production | 7 ++-
server/src/main/resources/application.yml | 4 ++
screen_standard/.env.development | 5 +-
screen_standard/vite.config.js | 2
server/src/main/resources/application-standardLingyang.yml | 54 +++++++++++++++++++++++++++
5 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index 5c3ce22..891725e 100644
--- a/screen_standard/.env.development
+++ b/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'
diff --git a/screen_standard/.env.production b/screen_standard/.env.production
index e332e9c..522f53e 100644
--- a/screen_standard/.env.production
+++ b/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'
\ No newline at end of file
+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'
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index bf4e9bc..a1d9926 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -43,7 +43,7 @@
// 鏈湴杩愯閰嶇疆锛屽強鍙嶅悜浠ｇ悊閰嶇疆
server: {
host: '192.168.0.3',
- port: '8080',
+ port: '1801',
cors: true, // 榛樿鍚敤骞跺厑璁镐换浣曟簮
open: true, // 鍦ㄦ湇鍔″櫒鍚姩鏃惰嚜鍔ㄥ湪娴忚鍣ㄤ腑鎵撳紑搴旂敤绋嬪簭
//鍙嶅悜浠ｇ悊閰嶇疆锛屾敞鎰弐ewrite鍐欐硶锛屽紑濮嬫病鐪嬫枃妗ｅ湪杩欓噷韪╀簡鍧�
diff --git a/server/src/main/resources/application-standardLingyang.yml b/server/src/main/resources/application-standardLingyang.yml
new file mode 100644
index 0000000..3ea0111
--- /dev/null
+++ b/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: /
\ No newline at end of file
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f085ed5..3d9a01d 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,11 @@
# application:
# name: doumeemes
profiles:
+<<<<<<< HEAD
active: standardTest
+=======
+ active: standardLingyang
+>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3