1.9 lrj

RMS/src/main/java/cn/cslg/report/common/config/RabbitMQConfig.java

@@ -5,13 +5,15 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 @Component
 public class RabbitMQConfig {
 //    private static final Logger LOGGER= LoggerFactory.getLogger(RabbitMQConfig.class);
-
+ @Value("${queueName}")
+ private String queueName;
     @Autowired
     private CachingConnectionFactory cachingConnectionFactory;
 
@@ -67,7 +69,7 @@ public class RabbitMQConfig {
 
     @Bean
     public DirectExchange directExchange() {
-        return new DirectExchange(MailConstants.MAIL_EXCHANGE_NAME);
+        return new DirectExchange(queueName);
     }
 
     @Bean

RMS/src/main/java/cn/cslg/report/service/BaseService.java

@@ -74,7 +74,7 @@ public class BaseService {
         //判断请求返回是否为200，不是的话则返回报错信息
         if (!jsonObject.get("code").equals(200)) {
             log.error("权限系统登录失败,错误信息:" + jsonObject.get("message").toString());
-            return Response.error(Constants.NET_ERROR);
+            return Response.error(jsonObject.get("message").toString());
         } else {
             PersonnelVO personnelVO = com.alibaba.fastjson2.JSONObject.parseObject(jsonObject.get("data").toString(), PersonnelVO.class);
             return Response.success(personnelVO.getToken());

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -59,6 +59,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         for (int i = 0; i < patentRights.size(); i++) {
             String str = patentRights.get(i).getContent();
             str = str.replace(" ", "");
+            str = str.replace("\r","");
             Pattern p = Pattern.compile("^[0-9]+\\..*");
             Matcher m = p.matcher(str);
             if (m.matches()) {

RMS/src/main/resources/application-dev.yml

@@ -29,4 +29,5 @@ spring:
         login-username: admin
         login-password: 123456
       web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+queueName: mail.queue

RMS/src/main/resources/application-test.yml

@@ -1,19 +1,33 @@
 spring:
   redis:
-    host: 172.27.247.174
+    host: 47.101.137.223
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
     timeout: 1000
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: TU5x6IeBi7rl
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      primary: rms
+      datasource:
+        pas:
+          url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
+        rms:
+          url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: Cslg2022+
+        login-password: 123456
       web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+queueName: mailTest.queue

RMS/target/classes/application-dev.yml

@@ -29,4 +29,5 @@ spring:
         login-username: admin
         login-password: 123456
       web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+queueName: mail.queue

RMS/target/classes/application-test.yml

@@ -1,19 +1,33 @@
 spring:
   redis:
-    host: 172.27.247.174
+    host: 47.101.137.223
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
     timeout: 1000
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: TU5x6IeBi7rl
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      primary: rms
+      datasource:
+        pas:
+          url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
+        rms:
+          url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: Cslg2022+
+        login-password: 123456
       web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+queueName: mailTest.queue