3.3.0 参数调整

distributed-print/src/main/resources/application.properties

@@ -7,20 +7,20 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=distributed-print
+spring.application.name=teachcloud
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=192.168.10.83
 db.port=3306
-db.name=distributed-print-test
-db.username=ENC(/Tvgn1JSwu3+8T3qR1CiBA==)
-db.password=ENC(Susfsu9bmA+vOmJOs/BCZv9514+7waIp)
+db.name=teachcloud_db_dev
+db.username=ENC(hFk5fogY40phjFsi2M9du3R6cwwlwI7G)
+db.password=ENC(BHE0A4BZd171ImTi/vyIncUnyDlJN2ul)
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=5
-#com.qmth.redis.password=
+com.qmth.redis.db=4
+com.qmth.redis.password=ENC(caK+KyXMkrMy9w0aB495kQ==)
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -53,25 +53,15 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-#com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
-#com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-#com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev1-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev1-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
 
-#com.qmth.fss.public.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.public.server=https://oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.private.server=https://oss-cn-shenzhen.aliyuncs.com
-
-com.qmth.fss.public.config=/Users/xiaofei/qmth/temporary/zxzk/file-temp
-com.qmth.fss.public.server=http://localhost:7001
-com.qmth.fss.private.config=/Users/xiaofei/qmth/temporary/zxzk/pdf-temp
-com.qmth.fss.private.server=http://localhost:7001
-
-#com.qmth.fss.public.config=/Users/king/git/static
-#com.qmth.fss.public.server=http://127.0.0.1:7001
-#com.qmth.fss.private.config=/Users/king/git/static
-#com.qmth.fss.private.server=http://127.0.0.1:7001
+#com.qmth.fss.public.config=/Users/xiaofei/qmth/temporary/zxzk/file-temp
+#com.qmth.fss.public.server=http://localhost:7001
+#com.qmth.fss.private.config=/Users/xiaofei/qmth/temporary/zxzk/pdf-temp
+#com.qmth.fss.private.server=http://localhost:7001
 
 #com.qmth.fss.public.config=/Users/king/Downloads/file-temp
 #com.qmth.fss.public.server=/file-temp/
@@ -79,7 +69,7 @@ com.qmth.fss.private.server=http://localhost:7001
 #com.qmth.fss.private.server=/pdf-temp/
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=false
+sys.config.oss=true
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.serverUpload=
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
@@ -106,7 +96,7 @@ spring.jackson.time-zone=GMT+8
 com.qmth.logging.root-level=info
 com.qmth.logging.file-path=/Users/xiaofei/qmth/temporary/zxzk/log/distributed-print.log
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 
 com.qmth.sms.server=https://solar.qmth.com.cn

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -153,7 +153,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     public boolean saveOrg(SysOrg org, SysUser sysUser) {
         boolean success = false;
         try {
-            Long schoolId = sysUser.getSchoolId();
+            Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
             // 机构代码不为空，校验唯一性
             if (StringUtils.isNotBlank(org.getCode())) {
                 QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();

teachcloud-task/src/main/resources/application.properties

@@ -11,17 +11,17 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=192.168.10.83
 db.port=3306
-db.name=distributed-print-test
-db.username=ENC(/Tvgn1JSwu3+8T3qR1CiBA==)
-db.password=ENC(Susfsu9bmA+vOmJOs/BCZv9514+7waIp)
+db.name=teachcloud_db_dev
+db.username=ENC(hFk5fogY40phjFsi2M9du3R6cwwlwI7G)
+db.password=ENC(BHE0A4BZd171ImTi/vyIncUnyDlJN2ul)
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=5
-#com.qmth.redis.password
+com.qmth.redis.db=4
+com.qmth.redis.password=ENC(caK+KyXMkrMy9w0aB495kQ==)
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -54,28 +54,23 @@ spring.activiti.check-process-definitions=false
 #full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
 spring.activiti.history-level=audit
 
-#com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-#com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
-#com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-#com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
-
-#com.qmth.fss.public.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.public.server=https://oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
-#com.qmth.fss.private.server=https://oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev1-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev1-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
 
 #com.qmth.fss.public.config=../static/
 #com.qmth.fss.public.server=/static/
 #com.qmth.fss.private.config=../static/
 #com.qmth.fss.private.server=/static/
 
-com.qmth.fss.public.config=/Users/xiaofei/qmth/temporary/zxzk/file-temp
-com.qmth.fss.public.server=http://localhost:7001
-com.qmth.fss.private.config=/Users/xiaofei/qmth/temporary/zxzk/pdf-temp
-com.qmth.fss.private.server=http://localhost:7001
+#com.qmth.fss.public.config=/Users/xiaofei/qmth/temporary/zxzk/file-temp
+#com.qmth.fss.public.server=http://localhost:7001
+#com.qmth.fss.private.config=/Users/xiaofei/qmth/temporary/zxzk/pdf-temp
+#com.qmth.fss.private.server=http://localhost:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=false
+sys.config.oss=true
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.serverUpload=
 #spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/