From 1eeae82f74cbb3469ad8931e45b6fc77a945b912 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 十月 2023 16:10:08 +0800
Subject: [PATCH] 姑苏实验室去除价格确认过程
---
src/main/webapp/resources/images/中国科学院苏州纳米技术与纳米仿生研究所logo.png | 0
src/main/webapp/WEB-INF/guotai/guotai.properties | 3
src/main/webapp/WEB-INF/spring-db.xml | 6
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java | 22 ++++-
src/main/webapp/WEB-INF/gcs/gcs.properties | 3
src/main/java/com/nanometer/smartlab/config/MyConfig.java | 46 +++++++++++
pom.xml | 6 +
src/main/webapp/WEB-INF/lzhws/lzhws.properties | 3
src/main/webapp/WEB-INF/shgjs/shgjs.properties | 3
src/main/webapp/WEB-INF/xjdx/xjdx.properties | 3
src/main/webapp/WEB-INF/zkysh/zkysh.properties | 3
src/main/webapp/WEB-INF/sdy/sdy.properties | 3
src/main/webapp/WEB-INF/zkdsz/zkdsz.properties | 3
src/main/webapp/WEB-INF/lhs/lhs.properties | 3
src/main/webapp/WEB-INF/sds/sds.properties | 3
src/main/webapp/WEB-INF/spring-core.xml | 2
src/main/webapp/WEB-INF/config.properties | 10 +
src/main/webapp/WEB-INF/hws/hws.properties | 3
src/main/webapp/WEB-INF/spring-mvc.xml | 1
src/main/webapp/index.xhtml | 17 ++-
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 7 +
src/main/webapp/WEB-INF/silkroad/silkroad.properties | 3
src/main/webapp/WEB-INF/szygs/szygs.properties | 3
src/main/java/com/nanometer/smartlab/controller/BaseController.java | 17 ++++
src/main/webapp/WEB-INF/zkyshs/zkyshs.properties | 3
src/main/webapp/WEB-INF/gslab/gslab.properties | 3
src/test/java/com/nanometer/smartlab/TestDemo.java | 20 +++++
src/main/webapp/WEB-INF/qhyhs/qhyhs.properties | 3
src/main/webapp/WEB-INF/twt/twt.properties | 3
src/main/webapp/WEB-INF/aky/aky.properties | 3
src/main/webapp/WEB-INF/cq/cq.properties | 3
src/main/webapp/WEB-INF/sin/sin.properties | 3
src/main/webapp/WEB-INF/test/test.properties | 5 +
src/main/webapp/login.xhtml | 2
34 files changed, 197 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index a5b08b2..1ecb2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,7 +395,7 @@
<profile>
<id>test</id>
<properties>
- <profile.active>sin</profile.active>
+ <profile.active>gslab</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -589,6 +589,10 @@
<include>message.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
</build>
</project>
diff --git a/src/main/java/com/nanometer/smartlab/config/MyConfig.java b/src/main/java/com/nanometer/smartlab/config/MyConfig.java
new file mode 100644
index 0000000..7c75d12
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/config/MyConfig.java
@@ -0,0 +1,46 @@
+package com.nanometer.smartlab.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "jdbc")
+public class MyConfig {
+ private String url;
+ private String username;
+ private String password;
+
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ @Override
+ public String toString() {
+ return "MyConfig{" +
+ "url='" + url + '\'' +
+ ", username='" + username + '\'' +
+ ", password='" + password + '\'' +
+ '}';
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index b49b41a..32222c5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -771,7 +771,12 @@
opeApply.setId(IDUtils.uuid());
opeApply.setApplyCode(applyCode);
opeApply.setApplyUserId(applyUser.getId());
- opeApply.setStatus(ApplyStatus.Price_CONFIRM);
+ if(getActiveEnv().equalsIgnoreCase("gslab")){//姑苏实验室跳过价格确认状态，直接进入待审批状态
+ opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ }else{
+ opeApply.setStatus(ApplyStatus.Price_CONFIRM);
+ }
+
}
this.opeApplyService.insertOpeApplyList(this.applyNewList);
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
index ae89ec6..4391eb5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -176,7 +176,7 @@
return;
}
- this.dangerousFlag = false;
+ this.dangerousFlag = false;//二级审批标志
this.adminApproveUserId = null;
for (OpeApply opeApply : this.selectedList) {
if (!this.opeApplyService.isApplyPendingApproval(opeApply)) {
@@ -189,13 +189,22 @@
dangerousFlag = true;
}
}*/
- String controlProducts = opeApply.getReagent().getControlProducts();
- if (StringUtils.isNotBlank(controlProducts)) {
- String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
- if (StringUtils.isNotBlank(baseMetaValue) && !"15fc90a1f7bf43bda01313904b543195".equals(this.getUser().getRoleId())) {
+ if(getActiveEnv().equalsIgnoreCase("gslab")){//姑苏实验室打开二级审批
+ if(StringUtils.isBlank(opeApply.getBeforeApproveUserId())){
dangerousFlag = true;
}
+
+ }else{//其他情形：管制品打开二级审批
+ String controlProducts = opeApply.getReagent().getControlProducts();
+ if (StringUtils.isNotBlank(controlProducts)) {
+ String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
+ if (StringUtils.isNotBlank(baseMetaValue) &&StringUtils.isBlank(opeApply.getBeforeApproveUserId())) {
+ dangerousFlag = true;
+ }
+ }
}
+
+
}
this.memo = null;
@@ -230,7 +239,8 @@
}*/
String baseMetaValue = baseMetaService.getBaseMetaValue(opeApply.getReagent().getControlProducts());
- if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
+ //if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
+ if (this.dangerousFlag&& StringUtils.isBlank(opeApply.getBeforeApproveUserId())) {
adminApplyIds.add(opeApply.getId());
firstUserIds.add(opeApply.getApproveUserId());
} else {
diff --git a/src/main/java/com/nanometer/smartlab/controller/BaseController.java b/src/main/java/com/nanometer/smartlab/controller/BaseController.java
index 0598a46..3a7426e 100644
--- a/src/main/java/com/nanometer/smartlab/controller/BaseController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/BaseController.java
@@ -18,6 +18,12 @@
@Value("${institute.name}")
private String title;
+ @Value("${institute.logo}")
+ private String logo;
+
+ @Value("${activeEnv}")
+ private String activeEnv;
+
public Subject getSubject() {
return SecurityUtils.getSubject();
}
@@ -75,4 +81,15 @@
}
return this.title;
}
+
+ public String getLogo(){
+ if(StringUtils.isBlank(this.logo)){
+ return "/resources/images/中国科学院苏州纳米技术与纳米仿生研究所logo.png";
+ }
+ return this.logo;
+ }
+
+ public String getActiveEnv(){
+ return this.activeEnv;
+ }
}
diff --git a/src/main/webapp/WEB-INF/aky/aky.properties b/src/main/webapp/WEB-INF/aky/aky.properties
index ad373a3..01f3e94 100644
--- a/src/main/webapp/WEB-INF/aky/aky.properties
+++ b/src/main/webapp/WEB-INF/aky/aky.properties
@@ -4,6 +4,7 @@
institute.id =
institute.name =\u65B0\u7586\u7EF4\u543E\u5C14\u81EA\u6CBB\u533A\u5B89\u5168\u79D1\u5B66\u6280\u672F\u7814\u7A76\u9662
+institute.logo =
institute.url = http://aq.sinanoaq.com:8005
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = aky
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/config.properties b/src/main/webapp/WEB-INF/config.properties
index 97a1f1a..86bce69 100644
--- a/src/main/webapp/WEB-INF/config.properties
+++ b/src/main/webapp/WEB-INF/config.properties
@@ -6,9 +6,9 @@
##
-jdbc.url=${jdbc.url}
-jdbc.username=${jdbc.username}
-jdbc.password=${jdbc.password}
+jdbc.url = ${jdbc.url}
+jdbc.username = ${jdbc.username}
+jdbc.password = ${jdbc.password}
# -----MySQL end-----
# -----customize start-----
@@ -57,9 +57,13 @@
institute.id = ${institute.id}
institute.name = ${institute.name}
+institute.logo = ${institute.logo}
institute.url = ${institute.url}
message.url = ${message.url}
reagent.detail.price.api = ${reagent.detail.price.api}
personImgPath = ${personImgPath}
+
+#activeEnv = ${envTag}
+activeEnv = gslab
diff --git a/src/main/webapp/WEB-INF/cq/cq.properties b/src/main/webapp/WEB-INF/cq/cq.properties
index cb1cb1e..8a06e74 100644
--- a/src/main/webapp/WEB-INF/cq/cq.properties
+++ b/src/main/webapp/WEB-INF/cq/cq.properties
@@ -5,6 +5,7 @@
institute.id =
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u91CD\u5E86\u7EFF\u8272\u667A\u80FD\u6280\u672F\u7814\u7A76\u9662
+institute.logo = /resources/images/\u4E2D\u56FD\u79D1\u5B66\u9662\u91CD\u5E86\u7EFF\u8272\u667A\u80FD\u6280\u672F\u7814\u7A76\u9662logo.png
institute.url = http://sinanoaq.com
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
@@ -14,3 +15,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = cq
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/gcs/gcs.properties b/src/main/webapp/WEB-INF/gcs/gcs.properties
index 30f184c..e65d70e 100644
--- a/src/main/webapp/WEB-INF/gcs/gcs.properties
+++ b/src/main/webapp/WEB-INF/gcs/gcs.properties
@@ -4,6 +4,7 @@
institute.id = 11
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5317\u4EAC\u8FC7\u7A0B\u5DE5\u7A0B\u7814\u7A76\u6240
+institute.logo =
institute.url = http://gcs.sinanoaq.com
institute.app.id = wx7ab4d938ce5ce618
institute.app.secret = c66b740b60220698570767c807361d3a
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = gcs
diff --git a/src/main/webapp/WEB-INF/gslab/gslab.properties b/src/main/webapp/WEB-INF/gslab/gslab.properties
index a2d297c..1e86253 100644
--- a/src/main/webapp/WEB-INF/gslab/gslab.properties
+++ b/src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -5,6 +5,7 @@
institute.id = 38
institute.name = \u6750\u6599\u79D1\u5B66\u59D1\u82CF\u5B9E\u9A8C\u5BA4
+institute.logo = /resources/images/\u6750\u6599\u79D1\u5B66\u59D1\u82CF\u5B9E\u9A8C\u5BA4logo.png
institute.url = http://222.92.16.2:18082
institute.app.id =
institute.app.secret =
@@ -14,3 +15,5 @@
message.url= http://aq.gusulab.ac.cn:18084/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = gslab
diff --git a/src/main/webapp/WEB-INF/guotai/guotai.properties b/src/main/webapp/WEB-INF/guotai/guotai.properties
index 0ce4e48..a392f5c 100644
--- a/src/main/webapp/WEB-INF/guotai/guotai.properties
+++ b/src/main/webapp/WEB-INF/guotai/guotai.properties
@@ -4,6 +4,7 @@
institute.id = 10
institute.name = \u65B0\u7586\u56FD\u6CF0\u65B0\u534E\u5316\u5DE5\u6709\u9650\u8D23\u4EFB\u516C\u53F8
+institute.logo =
institute.url = http://222.92.213.22:18001
institute.app.id = wxef5464cb3cd407ea
institute.app.secret = f0b8dec4bc340a9863ed7de08cf2dcf1
@@ -12,3 +13,5 @@
institute.copyright= Copyright\u00A92022 \u65B0\u7586\u56FD\u6CF0\u65B0\u534E\u5316\u5DE5\u6709\u9650\u8D23\u4EFB\u516C\u53F8
message.url= https://sinanoaq.com:8095/api/sendmessage
+
+envTag = guotai
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/hws/hws.properties b/src/main/webapp/WEB-INF/hws/hws.properties
index e47dcdc..7360152 100644
--- a/src/main/webapp/WEB-INF/hws/hws.properties
+++ b/src/main/webapp/WEB-INF/hws/hws.properties
@@ -4,6 +4,7 @@
institute.id = 9
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5927\u8FDE\u5316\u5B66\u7269\u7406\u7814\u7A76\u6240
+institute.logo =
institute.url = http://hws.sinanoaq.com
institute.app.id = wx7ab4d938ce5ce618
institute.app.secret = c66b740b60220698570767c807361d3a
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = hws
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/lhs/lhs.properties b/src/main/webapp/WEB-INF/lhs/lhs.properties
index 6f9de38..05c3255 100644
--- a/src/main/webapp/WEB-INF/lhs/lhs.properties
+++ b/src/main/webapp/WEB-INF/lhs/lhs.properties
@@ -4,6 +4,7 @@
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD
institute.id = 12
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u7406\u5316\u6280\u672F\u7814\u7A76\u6240
+institute.logo =
institute.url = http://lhs.sinanoaq.com
institute.app.id = wxc1c97c50f32a13f9
institute.app.secret = fc932330d22c3bc8e94b9f9b790fec98
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = lhs
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/lzhws/lzhws.properties b/src/main/webapp/WEB-INF/lzhws/lzhws.properties
index d9c97b5..5ed894f 100644
--- a/src/main/webapp/WEB-INF/lzhws/lzhws.properties
+++ b/src/main/webapp/WEB-INF/lzhws/lzhws.properties
@@ -4,6 +4,7 @@
institute.id = 30
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5170\u5DDE\u5316\u5B66\u7269\u7406\u7814\u7A76\u6240
+institute.logo =
institute.url = http://210.77.65.12:8001
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = lzhws
diff --git a/src/main/webapp/WEB-INF/qhyhs/qhyhs.properties b/src/main/webapp/WEB-INF/qhyhs/qhyhs.properties
index 24cbff8..9fce309 100644
--- a/src/main/webapp/WEB-INF/qhyhs/qhyhs.properties
+++ b/src/main/webapp/WEB-INF/qhyhs/qhyhs.properties
@@ -4,6 +4,7 @@
#\u7EB3\u7C73\u6240
institute.id = 29
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u9752\u6D77\u76D0\u6E56\u7814\u7A76\u6240
+institute.logo =
institute.url = http://yhs.sinanoaq.cn:8001
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = qhyhs
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sds/sds.properties b/src/main/webapp/WEB-INF/sds/sds.properties
index ac9061b..b7dee58 100644
--- a/src/main/webapp/WEB-INF/sds/sds.properties
+++ b/src/main/webapp/WEB-INF/sds/sds.properties
@@ -4,6 +4,7 @@
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\u032C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD
institute.id = 9
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u751F\u6001\u4E0E\u5730\u7406\u7814\u7A76\u6240
+institute.logo =
institute.url = http://sds.sinanoaq.com
institute.app.id = wx33de06d906c68d43
institute.app.secret = 0170d9126bcd16bda4f171bc4a33251f
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = sds
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sdy/sdy.properties b/src/main/webapp/WEB-INF/sdy/sdy.properties
index c8d8177..7035353 100644
--- a/src/main/webapp/WEB-INF/sdy/sdy.properties
+++ b/src/main/webapp/WEB-INF/sdy/sdy.properties
@@ -5,6 +5,7 @@
institute.id =
institute.name = \u82CF\u5DDE\u76DB\u8FEA\u4E9A\u751F\u7269\u533B\u836F\u6709\u9650\u516C\u53F8
+institute.logo =
institute.url = http://sinanoaq.com
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
@@ -14,3 +15,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = sdy
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/shgjs/shgjs.properties b/src/main/webapp/WEB-INF/shgjs/shgjs.properties
index 6b10f11..0bef934 100644
--- a/src/main/webapp/WEB-INF/shgjs/shgjs.properties
+++ b/src/main/webapp/WEB-INF/shgjs/shgjs.properties
@@ -4,6 +4,7 @@
institute.id = 27
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u4E0A\u6D77\u5149\u5B66\u7CBE\u5BC6\u673A\u68B0\u7814\u7A76\u6240
+institute.logo =
institute.url = http://210.72.9.173:8001/
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = shgjs
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/silkroad/silkroad.properties b/src/main/webapp/WEB-INF/silkroad/silkroad.properties
index 7a618bc..f3be0b8 100644
--- a/src/main/webapp/WEB-INF/silkroad/silkroad.properties
+++ b/src/main/webapp/WEB-INF/silkroad/silkroad.properties
@@ -4,6 +4,7 @@
institute.id = 10
institute.name = \u4E1D\u7EF8\u4E4B\u8DEF\u521B\u65B0\u53D1\u5C55\u7814\u7A76\u9662
+institute.logo =
institute.url = http://222.92.213.22:18001
institute.app.id = wxef5464cb3cd407ea
institute.app.secret = f0b8dec4bc340a9863ed7de08cf2dcf1
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = silkroad
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sin/sin.properties b/src/main/webapp/WEB-INF/sin/sin.properties
index 7bbfa8f..0798900 100644
--- a/src/main/webapp/WEB-INF/sin/sin.properties
+++ b/src/main/webapp/WEB-INF/sin/sin.properties
@@ -4,6 +4,7 @@
institute.id = 2
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240
+institute.logo = /resources/images/\u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240logo.png
institute.url = http://sinanoaq.com
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = sin
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring-core.xml b/src/main/webapp/WEB-INF/spring-core.xml
index b800730..7fbba57 100644
--- a/src/main/webapp/WEB-INF/spring-core.xml
+++ b/src/main/webapp/WEB-INF/spring-core.xml
@@ -15,7 +15,7 @@
<context:annotation-config/>
<bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>
- <context:property-placeholder location="WEB-INF/config.properties"></context:property-placeholder>
+ <context:property-placeholder location="WEB-INF/config.properties" file-encoding="UTF-8"></context:property-placeholder>
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="locations">
<list>
diff --git a/src/main/webapp/WEB-INF/spring-db.xml b/src/main/webapp/WEB-INF/spring-db.xml
index 81821fc..4d34097 100644
--- a/src/main/webapp/WEB-INF/spring-db.xml
+++ b/src/main/webapp/WEB-INF/spring-db.xml
@@ -15,11 +15,11 @@
init-method="init" destroy-method="close">
<!--mysql 5连接驱动-->
<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
- <property name="url" value="jdbc:mysql://124.221.143.185:23306/smartlb?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false" />
+ <property name="url" value="jdbc:mysql://192.168.0.228:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false" />
<!-- <property name="url" value="jdbc:mysql://124.221.143.185:23306/smartlb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false" />-->
- <property name="username" value="smartlb" />
- <property name="password" value="kabAG6TmMhrmB7MJ" />
+ <property name="username" value="root" />
+ <property name="password" value="Gslab@uss2021!" />
<!--mysql 8连接驱动-->
<!-- <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>-->
<!-- <property name="url" value="jdbc:mysql://127.0.0.1:3306/smartlb?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false" />-->
diff --git a/src/main/webapp/WEB-INF/spring-mvc.xml b/src/main/webapp/WEB-INF/spring-mvc.xml
index 4726456..a559523 100644
--- a/src/main/webapp/WEB-INF/spring-mvc.xml
+++ b/src/main/webapp/WEB-INF/spring-mvc.xml
@@ -19,7 +19,6 @@
<context:component-scan base-package="com.nanometer.smartlab.api"/>
<context:component-scan base-package="com.nanometer.smartlab.controller"/>
-
<context:property-placeholder ignore-unresolvable="true" location="WEB-INF/config.properties" file-encoding="UTF-8"/>
<!-- 开启注解 -->
<!-- 默认的注解映射的支持，org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping -->
diff --git a/src/main/webapp/WEB-INF/szygs/szygs.properties b/src/main/webapp/WEB-INF/szygs/szygs.properties
index ae73751..050fb71 100644
--- a/src/main/webapp/WEB-INF/szygs/szygs.properties
+++ b/src/main/webapp/WEB-INF/szygs/szygs.properties
@@ -4,6 +4,7 @@
institute.id = 28
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u751F\u7269\u533B\u5B66\u5DE5\u7A0B\u6280\u672F\u7814\u7A76\u6240
+institute.logo =
institute.url = http://58.210.42.60:8001/
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = szygs
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/test/test.properties b/src/main/webapp/WEB-INF/test/test.properties
index f3fd83a..4e80ae2 100644
--- a/src/main/webapp/WEB-INF/test/test.properties
+++ b/src/main/webapp/WEB-INF/test/test.properties
@@ -1,9 +1,10 @@
-jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://localhost:3306/smartlb?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
jdbc.username=root
jdbc.password=password
institute.id = 2
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240
+institute.logo = /resources/images/\u4E2D\u56FD\u79D1\u5B66\u9662\u91CD\u5E86\u7EFF\u8272\u667A\u80FD\u6280\u672F\u7814\u7A76\u9662logo.png
institute.url = https://sinanoaq.cn:8002
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = d:/opt/file/smartlab/img/
+
+envTag = test
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/twt/twt.properties b/src/main/webapp/WEB-INF/twt/twt.properties
index 27b1ac1..a54f476 100644
--- a/src/main/webapp/WEB-INF/twt/twt.properties
+++ b/src/main/webapp/WEB-INF/twt/twt.properties
@@ -4,6 +4,7 @@
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0328
institute.id = 10
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u5929\u6587\u53F0
+institute.logo =
institute.url = http://twt.sinanoaq.com
institute.app.id = wxef5464cb3cd407ea
institute.app.secret = f0b8dec4bc340a9863ed7de08cf2dcf1
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = twt
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/xjdx/xjdx.properties b/src/main/webapp/WEB-INF/xjdx/xjdx.properties
index 86f2a34..d9bde24 100644
--- a/src/main/webapp/WEB-INF/xjdx/xjdx.properties
+++ b/src/main/webapp/WEB-INF/xjdx/xjdx.properties
@@ -4,6 +4,7 @@
institute.id =
institute.name =\u65B0\u7586\u5927\u5B66
+institute.logo =
institute.url = http://aq.sinanoaq.com:8003
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = xjdx
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/zkdsz/zkdsz.properties b/src/main/webapp/WEB-INF/zkdsz/zkdsz.properties
index 713346a..259ff75 100644
--- a/src/main/webapp/WEB-INF/zkdsz/zkdsz.properties
+++ b/src/main/webapp/WEB-INF/zkdsz/zkdsz.properties
@@ -4,6 +4,7 @@
institute.id = 2
institute.name = \u4E2D\u56FD\u79D1\u5B66\u6280\u672F\u5927\u5B66\u82CF\u5DDE\u9AD8\u7B49\u7814\u7A76\u9662
+institute.logo =
institute.url = http://zkdsz.sinanoaq.cn:8005
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = zkdsz
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/zkysh/zkysh.properties b/src/main/webapp/WEB-INF/zkysh/zkysh.properties
index adad57c..21bcdc4 100644
--- a/src/main/webapp/WEB-INF/zkysh/zkysh.properties
+++ b/src/main/webapp/WEB-INF/zkysh/zkysh.properties
@@ -4,6 +4,7 @@
#\u4E2D\u56FD\u79D1\u5B66\u9662\u751F\u6001\u73AF\u5883\u7814\u7A76\u4E2D\u5FC3
institute.id = 35
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u751F\u6001\u73AF\u5883\u7814\u7A76\u4E2D\u5FC3
+institute.logo =
institute.url = http://sinanoaq.com:8002
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = zkysh
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties b/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties
index 5433aa9..396baf5 100644
--- a/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties
+++ b/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties
@@ -4,6 +4,7 @@
institute.id = 37
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u6C34\u751F\u751F\u7269\u7814\u7A76\u6240
+institute.logo =
institute.url = http://159.226.163.234:8001
institute.app.id =
institute.app.secret =
@@ -13,3 +14,5 @@
message.url= https://sinanoaq.com:8095/api/sendmessage
personImgPath = /opt/file/smartlab/img/
+
+envTag = zkyshs
\ No newline at end of file
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index d7ac4d7..22e051a 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -20,7 +20,7 @@
<p:panelGrid styleClass="header">
<p:row>
<p:column styleClass="header-logo">
- <p:graphicImage value="/resources/images/logo.png" style="width: 80px;height: 80px"></p:graphicImage>
+ <p:graphicImage value="#{loginController.logo}" style="width: 80px;height: 80px"></p:graphicImage>
</p:column>
<p:column styleClass="header-title">
<p:outputLabel value="#{loginController.title}"></p:outputLabel>
@@ -110,12 +110,17 @@
<p:submenu label="#{menu.title}" rendered="#{menuController.isDispRootMenu(menu)}"
style="border: none"
styleClass="#{menu.icon}">
+
<c:forEach items="#{menu.subMenu}" var="subMenu">
- <p:menuitem value="#{subMenu.title}"
- actionListener="#{menuController.goToPage(subMenu)}"
- update=":centerRootPanel,@form"
- containerStyleClass="#{menuController.currentPage==subMenu.page?'menu-item-selected':''}"
- rendered="#{menuController.isPermitted(subMenu.privilegeCode)}"></p:menuitem>
+ <c:if test="#{menuController.activeEnv ne 'gslab' or subMenu.id ne 'price_mng'}" >
+ <p:menuitem value="#{subMenu.title}"
+ actionListener="#{menuController.goToPage(subMenu)}"
+ update=":centerRootPanel,@form"
+ containerStyleClass="#{menuController.currentPage==subMenu.page?'menu-item-selected':''}"
+ rendered="#{menuController.isPermitted(subMenu.privilegeCode)}">
+ </p:menuitem>
+ </c:if>
+
</c:forEach>
</p:submenu>
</p:panelMenu>
diff --git a/src/main/webapp/login.xhtml b/src/main/webapp/login.xhtml
index a152e44..998cdbb 100644
--- a/src/main/webapp/login.xhtml
+++ b/src/main/webapp/login.xhtml
@@ -23,7 +23,7 @@
<p:panelGrid styleClass="header">
<p:row>
<p:column styleClass="header-logo">
- <p:graphicImage value="/resources/images/logo.png" style="width: 80px;height: 80px"></p:graphicImage>
+ <p:graphicImage value="#{loginController.logo}" style="width: 80px;height: 80px"></p:graphicImage>
</p:column>
<p:column styleClass="header-title">
<p:outputLabel value="#{loginController.title}"></p:outputLabel>
diff --git "a/src/main/webapp/resources/images/\344\270\255\345\233\275\347\247\221\345\255\246\351\231\242\350\213\217\345\267\236\347\272\263\347\261\263\346\212\200\346\234\257\344\270\216\347\272\263\347\261\263\344\273\277\347\224\237\347\240\224\347\251\266\346\211\200logo.png" "b/src/main/webapp/resources/images/\344\270\255\345\233\275\347\247\221\345\255\246\351\231\242\350\213\217\345\267\236\347\272\263\347\261\263\346\212\200\346\234\257\344\270\216\347\272\263\347\261\263\344\273\277\347\224\237\347\240\224\347\251\266\346\211\200logo.png"
new file mode 100644
index 0000000..d51b013
--- /dev/null
+++ "b/src/main/webapp/resources/images/\344\270\255\345\233\275\347\247\221\345\255\246\351\231\242\350\213\217\345\267\236\347\272\263\347\261\263\346\212\200\346\234\257\344\270\216\347\272\263\347\261\263\344\273\277\347\224\237\347\240\224\347\251\266\346\211\200logo.png"
Binary files differ
diff --git a/src/test/java/com/nanometer/smartlab/TestDemo.java b/src/test/java/com/nanometer/smartlab/TestDemo.java
new file mode 100644
index 0000000..5212c54
--- /dev/null
+++ b/src/test/java/com/nanometer/smartlab/TestDemo.java
@@ -0,0 +1,20 @@
+package com.nanometer.smartlab;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+//@ContextConfiguration(locations = {})
+public class TestDemo {
+
+ @Test
+ public void testDemo(){
+ System.out.println("gggg");
+
+ }
+}
--
Gitblit v1.9.2