From 7f38fb7e636882aea6c3b49e37eea188c6b2ab87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Mon, 17 Jul 2023 17:04:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=85=A5nacos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coolstore-partner-webb/pom.xml | 10 ++ .../cool/store/PartnerBWebApplication.java | 4 +- .../resources/application-local.properties | 93 ------------------- .../main/resources/bootstrap-dev.properties | 3 + ...cation.properties => bootstrap.properties} | 4 +- coolstore-partner-webc/pom.xml | 10 ++ .../cool/store/PartnerCWebApplication.java | 2 + .../resources/application-local.properties | 74 --------------- .../main/resources/bootstrap-dev.properties | 3 + ...cation.properties => bootstrap.properties} | 5 +- pom.xml | 17 ++++ 11 files changed, 51 insertions(+), 174 deletions(-) delete mode 100644 coolstore-partner-webb/src/main/resources/application-local.properties create mode 100644 coolstore-partner-webb/src/main/resources/bootstrap-dev.properties rename coolstore-partner-webb/src/main/resources/{application.properties => bootstrap.properties} (95%) delete mode 100644 coolstore-partner-webc/src/main/resources/application-local.properties create mode 100644 coolstore-partner-webc/src/main/resources/bootstrap-dev.properties rename coolstore-partner-webc/src/main/resources/{application.properties => bootstrap.properties} (95%) diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-webb/pom.xml index 86d6ca8fd..df3dc79fe 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-webb/pom.xml @@ -29,6 +29,16 @@ com.aliyun.oss aliyun-sdk-oss + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java b/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java index d0cb8582d..840bbb1a3 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java @@ -6,8 +6,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.scheduling.annotation.EnableAsync; @@ -20,6 +19,7 @@ import javax.sql.DataSource; * @Description: C端web层 * @date 2023-05-17 11:28 */ +@EnableDiscoveryClient @SpringBootApplication @EnableAsync @MapperScan("com.cool.store.mapper") diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties deleted file mode 100644 index 3350c3265..000000000 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ /dev/null @@ -1,93 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -#subtable size -customize_sub_table_size=10 - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain = https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir = partner/171cddee76471740/ -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 -#MDM -hs.mdm.baseUrl=http://10.56.21.30 -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 - -#sms -hs.sms.accessKeyId = LTAI4GEZKz9PBqqKa3hjup3W -hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb -hs.sms.templateCode = SMS_461530041 - -xxl.job.admin.addresses = -xxl.job.executor.appname = ${spring.application.name} -xxl.job.executor.ip = -xxl.job.executor.port = 30201 -xxl.job.executor.logpath = logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays = 30 -xxl.job.accessToken = - -ec.baseUrl=http://127.0.0.1:8017 -#飞书通知 -feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties new file mode 100644 index 000000000..73e64f0f1 --- /dev/null +++ b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 +spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties similarity index 95% rename from coolstore-partner-webb/src/main/resources/application.properties rename to coolstore-partner-webb/src/main/resources/bootstrap.properties index dc6e86bd0..e8cb5a145 100644 --- a/coolstore-partner-webb/src/main/resources/application.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ -spring.application.name=coolstore-partner-webb -spring.profiles.active=@profileActive@ +spring.application.name=hsay-partner-webb +spring.profiles.active=dev server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webc/pom.xml b/coolstore-partner-webc/pom.xml index fbca9fc1d..ff2e9d8fc 100644 --- a/coolstore-partner-webc/pom.xml +++ b/coolstore-partner-webc/pom.xml @@ -33,6 +33,16 @@ com.aliyun.oss aliyun-sdk-oss + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java b/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java index 03c3874f3..8aded9388 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.scheduling.annotation.EnableAsync; @@ -20,6 +21,7 @@ import javax.sql.DataSource; * @Description: B端web层 * @date 2023-05-17 11:28 */ +@EnableDiscoveryClient @SpringBootApplication @MapperScan("com.cool.store.mapper") @EnableAsync diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties deleted file mode 100644 index 94027cc8b..000000000 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ /dev/null @@ -1,74 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -#subtable size -customize_sub_table_size=10 - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain = https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir = partner/171cddee76471740/ -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties new file mode 100644 index 000000000..73e64f0f1 --- /dev/null +++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 +spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application.properties b/coolstore-partner-webc/src/main/resources/bootstrap.properties similarity index 95% rename from coolstore-partner-webc/src/main/resources/application.properties rename to coolstore-partner-webc/src/main/resources/bootstrap.properties index 7728a30a3..0f8e4f464 100644 --- a/coolstore-partner-webc/src/main/resources/application.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap.properties @@ -1,6 +1,5 @@ -spring.application.name=coolstore-partner-webc -spring.profiles.active=@profileActive@ - +spring.application.name=hsay-partner-webc +spring.profiles.active=dev server.port=30900 server.servlet.context-path=/partner/mini/program diff --git a/pom.xml b/pom.xml index 67fe71dbf..e4b63e2a5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,8 @@ 8 8 + Hoxton.SR4 + 2.2.0.RELEASE @@ -196,6 +198,21 @@ aspectjweaver 1.9.5 + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + From a5a43d2708298f675d5d1cb9bb31f80c87e65fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 19 Jul 2023 13:21:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A5=E5=85=A5nacos=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-ab.properties | 89 ------------------- .../resources/application-online.properties | 65 -------------- .../main/resources/bootstrap-dev.properties | 4 +- .../main/resources/bootstrap-test.properties | 3 + .../src/main/resources/bootstrap.properties | 2 +- .../main/resources/application-ab.properties | 72 --------------- .../resources/application-online.properties | 62 ------------- .../main/resources/bootstrap-dev.properties | 4 +- .../main/resources/bootstrap-test.properties | 3 + .../src/main/resources/bootstrap.properties | 11 +-- 10 files changed, 17 insertions(+), 298 deletions(-) delete mode 100644 coolstore-partner-webb/src/main/resources/application-ab.properties delete mode 100644 coolstore-partner-webb/src/main/resources/application-online.properties create mode 100644 coolstore-partner-webb/src/main/resources/bootstrap-test.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-ab.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-online.properties create mode 100644 coolstore-partner-webc/src/main/resources/bootstrap-test.properties diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties deleted file mode 100644 index da322ce70..000000000 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ /dev/null @@ -1,89 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain = https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir = partner/171cddee76471740/ - -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 -#xxljob配置 -xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin -xxl.job.executor.appname = ${spring.application.name} -xxl.job.executor.ip = -xxl.job.executor.port = 31001 -xxl.job.executor.logpath = logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays = 3 -xxl.job.accessToken = - -hs.mdm.baseUrl=http://36.7.115.86:10112 -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 - -#sms -hs.sms.accessKeyId = LTAI4GEZKz9PBqqKa3hjup3W -hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb -hs.sms.templateCode = SMS_461530041 - -ec.baseUrl=https://oapi-gateway.shpr.top/basic - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties deleted file mode 100644 index 3764060eb..000000000 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ /dev/null @@ -1,65 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://store-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true -default.datasource.username=coolstore -default.datasource.password=CSCErYcXniNYm7bT - -#redis -spring.redis.host=store-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain = https://store-isv.coolcollege.cn - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message -rocketmq.orderTopic=order_message - -#oss配置 -oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 -oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS -oss.endpoint=oss-cn-shanghai.aliyuncs.com -oss.bucket=vec-coolstore -corp.id = 171cddee76471740 -oss.file.dir = partner/ -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 -fixMobileOpenid=HSAY4AF322E -#阿里云ak sk -aliyun.accessKeyId= -aliyun.accessKeySecret= -aliyun.authCode= \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties index 73e64f0f1..e20af0316 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 -spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties new file mode 100644 index 000000000..e20af0316 --- /dev/null +++ b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..ed2256673 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=@profileActive@ server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties deleted file mode 100644 index 62c2e93e6..000000000 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ /dev/null @@ -1,72 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain = https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir = partner/171cddee76471740/ - -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties deleted file mode 100644 index 1ce5a8613..000000000 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ /dev/null @@ -1,62 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://store-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true -default.datasource.username=coolstore -default.datasource.password=CSCErYcXniNYm7bT - -#redis -spring.redis.host=store-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 -oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS -oss.endpoint=oss-cn-shanghai.aliyuncs.com -oss.bucket=vec-coolstore -corp.id = 171cddee76471740 -oss.file.dir = partner/171cddee76471740/ - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 -fixMobileOpenid=HSAY4AF322E -#阿里云ak sk -aliyun.accessKeyId= -aliyun.accessKeySecret= -aliyun.authCode= \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties index 73e64f0f1..e20af0316 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 -spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties new file mode 100644 index 000000000..e20af0316 --- /dev/null +++ b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap.properties b/coolstore-partner-webc/src/main/resources/bootstrap.properties index 0f8e4f464..ed2256673 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap.properties @@ -1,7 +1,8 @@ -spring.application.name=hsay-partner-webc -spring.profiles.active=dev -server.port=30900 -server.servlet.context-path=/partner/mini/program +spring.application.name=hsay-partner-webb +spring.profiles.active=@profileActive@ + +server.port=31000 +server.servlet.context-path=/partner/pc #logback logging.config=classpath:logback-spring.xml @@ -46,6 +47,6 @@ allow.upload.video.size=1024 * 1024 * 10L allow.upload.audio.size=1024 * 1024 * 10L server.connection-timeout=18000000 -server.tomcat.basedir=/tmp/tomcat/partner-c +server.tomcat.basedir=/tmp/tomcat/partner-b log4j2.formatMsgNoLookups=true From 438c7f390c1e31e30a15d734e9dd9e4212f856e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Jul 2023 14:06:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E9=85=8D?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/UserChannelEnum.java | 34 +++++++++++++++++++ .../mapper/HyPartnerLineInfoMapper.xml | 26 ++++---------- .../mapper/HyPartnerUserInfoMapper.xml | 8 +++-- .../store/dto/wx/MiniProgramLoginDTO.java | 3 ++ .../store/entity/HyPartnerLineInfoDO.java | 2 -- .../store/entity/HyPartnerUserInfoDO.java | 2 ++ .../store/service/impl/EcSyncServiceImpl.java | 2 +- .../impl/HyPartnerBaseInfoServiceImpl.java | 1 - .../impl/HyPartnerLineInfoServiceImpl.java | 15 ++++---- .../impl/WechatMiniAppServiceImpl.java | 3 ++ 10 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java new file mode 100644 index 000000000..4db251d24 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserChannelEnum.java @@ -0,0 +1,34 @@ +package com.cool.store.enums; + +/** + * @Author suzhuhong + * @Date 2023/7/18 17:01 + * @Version 1.0 + */ +public enum UserChannelEnum { + + EXHIBITION("exhibition", 45000,"北京展会"), + RECOMMENDED("recommended", 45100,"李德龙推荐"); + + private final String code; + private final Integer channelId; + private final String desc; + + UserChannelEnum(String code, Integer channelId, String desc) { + this.code = code; + this.channelId = channelId; + this.desc = desc; + } + + public String getCode() { + return code; + } + + public Integer getChannelId() { + return channelId; + } + + public String getDesc() { + return desc; + } +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 4ba9db126..0aea443ad 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -20,13 +20,12 @@ - id, partner_id, workflow_stage, workflow_status, line_status, investment_manager, development_director, development_manager, deadline, pass_reason, reject_public_reason, reject_real_reason, certify_file, deleted, create_time, update_time, close_time, - close_user_id,user_channel_id + close_user_id SELECT FROM hy_partner_line_info - where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null)) + where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null and investment_manager is not null)) and partner_id = #{partner_id} + order by id desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index bf8536c1c..b9702e175 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -19,10 +19,12 @@ + id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, - invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, recommend_partner_id, recommend_partner_name, recommend_partner_mobile + invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, + recommend_partner_id, recommend_partner_name, recommend_partner_mobile,user_channel_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java index 94932f671..aac2d2937 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java @@ -1,5 +1,6 @@ package com.cool.store.dto.wx; +import com.cool.store.enums.UserChannelEnum; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -24,4 +25,6 @@ public class MiniProgramLoginDTO { @NotBlank(message = "ivStr不能为空") private String ivStr; + + private UserChannelEnum userChannelEnum; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java index beda39416..e6ff6ce8a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java @@ -80,6 +80,4 @@ public class HyPartnerLineInfoDO implements Serializable { @ApiModelProperty("移除黑名单原因") private String removeBlackReason; - @ApiModelProperty("hy_partner_user_channel.id") - private Integer userChannelId; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java index c1f77aeae..b770bc746 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java @@ -70,4 +70,6 @@ public class HyPartnerUserInfoDO implements Serializable { @ApiModelProperty("推荐加盟商手机号") private String recommendPartnerMobile; + + private Integer userChannelId; } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index 730d50eaa..d8c9212d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -140,7 +140,7 @@ public class EcSyncServiceImpl implements EcSyncService { } resultLine.setInvestmentManager(userId); } - resultLine.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()).setUserChannelId(Convert.toInt(channelId)) + resultLine.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()) .setLineStatus(StringUtil.isEmpty(customerInfoItem.getFollowUserName()) ? LineStatusEnum.PUBLIC_SEAS.getCode() : LineStatusEnum.PRIVATE_SEAS.getCode()); HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index ca44812f5..69313b7fb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -275,7 +275,6 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { oldLineInfo.setCloseUserId(null); oldLineInfo.setJoinBlackReason(null); oldLineInfo.setRemoveBlackReason(null); - oldLineInfo.setUserChannelId(null); } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 816466d2d..a733b4238 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -198,7 +198,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); hyPartnerLineInfoDO.setLineStatus(1); - hyPartnerLineInfoDO.setUserChannelId(x.getUserChannelId()); list.add(hyPartnerLineInfoDO); }); hyPartnerLineInfoDAO.batchInsert(list); @@ -307,7 +306,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { newHyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); newHyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); newHyPartnerLineInfoDO.setLineStatus(status); - newHyPartnerLineInfoDO.setUserChannelId(hyPartnerLineInfo.getUserChannelId()); hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO); HyPartnerBaseInfoDO oldHyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(lineId); @@ -555,7 +553,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) { log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType); - List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); //当前加盟商线索 HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId); //如果意向区域没有绑定战区 不分配招商经理 @@ -578,9 +575,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return Boolean.FALSE; } - //如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1 - if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isNotEmpty(lineFollowHistoryList)){ - log.info("如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1 lineStatus:{},lineFollowHistoryList:{}",HyPartnerLineInfo.getLineStatus(),lineFollowHistoryList.size()); + //如果是私海线索 不需要重新分配招商经理 + if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1)){ + log.info("如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1 lineStatus:{}",HyPartnerLineInfo.getLineStatus()); return Boolean.FALSE; } @@ -642,6 +639,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { public String getAssignFollowUser(String partnerId,String type) { //查询意向区域 HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); + List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); + //如果跟进次数大于1 直接使用上一次的招商经理 + if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){ + return lineFollowHistoryList.get(0).getInvestmentManager(); + } //意向区域 String wantShopArea = hyPartnerUserInfoDO.getWantShopArea(); //查询意向区域绑定的组织架构 没有绑定战区 分配空 @@ -723,7 +725,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); // 生成一条新线索 HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType()); - newLineInfoDO.setUserChannelId(hyPartnerLineInfoDO.getUserChannelId()); // 生成一条意向基本信息 HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId); hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 042839a6b..bf0c1d5e0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -13,6 +13,7 @@ import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.entity.HyPartnerUserPlatformBindDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.UserChannelEnum; import com.cool.store.enums.UserPlatformTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.http.WechatRest; @@ -108,6 +109,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); hyPartnerUserInfoDO.setIsWritePartnerKnow(0); + Integer channelId = param.getUserChannelEnum() != null ? param.getUserChannelEnum().getChannelId() : null; + hyPartnerUserInfoDO.setUserChannelId(channelId); hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); } hyPartnerUserPlatformBindDO = new HyPartnerUserPlatformBindDO(); From d79e1d7329fe6234f0c336ead9f1382cff50d3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 19 Jul 2023 14:13:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A5=E5=85=A5nacos=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-test.properties | 4 ++-- .../src/main/resources/bootstrap-test.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties index e20af0316..e793965bb 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=121.41.41.92 -spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.discovery.server-addr=10.7.54.16:8848 +spring.cloud.nacos.config.server-addr=10.7.54.16:8848 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties index e20af0316..e793965bb 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=121.41.41.92 -spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.discovery.server-addr=10.7.54.16:8848 +spring.cloud.nacos.config.server-addr=10.7.54.16:8848 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file