Merge branch 'master' of licailing/zhirongip into dev

src/main/resources/application.yaml

@@ -12,9 +12,9 @@ spring:
     profiles:
         active: dev
     datasource:
-        url: jdbc:mysql://mysql.izouma.com/zhirongip_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-        username: microball
-        password: 2wsx@WSX#EDC
+        url: jdbc:mysql://rm-bp1z487a1rz64294gpo.mysql.rds.aliyuncs.com/zhirongip?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+        username: zhirongip
+        password: Wilhelmzhirong98
         hikari:
             minimum-idle: 5
             maximum-pool-size: 30
@@ -75,22 +75,22 @@ storage:
     provider: aliyun
     local_path: /var/www/upload/
 aliyun:
-    access-key-id: PXzJyah5rZfWHIIH
-    access-key-secret: e1MS6j0wypXJrw8CM0hObZu8qKbfah
+    access-key-id: LTAI5tBhTJmZfMx64Nqr9WTr
+    access-key-secret: KcMqcOJD5lstXEbL3kbC9lNNeIPvfH
     oss-end-point: oss-cn-hangzhou.aliyuncs.com
     oss-bucket-name: zhirongip
-    oss-domain: https://zhirongip.oss-cn-hangzhou.aliyuncs.com
+    oss-domain: https://zhirongipp.oss-cn-hangzhou.aliyuncs.com
 general:
-    host: http://zhirongip.izouma.com
+    host: https://www.njzrzc.com
 ---
 
 spring:
     profiles: test
-    url: jdbc:mysql://mysql.izouma.com/zhirongip_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://rm-bp1z487a1rz64294gpo.mysql.rds.aliyuncs.com/zhirongip?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 
 ---
 
 spring:
     profiles: prod
-    url: jdbc:mysql://mysql.izouma.com/zhirongip?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://rm-bp1z487a1rz64294gpo.mysql.rds.aliyuncs.com/zhirongip?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 

src/main/zhi-rong-web/src/views/Home.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="home">
         <banner></banner>
-        <div class="center-content" style="padding-top: 80px;">
+        <div class="center-content" style="padding-top: 80px">
             <div class="news">
                 <div class="carousel news-item" @mouseover="autoplay = false" @mouseout="autoplay = true">
                     <el-carousel ref="carousel" height="360px" arrow="never" trigger="hover" @change="changeCarousl">
@@ -9,7 +9,7 @@
                             <el-image
                                 :src="item.img"
                                 @click="all('/news')"
-                                style="width: 100%; height: 100%; cursor: pointer;"
+                                style="width: 100%; height: 100%; cursor: pointer"
                                 fit="cover"
                             ></el-image>
 
@@ -58,8 +58,8 @@
                         </router-link>
                     </div>
                     <div class="empty" v-else>
-                        <i class="el-icon-takeaway-box" style="margin-left: 24px;"></i>
-                        <div style="font-size: 20px;">暂无数据</div>
+                        <i class="el-icon-takeaway-box" style="margin-left: 24px"></i>
+                        <div style="font-size: 20px">暂无数据</div>
                     </div>
                 </div>
             </div>
@@ -322,7 +322,11 @@ export default {
     },
     created() {
         this.$http
-            .post('/policyLaw/all', { query: { category: 'NEWS', typeSettingId: 324 } }, { body: 'json' })
+            .post(
+                '/policyLaw/all',
+                { query: { category: 'NEWS', typeSettingId: 324 }, sort: 'issuedAt,desc' },
+                { body: 'json' }
+            )
             .then(res => {
                 this.newsList = res.content;
             });
@@ -340,7 +344,11 @@ export default {
             let name = item == '平台动态' ? 324 : 325;
             const typeSettingId = name;
             this.$http
-                .post('/policyLaw/all', { query: { category: 'NEWS', typeSettingId } }, { body: 'json' })
+                .post(
+                    '/policyLaw/all',
+                    { query: { category: 'NEWS', typeSettingId }, sort: 'issuedAt,desc' },
+                    { body: 'json' }
+                )
                 .then(res => {
                     this.newsList = res.content;
                 });

src/main/zhi-rong-web/src/views/Index.vue

@@ -50,7 +50,8 @@
                     <!-- 页面所涉及产品信息仅用于展示目的，本网站及本网站展商合作方保留更改网页上所列产品相关信息的权利，恕不另行通知。 -->
                     <!-- </div> -->
                 </div>
-                <div class="pIc">© 智 戎 知 识 产 权 融 合 公 共 服 务 平 台 苏 * * * * * * * *</div>
+              <div class="footer-content_pIc record_jump" @click="recordJump">Copyright © 2019 - 2022 Fentiao 版权所有 苏ICP备17027521号</div>
+
             </el-footer>
         </el-container>