接受类型修改

jyBXBase/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

jyBXBase/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

jyBXBase/.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

jyBXBase/.idea/jyBXBase.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

jyBXBase/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jyBXBase.iml" filepath="$PROJECT_DIR$/.idea/jyBXBase.iml" />
+    </modules>
+  </component>
+</project>

jyBXBase/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

jyBXBase/api/logs/access.log

@@ -0,0 +1,18 @@
+{"@timestamp":"2023-04-12T09:02:46.686+08:00","caller":"init/init.go:43","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-04-12T09:02:46.686+08:00","caller":"init/init.go:43","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-04-12T09:02:46.687+08:00","caller":"init/db.go:20","content":"--初始化 mongodb log--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:46.687+08:00","caller":"gozeropprof@v1.0.2/agent.go:25","content":"Starting pprof agent at 0.0.0.0:6060","level":"info"}
+{"@timestamp":"2023-05-08T14:32:45.518+08:00","caller":"init/init.go:43","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:32:45.518+08:00","caller":"init/init.go:43","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:32:45.519+08:00","caller":"init/db.go:20","content":"--初始化 mongodb log--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:45.519+08:00","caller":"gozeropprof@v1.0.2/agent.go:25","content":"Starting pprof agent at 0.0.0.0:6060","level":"info"}
+{"@timestamp":"2023-05-08T15:07:54.265+08:00","caller":"init/init.go:43","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:07:54.265+08:00","caller":"init/init.go:43","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:07:54.265+08:00","caller":"init/db.go:20","content":"--初始化 mongodb log--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:54.265+08:00","caller":"gozeropprof@v1.0.2/agent.go:25","content":"Starting pprof agent at 0.0.0.0:6060","level":"info"}
+{"@timestamp":"2023-05-08T15:08:07.538+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 400 - POST /jybx/base/newest - 127.0.0.1:60856 - ApiPOST Runtime +https://www.apipost.cn","duration":"0.2ms","level":"info","span":"b9e96302f1d043f7","trace":"18b7b9c8c5c87e6700f8289b3b3b2cc1"}
+{"@timestamp":"2023-05-08T15:08:52.111+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:60898 - ApiPOST Runtime +https://www.apipost.cn","duration":"2051.2ms","level":"info","span":"ba467e1840962b1b","trace":"869e8db3c6a6ee333cfc17fe21c0484a"}
+{"@timestamp":"2023-05-08T15:09:44.361+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:60966 - ApiPOST Runtime +https://www.apipost.cn","duration":"7.9ms","level":"info","span":"65dcad248385753a","trace":"a3cd7d922c74fabf59ca818a0d5a0d80"}
+{"@timestamp":"2023-05-08T15:09:50.069+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:60973 - ApiPOST Runtime +https://www.apipost.cn","duration":"1.5ms","level":"info","span":"9401ed44d61a158c","trace":"7fb915351a36a0258b0a6df3621cec9b"}
+{"@timestamp":"2023-05-08T15:11:13.511+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:61094 - ApiPOST Runtime +https://www.apipost.cn","duration":"12.9ms","level":"info","span":"69376c9752fe60b1","trace":"15d2f101bd7c5c69a63a487c61ace2c5"}
+{"@timestamp":"2023-05-08T15:11:24.717+08:00","caller":"handler/loghandler.go:160","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:61101 - ApiPOST Runtime +https://www.apipost.cn","duration":"8.8ms","level":"info","span":"e615f7569990b1b5","trace":"2330a6cd710dfcbba95bc7835d42f9cf"}

jyBXBase/api/logs/error.log-2023-02-27

