Merge pull request #33 from linhaojun857/dev

merge dev

aurora-springboot/src/main/java/com/aurora/config/GlobalZoneConfig.java

@@ -11,7 +11,7 @@ import static com.aurora.enums.ZoneEnum.SHANGHAI;
 public class GlobalZoneConfig {
 
     @PostConstruct
-    void started() {
+    public void setGlobalZone() {
         TimeZone.setDefault(TimeZone.getTimeZone(SHANGHAI.getZone()));
     }
 

aurora-springboot/src/main/java/com/aurora/config/RedisConfig.java

@@ -12,6 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
 public class RedisConfig {
+
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
@@ -28,4 +29,5 @@ public class RedisConfig {
         redisTemplate.afterPropertiesSet();
         return redisTemplate;
     }
+
 }

aurora-springboot/src/main/java/com/aurora/config/WebSecurityConfig.java

@@ -88,4 +88,5 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
         http.addFilterBefore(jwtAuthenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
     }
+
 }

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

@@ -9,11 +9,11 @@ spring:
     username: 账号
     password: 密码
     hikari:
-      minimum-idle: 5
+      minimum-idle: 10
       # 空闲连接存活最大时间，默认600000（10分钟）
       idle-timeout: 180000
       # 连接池最大连接数，默认是10
-      maximum-pool-size: 10
+      maximum-pool-size: 100
       # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
       auto-commit: true
       # 连接池名称
@@ -31,8 +31,8 @@ spring:
     database: 1
     lettuce:
       pool:
-        max-idle: 30
-        max-active: 8
+        max-idle: 100
+        max-active: 100
         max-wait: 10000
         min-idle: 10
 

aurora-vue/aurora-admin/src/views/talk/Talk.vue

@@ -85,7 +85,7 @@ export default {
         { status: 2, desc: '私密' }
       ],
       uploads: [],
-      headers: { token: sessionStorage.getItem('token') }
+      headers: { Authorization: 'Bearer ' + sessionStorage.getItem('token') }
     }
   },
   methods: {

aurora-vue/aurora-blog/babel.config.js

@@ -4,9 +4,9 @@ module.exports = {
     [
       'prismjs',
       {
-        languages: ['javascript', 'css','sql','java','c','cpp','nginx','markup','shell','json'],
-        plugins: ['line-numbers','toolbar','copy-to-clipboard'], //配置插件
-        theme: 'okaidia', //配置主题
+        languages: ['javascript', 'css', 'sql', 'java', 'c', 'cpp', 'nginx', 'markup', 'shell', 'json'],
+        plugins: ['line-numbers', 'toolbar', 'copy-to-clipboard'],
+        theme: 'okaidia',
         css: true
       }
     ]

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

@@ -8,7 +8,7 @@
       <div class="main-grid">
         <div class="relative space-y-5">
           <div
-            class="bg-ob-deep-800 flex p-4 lg:p-8 rounded-2xl shadow-xl mb-8 lg:mb-0 talk-item"
+            class="bg-ob-deep-800 flex p-4 lg:p-8 rounded-2xl shadow-xl mb-0 talk-item"
             v-for="item in talks"
             :key="item.id"
             @click="toTalk(item.id)">

aurora-vue/aurora-blog/vue.config.js

@@ -24,7 +24,6 @@ module.exports = defineConfig({
       }
     }
   },
-  //去掉v-i18n浏览器告警部分
   chainWebpack: (config) => {
     config.resolve.alias.set('vue-i18n', 'vue-i18n/dist/vue-i18n.cjs.js')
     config.module.rule('svg').exclude.add(resolve('src/icons')).end()