Merge branch 'prod2.x' into dev

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

@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
       timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas_history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -22,4 +22,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/*"
+authorUrl: http://localhost:8871

PAS/src/main/resources/application-prod2.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 172.27.247.174
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver

PAS/src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prod2
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization:

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -1258,7 +1258,8 @@
         select DISTINCT a.patentno as patent_no
         from os_patent a
         <where>
-            patentno="0"
+
+             1=!1
             <if test="params.projectId != null">
                 or a.id in (select pid from os_thematic_pid where zid = #{params.projectId})
             </if>
@@ -1587,9 +1588,9 @@
         a.quote,
         a.patsnap_family as patSnapFamily, a.patsnapfamilynum as patSnapFamilyNum
         from os_patent a
-        <where>patentno="0"
+        <where>
             <if test="patentNo != null and patentNo.size!=0">
-                or patentno in
+                 patentno in
                 <foreach item="item" collection="patentNo" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>