From cca0e9fe9d471799538ddc277baa6e79778c3adb Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 一月 2024 10:14:14 +0800
Subject: [PATCH] 设备加工工件报表页面修改
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-test.yml | 111 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-test.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-test.yml
index 5005182..8556b6f 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-test.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-test.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8091
tomcat:
max-swallow-size: -1
error:
@@ -7,7 +7,7 @@
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path: /jeecg-boot
+ context-path:
compression:
enabled: true
min-response-size: 1024
@@ -36,41 +36,43 @@
enable: true
required: true
## quartz瀹氭椂浠诲姟,閲囩敤鏁版嵁搴撴柟寮�
- #quartz:
- # job-store-type: jdbc
- # initialize-schema: embedded
- # #瀹氭椂浠诲姟鍚姩寮�鍏筹紝true-寮� false-鍏�
- # auto-startup: true
- # #寤惰繜1绉掑惎鍔ㄥ畾鏃朵换鍔�
- # startup-delay: 1s
- # #鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob
- # overwrite-existing-jobs: true
- # properties:
- # org:
- # quartz:
- # scheduler:
- # instanceName: MyScheduler
- # instanceId: AUTO
- # jobStore:
- # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
- # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
- # tablePrefix: QRTZ_
- # isClustered: true
- # misfireThreshold: 12000
- # clusterCheckinInterval: 15000
- # threadPool:
- # class: org.quartz.simpl.SimpleThreadPool
- # threadCount: 10
- # threadPriority: 5
- # threadsInheritContextClassLoaderOfInitializingThread: true
+ quartz:
+ job-store-type: jdbc
+ initialize-schema: embedded
+ #瀹氭椂浠诲姟鍚姩寮�鍏筹紝true-寮� false-鍏�
+ auto-startup: true
+ #寤惰繜1绉掑惎鍔ㄥ畾鏃朵换鍔�
+ startup-delay: 1s
+ #鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob
+ overwrite-existing-jobs: true
+ properties:
+ org:
+ quartz:
+ scheduler:
+ instanceName: MyScheduler
+ instanceId: AUTO
+ jobStore:
+ selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
+ # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+ # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+ # tablePrefix: QRTZ_
+ # isClustered: true
+ # misfireThreshold: 12000
+ # clusterCheckinInterval: 15000
+ threadPool:
+ class: org.quartz.simpl.SimpleThreadPool
+ threadCount: 10
+ threadPriority: 5
+ threadsInheritContextClassLoaderOfInitializingThread: true
#json 鏃堕棿鎴崇粺涓�杞崲
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
- aop:
- proxy-target-class: true
jpa:
open-in-view: false
+ database-platform: org.hibernate.dialect.SQLServerDialect
+ aop:
+ proxy-target-class: true
#閰嶇疆freemarker
freemarker:
# 璁剧疆妯℃澘鍚庣紑鍚�
@@ -117,7 +119,7 @@
timeBetweenEvictionRunsMillis: 60000
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1 FROM DUAL
+ validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
@@ -130,22 +132,30 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
- username: root
- password: root
- driver-class-name: com.mysql.cj.jdbc.Driver
- # 澶氭暟鎹簮閰嶇疆
- #multi-datasource1:
- #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ url: jdbc:sqlserver://192.168.0.118:1433;databasename=LXZN_TEST_430
+# url: jdbc:sqlserver://30036q420j.yicp.fun:11047;databasename=LXZN_TEST_430
+# url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430
+ username: sa
+# password: LXZN@1688
+ password: 123
+# password: 123456
+ driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
+ # 澶氭暟鎹簮閰嶇疆
+ #multi-datasource1:
+ # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
+ # username: sa
+ # password: 123
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
database: 0
- host: 192.168.1.199
- port: 6379
- password: ''
+ host: 127.0.0.1
+ port: 6381
+ password:
#mybatis plus 璁剧疆
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -153,7 +163,7 @@
# 鍏抽棴MP3.0鑷甫鐨刡anner
banner: false
db-config:
- #涓婚敭绫诲瀷
+ #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷",1:"璇ョ被鍨嬩负鏈缃富閿被鍨�", 2:"鐢ㄦ埛杈撳叆ID",3:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 4:"鍏ㄥ眬鍞竴ID UUID",5:"瀛楃涓插叏灞�鍞竴ID (idWorker 鐨勫瓧绗︿覆琛ㄧず)";
id-type: ASSIGN_ID
# 榛樿鏁版嵁搴撹〃涓嬪垝绾垮懡鍚�
table-underline: true
@@ -191,27 +201,26 @@
secretKey: ??
endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev
- staticDomain: https://static.jeecg.com
- # ElasticSearch 璁剧疆
+ # ElasticSearch 6璁剧疆
elasticsearch:
cluster-name: jeecg-ES
- cluster-nodes: 81.70.47.128:9200
+ cluster-nodes: 127.0.0.1:9200
check-enabled: false
# 鍦ㄧ嚎棰勮鏂囦欢鏈嶅姟鍣ㄥ湴鍧�閰嶇疆
- file-view-domain: http://127.0.0.1:8012
+ file-view-domain: 127.0.0.1:8012
# minio鏂囦欢涓婁紶
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
- bucketName: ??
+ bucketName: otatest
#澶у睆鎶ヨ〃鍙傛暟璁剧疆
jmreport:
- mode: prod
+ mode: dev
#鏁版嵁瀛楀吀鏄惁杩涜saas鏁版嵁闅旂锛岃嚜宸辩湅鑷繁鐨勫瓧鍏�
saas: false
#鏄惁闇�瑕佹牎楠宼oken
- is_verify_token: false
+ is_verify_token: true
#蹇呴』鏍￠獙鏂规硶
verify_methods: remove,delete,save,add,update
#xxl-job閰嶇疆
@@ -245,7 +254,7 @@
#寮�鍚敓浜х幆澧冨睆钄�
production: false
basic:
- enable: true
+ enable: false
username: jeecg
password: jeecg1314
#绗笁鏂圭櫥褰�
--
Gitblit v1.9.3