分支合并

.idea/workspace.xml

@@ -4,12 +4,8 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f5220264-ecf0-4305-ada3-6105184077a7" name="Changes" comment="提交">
+    <list default="true" id="f5220264-ecf0-4305-ada3-6105184077a7" name="Changes" comment="分支合并">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/access.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/access.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/slow.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/slow.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/rpc/messagecenter/logs/stat.log" beforeDir="false" afterPath="$PROJECT_DIR$/rpc/messagecenter/logs/stat.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,20 +22,89 @@
       </list>
     </option>
   </component>
-  <component name="GOROOT" url="file://H:/go/go1.16" />
+  <component name="GOROOT" url="file://H:/go/go1.18" />
   <component name="Git.Settings">
+    <favorite-branches>
+      <branch-storage>
+        <map>
+          <entry type="LOCAL">
+            <value>
+              <list>
+                <branch-info repo="$PROJECT_DIR$" source="dev_v1.2.6_wh" />
+              </list>
+            </value>
+          </entry>
+          <entry type="REMOTE">
+            <value>
+              <list>
+                <branch-info repo="$PROJECT_DIR$" source="origin/feature/v1.2.6" />
+              </list>
+            </value>
+          </entry>
+        </map>
+      </branch-storage>
+    </favorite-branches>
+    <option name="PUSH_TAGS">
+      <GitPushTagMode>
+        <option name="argument" value="--tags" />
+        <option name="title" value="All" />
+      </GitPushTagMode>
+    </option>
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="feature/v1.2.6_wh" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="GitToolBoxStore">
+    <option name="projectConfigVersion" value="5" />
+    <option name="recentBranches">
+      <RecentBranches>
+        <option name="branchesForRepo">
+          <list>
+            <RecentBranchesForRepo>
+              <option name="branches">
+                <list>
+                  <RecentBranch>
+                    <option name="branchName" value="dev/v1.2.6_wh" />
+                    <option name="lastUsedInstant" value="1682236043" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="feature/v1.2.6_wh" />
+                    <option name="lastUsedInstant" value="1682235983" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="feature/v1.2.6" />
+                    <option name="lastUsedInstant" value="1682235768" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="master" />
+                    <option name="lastUsedInstant" value="1681434817" />
+                  </RecentBranch>
+                </list>
+              </option>
+              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
+            </RecentBranchesForRepo>
+          </list>
+        </option>
+      </RecentBranches>
+    </option>
+  </component>
   <component name="GoLibraries">
     <option name="indexEntireGoPath" value="true" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://H:/go/go1.16/pkg/mod/app.yhyue.com/moapp/jybase@v0.0.0-20220617085837-48c1bf245c2f/common/common.go" root0="SKIP_INSPECTION" />
-    <setting file="file://H:/go/go1.16/pkg/mod/github.com/zeromicro/go-zero@v1.3.4/zrpc/internal/serverinterceptors/timeoutinterceptor.go" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/service/message_mail_box.go" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://H:/go/go1.16/pkg/mod/app.yhyue.com/moapp/jybase@v0.0.0-20220617085837-48c1bf245c2f/mysql/mysql.go" root0="SKIP_INSPECTION" />
-    <setting file="file://H:/go/go1.17.2/src/runtime/asm_amd64.s" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/go.mod" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/service/message_mail_box.go" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
@@ -51,28 +116,59 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="DefaultGoTemplateProperty" value="Go File" />
+    <property name="Git.Branch.Popup.ShowAllRemotes" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="configurable..is.expanded" value="false" />
     <property name="configurable.GoLibrariesConfigurable.is.expanded" value="true" />
     <property name="go.import.settings.migrated" value="true" />
-    <property name="last_opened_file_path" value="$USER_HOME$" />
-    <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/rpc/messagecenter/messagecenter" />
+    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\top_git_projects\SocialPlatform1\messageCenter\rpc\messagecenter\messagecenter" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\rpc\messagecenterclient" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\api\etc" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\rpc\etc" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\rpc" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\top_git_projects\SocialPlatform1\messageCenter\rpc\messagecenter\messagecenter" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\rpc\messagecenterclient" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\rpc" />
       <recent name="D:\workspace\top_project\SocialPlatform\messageCenter\api" />
     </key>
   </component>