@@ -0,0 +1,19 @@
+{"@timestamp":"2022-12-09T15:50:36.763+08:00","level":"error","content":"discovbuilder.go:34 bad resolver state"}
+{"@timestamp":"2023-02-27T15:08:17.018+08:00","caller":"internal/discovbuilder.go:34","content":"bad resolver state","level":"error"}
+{"@timestamp":"2023-02-27T15:24:49.033+08:00","caller":"internal/discovbuilder.go:34","content":"bad resolver state","level":"error"}
+{"@timestamp":"2023-02-27T15:24:49.642+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = DeadlineExceeded desc = context deadline exceeded","duration":"8000.4ms","level":"error","span":"7c9318795115d5c5","trace":"a8f8de8a0bef2d1ba3b655499334be8b"}
+{"@timestamp":"2023-02-27T15:24:49.642+08:00","caller":"handler/loghandler.go:162","content":"[HTTP] 503 - POST /jybx/base/newest - 127.0.0.1:51492 - PostmanRuntime/7.28.4\nPOST /jybx/base/newest HTTP/1.1\r\nHost: 127.0.0.1:8006\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, br\r\nAppid: 10000\r\nCache-Control: no-cache\r\nConnection: keep-alive\r\nContent-Length: 24\r\nContent-Type: application/json\r\nCookie: SESSIONID=5b9e67e0d3e6512d6baa41375fbb815e8052fba4\r\nNewuserid: 336004\r\nPositiontype: 1\r\nPostman-Token: cc4f39a2-7ad6-42b1-9a37-d8e5969effc0\r\nUser-Agent: PostmanRuntime/7.28.4\r\nUserid: 63944e2d72a029737ac2a793\r\n\r\n{\"city\":\"\",\"isSearch\":1}","duration":"8000.4ms","level":"error","span":"e6feb51b8ab00515","trace":"a8f8de8a0bef2d1ba3b655499334be8b"}
+{"@timestamp":"2023-02-27T15:26:29.739+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = Unavailable desc = last connection error: connection error: desc = \"transport: Error while dialing dial tcp 127.0.0.1:8005: connectex: No connection could be made because the target machine actively refused it.\"; last resolver error: produced zero addresses","duration":"0.0ms","level":"error","span":"9ef0f84f9de6d237","trace":"6c8356a8453982bcdf98a36a4bf5b55e"}
+{"@timestamp":"2023-02-27T15:26:40.754+08:00","caller":"internal/discovbuilder.go:34","content":"bad resolver state","level":"error"}
+{"@timestamp":"2023-02-27T15:26:41.053+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = DeadlineExceeded desc = context deadline exceeded","duration":"8010.3ms","level":"error","span":"6556295de389be2c","trace":"729517970358c7716c1dcfe8a9679e47"}
+{"@timestamp":"2023-02-27T15:26:41.053+08:00","caller":"handler/loghandler.go:162","content":"[HTTP] 503 - POST /jybx/base/newest - 127.0.0.1:51747 - PostmanRuntime/7.28.4\nPOST /jybx/base/newest HTTP/1.1\r\nHost: 127.0.0.1:8006\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, br\r\nAppid: 10000\r\nCache-Control: no-cache\r\nConnection: keep-alive\r\nContent-Length: 24\r\nContent-Type: application/json\r\nCookie: SESSIONID=5b9e67e0d3e6512d6baa41375fbb815e8052fba4\r\nNewuserid: 336004\r\nPositiontype: 1\r\nPostman-Token: cc2d89c1-4774-4733-95d6-62daaae68e6d\r\nUser-Agent: PostmanRuntime/7.28.4\r\nUserid: 63944e2d72a029737ac2a793\r\n\r\n{\"city\":\"\",\"isSearch\":1}","duration":"8011.3ms","level":"error","span":"0878b989fe88380a","trace":"729517970358c7716c1dcfe8a9679e47"}
+{"@timestamp":"2023-02-27T15:26:54.176+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = Unavailable desc = last connection error: connection error: desc = \"transport: Error while dialing dial tcp 127.0.0.1:8005: connectex: No connection could be made because the target machine actively refused it.\"; last resolver error: produced zero addresses","duration":"0.0ms","level":"error","span":"1791e18cdb3063bc","trace":"bf8ebc0766d9d83f05bb43f2a19a222a"}
+{"@timestamp":"2023-02-27T15:27:02.350+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = Unavailable desc = last connection error: connection error: desc = \"transport: Error while dialing dial tcp 127.0.0.1:8005: connectex: No connection could be made because the target machine actively refused it.\"; last resolver error: produced zero addresses","duration":"0.0ms","level":"error","span":"ad1fb39b9f4b1b9d","trace":"edbcb724127f52af462820d5177d5828"}
+{"@timestamp":"2023-02-27T15:27:04.588+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = Unavailable desc = last connection error: connection error: desc = \"transport: Error while dialing dial tcp 127.0.0.1:8005: connectex: No connection could be made because the target machine actively refused it.\"; last resolver error: produced zero addresses","duration":"0.0ms","level":"error","span":"06c2dd5450ff6051","trace":"79828608c7749b818e8a10e3066c97cd"}
+{"@timestamp":"2023-02-27T15:27:24.344+08:00","caller":"internal/discovbuilder.go:34","content":"bad resolver state","level":"error"}
+{"@timestamp":"2023-02-27T15:27:24.558+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"63944e2d72a029737ac2a793\"  appId:\"10000\"  newUserId:336004  positionType:1 - rpc error: code = DeadlineExceeded desc = context deadline exceeded","duration":"8011.8ms","level":"error","span":"f2c44f599475761c","trace":"2eacf0f168dd95f9751f39a74aac7b8d"}
+{"@timestamp":"2023-02-27T15:27:24.558+08:00","caller":"handler/loghandler.go:162","content":"[HTTP] 503 - POST /jybx/base/newest - 127.0.0.1:51856 - PostmanRuntime/7.28.4\nPOST /jybx/base/newest HTTP/1.1\r\nHost: 127.0.0.1:8006\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, br\r\nAppid: 10000\r\nCache-Control: no-cache\r\nConnection: keep-alive\r\nContent-Length: 24\r\nContent-Type: application/json\r\nCookie: SESSIONID=5b9e67e0d3e6512d6baa41375fbb815e8052fba4\r\nNewuserid: 336004\r\nPositiontype: 1\r\nPostman-Token: 0f3a98fb-f78a-4325-97e2-5ba481dad727\r\nUser-Agent: PostmanRuntime/7.28.4\r\nUserid: 63944e2d72a029737ac2a793\r\n\r\n{\"city\":\"\",\"isSearch\":1}","duration":"8011.8ms","level":"error","span":"0c42a3e6c8161a82","trace":"2eacf0f168dd95f9751f39a74aac7b8d"}
+{"@timestamp":"2023-02-27T15:38:12.824+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"61e675d6f24e3943c7d21b04\"  appId:\"10000\"  entUserId:\"3662\"  newUserId:73044  entId:\"14640\" - rpc error: code = Unavailable desc = last connection error: connection error: desc = \"transport: Error while dialing dial tcp 127.0.0.1:8005: connectex: No connection could be made because the target machine actively refused it.\"; last resolver error: produced zero addresses","duration":"0.0ms","level":"error","span":"0e802c4ca15ab756","trace":"11acd0fc171d13f53c5bea984d2275de"}
+{"@timestamp":"2023-02-27T15:40:45.674+08:00","caller":"clientinterceptors/durationinterceptor.go:35","content":"fail - etcd:/127.0.0.1:2379/bxbase.rpc/bxcol.bxbase/NewestBidding - isSearch:1  userId:\"61e675d6f24e3943c7d21b04\"  appId:\"10000\"  entUserId:\"3662\"  newUserId:73044  entId:\"14640\"  positionType:1 - rpc error: code = DeadlineExceeded desc = context deadline exceeded","duration":"8001.6ms","level":"error","span":"446768669ce9c1e0","trace":"c4b286b866d20121533c0c062f610930"}
+{"@timestamp":"2023-02-27T15:40:45.674+08:00","caller":"handler/loghandler.go:162","content":"[HTTP] 503 - POST /jybx/base/newest - 127.0.0.1:53549 - PostmanRuntime/7.28.4\nPOST /jybx/base/newest HTTP/1.1\r\nHost: 127.0.0.1:8006\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, br\r\nAppid: 10000\r\nCache-Control: no-cache\r\nConnection: keep-alive\r\nContent-Length: 24\r\nContent-Type: application/json\r\nCookie: SESSIONID=5b9e67e0d3e6512d6baa41375fbb815e8052fba4\r\nEntid: 14640\r\nEntuserid: 3662\r\nNewuserid: 73044\r\nPositiontype: 1\r\nPostman-Token: 3e5abc85-13cc-44d5-962b-deeadf60322e\r\nUser-Agent: PostmanRuntime/7.28.4\r\nUserid: 61e675d6f24e3943c7d21b04\r\n\r\n{\"city\":\"\",\"isSearch\":1}","duration":"8001.6ms","level":"error","span":"8090aed0ed9a4062","trace":"c4b286b866d20121533c0c062f610930"}
+{"@timestamp":"2023-02-27T15:40:52.755+08:00","caller":"internal/discovbuilder.go:34","content":"bad resolver state","level":"error"}

