From f0f58829c5c8dd9b249f594526f01fa957cbdd59 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 12 四月 2023 18:03:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.properties |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d0c6aad..1ec895b 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
 
@@ -17,17 +19,17 @@
 spring.http.multipart.maxRequestSize=3000Mb
 #mysqldb.datasource.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds.aliyuncs.com:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
 #mysqldb.datasource.url=jdbc:mysql://10.1.80.52:3306/rsdb?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
-mysqldb.datasource.url=jdbc:mysql://localhost:3306/scc?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
+mysqldb.datasource.url=jdbc:mysql://110.41.147.200: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=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.url=jdbc:mysql://rds88t2of1fi184y4s5wo.mysql.rds    .aliyuncs.com:3306/scc_sr?useUnicode=true&characterEncoding=GBK&characterSetResults=GBK&zeroDateTimeBehavior=convertToNull
 #mysqldb.datasource.username=ssc_sr
 #mysqldb.datasource.password=fsefWEF23@#!
 mysqldb.datasource.driverClassName= com.mysql.jdbc.Driver
@@ -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,7 @@
 # default DefaultExpiration time : 30 minutes(600 seconds)
 spring.redis.default.ttl=600
 
+wx.appId=wx953bf2ed18e7836b
+wx.secret=1d8b00beaddf5c8f36d1fedc14ef7973
+
 logging.config=classpath:log4j2.xml

--
Gitblit v1.8.0