-  <component name="RunManager" selected="Go Test.TestMessaggeService_FindMessage/客服获取历史信息查询 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service">
+  <component name="RunManager" selected="Go 构建.go build  rpc">
+    <configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
+      <module name="messageCenter" />
+      <working_directory value="$PROJECT_DIR$" />
+      <kind value="PACKAGE" />
+      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="go build  rpc" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true">
+      <module name="messageCenter" />
+      <working_directory value="$PROJECT_DIR$/rpc/messagecenter" />
+      <kind value="PACKAGE" />
+      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$/rpc/messagecenter/messagecenter.go" />
+      <method v="2" />
+    </configuration>
+    <configuration name="go build api" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true">
+      <module name="messageCenter" />
+      <working_directory value="$PROJECT_DIR$/api/messagecenter" />
+      <kind value="PACKAGE" />
+      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter" />
+      <directory value="$PROJECT_DIR$/api/messagecenter" />
+      <filePath value="$PROJECT_DIR$/api/messagecenter/messagecenter.go" />
+      <method v="2" />
+    </configuration>
     <configuration name="messageApi" type="GoApplicationRunConfiguration" factoryName="Go Application">
       <module name="messageCenter" />
       <working_directory value="$PROJECT_DIR$/api/messagecenter" />
@@ -105,31 +201,17 @@
       <option name="run" value="false" />
       <method v="2" />
     </configuration>
-    <configuration name="TestMessaggeService_FindMessage/客服获取历史信息查询 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+    <configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
       <module name="messageCenter" />
-      <working_directory value="$PROJECT_DIR$/service" />
-      <root_directory value="$PROJECT_DIR$" />
-      <kind value="PACKAGE" />
-      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <framework value="gotest" />
-      <pattern value="^\QTestMessaggeService_FindMessage\E$/^\Q客服获取历史信息查询\E$" />
-      <method v="2" />
-    </configuration>
-    <configuration name="TestMessaggeService_SaveAutoReplyMsg/会话保存以及消息保存#01 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
-      <module name="messageCenter" />
-      <working_directory value="$PROJECT_DIR$/service" />
-      <root_directory value="$PROJECT_DIR$" />
-      <kind value="PACKAGE" />
-      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
+      <working_directory value="$PROJECT_DIR$" />
+      <kind value="DIRECTORY" />
+      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter" />
       <directory value="$PROJECT_DIR$" />
       <filePath value="$PROJECT_DIR$" />
       <framework value="gotest" />
-      <pattern value="^\QTestMessaggeService_SaveAutoReplyMsg\E$/^\Q会话保存以及消息保存#01\E$" />
       <method v="2" />
     </configuration>
-    <configuration name="TestMessaggeService_SaveMessage/7、机器人给用户发送信息 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+    <configuration name="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeGet/公告获取" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
       <module name="messageCenter" />
       <working_directory value="$PROJECT_DIR$/service" />
       <root_directory value="$PROJECT_DIR$" />
@@ -138,10 +220,10 @@
       <directory value="$PROJECT_DIR$" />
       <filePath value="$PROJECT_DIR$" />
       <framework value="gotest" />
-      <pattern value="^\QTestMessaggeService_SaveMessage\E$/^\Q7、机器人给用户发送信息\E$" />
+      <pattern value="^\QTestChatGroupService_GroupNoticeGet\E$/^\Q公告获取\E$" />
       <method v="2" />
     </configuration>
-    <configuration name="TestMessaggeService_UpdateReadById in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+    <configuration name="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeUpdate/公告修改" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
       <module name="messageCenter" />
       <working_directory value="$PROJECT_DIR$/service" />
       <root_directory value="$PROJECT_DIR$" />
@@ -150,37 +232,31 @@
       <directory value="$PROJECT_DIR$" />
       <filePath value="$PROJECT_DIR$" />
       <framework value="gotest" />
-      <pattern value="^\QTestMessaggeService_UpdateReadById\E$" />
+      <pattern value="^\QTestChatGroupService_GroupNoticeUpdate\E$/^\Q公告修改\E$" />
       <method v="2" />
     </configuration>
