适配

fw-sample-admin/src/main/java/com/mokasz/sample/admin/controller/AdminLogController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
-
 @RestController
 @RequestMapping("/admin/adminLog/")
 @GlobalApiResponse

fw-sample-admin/src/main/java/com/mokasz/sample/admin/controller/DictController.java

@@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokasz.sample.admin.query.DictQuery;
-import com.mokasz.sample.common.model.ApiResponse;
+import com.mokasz.sample.common.annotation.GlobalApiResponse;
+import com.mokasz.sample.common.context.ApiContext;
+import com.mokasz.sample.common.model.ApiContextModel;
 import com.mokasz.sample.mapper.entity.DictENT;
 import com.mokasz.sample.service.DictService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +24,7 @@ import java.util.List;
  **/
 @RestController
 @RequestMapping("/admin/dict/")
+@GlobalApiResponse
 public class DictController {
 
     @Autowired
@@ -35,19 +39,28 @@ public class DictController {
     }
 
     @GetMapping("queryByGroup")
-    public ApiResponse<List<DictENT>> queryByGroupCode(@RequestParam String groupCode) {
-        List<DictENT> rows = dictService.lambdaQuery().eq(DictENT::getGroupCode, groupCode).list();
-        return ApiResponse.ok(rows);
+    public List<DictENT> queryByGroupCode(@RequestParam String groupCode) {
+        return dictService.lambdaQuery().eq(DictENT::getGroupCode, groupCode).list();
     }
 
 
     @PostMapping(value = "save")
     public Boolean save(@RequestBody DictENT ent) {
+        ApiContextModel user = ApiContext.getApiContextModel();
+        Date now = new Date();
+        ent.setCreateTime(now);
+        ent.setCreateBy(user.getUserName());
+        ent.setUpdateTime(now);
+        ent.setUpdateBy(user.getUserName());
         return dictService.save(ent);
     }
 
     @PostMapping(value = "update")
     public Boolean update(@RequestBody DictENT ent) {
+        ApiContextModel user = ApiContext.getApiContextModel();
+        Date now = new Date();
+        ent.setUpdateTime(now);
+        ent.setUpdateBy(user.getUserName());
         return dictService.updateById(ent);
     }
 

fw-sample-admin/src/main/java/com/mokasz/sample/admin/controller/HomeController.java

@@ -45,7 +45,7 @@ public class HomeController {
     @GetMapping(value = Conf.SSO_LOGOUT)
     public ApiResponse<?> logout(HttpServletRequest request, HttpServletResponse response) {
         SsoWebLoginHelper.logout(request, response);
-        return ApiResponse.OK;
+        return ApiResponse.ok(ssoLoginUrl);
     }
 
 }

fw-sample-portal/src/network/api/api-base.js

@@ -3,8 +3,8 @@ import service from '@/network/service/service'
 /**
  * 获取用户信息
  */
-export function getUserInfo (params) {
-    return service.get('/api/free-novel/admin/getAdminInfo', { params })
+export function getUserInfo () {
+    return service.get('/admin/getAdminInfo')
 }
 
 /**

fw-sample-portal/src/network/service/service.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { MessageBox } from 'element-ui'
+import { MessageBox, Notification } from 'element-ui'
 
 const service = axios.create({
   timeout: 30000
@@ -23,7 +23,16 @@ service.interceptors.response.use(
       return response
     }
     if (response.status === 200) {
-      return response.data
+      if (response.data.code === 200) {
+        return response.data
+      } else {
+        Notification({
+          type: 'error',
+          title: '系统错误',
+          message: response.data.msg,
+          duration: 2000
+        })
+      }
     } else {
       return Promise.reject(response.data)
     }

fw-sample-portal/src/views/adminLog/AdminLogMain.vue

@@ -70,8 +70,8 @@ export default {
       let req = {...searchForm, ...this.pageInfo}
       this.loading = true
       Page(req).then(res => {
-        this.data = res.records
-        this.pageInfo.total = res.total
+        this.data = res.data.records
+        this.pageInfo.total = res.data.total
         this.loading = false
       })
     },

fw-sample-portal/src/views/dict/DictMain.vue

@@ -76,8 +76,8 @@ export default {
       let req = {...searchForm, ...this.pageInfo}
       this.loading = true
       Page(req).then(res => {
-        this.data = res.records
-        this.pageInfo.total = res.total
+        this.data = res.data.records
+        this.pageInfo.total = res.data.total
         this.loading = false
       })
     },

fw-sample-portal/src/views/redis/redisManager.vue

@@ -51,7 +51,7 @@ export default {
       this.isBtnLoading = true
       exec(this.redisCommand).then(res => {
         this.isBtnLoading = false
-        this.result = JSON.stringify(res, null, "  ")
+        this.result = JSON.stringify(res.data, null, "  ")
       })
     },
     reset() {

fw-sample-service/src/main/java/com/mokasz/sample/common/aspect/GlobalApiResponseControllerAdvice.java

@@ -2,6 +2,7 @@ package com.mokasz.sample.common.aspect;
 
 
 import com.mokasz.sample.common.annotation.GlobalApiResponse;
+import com.mokasz.sample.common.model.ApiResponse;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
@@ -11,7 +12,6 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-import com.mokasz.sample.common.model.ApiResponse;
 
 
 @RestControllerAdvice(value = {"com.mokasz.sample.api.controller", "com.mokasz.sample.admin.controller"})

fw-sample-service/src/main/java/com/mokasz/sample/common/aspect/LogControllerAspect.java

@@ -1,8 +1,8 @@
 package com.mokasz.sample.common.aspect;
 
 import com.alibaba.fastjson.JSON;
-import com.plumelog.core.TraceId;
 import com.mokasz.sample.common.context.ApiContext;
+import com.plumelog.core.TraceId;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;

fw-sample-service/src/main/java/com/mokasz/sample/common/enums/BaseEnum.java

@@ -1,8 +1,5 @@
 package com.mokasz.sample.common.enums;
 
-import java.util.EnumSet;
-import java.util.Objects;
-
 public interface BaseEnum<T> {
 
     T getValue();

fw-sample-service/src/main/java/com/mokasz/sample/common/filter/XxlSSOFilter.java

@@ -7,7 +7,6 @@ import com.xxl.sso.core.conf.Conf;
 import com.xxl.sso.core.user.XxlSsoUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpMethod;
 
 import javax.servlet.*;

fw-sample-service/src/main/java/com/mokasz/sample/common/interceptor/AvoidDuplicateSubmitInterceptor.java

@@ -1,10 +1,10 @@
 package com.mokasz.sample.common.interceptor;
 
 import com.alibaba.fastjson.JSON;
-import com.mokasz.sample.common.model.ApiResponse;
 import com.mokasz.sample.common.annotation.AvoidDuplicateSubmit;
 import com.mokasz.sample.common.constant.RedisKeyConstant;
 import com.mokasz.sample.common.context.ApiContext;
+import com.mokasz.sample.common.model.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

fw-sample-service/src/main/java/com/mokasz/sample/common/util/CsvUtil.java

@@ -1,18 +1,20 @@
 package com.mokasz.sample.common.util;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.FileUtil;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.google.common.collect.Lists;
-import com.mokasz.sample.common.model.CsvModel;
 import com.mokasz.sample.common.annotation.Csv;
+import com.mokasz.sample.common.model.CsvModel;
 import lombok.SneakyThrows;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;

fw-sample-service/src/main/java/com/mokasz/sample/common/util/PasswordUtil.java

@@ -3,8 +3,6 @@ package com.mokasz.sample.common.util;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.nacos.common.utils.Md5Utils;
 
-import java.util.Random;
-
 
 public class PasswordUtil {
 

fw-sample-service/src/main/java/com/mokasz/sample/infrastructure/ds/DataSource.java

@@ -1,10 +0,0 @@
-package com.mokasz.sample.infrastructure.ds;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface DataSource {
-    DataSourceEnum value();
-}

fw-sample-service/src/main/java/com/mokasz/sample/infrastructure/ds/DataSourceAspect.java

@@ -1,43 +0,0 @@
-package com.mokasz.sample.infrastructure.ds;
-
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-import java.util.Optional;
-
-
-@Slf4j
-@Aspect
-@Order(-1)
-@Component
-public class DataSourceAspect {
-
-    @Pointcut("execution(public * com.mokasz.sample..*.*(..))")
-    public void pointcut() {
-    }
-
-    @Before("pointcut()")
-    public void before(JoinPoint joinPoint) {
-        DataSource annotation = (DataSource) joinPoint.getSignature().getDeclaringType().getAnnotation(DataSource.class);
-        DataSource methodDataSource = ((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(DataSource.class);
-        if (!Objects.isNull(annotation) || !Objects.isNull(methodDataSource)) {
-            DataSourceEnum dbModule = Optional.ofNullable(methodDataSource).orElse(annotation).value();
-            DataSourceContext.setDataSourceType(dbModule.getModule());
-        }
-    }
-
-    @After("pointcut()")
-    public void after() {
-        DataSourceContext.clearDataSourceType();
-    }
-
-
-}

fw-sample-service/src/main/java/com/mokasz/sample/infrastructure/ds/DataSourceContext.java

@@ -1,20 +0,0 @@
-package com.mokasz.sample.infrastructure.ds;
-
-
-public class DataSourceContext {
-
-    private static final ThreadLocal<String> contextHolder = new ThreadLocal<>();
-
-    public static void setDataSourceType(String dataSourceType) {
-        contextHolder.set(dataSourceType);
-    }
-
-    public static String getDataSourceType() {
-        return contextHolder.get();
-    }
-
-    public static void clearDataSourceType() {
-        contextHolder.remove();
-    }
-
-}

fw-sample-service/src/main/java/com/mokasz/sample/infrastructure/ds/DataSourceEnum.java

@@ -1,31 +0,0 @@
-package com.mokasz.sample.infrastructure.ds;
-
-
-public enum DataSourceEnum {
-
-    /**
-     * 主库
-     */
-    MASTER("fw-sample", "MASTER"),
-    /**
-     * 从库
-     */
-    SLAVE("fw-sample", "SLAVE");
-
-    private String scheme;
-    private String module;
-
-    DataSourceEnum(String scheme, String module) {
-        this.scheme = scheme;
-        this.module = module;
-    }
-
-    public String getScheme() {
-        return scheme;
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-}

fw-sample-service/src/main/java/com/mokasz/sample/infrastructure/ds/DynamicDataSource.java

@@ -1,20 +0,0 @@
-package com.mokasz.sample.infrastructure.ds;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-@Slf4j
-public class DynamicDataSource extends AbstractRoutingDataSource {
-    @Override
-    protected Object determineCurrentLookupKey() {
-        String dataSourceType = DataSourceContext.getDataSourceType();
-
-        if (StringUtils.isEmpty(dataSourceType)) {
-            dataSourceType = DataSourceEnum.MASTER.getModule();
-        }
-
-        log.info("====switch to db:{}", dataSourceType);
-        return dataSourceType;
-    }
-}

fw-sample-service/src/main/java/com/mokasz/sample/mapper/entity/AdminLogENT.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-
 import java.util.Date;
 
 @TableName("fn_admin_log")

fw-sample-service/src/main/java/com/mokasz/sample/service/impl/DictServiceImpl.java

@@ -1,11 +1,8 @@
 package com.mokasz.sample.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mokasz.sample.mapper.AdminLogMapper;
 import com.mokasz.sample.mapper.DictMapper;
-import com.mokasz.sample.mapper.entity.AdminLogENT;
 import com.mokasz.sample.mapper.entity.DictENT;
-import com.mokasz.sample.service.AdminLogService;
 import com.mokasz.sample.service.DictService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;