20220405合并master分支

src/main/java/com/ccsens/ptccsens/service/TallService.java

@@ -646,12 +646,13 @@ public class TallService implements ITallService {
                 }
             }
         }
+
         //如果查看的角色项目经理，则查看所有任务
-//        int isPm = 0;
-//        ProRole role = proRoleDao.selectByPrimaryKey(param.getRoleId());
-//        if(ObjectUtil.isNotNull(role)){
-//            isPm = role.getLabelId().equals(Constant.PM_LABEL_ID) ? 1 : 0;
-//        }
+        int isPm = 0;
+        ProRole role = proRoleDao.selectByPrimaryKey(param.getRoleId());
+        if(ObjectUtil.isNotNull(role)){
+            isPm = role.getLabelId().equals(Constant.PM_LABEL_ID) ? 1 : 0;
+        }
 
         //获取任务列表
         PageHelper.startPage(param.getPageNum(), param.getPageSize());

src/main/resources/application-dev.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
 #  rabbitmq:
@@ -44,8 +44,8 @@ mybatisCache:
   port: 6379
   timeout: 1000
 
-notGatewayUrl: http://101.201.226.163:7320/v1.0
+notGatewayUrl: http://101.201.226.163:7330/v1.0
 file:
-  path: /home/pt_ccsens/server/uploads/
-  domain: https://test.tall.wiki/gateway/ptccsens
-  imgDomain: http://101.201.226.163:7320/v1.0/uploads
+  path: /home/pt_contest/server/uploads/
+  domain: https://test.tall.wiki/gateway/ptcontest
+  imgDomain: http://101.201.226.163:7330/v1.0/uploads

src/main/resources/application-prod.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
@@ -35,6 +35,6 @@ gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/
 apiUrl: http://www.tall.wiki/
 file:
-  path: /home/ptccsens/server/uploads/
-  domain: https://www.tall.wiki/gateway/ptccsens
-  imgDomain: https://www.tall.wiki/gateway/ptccsens/v1.0/uploads/
+  path: /home/ptcontest/server/uploads/
+  domain: https://www.tall.wiki/gateway/ptcontest
+  imgDomain: https://www.tall.wiki/gateway/ptcontest/v1.0/uploads/

src/main/resources/application-test.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
@@ -43,6 +43,6 @@ eureka:
     ip-address: 127.0.0.1
 
 file:
-  path: /home/ptccsens/server/uploads/
-  domain: https://test.tall.wiki/gateway/ptccsens
-  imgDomain: https://test.tall.wiki/gateway/ptccsens/v1.0/uploads/
+  path: /home/ptcontest/server/uploads/
+  domain: https://test.tall.wiki/gateway/ptcontest
+  imgDomain: https://test.tall.wiki/gateway/ptcontest/v1.0/uploads/

src/main/resources/druid-dev.yml

@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://101.201.226.163:3306/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://101.201.226.163:3306/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME

src/main/resources/druid-prod.yml

@@ -29,7 +29,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
 #      url: jdbc:mysql://127.0.0.1/defaultwbs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
-      url: jdbc:mysql://www.tall.wiki/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://www.tall.wiki/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/druid-test.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://test.tall.wiki/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
     <contextName>logback</contextName>
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/home/cloud/pt_ccsens/log/" />
+    <property name="log.path" value="/home/cloud/pt_contest/server/log/" />
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->

src/main/resources/mapper_dao/ProTaskDetailDao.xml

@@ -488,6 +488,7 @@
         and s.plan_start_time <= #{endTime}
         and s.plan_end_time >= #{startTime}
     </select>
+
     <select id="pageQueryRegularTask" resultType="com.ccsensptos.tallsdk.bean.vo.TallTaskVo$QueryTask">
         SELECT
         alltask.*

src/main/resources/mbg.xml

@@ -21,7 +21,7 @@
 
         <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://101.201.226.163:3306/pt_ccsens?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://101.201.226.163:3306/pt_contest?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
         </jdbcConnection>
@@ -33,7 +33,7 @@
         </javaTypeResolver>
 
         <!-- targetProject:生成PO类的位置 -->
-        <javaModelGenerator targetPackage="com.ccsens.ptccsens.bean.po"
+        <javaModelGenerator targetPackage="com.ccsens.ptcontest.bean.po"
                             targetProject=".\src\main\java">
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />
@@ -50,7 +50,7 @@
 
         <!-- targetPackage：mapper接口生成的位置 -->
         <javaClientGenerator type="XMLMAPPER"
-                             targetPackage="com.ccsens.ptccsens.persist.mapper"
+                             targetPackage="com.ccsens.ptcontest.persist.mapper"
                              targetProject=".\src\main\java">
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />