2.0.0项目初始化

datax-modules/system-service-parent/system-service/pom.xml

@@ -45,6 +45,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>${bitwalker.version}</version>
+        </dependency>
+        <dependency>
             <groupId>cn.datax</groupId>
             <artifactId>datax-common-mybatis</artifactId>
             <version>2.0.0</version>

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/UserController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -134,5 +135,11 @@ public class UserController extends BaseController {
         Map<String, Object> result =  userService.getRouteById(id);
         return R.ok().setData(result);
     }
+
+    @PostMapping("/login/log")
+    public R loginLog(HttpServletRequest request) {
+        userService.loginLog(request);
+        return R.ok();
+    }
 }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/UserService.java

@@ -9,6 +9,7 @@ import cn.datax.service.system.api.vo.UserInfo;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -37,4 +38,6 @@ public interface UserService extends BaseService<UserEntity> {
     IPage<UserEntity> pageDataScope(IPage<UserEntity> page, Wrapper<UserEntity> queryWrapper, DataScope dataScope);
 
     Map<String, Object> getRouteById(String id);
+
+    void loginLog(HttpServletRequest request);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/UserServiceImpl.java

@@ -2,7 +2,10 @@ package cn.datax.service.system.service.impl;
 
 import cn.datax.common.base.DataScope;
 import cn.datax.common.core.DataConstant;
+import cn.datax.common.core.DataUser;
 import cn.datax.common.exception.DataException;
+import cn.datax.common.utils.IPUtil;
+import cn.datax.common.utils.SecurityUtil;
 import cn.datax.service.system.api.dto.UserDto;
 import cn.datax.service.system.api.dto.UserPasswordDto;
 import cn.datax.service.system.api.entity.*;
@@ -21,12 +24,14 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import eu.bitwalker.useragentutils.UserAgent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -216,4 +221,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         return result;
     }
+
+    @Override
+    public void loginLog(HttpServletRequest request) {
+        String ip = IPUtil.getIpAddr(request);
+        UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
+        String os = userAgent.getOperatingSystem().getName();
+        String browser = userAgent.getBrowser().getName();
+        DataUser user = SecurityUtil.getDataUser();
+        String userId = user.getId();
+        String username = user.getUsername();
+    }
 }

datax-ui/src/views/system/config/ConfigList.vue

@@ -51,6 +51,13 @@
               @click="handleBatchDelete"
               v-hasPerm="['system:config:remove']"
             >删除</el-button>
+            <el-button
+              type="warning"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handleConfigRefresh"
+              v-hasPerm="['system:config:refresh']"
+            >刷新缓存</el-button>
           </el-button-group>
         </el-col>
         <el-col :span="12">
@@ -160,7 +167,7 @@
 </template>
 
 <script>
-import { pageConfig, delConfig, delConfigs } from '@/api/system/config'
+import { pageConfig, delConfig, delConfigs, refreshConfig } from '@/api/system/config'
 
 export default {
   name: 'ConfigList',
@@ -315,6 +322,10 @@ export default {
       }
       this.$message.warning('不支持批量删除')
     },
+    /** 刷新缓存 */
+    handleConfigRefresh () {
+      refreshConfig()
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.queryParams.pageNum = 1

datax-ui/src/views/system/dict/DictList.vue

@@ -58,6 +58,13 @@
               @click="handleBatchDelete"
               v-hasPerm="['system:dict:remove']"
             >删除</el-button>
+            <el-button
+              type="warning"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handleDictRefresh"
+              v-hasPerm="['system:dict:refresh']"
+            >刷新缓存</el-button>
           </el-button-group>
         </el-col>
         <el-col :span="12">
@@ -173,7 +180,7 @@
 </template>
 
 <script>
-import { pageDict, delDict, delDicts } from '@/api/system/dict'
+import { pageDict, delDict, delDicts, refreshDict } from '@/api/system/dict'
 
 export default {
   name: 'DictList',
@@ -334,6 +341,10 @@ export default {
       this.showOptions.showItemDetail = false
       this.$emit('showCard', this.showOptions)
     },
+    /** 刷新缓存 */
+    handleDictRefresh () {
+      refreshDict()
+    },
     /** 删除按钮操作 */
     handleDelete (row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {

datax-ui/src/views/system/user/UserEdit.vue

@@ -32,7 +32,7 @@
               <treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="请选择归属部门" />
             </el-form-item>
             <el-form-item label="岗位">
-              <el-select v-model="form.postList" multiple placeholder="请选择岗位">
+              <el-select v-model="form.postList" multiple placeholder="请选择岗位" @change="$set(form, form.postList, $event)">
                 <el-option
                   v-for="item in postOptions"
                   :key="item.id"
@@ -43,7 +43,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="角色">
-              <el-select v-model="form.roleList" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleList" multiple placeholder="请选择角色" @change="$set(form, form.roleList, $event)">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.id"
@@ -109,10 +109,7 @@ export default {
         isDisabled: false
       },
       // 表单参数
-      form: {
-        postList: [],
-        roleList: []
-      },
+      form: {},
       // 表单校验
       rules: {
         username: [
@@ -212,8 +209,8 @@ export default {
       getUser(id).then(response => {
         if (response.success) {
           this.form = response.data
-          this.form.roleList = response.data.roles.map(role => role.id)
           this.form.postList = response.data.posts.map(post => post.id)
+          this.form.roleList = response.data.roles.map(role => role.id)
         }
       })
     },
@@ -240,6 +237,12 @@ export default {
           })
         }
       })
+    },
+    change1 () {
+      console.log(this.form.postList)
+    },
+    change2 () {
+      console.log(this.form.roleList)
     }
   }
 }

pom.xml

@@ -50,6 +50,7 @@
     <jasperreports.version>6.12.2</jasperreports.version>
     <mybatis-spring.version>2.1.2</mybatis-spring.version>
     <flowable.version>6.5.0</flowable.version>
+    <bitwalker.version>1.21</bitwalker.version>
   </properties>
 
   <modules>