12chenyi

.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml

@@ -1,79 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]" date="1671614308671" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022/12/21 17:18 [Default Changelist]" />
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7e9c8204c71f4862b0f49b6713271856.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7e9c8204c71f4862b0f49b6713271856.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/14fed836f00f4725a1aaf61f7494c7a6.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/14fed836f00f4725a1aaf61f7494c7a6.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IProductService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IAssoProductFileService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductController.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileMapper.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7738d41e149e4addab9a88b2bd6051a8.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7738d41e149e4addab9a88b2bd6051a8.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductDTO.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ReportService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/Product.class" />
-  </binary>
-</changelist>

.idea/workspace.xml

@@ -4,19 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 陈宇">
-      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/AddSyneryVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" afterDir="false" />
+    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 chenyi">
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-docker.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-docker.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
@@ -60,6 +52,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report" />
@@ -68,6 +61,7 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
@@ -85,17 +79,6 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="RMS" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cslg.report.Application" />
@@ -115,6 +98,10 @@
       <workItem from="1671511902044" duration="19866000" />
       <workItem from="1671539384819" duration="6630000" />
       <workItem from="1671585394564" duration="1889000" />
+      <workItem from="1673232805752" duration="20679000" />
+      <workItem from="1673314193726" duration="396000" />
+      <workItem from="1673314631144" duration="15878000" />
+      <workItem from="1673400625616" duration="625000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -137,7 +124,28 @@
       <option name="project" value="LOCAL" />
       <updated>1671546004898</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="12.20 chenyi">
+      <created>1673250297145</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1673250297145</updated>
+    </task>
+    <task id="LOCAL-00005" summary="12.20 chenyi">
+      <created>1673258736217</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1673258736217</updated>
+    </task>
+    <task id="LOCAL-00006" summary="12.20 chenyi">
+      <created>1673346654153</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1673346654153</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -157,17 +165,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="12.20 陈宇" />
-    <option name="LAST_COMMIT_MESSAGE" value="12.20 陈宇" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java</url>
-          <line>114</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="12.20 chenyi" />
+    <option name="LAST_COMMIT_MESSAGE" value="12.20 chenyi" />
   </component>
 </project>

RMS/target/classes/application-docker.yml

@@ -3,7 +3,13 @@ spring:
     host: pas-redis
     port: 6379
     database: 0
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
     password: cslg_docker_123456
   datasource:
     url: jdbc:mysql://pas-mysql:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8

RMS/target/classes/application-prod.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        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
     username: root