易信

src/main/java/com/izouma/nineth/domain/netease/Msg.java

@@ -0,0 +1,22 @@
+package com.izouma.nineth.domain.netease;
+
+import com.izouma.nineth.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class Msg extends BaseEntity {
+    private String  from;
+    private String  to;
+    private Integer ope;
+    private Integer type;
+    private String  body;
+}

src/main/java/com/izouma/nineth/domain/NeteaseUser.java → src/main/java/com/izouma/nineth/domain/netease/NeteaseUser.java

@@ -1,10 +1,10 @@
-package com.izouma.nineth.domain;
+package com.izouma.nineth.domain.netease;
 
+import com.izouma.nineth.domain.BaseEntityNoID;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.internal.util.StringHelper;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

src/main/java/com/izouma/nineth/domain/netease/Team.java

@@ -0,0 +1,42 @@
+package com.izouma.nineth.domain.netease;
+
+import com.izouma.nineth.converter.StringArrayConverter;
+import com.izouma.nineth.domain.BaseEntityNoID;
+import com.izouma.nineth.enums.netease.TeamType;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("系列活动")
+public class Team extends BaseEntityNoID {
+    @Id
+    private Long         tid;
+    private String       name;
+    private String       ownerid;
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> members;
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> admins;
+    private String       announcement;
+    private String       intro;
+    private String       msg;
+    @Enumerated(EnumType.STRING)
+    private TeamType     custom;
+    private String       icon;
+
+    private Long   collectionId;
+    private String password;
+
+}

