huanghongfa
2021-01-29 2a40c27f2fb7c3c3503b8554ed8ee68873223ccb
社区动态
11个文件已修改
107 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -186,13 +186,15 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
          <option name="containerStateName" value="" />
        </value>
      </option>
      <option name="TEST_OBJECT" value="class" />
      <option name="TEST_OBJECT" value="CLASS" />
      <properties />
      <listeners />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -418,6 +420,7 @@
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="58745000" />
      <workItem from="1611834131869" duration="1431000" />
      <workItem from="1611883117467" duration="1486000" />
    </task>
    <servers />
  </component>
@@ -477,54 +480,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="515" key="GridCell.Tab.0.bottom" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.0.bottom" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.0.center" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.center" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.0.left" timestamp="1611835504808">
    <state width="1031" height="515" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.left" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611835504808" />
    <state width="1031" height="515" key="GridCell.Tab.0.right" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.right" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.1.bottom" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.bottom" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.1.center" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.center" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.1.left" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.left" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.1.right" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.right" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.2.bottom" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.bottom" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.2.center" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.center" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.2.left" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.left" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.2.right" timestamp="1611835504809">
    <state width="1031" height="515" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.right" timestamp="1611883664802">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611835504809" />
    <state width="1031" height="515" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -553,10 +556,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611623127978" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611834397604">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611883185831">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611834397604" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611883185831" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
  servlet:
    multipart:
      max-file-size: 10MB
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
  servlet:
    multipart:
      max-file-size: 10MB
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
  servlet:
    multipart:
      max-file-size: 10MB
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -332,12 +332,20 @@
    @PostMapping("putdynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
        ComActDynDO comActDynDO = new ComActDynDO();
        Long id = comActDynVO.getId();
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        Integer isTopping = comActDynVO.getIsTopping();
        boolean b = isTopping.intValue() == 1;
        if(b){
            ComActDynDO comActDynDO1 = comActDynService.getById(id);
            Integer status = comActDynDO1.getStatus();
            if (status.intValue()==0) {
                return R.fail("该动态还未发布");
            }
        }
        boolean update = comActDynService.updateById(comActDynDO);
        if (update) {
//            最多只能设置三条置顶状态,后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
  servlet:
    multipart:
      max-file-size: 10MB
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
  servlet:
    multipart:
      max-file-size: 10MB