Merge branch 'pt' of gitee.com:ccsens_s/ccsenscloud into pt

cloudutil/src/main/resources/application-util-prod.yml

@@ -20,7 +20,7 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@140.143.228.3:7010/eureka/
+      defaultZone: http://admin:admin@81.70.54.64:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

mt/src/main/resources/application-prod.yml

@@ -0,0 +1,31 @@
+server:
+  port: 7060
+  servlet:
+    context-path:
+spring:
+  application:
+    name: mt
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+  rabbitmq:
+    host: 127.0.0.1
+    password: 111111
+    port: 5672
+    username: admin
+  redis:
+    database: 0
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: 200
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    password: ''
+    port: 6379
+    timeout: 1000ms
+swagger:
+  enable: true
+eureka:
+  instance:
+    ip-address: 81.70.54.64

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: prod
+    include: common, util-prod

mt/src/main/resources/mapper_dao/TopicDao.xml

@@ -70,7 +70,7 @@
         GROUP BY
             p.id
         ORDER BY
-            p.score
+            p.description
             LIMIT ${nums}
     </select>
     <select id="queryOption" resultType="java.lang.String">

mt/src/main/resources/mapper_dao/VoteDao.xml

@@ -7,16 +7,16 @@
         SELECT
             g.id as groupId,
             g.name as groupName,
-            count(*) as voteNums
+            count(v.id) as voteNums
         FROM
             t_mt_group g
-            LEFT JOIN t_mt_vote v ON g.id = v.group_id
+            LEFT JOIN (select * from t_mt_vote where rec_status = 0) v ON g.id = v.group_id
         WHERE
             g.project_id = #{projectId}
             AND g.type = 1
             AND g.rec_status = 0
-            AND ( v.rec_status = 0 OR v.id IS NULL )
         GROUP BY g.id, g.name
+        order by count(v.id) desc
     </select>
     <select id="countUserVoteNums" resultType="java.lang.Long">
         SELECT

tall/src/main/resources/application-prod.yml

@@ -24,7 +24,7 @@ spring:
         max-idle: 10
         max-wait: -1ms
         min-idle: 0
-    password: 'areowqr!@43ef'
+    password:
     port: 6379
     timeout: 1000ms
 swagger:

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common

tall/src/main/resources/druid-prod.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
       driverClassName: com.mysql.cj.jdbc.Driver
-      dynamicUrl: jdbc:mysql://api.ccsens.com:3306/${schema}
+      dynamicUrl: jdbc:mysql://127.0.0.1:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
       filterProfileEnable: true
@@ -15,7 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633
+#      password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633
+      password:
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -27,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://api.ccsens.com/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_HEALTH