jyBXBase/api/logs/slow.log

@@ -0,0 +1 @@
+{"@timestamp":"2023-05-08T15:08:52.111+08:00","caller":"handler/loghandler.go:137","content":"[HTTP] 200 - POST /jybx/base/newest - 127.0.0.1:60898 - ApiPOST Runtime +https://www.apipost.cn - slowcall(2051.2ms)","duration":"2051.2ms","level":"slow","span":"ba467e1840962b1b","trace":"869e8db3c6a6ee333cfc17fe21c0484a"}

jyBXBase/rpc/logs/access.log

@@ -0,0 +1,82 @@
+{"@timestamp":"2023-04-12T09:02:22.406+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.406+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.407+08:00","caller":"init/db.go:30","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.407+08:00","caller":"init/db.go:40","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.407+08:00","caller":"init/db.go:51","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.407+08:00","caller":"init/db.go:67","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.417+08:00","caller":"init/db.go:82","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.421+08:00","caller":"init/db.go:95","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.426+08:00","caller":"init/db.go:108","content":"--初始化 push mysql--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.433+08:00","caller":"init/db.go:120","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.440+08:00","caller":"init/db.go:137","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-04-12T09:02:22.440+08:00","caller":"init/db.go:146","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.307+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.307+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.308+08:00","caller":"init/db.go:30","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.308+08:00","caller":"init/db.go:40","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.308+08:00","caller":"init/db.go:51","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.308+08:00","caller":"init/db.go:67","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.316+08:00","caller":"init/db.go:82","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.321+08:00","caller":"init/db.go:95","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.325+08:00","caller":"init/db.go:107","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.497+08:00","caller":"init/db.go:124","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-04-18T17:13:20.497+08:00","caller":"init/db.go:133","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.149+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.149+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.151+08:00","caller":"init/db.go:30","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.151+08:00","caller":"init/db.go:40","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.152+08:00","caller":"init/db.go:51","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.152+08:00","caller":"init/db.go:67","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.175+08:00","caller":"init/db.go:82","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.190+08:00","caller":"init/db.go:95","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.204+08:00","caller":"init/db.go:107","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.228+08:00","caller":"init/db.go:124","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-05-08T14:32:50.228+08:00","caller":"init/db.go:133","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.973+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.973+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.975+08:00","caller":"init/db.go:29","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.975+08:00","caller":"init/db.go:39","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.975+08:00","caller":"init/db.go:50","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:30.975+08:00","caller":"init/db.go:66","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:31.008+08:00","caller":"init/db.go:81","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:31.025+08:00","caller":"init/db.go:94","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:31.045+08:00","caller":"init/db.go:106","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:31.066+08:00","caller":"init/db.go:123","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-05-08T14:37:31.066+08:00","caller":"init/db.go:132","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.381+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.381+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.382+08:00","caller":"init/db.go:29","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.382+08:00","caller":"init/db.go:39","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.382+08:00","caller":"init/db.go:50","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.383+08:00","caller":"init/db.go:66","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.412+08:00","caller":"init/db.go:81","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.435+08:00","caller":"init/db.go:94","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.450+08:00","caller":"init/db.go:106","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.466+08:00","caller":"init/db.go:123","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-05-08T15:07:43.466+08:00","caller":"init/db.go:132","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.534+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.534+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.535+08:00","caller":"init/db.go:29","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.535+08:00","caller":"init/db.go:39","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.535+08:00","caller":"init/db.go:50","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.535+08:00","caller":"init/db.go:66","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.567+08:00","caller":"init/db.go:81","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.586+08:00","caller":"init/db.go:94","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.613+08:00","caller":"init/db.go:106","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.629+08:00","caller":"init/db.go:123","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:39.629+08:00","caller":"init/db.go:132","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T15:09:44.360+08:00","caller":"serverinterceptors/statinterceptor.go:72","content":"127.0.0.1:60965 - /bxcol.bxbase/NewestBidding - {\"userId\":\"userId\",\"appId\":\"10000\",\"entUserId\":\"3519\",\"newUserId\":69797,\"entId\":\"14544\"}","duration":"4.0ms","level":"info","span":"bd7564ade1ae4099","trace":"a3cd7d922c74fabf59ca818a0d5a0d80"}
+{"@timestamp":"2023-05-08T15:09:50.068+08:00","caller":"serverinterceptors/statinterceptor.go:72","content":"127.0.0.1:60965 - /bxcol.bxbase/NewestBidding - {\"userId\":\"userId\",\"appId\":\"10000\",\"entUserId\":\"3519\",\"newUserId\":69797,\"entId\":\"14544\"}","duration":"0.0ms","level":"info","span":"ba76ac4419d7e05d","trace":"7fb915351a36a0258b0a6df3621cec9b"}
+{"@timestamp":"2023-05-08T15:11:09.311+08:00","caller":"init/init.go:39","content":"info--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.311+08:00","caller":"init/init.go:39","content":"error--日志记录","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.312+08:00","caller":"init/db.go:29","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.312+08:00","caller":"init/db.go:39","content":"--初始化 mongodb bidding--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.313+08:00","caller":"init/db.go:50","content":"--初始化 mongodb ent--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.313+08:00","caller":"init/db.go:66","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.341+08:00","caller":"init/db.go:81","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.381+08:00","caller":"init/db.go:94","content":"--初始化 main mysql--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.397+08:00","caller":"init/db.go:106","content":"--初始化 BaseServiceMysql tidb--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.443+08:00","caller":"init/db.go:123","content":"--初始化 redis--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:09.443+08:00","caller":"init/db.go:132","content":"--初始化 elasticsearch--","level":"info"}
+{"@timestamp":"2023-05-08T15:11:13.510+08:00","caller":"serverinterceptors/statinterceptor.go:72","content":"127.0.0.1:61093 - /bxcol.bxbase/NewestBidding - {\"userId\":\"userId\",\"appId\":\"10000\",\"entUserId\":\"3519\",\"newUserId\":69797,\"entId\":\"14544\"}","duration":"10.4ms","level":"info","span":"957075cbe6b95825","trace":"15d2f101bd7c5c69a63a487c61ace2c5"}
+{"@timestamp":"2023-05-08T15:11:24.717+08:00","caller":"serverinterceptors/statinterceptor.go:72","content":"127.0.0.1:61093 - /bxcol.bxbase/NewestBidding - {\"userId\":\"userId\",\"appId\":\"10000\",\"entUserId\":\"3519\",\"newUserId\":69797,\"entId\":\"14544\"}","duration":"8.2ms","level":"info","span":"1834c074580ffab0","trace":"2330a6cd710dfcbba95bc7835d42f9cf"}

