Merge remote-tracking branch 'origin/master'

im-admin-ui/src/views/im/code/components/wangye.vue

@@ -9,26 +9,26 @@
     <div class="fenlei">
       <div class="code-content-wrap">
         <textarea id="NormalCodeTextarea1" class="code" rows="22">
-<script>
+      <script>
-  (function() {
+        (function() {
-  _s = document.createElement('script');
+        _s = document.createElement('script');
-  _s.src="{{ siteUrl }}/customerServer.js"
+        _s.src="{{ siteUrl }}/customerServer.js"
-  _s.onload = function(){
+        _s.onload = function(){
-  var option = {
+        var option = {
-        "authInit":true,
+              "authInit":true,
-        openUrl: '{{ siteUrl }}',
+              openUrl: '{{ siteUrl }}',
-        token: '{{ uniqueToken }}',
+              token: '{{ uniqueToken }}',
-        isShowTip: true,
+              isShowTip: true,
-        mobileIcon: '{{ floatConfig?.mobileImage || "" }}',
+              mobileIcon: '{{ floatConfig?.mobileImage || "" }}',
-        pcIcon: '{{ floatConfig?.pcImage || "" }}',
+              pcIcon: '{{ floatConfig?.pcImage || "" }}',
-        windowStyle:'',
+              windowStyle:'',
-      };
+            };
-      var canCustomerServer = new initCustomerServer(option);
+            var canCustomerServer = new initCustomerServer(option);
-      canCustomerServer.init();
+            canCustomerServer.init();
-  }
+        }
-  document.head.appendChild(_s)
+        document.head.appendChild(_s)
-  })();
+        })();
-</script>
+      </script>
         </textarea>
 
         <div class="other-wrap">

im-admin-ui/src/views/im/user/index.vue

@@ -69,7 +69,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="群组" align="center" prop="groupIds" width="200">
+        <el-table-column label="群组" align="center" prop="groupIds" width="120">
           <template #default="scope">
             <el-tag
               v-for="groupId in (scope.row.groupIds || '').split(',').filter((id) => id)"
@@ -99,8 +99,9 @@
             <span>{{ parseTime(scope.row.lastLoginTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="用户IP" align="center" prop="lastLoginIp" />
         <el-table-column label="地址来源" align="center" prop="sourceUrl" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
           <template #default="scope">
             <!--
             <el-button v-hasPermi="['im:user:query']" link type="primary" @click="handleDetail(scope.row)">详情</el-button>

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java

@@ -115,6 +115,9 @@ public class ImUser implements TransPojo {
      */
     private String welcomeMsg;
 
-
+    /**
+     * 用户ip地址
+     */
+    private String lastLoginIp;
 
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImAgentVo.java

@@ -86,5 +86,5 @@ public class ImAgentVo implements Serializable {
      * 移动端悬浮球图片
      */
     private String mobileFloatBall;
-    
+
 }