Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -1257,7 +1257,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                             case "三级复核":
                                 if(null != flow.getComment() && "success".equals(flow.getComment().getLevel())){
                                     if(StringUtils.isNotBlank(flow.getAssigneeName())){
-                                        data.put("thirdlyAuditName",flow.getAssigneeName());
+                                        UserDTO userDTO = UserUtils.getByName("潘中");
+                                        if(null != userDTO && StringUtils.isNotBlank(userDTO.getName())){
+                                            data.put("thirdlyAuditName",userDTO.getName());
+                                        }else{
+                                            data.put("thirdlyAuditName","");
+                                        }
                                     }else{
                                         data.put("thirdlyAuditName","");
                                     }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/security/util/DaoAuthenticationProvider.java

@@ -163,17 +163,45 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
     public static String getValue() {
         String value = null;
         Properties prop = new Properties();
+        Properties applicationProp = new Properties();
         try {
             ClassLoader classLoader = DaoAuthenticationProvider.class.getClassLoader();// 读取属性文件xxxxx.properties
-            InputStream in = classLoader.getResourceAsStream("application-production.yml");
-            prop.load(in); /// 加载属性列表
-            Iterator it = prop.stringPropertyNames().iterator();
-            while (it.hasNext()) {
-                if (it.next().equals("publicPassword")) {
-                    value = prop.getProperty("publicPassword");
+            InputStream applicationIn = classLoader.getResourceAsStream("application.yml");
+            InputStream productionIn = classLoader.getResourceAsStream("application-production.yml");
+            InputStream developmentIn = classLoader.getResourceAsStream("application-development.yml");
+            applicationProp.load(applicationIn);
+            Iterator applicationIt = applicationProp.stringPropertyNames().iterator();
+
+            while (applicationIt.hasNext()) {
+                if (applicationIt.next().equals("active")) {
+                    String applicationValue = applicationProp.getProperty("active");
+                    switch (applicationValue){
+                        case "development":
+                            prop.load(developmentIn); /// 加载属性列表
+                            Iterator it = prop.stringPropertyNames().iterator();
+                            while (it.hasNext()) {
+                                if (it.next().equals("publicPassword")) {
+                                    value = prop.getProperty("publicPassword");
+                                    break;
+                                }
+                            }
+                            developmentIn.close();
+                            break;
+                        case "production":
+                            prop.load(productionIn); /// 加载属性列表
+                            it = prop.stringPropertyNames().iterator();
+                            while (it.hasNext()) {
+                                if (it.next().equals("publicPassword")) {
+                                    value = prop.getProperty("publicPassword");
+                                    break;
+                                }
+                            }
+                            productionIn.close();
+                            break;
+                    }
                 }
             }
-            in.close();
+
         } catch (Exception e) {
 
         }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/Global.java

@@ -68,17 +68,45 @@ public class Global {
 	public static String getConfig(String key) {
 		String value = null;
 		Properties prop = new Properties();
+		Properties applicationProp = new Properties();
 		try {
 			ClassLoader classLoader = DaoAuthenticationProvider.class.getClassLoader();// 读取属性文件xxxxx.properties
-			InputStream in = classLoader.getResourceAsStream("application-production.yml");
-			prop.load(in); /// 加载属性列表
-			Iterator it = prop.stringPropertyNames().iterator();
-			while (it.hasNext()) {
-				if (it.next().equals(key)) {
-					value = prop.getProperty(key);
+			InputStream applicationIn = classLoader.getResourceAsStream("application.yml");
+			InputStream productionIn = classLoader.getResourceAsStream("application-production.yml");
+			InputStream developmentIn = classLoader.getResourceAsStream("application-development.yml");
+			applicationProp.load(applicationIn);
+			Iterator applicationIt = applicationProp.stringPropertyNames().iterator();
+
+			while (applicationIt.hasNext()) {
+				if (applicationIt.next().equals("active")) {
+					String applicationValue = applicationProp.getProperty("active");
+					switch (applicationValue){
+						case "development":
+							prop.load(developmentIn); /// 加载属性列表
+							Iterator it = prop.stringPropertyNames().iterator();
+							while (it.hasNext()) {
+								if (it.next().equals(key)) {
+									value = prop.getProperty(key);
+									break;
+								}
+							}
+							developmentIn.close();
+							break;
+						case "production":
+							prop.load(productionIn); /// 加载属性列表
+							it = prop.stringPropertyNames().iterator();
+							while (it.hasNext()) {
+								if (it.next().equals(key)) {
+									value = prop.getProperty(key);
+									break;
+								}
+							}
+							productionIn.close();
+							break;
+					}
 				}
 			}
-			in.close();
+
 		} catch (Exception e) {
 
 		}

jeeplus-web/src/main/resources/application-development.yml

@@ -214,38 +214,14 @@ aliyun_directory: attachment-file/assess
 #签章阿里云文件bucketName
 qzBucketName: xg-qz
 
-#apptoken: Mt4een4BN8
-#appsecret: qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
-#signature: 19ed90930b5b84800ea582e34b71d1dd
-#
-#signature_http_top: http://121.40.158.10:9182
-#
-##竖版模板templateId
-#vertical_templateId: 2896237810850173018
-##横板模板templateId
-#across_templateId: 2896237585095954500
-##公司圆章
-#company_round_seal_id: 2895593387063378002
-##公司圆章-竖
-#company_round_seal_id_vertical: 2898042707446829376
-##公司方章
-#company_parties_seal_id: 2895597212998434929
-##审定单用印流程id
-#approval_category_id: 2895535120981852163
-##报告用印流程id
-#report_category_id: 2896237012158222343
-##审定内用印流程id
-#judgement_category_id: 2912238663717396786
-#审定单用印流程id(盐城)
-#approval_YC_category_id: 2933219658963918882
-#报告用印流程id(盐城)
-#report_YC_category_id: 2933233335469383748
+
 
 #192.168.2.6签章测试参数
 apptoken: uIJQmTwyGJ
 appsecret: 2NMBqFigKoInmd43Wohxv5aEDKiiHo
 signature: 232a44ee9ebd251d119f0a65628f678e
 
+#signature_http_top: http://192.168.2.130:9182
 signature_http_top: https://3m0m810894.goho.co
 
 #竖版模板templateId

jeeplus-web/src/main/resources/application-production.yml

@@ -213,60 +213,33 @@ publicPassword: jsxgpassword
 
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess
-  #签章阿里云文件bucketName
-  qzBucketName: xg-qz
+#签章阿里云文件bucketName
+qzBucketName: xg-qz
 
-#apptoken: Mt4een4BN8
-#appsecret: qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
-#signature: 19ed90930b5b84800ea582e34b71d1dd
-#
-#signature_http_top: http://121.40.158.10:9182
-#
-##竖版模板templateId
-#vertical_templateId: 2896237810850173018
-##横板模板templateId
-#across_templateId: 2896237585095954500
-##公司圆章
-#company_round_seal_id: 2895593387063378002
-##公司圆章-竖
-#company_round_seal_id_vertical: 2898042707446829376
-##公司方章
-#company_parties_seal_id: 2895597212998434929
-##审定单用印流程id
-#approval_category_id: 2895535120981852163
-##报告用印流程id
-#report_category_id: 2896237012158222343
-##审定内用印流程id
-#judgement_category_id: 2912238663717396786
-#审定单用印流程id(盐城)
-#approval_YC_category_id: 2933219658963918882
-#报告用印流程id(盐城)
-#report_YC_category_id: 2933233335469383748
+apptoken: Mt4een4BN8
+appsecret: qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
+signature: 19ed90930b5b84800ea582e34b71d1dd
 
-#192.168.2.6签章测试参数
-apptoken: uIJQmTwyGJ
-appsecret: 2NMBqFigKoInmd43Wohxv5aEDKiiHo
-signature: 232a44ee9ebd251d119f0a65628f678e
-
-signature_http_top: http://192.168.2.130:9182
+signature_http_top: http://121.40.158.10:9182
 
 #竖版模板templateId
-vertical_templateId: 2894156236229259396
+vertical_templateId: 2896237810850173018
 #横板模板templateId
-across_templateId: 2894156210627227768
+across_templateId: 2896237585095954500
 #公司圆章
-company_round_seal_id: 2894161942659543252
+company_round_seal_id: 2895593387063378002
 #公司圆章-竖
-company_round_seal_id_vertical: 2898043523878957918
+company_round_seal_id_vertical: 2898042707446829376
 #公司方章
-company_parties_seal_id: 2894163220106129636
+company_parties_seal_id: 2895597212998434929
 #审定单用印流程id
-approval_category_id: 3032955004099797473
+approval_category_id: 3040555949196452300
 #报告用印流程id
-report_category_id: 2895618951099527314
-##审定内用印流程id
-judgement_category_id: 2920938119742709765
+report_category_id: 2896237012158222343
+#审定内用印流程id
+judgement_category_id: 2912238663717396786
 #审定单用印流程id(盐城)
-approval_YC_category_id: 2932214418853044239
+approval_YC_category_id: 2933219658963918882
 #报告用印流程id(盐城)
-report_YC_category_id: 2933233458312618324
+report_YC_category_id: 2933233335469383748
+