From 4ac77c9bbe4dc11efcdbb4b4490fa5cc34446dee Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 05 十二月 2022 14:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.properties | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d0c6aad..4da5ba6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -10,6 +10,8 @@
spring.aop.proxy-target-class=true
spring.mvc.view.suffix=.html
+
+
#spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${scc.resRootPath},file:D:/files/code/qcampus/pc-admin/dist,file:D:/files/code/qcampus/pc-student/dist
spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${scc.resRootPath},file:D:/scc/htmls/web/mobile_student,file:/Users/yansi/penguin/szped/zns-mobile-student/dist
@@ -20,12 +22,12 @@
mysqldb.datasource.url=jdbc:mysql://localhost:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
mysqldb.datasource.username=root
#mysqldb.datasource.username=rs
-#######此组为安装版系统的默认用户名密码端口#############
+#######\uFFFD\uFFFD\uFFFD\uFFFD\u03AA\uFFFD\uFFFD\u05F0\uFFFD\uFFFD\u03F5\u0373\uFFFD\uFFFD\u012C\uFFFD\uFFFD\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02FF\uFFFD#############
#mysqldb.datasource.username=scc #
#mysqldb.datasource.password=fwefwefWEFefewf$ #
# port:3370 #
#################################################
-mysqldb.datasource.password=123456
+mysqldb.datasource.password=12345678
#mysqldb.datasource.password=QQTec@2019
#mysqldb.datasource.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds.aliyuncs.com:3306/scc_sr?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
#mysqldb.datasource.username=ssc_sr
@@ -48,6 +50,19 @@
#If more than one spilt ';'
mysqldb.datasource.scanPackages=com.qxueyou.scc
+
+# \u534E\u4E3A\u4E91OBS\u914D\u7F6E\u4FE1\u606F
+#hwyun:
+# obs:
+# accessKey: 8PIDYINPWSWR3MLYTOA1
+# securityKey: YYB1kaC3pFYoIKoJ59jx9Fv1U7D0p4TvLELeuISg
+# endPoint: o********m
+# bucketName: qxueyou-competition
+
+hwyun.obs.accessKey=8PIDYINPWSWR3MLYTOA1
+hwyun.obs.securityKey=YYB1kaC3pFYoIKoJ59jx9Fv1U7D0p4TvLELeuISg
+hwyun.obs.endPoint=obs.cn-south-1.myhuaweicloud.com
+hwyun.obs.bucketName=qxueyou-competition
#stream
streamServer=192.168.10.134
@@ -78,4 +93,6 @@
# default DefaultExpiration time : 30 minutes(600 seconds)
spring.redis.default.ttl=600
+
+
logging.config=classpath:log4j2.xml
--
Gitblit v1.8.0