Merge pull request #165 from linhaojun857/dev

dev

Author: linhaojun857

.gitignore

@@ -19,4 +19,5 @@ yarn-error.log*
 *.sw?
 
 target
-aurora-springboot/src/test
+test
+application-dev.yml

aurora-springboot/Dockerfile

@@ -3,6 +3,5 @@ RUN rm -f /etc/localtime \
 && ln -sv /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
 && echo "Asia/Shanghai" > /etc/timezone
 COPY target/aurora-springboot-0.0.1.jar /app/aurora-springboot-0.0.1.jar
-COPY src/main/resources/application.yml /config/application.yml
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/aurora-springboot-0.0.1.jar","--spring.config.location=/config/application.yml"]
 EXPOSE 8080

aurora-springboot/src/main/resources/application-prod.yml

@@ -0,0 +1,104 @@
+server:
+  port: 8080
+
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://mysql的ip:3306/aurora?serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: 账号
+    password: 密码
+    hikari:
+      minimum-idle: 10
+      idle-timeout: 180000
+      maximum-pool-size: 100
+      auto-commit: true
+      pool-name: MyHikariCP
+      max-lifetime: 60000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+
+  redis:
+    host: redis的ip
+    port: 6379
+    password: 密码
+    database: 0
+    lettuce:
+      pool:
+        min-idle: 10
+        max-idle: 100
+        max-active: 100
+        max-wait: 10000
+
+  rabbitmq:
+    host: rabbitmq的ip
+    port: 5672
+    username: 账号
+    password: 密码
+    listener:
+      simple:
+        retry:
+          enabled: true
+          max-attempts: 3
+          initial-interval: 3000
+
+  elasticsearch:
+    rest:
+      uris: es的ip:9200
+
+  mail:
+    host: smtp.163.com
+    username: 邮箱
+    password: 密码
+    default-encoding: UTF-8
+    protocol: smtp
+    port: 465
+    properties:
+      mail:
+        smtp:
+          auth: true
+          socketFactory:
+            class: javax.net.ssl.SSLSocketFactory
+            port: 465
+          ssl:
+            enable: true
+          starttls:
+            enable: true
+            required: true
+
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    map-underscore-to-camel-case: true
+
+search:
+  mode: elasticsearch
+
+upload:
+  mode: oss
+  oss:
+    url: http://Bucket域名/
+    endpoint: OSS配置endpoint
+    accessKeyId: OSS配置accessKeyId
+    accessKeySecret: OSS配置accessKeySecret
+    bucketName: OSS配置bucketName
+  minio:
+    url: http://minio的ip:9000/
+    endpoint: http://minio的ip:9000
+    accesskey: 用户名
+    secretKey: 密码
+    bucketName: 桶的名称
+
+website:
+  url: https://前台域名
+
+qq:
+  app-id: QQ APPID
+  check-token-url: https://graph.qq.com/oauth2.0/me?access_token={access_token}
+  user-info-url: https://graph.qq.com/user/get_user_info?openid={openid}&access_token={access_token}&oauth_consumer_key={oauth_consumer_key}

aurora-springboot/src/main/resources/application.yml

@@ -1,104 +1,5 @@
-server:
-  port: 8080
-
 spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql的ip:3306/aurora?serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: 账号
-    password: 密码
-    hikari:
-      minimum-idle: 10
-      idle-timeout: 180000
-      maximum-pool-size: 100
-      auto-commit: true
-      pool-name: MyHikariCP
-      max-lifetime: 60000
-      connection-timeout: 30000
-      connection-test-query: SELECT 1
-
-  redis:
-    host: redis的ip
-    port: 6379
-    password: 密码
-    database: 0
-    lettuce:
-      pool:
-        min-idle: 10
-        max-idle: 100
-        max-active: 100
-        max-wait: 10000
-
-  rabbitmq:
-    host: rabbitmq的ip
-    port: 5672
-    username: 账号
-    password: 密码
-    listener:
-      simple:
-        retry:
-          enabled: true
-          max-attempts: 3
-          initial-interval: 3000
-
-  elasticsearch:
-    rest:
-      uris: es的ip:9200
-
-  mail:
-    host: smtp.163.com
-    username: 邮箱
-    password: 密码
-    default-encoding: UTF-8
-    protocol: smtp
-    port: 465
-    properties:
-      mail:
-        smtp:
-          auth: true
-          socketFactory:
-            class: javax.net.ssl.SSLSocketFactory
-            port: 465
-          ssl:
-            enable: true
-          starttls:
-            enable: true
-            required: true
-
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-
-mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    map-underscore-to-camel-case: true
-
-search:
-  mode: elasticsearch
-
-upload:
-  mode: oss
-  oss:
-    url: http://Bucket域名/
-    endpoint: OSS配置endpoint
-    accessKeyId: OSS配置accessKeyId
-    accessKeySecret: OSS配置accessKeySecret
-    bucketName: OSS配置bucketName
-  minio:
-    url: http://minio的ip:9000/
-    endpoint: http://minio的ip:9000
-    accesskey: 用户名
-    secretKey: 密码
-    bucketName: 桶的名称
-
-website:
-  url: https://前台域名
-
-qq:
-  app-id: QQ APPID
-  check-token-url: https://graph.qq.com/oauth2.0/me?access_token={access_token}
-  user-info-url: https://graph.qq.com/user/get_user_info?openid={openid}&access_token={access_token}&oauth_consumer_key={oauth_consumer_key}
+  application:
+    name: aurora-springboot
+  profiles:
+    active: dev

aurora-vue/aurora-blog/src/views/Archives.vue

@@ -27,7 +27,7 @@
             </div>
             <div class="timeline-marker"></div>
             <div class="timeline-content">
-              <h3 class="timeline-title" @click="toArticle(article)">
+              <h3 class="timeline-title article-title" @click="toArticle(article)">
                 <span>{{ article.articleTitle }}</span>
                 <svg-icon v-if="article.status == 2" icon-class="lock" class="lock-svg" />
               </h3>
@@ -388,4 +388,8 @@ export default defineComponent({
     }
   }
 }
+
+.article-title {
+  cursor: default;
+}
 </style>