update codes

lib/java/bi-report-service/.idea/workspace.xml

@@ -199,7 +199,7 @@
       <workItem from="1592568026557" duration="772000" />
       <workItem from="1593835574199" duration="4438000" />
       <workItem from="1594091429524" duration="3648000" />
-      <workItem from="1594173992446" duration="408000" />
+      <workItem from="1594173992446" duration="1574000" />
     </task>
     <servers />
   </component>

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/EmailServiceImpl.java

@@ -28,6 +28,8 @@ public class EmailServiceImpl implements EmailService {
     private String filePath;
     @Value("${proper.file.path}")
     private String properFilePath;
+    @Value("${proper.base.path}")
+    private String properBasePath;
     @Autowired
     private JavaMailSender mailSender;
     private static final Logger logger = LoggerFactory.getLogger(EmailServiceImpl.class);
@@ -37,7 +39,10 @@ public class EmailServiceImpl implements EmailService {
         int rs = Constants.SUCCESS;
 
         String subject = "";
-        String value = ProperUtils.getValue(properFilePath, name);
+        String properPath = properBasePath + "pm/" + name + "/en-cn.properties";
+        logger.info("邮件主题属性文件目录为：{}",properPath);
+        String value = ProperUtils.getValue(properPath , name);
+        //String value = ProperUtils.getValue(properFilePath, name);
         if(null != value){
             subject = value;
         }else{

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.java

@@ -37,8 +37,6 @@ public class ExcelServiceImpl implements ExcelService {
 
     @Value("${excel.output.path}")
     private String filePath;
-    @Value("${proper.file.path}")
-    private String properFilePath;
     private static final Logger logger = LoggerFactory.getLogger(ExcelServiceImpl.class);
 
     /**

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/SparksqlServiceImpl.java

@@ -104,7 +104,7 @@ public class SparksqlServiceImpl implements SparksqlService {
             String nameStr =fileName.replace(".sql","");
             String subject = "";
             String properPath = properBasePath + "pm/" + name + "/en-cn.properties";
-            logger.info("属性文件目录为：{}",properPath);
+            logger.info("Sheets属性文件目录为：{}",properPath);
             String value = ProperUtils.getValue(properPath , nameStr);
             if(null != value){
                 subject = value;