src/main/java/com/izouma/nineth/enums/netease/TeamType.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.enums.netease;
+
+public enum TeamType {
+    PUBLIC("公共群"),
+    COLLECTION("藏品群"),
+    PRIVATE("私密群");
+
+    private final String description;
+
+    TeamType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/izouma/nineth/repo/Netease/TeamRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo.Netease;
+
+import com.izouma.nineth.domain.netease.Team;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface TeamRepo extends JpaRepository<Team, Long>, JpaSpecificationExecutor<Team> {
+    @Query("update Team t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/NeteaseUserRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth.repo;
 
-import com.izouma.nineth.domain.NeteaseUser;
+import com.izouma.nineth.domain.netease.NeteaseUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/izouma/nineth/service/netease/NeteaseUserService.java

@@ -3,7 +3,7 @@ package com.izouma.nineth.service.netease;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.izouma.nineth.domain.NeteaseUser;
+import com.izouma.nineth.domain.netease.NeteaseUser;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -16,7 +16,6 @@ import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import javax.print.DocFlavor;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -39,7 +38,8 @@ public class NeteaseUserService {
         Map<String, String> headers = new HashMap<>();
         String appKey = "872dd9d0a0f8eda25b579654745db459";
         String nonce = RandomStringUtils.randomAlphabetic(32);
-        Timestamp timestamp = new Timestamp(LocalDateTime.now(ZoneOffset.UTC).toInstant(ZoneOffset.UTC).getEpochSecond());
+        Timestamp timestamp = new Timestamp(LocalDateTime.now(ZoneOffset.UTC).toInstant(ZoneOffset.UTC)
+                .getEpochSecond());
         String curTime = String.valueOf(timestamp.getTime());
         String appSecret = "24e63777e4bb";
         headers.put("AppKey", appKey);
@@ -77,4 +77,22 @@ public class NeteaseUserService {
                 .build();
         return neteaseUserRepo.save(neteaseUser);
     }
+
+    public NeteaseUser updateToken(Long userId) {
+        NeteaseUser record = neteaseUserRepo.findById(userId).orElseThrow(new BusinessException("该用户暂无注册信息"));
+        String url = "user/update.refreshToken";
+        String contentType = "application/x-www-form-urlencoded;charset=utf-8";
+        Map<String, String> params = new HashMap<>();
+        params.put("accid", String.valueOf(userId));
+        String result = httpPost(url, contentType, params);
+        JSONObject jsonObject = JSON.parseObject(result);
+        Integer code = jsonObject.getInteger("code");
+        if (code != 200) {
+            throw new BusinessException("注册出错，请核查后重新注册");
+        }
+        JSONObject info = jsonObject.getJSONObject("info");
+        String token = info.getString("token");
+        record.setToken(token);
+        return neteaseUserRepo.save(record);
+    }
 }

src/main/java/com/izouma/nineth/service/netease/TeamService.java

@@ -0,0 +1,48 @@
+package com.izouma.nineth.service.netease;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.nineth.domain.netease.Team;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.Netease.TeamRepo;
+import com.izouma.nineth.service.netease.NeteaseUserService;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class TeamService {
+
+    private TeamRepo           teamRepo;
+    private NeteaseUserService neteaseUserService;
+
+    public Page<Team> all(PageQuery pageQuery) {
+        return teamRepo.findAll(JpaUtils.toSpecification(pageQuery, Team.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public Team create(Team team) {
+        Map<String, String> params = new HashMap<>();
+        params.put("tname", team.getName());
+        params.put("owner", team.getOwnerid());
+        params.put("members", JSONObject.toJSONString(team.getMembers()));
+        params.put("joinmode", "0");
+        params.put("custom", team.getCustom().toString());
+        params.put("msg", "欢迎加入大厅测试群~~");
+        String result = neteaseUserService
+                .httpPost("team/create.action", "application/x-www-form-urlencoded;charset=utf-8", params);
+        JSONObject jsonObject = JSON.parseObject(result);
+        Integer code = jsonObject.getInteger("code");
+        if (code != 200) {
+            throw new BusinessException("注册出错，请核查后重新注册");
+        }
+        Long id = jsonObject.getLong("tid");
+        team.setTid(id);
+        return teamRepo.save(team);
+    }
+}

src/main/java/com/izouma/nineth/web/Netease/TeamController.java

@@ -0,0 +1,66 @@
+package com.izouma.nineth.web.Netease;
+
+import com.izouma.nineth.service.netease.TeamService;
+import com.izouma.nineth.web.BaseController;
+import com.izouma.nineth.domain.netease.Team;
+
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.Netease.TeamRepo;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/team")
+@AllArgsConstructor
+public class TeamController extends BaseController {
+    private TeamService teamService;
+    private TeamRepo    teamRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+//    @PostMapping("/save")
+//    public Team save(@RequestBody Team record) {
+//        if (record.getId() != null) {
+//            Team orig = teamRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+//            ObjUtils.merge(orig, record);
+//            return teamRepo.save(orig);
+//        }
+//        return teamRepo.save(record);
+//    }
+
+    @PostMapping("/create")
+    public Team create(@RequestParam Team team) {
+        return teamService.create(team);
+    }
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Team> all(@RequestBody PageQuery pageQuery) {
+        return teamService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Team get(@PathVariable Long id) {
+        return teamRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        teamRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Team> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/nineth/web/NeteaseUserController.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth.web;
 
-import com.izouma.nineth.domain.NeteaseUser;
+import com.izouma.nineth.domain.netease.NeteaseUser;
 import com.izouma.nineth.service.netease.NeteaseUserService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -58,8 +58,13 @@ public class NeteaseUserController extends BaseController {
     }
 
     @PostMapping("/create")
-    public NeteaseUser all(@RequestParam Long userId) {
+    public NeteaseUser create(@RequestParam Long userId) {
         return neteaseUserService.create(userId);
     }
+
+    @PostMapping("/refresh")
+    public NeteaseUser refresh(@RequestParam Long userId) {
+        return neteaseUserService.updateToken(userId);
+    }
 }
 

src/main/vue/src/router.js

@@ -1443,6 +1443,22 @@ const router = new Router({
                     meta: {
                        title: '云信用户表',
                     },
+               },
+                {
+                    path: '/teamEdit',
+                    name: 'TeamEdit',
+                    component: () => import(/* webpackChunkName: "teamEdit" */ '@/views/TeamEdit.vue'),
+                    meta: {
+                       title: '群组编辑',
+                    },
+                },
+                {
+                    path: '/teamList',
+                    name: 'TeamList',
+                    component: () => import(/* webpackChunkName: "teamList" */ '@/views/TeamList.vue'),
+                    meta: {
+                       title: '群组',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]
@@ -1503,4 +1519,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/TeamEdit.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="tid" label="tid">
+                                    <el-input-number type="number" v-model="formData.tid"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="name" label="群名">
+                                    <el-input v-model="formData.name"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="ownerid" label="群主id">
+                                    <el-input v-model="formData.ownerid"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="members" label="群成员列表">
+                                    <el-input v-model="formData.members"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="admins" label="管理员列表">
+                                    <el-input v-model="formData.admins"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="announcement" label="公告">
+                                    <el-input v-model="formData.announcement"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="intro" label="介绍">
+                                    <el-input v-model="formData.intro"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="msg" label="邀请信息">
+                                    <el-input v-model="formData.msg"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="custom" label="群组分类">
+                                    <el-input v-model="formData.custom"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="icon" label="图标">
+                                    <single-upload v-model="formData.icon"></single-upload>
+                        </el-form-item>
+                        <el-form-item prop="collectionId" label="藏品id">
+                                    <el-input-number type="number" v-model="formData.collectionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="password" label="密码">
+                                    <el-input v-model="formData.password"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'TeamEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('team/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/team/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/team/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/TeamList.vue

@@ -0,0 +1,201 @@
+<template>
+    <div  class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+                新增
+            </el-button>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                    placeholder="搜索..."
+                    v-model="search"
+                    clearable
+                    class="filter-item search"
+                    @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="tid" label="tid"
+>
+                    </el-table-column>
+                    <el-table-column prop="name" label="群名"
+>
+                    </el-table-column>
+                    <el-table-column prop="ownerid" label="群主id"
+>
+                    </el-table-column>
+                    <el-table-column prop="members" label="群成员列表"
+>
+                    </el-table-column>
+                    <el-table-column prop="admins" label="管理员列表"
+>
+                    </el-table-column>
+                    <el-table-column prop="announcement" label="公告"
+>
+                    </el-table-column>
+                    <el-table-column prop="intro" label="介绍"
+>
+                    </el-table-column>
+                    <el-table-column prop="msg" label="邀请信息"
+>
+                    </el-table-column>
+                    <el-table-column prop="custom" label="群组分类"
+>
+                    </el-table-column>
+                    <el-table-column prop="icon" label="图标"
+>
+                            <template slot-scope="{row}">
+                                <el-image style="width: 30px; height: 30px"
+                                          :src="row.icon" fit="cover"
+                                          :preview-src-list="[row.icon]"></el-image>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="collectionId" label="藏品id"
+>
+                    </el-table-column>
+                    <el-table-column prop="password" label="密码"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'TeamList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/team/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/teamEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/teamEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/team/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/team/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>