-    <configuration name="Test_test1 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/test (1)" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
-      <module name="messageCenter" />
-      <working_directory value="$PROJECT_DIR$/rpc/messagecenter/test" />
-      <root_directory value="$PROJECT_DIR$" />
-      <kind value="PACKAGE" />
-      <package value="bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/test" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <framework value="gotest" />
-      <pattern value="^\QTest_test1\E$" />
+    <configuration name="genRpc" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
+      <makefile filename="$PROJECT_DIR$/Makefile" target="genRpc" workingDirectory="" arguments="">
+        <envs />
+      </makefile>
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Go Build.messageApi" />
-      <item itemvalue="Go Build.messageRpc" />
-      <item itemvalue="Go Test.Test_test1 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/test (1)" />
-      <item itemvalue="Go Test.TestMessaggeService_SaveAutoReplyMsg/会话保存以及消息保存#01 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-      <item itemvalue="Go Test.TestMessaggeService_UpdateReadById in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-      <item itemvalue="Go Test.TestMessaggeService_SaveMessage/7、机器人给用户发送信息 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-      <item itemvalue="Go Test.TestMessaggeService_FindMessage/客服获取历史信息查询 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
+      <item itemvalue="Go 构建.messageApi" />
+      <item itemvalue="Go 构建.messageRpc" />
+      <item itemvalue="Go 构建.go build  rpc" />
+      <item itemvalue="Go 构建.go build api" />
+      <item itemvalue="Go 测试.bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeGet/公告获取" />
+      <item itemvalue="Go 测试.bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeUpdate/公告修改" />
+      <item itemvalue="Makefile 目标.genRpc" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Go Test.TestMessaggeService_FindMessage/客服获取历史信息查询 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-        <item itemvalue="Go Test.TestMessaggeService_SaveMessage/7、机器人给用户发送信息 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-        <item itemvalue="Go Test.TestMessaggeService_UpdateReadById in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
-        <item itemvalue="Go Test.Test_test1 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/test (1)" />
-        <item itemvalue="Go Test.TestMessaggeService_SaveAutoReplyMsg/会话保存以及消息保存#01 in bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service" />
+        <item itemvalue="Go 构建.go build  rpc" />
+        <item itemvalue="Go 构建.go build api" />
+        <item itemvalue="Makefile 目标.genRpc" />
+        <item itemvalue="Go 测试.bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeUpdate/公告修改" />
+        <item itemvalue="Go 测试.bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service 中的 TestChatGroupService_GroupNoticeGet/公告获取" />
       </list>
     </recent_temporary>
   </component>
@@ -198,11 +274,8 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="封装方法" />
-    <MESSAGE value="代码整合" />
     <MESSAGE value="用户列表修改" />
     <MESSAGE value="域名添加" />
     <MESSAGE value="添加时间" />
@@ -217,95 +290,40 @@
     <MESSAGE value="聊天提交" />
     <MESSAGE value="提交" />
     <MESSAGE value="已读状态修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="已读状态修改" />
+    <MESSAGE value="分支创建" />
+    <MESSAGE value="协议文件提交" />
+    <MESSAGE value="协议文件修改" />
+    <MESSAGE value="rpc更新提交" />
+    <MESSAGE value="协议文件出错修改" />
+    <MESSAGE value="api编码" />
+    <MESSAGE value="注释增加" />
+    <MESSAGE value="注释新增" />
+    <MESSAGE value="自测出现问题处理" />
+    <MESSAGE value="接口删除" />
+    <MESSAGE value="分支合并" />
+    <option name="LAST_COMMIT_MESSAGE" value="分支合并" />
   </component>
   <component name="VgoProject">
     <integration-enabled>true</integration-enabled>
     <environment>
       <map>
-        <entry key="GOPRIVATE" value="https://app.yhyue.com" />
-        <entry key="GOPROXY" value="https://goproxy.io,direct" />
-        <entry key="GOSUMDB" value="off" />
+        <entry key="GOPRIVATE" value="bp.jydev.jianyu360.cn,app.yhyue.com" />
+        <entry key="GOPROXY" value="https://goproxy.cn,https://goproxy.io,https://mirrors.aliyun.com/goproxy/,direct" />
       </map>
     </environment>
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go</url>
-          <line>42</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go</url>
-          <line>39</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>152</line>
-          <option name="timeStamp" value="5" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box_test.go</url>
-          <line>44</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box_test.go</url>
-          <line>242</line>
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>310</line>
-          <option name="timeStamp" value="10" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>388</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>386</line>
-          <option name="timeStamp" value="19" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>393</line>
-          <option name="timeStamp" value="20" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>410</line>
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>164</line>
-          <option name="timeStamp" value="22" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>114</line>
-          <option name="timeStamp" value="23" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>302</line>
-          <option name="timeStamp" value="24" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>316</line>
-          <option name="timeStamp" value="25" />
+          <url>file://$PROJECT_DIR$/service/chat_group.go</url>
+          <line>8</line>
+          <option name="timeStamp" value="59" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/service/message_mail_box.go</url>
-          <line>318</line>
-          <option name="timeStamp" value="26" />
+          <url>file://$PROJECT_DIR$/service/chat_group.go</url>
+          <line>7</line>
+          <option name="timeStamp" value="60" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>