jyBXBase/rpc/logs/error.log-2023-02-27

@@ -0,0 +1,6 @@
+{"@timestamp":"2022-12-08T16:52:52.711+08:00","level":"error","content":"server.go:90 listen tcp 127.0.0.1:8005: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted."}
+{"@timestamp":"2023-02-27T14:54:27.760+08:00","caller":"zrpc/server.go:91","content":"context deadline exceeded","level":"error"}
+{"@timestamp":"2023-02-27T14:57:15.275+08:00","caller":"zrpc/server.go:91","content":"context deadline exceeded","level":"error"}
+{"@timestamp":"2023-02-27T15:26:29.257+08:00","caller":"discov/publisher.go:178","content":"etcd publisher revoke: etcdserver: requested lease not found","level":"error"}
+{"@timestamp":"2023-02-27T15:26:57.198+08:00","caller":"discov/publisher.go:178","content":"etcd publisher revoke: etcdserver: requested lease not found","level":"error"}
+{"@timestamp":"2023-02-27T15:38:22.581+08:00","caller":"discov/publisher.go:178","content":"etcd publisher revoke: etcdserver: requested lease not found","level":"error"}

jyBXBase/rpc/logs/slow.log

@@ -0,0 +1 @@
+{"@timestamp":"2023-05-08T15:08:52.110+08:00","caller":"serverinterceptors/statinterceptor.go:70","content":"[RPC] slowcall - 127.0.0.1:60848 - /bxcol.bxbase/NewestBidding - {\"userId\":\"userId\",\"appId\":\"10000\",\"entUserId\":\"3519\",\"newUserId\":69797,\"entId\":\"14544\"}","duration":"2049.1ms","level":"slow","span":"47f4d6a786d2131b","trace":"869e8db3c6a6ee333cfc17fe21c0484a"}

jyBXSubscribe/api/bxsubscribe.api

@@ -10,32 +10,32 @@ info (
 type (
 	//订阅列表
 	subscribeReq {
-		AppId          string `header:"appId"`
-		UserId         string `header:"userId"`
-		EntId          string `header:"entId,optional"`
-		EntUserId      string `header:"entUserId,optional"`
-		DeptId         string `header:"deptId,optional"` //部门id
-		PageNum        int64  `json:"pageNum,optional"`
-		PageSize       int64  `json:"pageSize,optional"`
-		SelectTime     string `json:"selectTime,optional"`
-		Area           string `json:"area,optional"`
-		City           string `json:"city,optional"`
-		Industry       string `json:"industry,optional"`
-		BuyerClass     string `json:"buyerClass,optional"`
-		KeyWords       string `json:"keyWords,optional"`
-		Subtype        string `json:"subtype,optional"`
-		Price          string `json:"price,optional"`
-		FileExists     string `json:"fileExists,optional"`
-		Source         string `json:"source,optional"`                                        //信息来源
-		IsRead         string `json:"isRead,optional"`                                        //是否已读
-		Staffs         string `json:"staffs,optional"`                                        //分发的员工
-		UserType       string `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
-		NewUserId      int64  `header:"newUserId"`
-		IsEnt          bool   `json:"isEnt,optional"`
-		SelectIds      string `json:"selectIds,optional"`
-		PositionType   int64  `header:"positionType,optional"`
-		NotReturnCount int64  `json:"notReturnCount,optional"`
-		Item           string `json:"item,optional"`
+		AppId          string                 `header:"appId"`
+		UserId         string                 `header:"userId"`
+		EntId          string                 `header:"entId,optional"`
+		EntUserId      string                 `header:"entUserId,optional"`
+		DeptId         string                 `header:"deptId,optional"` //部门id
+		PageNum        int64                  `json:"pageNum,optional"`
+		PageSize       int64                  `json:"pageSize,optional"`
+		SelectTime     string                 `json:"selectTime,optional"`
+		Area           string                 `json:"area,optional"`
+		City           string                 `json:"city,optional"`
+		Industry       string                 `json:"industry,optional"`
+		BuyerClass     string                 `json:"buyerClass,optional"`
+		KeyWords       string                 `json:"keyWords,optional"`
+		Subtype        string                 `json:"subtype,optional"`
+		Price          string                 `json:"price,optional"`
+		FileExists     string                 `json:"fileExists,optional"`
+		Source         string                 `json:"source,optional"`                                        //信息来源
+		IsRead         string                 `json:"isRead,optional"`                                        //是否已读
+		Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+		UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
+		NewUserId      int64                  `header:"newUserId"`
+		IsEnt          bool                   `json:"isEnt,optional"`
+		SelectIds      string                 `json:"selectIds,optional"`
+		PositionType   int64                  `header:"positionType,optional"`
+		NotReturnCount int64                  `json:"notReturnCount,optional"`
+		Item           map[string]interface{} `json:"item,optional"`
 	}
 	//
 	someInfoReq {

jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -1,8 +1,10 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
+	"strings"
 
 	"jyBXSubscribe/api/internal/svc"
 	"jyBXSubscribe/api/internal/types"
@@ -25,6 +27,29 @@ func NewByPushHistoryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ByP
 }
 
 func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types.CommonResp, err error) {
+	//关键词处理
+	//分类
+	matchitemsArr := []string{}
+	matchitems := ""
+	//关键词
+	matchkeysArr := []string{}
+	matchkeys := ""
+	if req.PositionType == 0 {
+		for k, v := range req.Item {
+			if common.InterfaceToStr(v) == "" {
+				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(v))
+			} else {
+				matchkeysArr = append(matchkeysArr, common.InterfaceToStr(k))
+			}
+		}
+		if len(matchitemsArr) == 0 {
+			matchkeys = strings.Join(matchkeysArr, ",")
+		} else {
+			matchitems = strings.Join(matchitemsArr, ",")
+		}
+	} else {
+		matchkeys = req.KeyWords
+	}
 	res, err := l.svcCtx.Suscribe.ByPushHistory(l.ctx, &bxsubscribe.SubscribeInfosReq{
 		PageNum:        req.PageNum,
 		PageSize:       req.PageSize,
@@ -33,7 +58,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 		City:           req.City,
 		Industry:       req.Industry,
 		BuyerClass:     req.BuyerClass,
-		KeyWords:       req.KeyWords,
+		KeyWords:       matchkeys,
 		Subtype:        req.Subtype,
 		UserType:       req.UserType,
 		Price:          req.Price,
@@ -50,7 +75,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 		SelectIds:      req.SelectIds,
 		PositionType:   req.PositionType,
 		NotReturnCount: req.NotReturnCount,
-		Item:           req.Item,
+		Item:           matchitems,
 	})
 	if err != nil {
 		return &types.CommonResp{

jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -1,11 +1,13 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jyBXSubscribe/api/internal/svc"
 	"jyBXSubscribe/api/internal/types"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
 	"net/http"
+	"strings"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -27,29 +29,54 @@ func NewSubscribeListLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *h
 }
 
 func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types.CommonResp, err error) {
+	//关键词处理
+	//分类
+	matchitemsArr := []string{}
+	matchitems := ""
+	//关键词
+	matchkeysArr := []string{}
+	matchkeys := ""
+	if req.PositionType == 0 {
+		for k, v := range req.Item {
+			if common.InterfaceToStr(v) == "" {
+				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(v))
+			} else {
+				matchkeysArr = append(matchkeysArr, common.InterfaceToStr(k))
+			}
+		}
+		if len(matchitemsArr) == 0 {
+			matchkeys = strings.Join(matchkeysArr, ",")
+		} else {
+			matchitems = strings.Join(matchitemsArr, ",")
+		}
+	} else {
+		matchkeys = req.KeyWords
+	}
 	res, err := l.svcCtx.Suscribe.GetSubList(l.ctx, &bxsubscribe.SubscribeInfosReq{
-		PageNum:      req.PageNum,
-		PageSize:     req.PageSize,
-		SelectTime:   req.SelectTime,
-		Area:         req.Area,
-		City:         req.City,
-		Industry:     req.Industry,
-		BuyerClass:   req.BuyerClass,
-		KeyWords:     req.KeyWords,
-		Subtype:      req.Subtype,
-		UserType:     req.UserType,
-		Price:        req.Price,
-		FileExists:   req.FileExists,
-		IsRead:       req.IsRead,
-		Source:       req.Source,
-		Staffs:       req.Staffs,
-		UserId:       req.UserId,
-		EntId:        req.EntId,
-		EntUserId:    req.EntUserId,
-		DeptId:       req.DeptId,
-		NewUserId:    req.NewUserId,
-		IsEnt:        req.IsEnt,
-		PositionType: req.PositionType,
+		PageNum:        req.PageNum,
+		PageSize:       req.PageSize,
+		SelectTime:     req.SelectTime,
+		Area:           req.Area,
+		City:           req.City,
+		Industry:       req.Industry,
+		BuyerClass:     req.BuyerClass,
+		KeyWords:       matchkeys,
+		Subtype:        req.Subtype,
+		UserType:       req.UserType,
+		Price:          req.Price,
+		FileExists:     req.FileExists,
+		IsRead:         req.IsRead,
+		Source:         req.Source,
+		Staffs:         req.Staffs,
+		UserId:         req.UserId,
+		EntId:          req.EntId,
+		EntUserId:      req.EntUserId,
+		DeptId:         req.DeptId,
+		NewUserId:      req.NewUserId,
+		IsEnt:          req.IsEnt,
+		PositionType:   req.PositionType,
+		NotReturnCount: req.NotReturnCount,
+		Item:           matchitems,
 	})
 	if err != nil {
 		return &types.CommonResp{

jyBXSubscribe/api/internal/types/types.go

@@ -2,32 +2,32 @@
 package types
 
 type SubscribeReq struct {
-	AppId          string `header:"appId"`
-	UserId         string `header:"userId"`
-	EntId          string `header:"entId,optional"`
-	EntUserId      string `header:"entUserId,optional"`
-	DeptId         string `header:"deptId,optional"` //部门id
-	PageNum        int64  `json:"pageNum,optional"`
-	PageSize       int64  `json:"pageSize,optional"`
-	SelectTime     string `json:"selectTime,optional"`
-	Area           string `json:"area,optional"`
-	City           string `json:"city,optional"`
-	Industry       string `json:"industry,optional"`
-	BuyerClass     string `json:"buyerClass,optional"`
-	KeyWords       string `json:"keyWords,optional"`
-	Subtype        string `json:"subtype,optional"`
-	Price          string `json:"price,optional"`
-	FileExists     string `json:"fileExists,optional"`
-	Source         string `json:"source,optional"`                                        //信息来源
-	IsRead         string `json:"isRead,optional"`                                        //是否已读
-	Staffs         string `json:"staffs,optional"`                                        //分发的员工
-	UserType       string `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
-	NewUserId      int64  `header:"newUserId"`
-	IsEnt          bool   `json:"isEnt,optional"`
-	SelectIds      string `json:"selectIds,optional"`
-	PositionType   int64  `header:"positionType,optional"`
-	NotReturnCount int64  `json:"notReturnCount,optional"`
-	Item           string `json:"item,optional"`
+	AppId          string                 `header:"appId"`
+	UserId         string                 `header:"userId"`
+	EntId          string                 `header:"entId,optional"`
+	EntUserId      string                 `header:"entUserId,optional"`
+	DeptId         string                 `header:"deptId,optional"` //部门id
+	PageNum        int64                  `json:"pageNum,optional"`
+	PageSize       int64                  `json:"pageSize,optional"`
+	SelectTime     string                 `json:"selectTime,optional"`
+	Area           string                 `json:"area,optional"`
+	City           string                 `json:"city,optional"`
+	Industry       string                 `json:"industry,optional"`
+	BuyerClass     string                 `json:"buyerClass,optional"`
+	KeyWords       string                 `json:"keyWords,optional"`
+	Subtype        string                 `json:"subtype,optional"`
+	Price          string                 `json:"price,optional"`
+	FileExists     string                 `json:"fileExists,optional"`
+	Source         string                 `json:"source,optional"`                                        //信息来源
+	IsRead         string                 `json:"isRead,optional"`                                        //是否已读
+	Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+	UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
+	NewUserId      int64                  `header:"newUserId"`
+	IsEnt          bool                   `json:"isEnt,optional"`
+	SelectIds      string                 `json:"selectIds,optional"`
+	PositionType   int64                  `header:"positionType,optional"`
+	NotReturnCount int64                  `json:"notReturnCount,optional"`
+	Item           map[string]interface{} `json:"item,optional"`
 }
 
 type SomeInfoReq struct {

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -28,8 +28,8 @@ message SubscribeInfosReq {
   bool IsEnt = 22;
   string SelectIds = 23;
   int64 positionType = 24;
-  int64 notReturnCount=25;
-  string item=26;
+  int64 notReturnCount = 25;
+  string item = 26;
 }
 
 message SubscribeInfosResp {
@@ -275,8 +275,8 @@ message UserStatus {
   int64 isvisit = 3;
   string visittime = 4;
   string date = 5;
-  string phone =6;
-  int64 source =7;
+  string phone = 6;
+  int64 source = 7;
 }
 message GetUserInfoReq{
   string  appId = 1;
@@ -296,8 +296,8 @@ message GetUserInfo{
   string mail = 1;
   int64  state = 2;
   string imgUrl = 3;
-  string appUrl=4;
-  bool   showWx=5;
+  string appUrl = 4;
+  bool   showWx = 5;
 }
 message SetUserInfoReq{
   string  appId = 1;
@@ -320,7 +320,7 @@ message GetPushSetReq{
 
 message GetPushSetResp{
   map<string, PushSet> data = 1;
-  map<int64,TimeJson> timeData=3;
+  map<int64, TimeJson> timeData = 3;
   string error_msg = 4;
   int64 error_code = 5;
 }
@@ -334,8 +334,8 @@ message PushSet{
   int64 i_mailpush = 4;
   int64 i_ratemode = 5;
   int64 isWxShow = 6;
-  int64 interested=7;
-  int64 isMailShow=8;
+  int64 interested = 7;
+  int64 isMailShow = 8;
 }
 message SetPushSetReq{
   string appId = 1;
@@ -360,14 +360,14 @@ message StaffSubscribeReq {
   int64 eStatus = 6;
   int64 pStatus = 7;
   int64 pageNum = 8;
-  int64 pageSize =9;
+  int64 pageSize = 9;
 }
 
 
 message StaffSubscribeListResp {
   int64 err_code = 1;
   string err_msg = 2;
-  int64 total =3;
+  int64 total = 3;
   repeated StaffSubscribe items = 4;
 }
 message StaffSubscribe {
@@ -381,13 +381,13 @@ message StaffSubscribe {
 message StaffSubscribeDetailReq{
   int64  entId = 1;
   int64  entUserId = 2;
-  string  token =3;
+  string  token = 3;
 }
 
 message StaffSubscribeDetail{
   int64 err_code = 1;
   string err_msg = 2;
-  bytes  data =3;
+  bytes  data = 3;
 }
 
 

jyBXSubscribe/rpc/model/push.go

@@ -496,19 +496,13 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 		//关键词
 		find_in_set := []string{}
 		if spqp.PositionType == 0 {
-			if spqp.Item != "" {
-				keyMap := make(map[string][]string)
-				json.Unmarshal([]byte(spqp.Key), &keyMap)
-				for k, v := range keyMap {
-					if len(v) == 0 {
-						//关键词分类名称搜索
-						find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchitems,'+',','),' ',','))", k))
-					} else {
-						//关键词搜索
-						for _, v := range v {
-							find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
-						}
-					}
+			if spqp.Item == "" {
+				for _, v := range strings.Split(spqp.Key, ",") {
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+				}
+			} else {
+				for _, v := range strings.Split(spqp.Item, ",") {
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchitems,'+',','),' ',','))", v))
 				}
 			}
 		} else {